Skip to content

Commit

Permalink
Fix weapon path (SerbiaStrong-220#1615)
Browse files Browse the repository at this point in the history
  • Loading branch information
EstKemran authored Aug 18, 2024
1 parent 11ace57 commit 06a8377
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 58 deletions.
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss220/weapons/hosgun.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-WeaponRevolverMatebaSouvenir = уника
.desc = Сувенирная версия авторевольвера Матеба с золотым покрытием. Из-за других материалов обладает конструктивно уменьшенной скорострельностью. Использует патроны калибра .45 магнум.
ent-LockedUnicaBox = защищённый кейс для револьвера
.desc = Ударопрочный кейс с замком для хранения револьвера. Является аксессуаром к сувенирному револьверу "Уника".
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-NTbaton = телескопическая бита НТ
.desc = А вы знали, что Офицеры ЦК любят играть в бейсбол головами некомпетентного руководства своих активов?
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss220/weapons/oldbroom.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-MagicBroom = старая метла
.desc =Обычная, не волшебная метла. Только для реквизита.
ent-OldBroom = старая метла
.desc =Обычная, не волшебная метла. Только для реквизита.
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

- type: entity
name: Уника
parent: BaseWeaponRevolver
id: WeaponRevolverMatebaSouvenir
description: Сувенирная версия авторевольвера Матеба с золотым покрытием. Из-за других материалов обладает конструктивно уменьшенной скорострельностью. Использует патроны калибра .45 магнум.
name: unika
description: A souvenir version of the Mateb auto revolver with a gold coating. Due to other materials, it has a structurally reduced rate of fire. Uses caliber cartridges .45 magnum.
components:
- type: Sprite
sprite: SS220/Objects/Weapons/Guns/hosgun.rsi
Expand All @@ -22,10 +24,10 @@
price: 5000

- type: entity
name: защищённый кейс для револьвера
description: Ударопрочный кейс с замком для хранения револьвера. Является аксессуаром к сувенирному револьверу "Уника".
id: LockedUnicaBox
parent: BaseStorageItem
id: LockedUnicaBox
name: a protected revolver case
description: A shockproof case with a lock for storing a revolver. It is an accessory to the souvenir revolver "Unica".
components:
- type: Storage
grid:
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

- type: entity
name: телескопическая бита НТ
parent: BaseItem
id: NTbaton
description: А вы знали, что Офицеры ЦК любят играть в бейсбол головами некомпетентного руководства своих активов?
name: telescopic bat NT
description: Did you know that Central Committee officers like to play baseball with the heads of the incompetent management of their assets?
components:
- type: Sprite
sprite: SS220/Objects/Weapons/Melee/ntbaton.rsi
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
- type: entity
parent: BaseItem
id: MagicBroom
name: an old broom
description: An ordinary, non-magical broom. Only for props.
components:
- type: Sprite
sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi
state: icon
- type: MeleeWeapon
wideAnimationRotation: -150
damage:
types:
Blunt: 0
- type: Item
size: Normal
sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi

- type: entity
parent: BaseItem
id: OldBroom
name: an old broom
description: An ordinary, non-magical broom. Only for props.
components:
- type: Sprite
sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi
state: icon
- type: MeleeWeapon
wideAnimationRotation: -150
damage:
types:
Blunt: 0
- type: Item
size: Normal
sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

# Цзянь
- type: entity
name: jian sword
parent: CaptainSabre
id: JianSword
description: An ancient ceremonial sword.
components:
- type: Sprite
sprite: SS220/Objects/Weapons/Melee/jian_sword.rsi
state: icon
- type: Item
size: Normal
sprite: SS220/Objects/Weapons/Melee/jian_sword.rsi
- type: Tag
tags:
- JianSword

# Ёримицу
- type: entity
name: minamoto no yorimitsu
parent: CaptainSabre
Expand All @@ -19,6 +39,7 @@
tags:
- MinamotoNoYorimitsu

# Рапира
- type: entity
parent: BaseItem
id: Rapier
Expand All @@ -37,7 +58,6 @@
types:
Piercing: 27
angle: 0
animation: WeaponArcThrust
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
Expand All @@ -58,6 +78,7 @@
types:
Piercing: 15

# Офицерский кортик
- type: entity
parent: CaptainSabre
id: OfficerCutlass
Expand All @@ -73,7 +94,6 @@
types:
Piercing: 12
angle: 0
animation: WeaponArcThrust
- type: Item
size: Normal
sprite: SS220/Objects/Weapons/Melee/officer_cutlass.rsi
Expand Down
17 changes: 0 additions & 17 deletions Resources/Prototypes/SS220/Entities/Weapons/Guns/oldbroom.yml

This file was deleted.

17 changes: 0 additions & 17 deletions Resources/Prototypes/SS220/Entities/Weapons/oldbroom.yml

This file was deleted.

0 comments on commit 06a8377

Please sign in to comment.