forked from SerbiaStrong-220/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix weapon path (SerbiaStrong-220#1615)
- Loading branch information
Showing
11 changed files
with
76 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
ent-WeaponRevolverMatebaSouvenir = уника | ||
.desc = Сувенирная версия авторевольвера Матеба с золотым покрытием. Из-за других материалов обладает конструктивно уменьшенной скорострельностью. Использует патроны калибра .45 магнум. | ||
ent-LockedUnicaBox = защищённый кейс для револьвера | ||
.desc = Ударопрочный кейс с замком для хранения револьвера. Является аксессуаром к сувенирному револьверу "Уника". |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-NTbaton = телескопическая бита НТ | ||
.desc = А вы знали, что Офицеры ЦК любят играть в бейсбол головами некомпетентного руководства своих активов? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
ent-MagicBroom = старая метла | ||
.desc =Обычная, не волшебная метла. Только для реквизита. | ||
ent-OldBroom = старая метла | ||
.desc =Обычная, не волшебная метла. Только для реквизита. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 0 additions & 15 deletions
15
Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/jian_sword.yml
This file was deleted.
Oops, something went wrong.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
.../SS220/Entities/Weapons/Melee/ntbaton.yml → ...ntities/Objects/Weapons/Melee/ntbaton.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/oldbroom.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 0 additions & 17 deletions
17
Resources/Prototypes/SS220/Entities/Weapons/Guns/oldbroom.yml
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.