diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index 13b100f8ec5..0a133d070cd 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -13,7 +13,10 @@ - id: ClothingShoesColorBlack amount: 2 - id: ClothingMaskMuzzle - - id: ClothingHeadsetPrison #DV - Added prisoner headsets + # Begin DeltaV modifications + - id: ClothingHeadsetPrison # Added prisoner headsets + - id: PrisonKnife # Bread cutting knife, does 4 damage total. + # End DeltaV modifications #- type: entity # id: WardrobePajamaFilled diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/knife.yml new file mode 100644 index 00000000000..b19fa1dbfe5 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/knife.yml @@ -0,0 +1,18 @@ +- type: entity + parent: KitchenKnife + id: PrisonKnife + name: prisoner's knife + description: A slightly dulled bread knife + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Melee/prison_knife.rsi + state: icon + - type: Item + sprite: DeltaV/Objects/Weapons/Melee/prison_knife.rsi + - type: MeleeWeapon + damage: + types: + Slash: 3 + Blunt: 1 + - type: Execution + doAfterDuration: 10.0 # Duller knife. diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/equipped-BELT.png new file mode 100644 index 00000000000..8b714d814ea Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/icon.png new file mode 100644 index 00000000000..764282f6fdd Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/inhand-left.png new file mode 100644 index 00000000000..b885d1e1768 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/inhand-right.png new file mode 100644 index 00000000000..bd9c42937ad Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/meta.json new file mode 100644 index 00000000000..751fedd5216 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d, modified into bread knife by Radezolid", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +}