diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/gohei.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/gohei.ftl index ed6be8e73e..b5bdfc276d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/gohei.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/gohei.ftl @@ -1,2 +1,2 @@ ent-Gohei = гохэй - .desc = деревянныей жезл, украшенный двумя бумажными лентами сидэ. Изначально использовался жрицами синтоистских храмов для очищения предметов. Теперь используется станционными виабушниками. \ No newline at end of file + .desc = Деревянныей жезл, украшенный двумя бумажными лентами сидэ. Изначально использовался жрицами синтоистских храмов для очищения предметов. Теперь используется станционными виабушниками. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index 02bd2b5f0d..7c092d6b09 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -24,6 +24,9 @@ Structural: 10 - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 - type: Tool qualities: - Rolling @@ -63,6 +66,9 @@ state: icon - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 - type: Construction graph: WoodenBat node: incompleteBat diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml index eb66e095a3..9f5c32efdc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml @@ -9,6 +9,9 @@ state: cane - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 sprite: Objects/Weapons/Melee/cane.rsi - type: Appearance - type: MeleeWeapon @@ -46,6 +49,9 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 sprite: Objects/Weapons/Melee/cane_blade.rsi - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 558f53cd02..425d93ee30 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -19,7 +19,7 @@ - type: ItemToggleDisarmMalus activatedDisarmMalus: 0.6 - type: ItemToggleSize - activatedSize: Huge + activatedSize: Ginormous # WD EDIT - type: ItemToggleMeleeWeapon activatedSoundOnHit: path: /Audio/Weapons/eblade1.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 0d59037069..947bc01bcc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -88,6 +88,8 @@ - type: Tag tags: - Knife + - type: Item # WD + storedRotation: -44 # Like a crusher... but better - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml index 7347bb0d41..2a39c20089 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml @@ -25,3 +25,6 @@ Structural: 10 - type: Item size: Large + storedRotation: -44 # WD + shape: # WD + - 0,0,1,3 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml index e93e151605..f55a9b7586 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml @@ -77,6 +77,9 @@ - state: stunprod_nocell map: [ "enum.ToggleVisuals.Layer" ] - type: Item + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 sprite: Objects/Weapons/Melee/stunprod.rsi - type: Clothing sprite: Objects/Weapons/Melee/stunprod.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 0bcd987881..fc1fd2b4de 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -24,9 +24,9 @@ - type: Item size: Large sprite: Objects/Weapons/Melee/captain_sabre.rsi - storedRotation: 44 # It just works + storedRotation: -44 # WD shape: - - 0, 0, 4, 0 + - 0, 0, 0, 3 # WD - type: DisarmMalus - type: MeleeBlock delay: 6.1 @@ -56,6 +56,9 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: Huge + storedRotation: -44 # WD + shape: + - 0, 0, 1, 3 # WD sprite: Objects/Weapons/Melee/katana.rsi - type: Clothing sprite: Objects/Weapons/Melee/katana.rsi @@ -83,6 +86,9 @@ Slash: 33 # WD - type: Item size: Huge + storedRotation: 70 # WD + shape: # WD + - 0, 0, 1, 3 sprite: Objects/Weapons/Melee/energykatana.rsi - type: EnergyKatana - type: DashAbility @@ -128,6 +134,9 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: Large + storedRotation: -44 # WD + shape: # WD + - 0, 0, 1, 2 sprite: Objects/Weapons/Melee/machete.rsi - type: Clothing sprite: Objects/Weapons/Melee/machete.rsi @@ -160,6 +169,9 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: Huge + storedRotation: -44 # WD + shape: # WD + - 0, 0, 1, 3 - type: Clothing sprite: Objects/Weapons/Melee/claymore.rsi slots: @@ -196,6 +208,9 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: Large + storedRotation: -44 # WD + shape: # WD + - 0, 0, 1, 3 sprite: Objects/Weapons/Melee/cutlass.rsi - type: DisarmMalus - type: MeleeBlock diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml index d69652b1f5..87cc9307b3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml @@ -9,6 +9,9 @@ state: icon - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 sprite: Objects/Weapons/Melee/white_cane.rsi - type: MeleeWeapon wideAnimationRotation: 45 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 6332df533b..d72322bfd0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -114,6 +114,9 @@ bluntStaminaDamageFactor: 1.5 - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 - type: Tag tags: - Truncheon diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml index 8bb031ba6d..43d4460ec5 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml @@ -104,6 +104,10 @@ - belt - suitStorage - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/claymore.rsi - type: MeleeWeapon damage: @@ -130,6 +134,10 @@ - belt - suitStorage - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/chainsword.rsi - type: MeleeWeapon soundHit: @@ -159,6 +167,10 @@ energy: 2 color: lightblue - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/forceweapon.rsi # Позволяет блокировать быстрее, средненький урон. @@ -177,6 +189,10 @@ - belt - suitStorage - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/katana.rsi - type: MeleeWeapon wideAnimationRotation: -135 @@ -212,6 +228,10 @@ - back - suitStorage - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/multiverse.rsi - type: RandomDamage - type: Sharp @@ -236,6 +256,10 @@ - back - suitStorage - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 2, 3 sprite: White/Objects/Weapons/Chaplain/scythe-inhands.rsi - type: Sharp @@ -263,6 +287,10 @@ - type: GhostTakeoverAvailable - type: Examiner - type: Item + size: Huge + storedRotation: 44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/possessed.rsi # Приклеен к руке, быстро и громко бьет @@ -340,6 +368,9 @@ state: icon - type: Item size: Huge + storedRotation: 44 + shape: + - 0, 0, 0, 4 sprite: White/Objects/Weapons/Chaplain/staff.rsi - type: Clothing sprite: White/Objects/Weapons/Chaplain/staff.rsi @@ -380,6 +411,9 @@ - type: Item sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 - type: Clothing sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi slots: @@ -438,6 +472,9 @@ state: icon - type: Item size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/hammer.rsi - type: Clothing sprite: White/Objects/Weapons/Chaplain/hammer.rsi diff --git a/Resources/Prototypes/_White/Wizard/magic_items.yml b/Resources/Prototypes/_White/Wizard/magic_items.yml index 7bc0ef44c9..5fda381d38 100644 --- a/Resources/Prototypes/_White/Wizard/magic_items.yml +++ b/Resources/Prototypes/_White/Wizard/magic_items.yml @@ -48,6 +48,10 @@ - suitStorage - type: Item sprite: White/Objects/Weapons/Chaplain/spellblade.rsi + size: Large + storedRotation: 44 + shape: + - 0, 0, 1, 3 - type: UserInterface interfaces: enum.SpellBladeUiKey.Key: @@ -88,6 +92,9 @@ Structural: 60 - type: Item size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/mjolnir.rsi - type: Clothing quickEquip: false