From 6391624a48f0186c3d548a287eeea3d817a66d2f Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 19 Dec 2024 01:55:03 -0300 Subject: [PATCH] Add a bread knife exclusive to perma (#2304) * Added knife * Add knife to prisoner's locker + better comment. --------- Co-authored-by: Milon --- .../Catalog/Fills/Lockers/wardrobe_job.yml | 5 +++- .../Entities/Objects/Weapons/Melee/knife.yml | 18 ++++++++++++ .../Melee/prison_knife.rsi/equipped-BELT.png | Bin 0 -> 161 bytes .../Weapons/Melee/prison_knife.rsi/icon.png | Bin 0 -> 198 bytes .../Melee/prison_knife.rsi/inhand-left.png | Bin 0 -> 199 bytes .../Melee/prison_knife.rsi/inhand-right.png | Bin 0 -> 182 bytes .../Weapons/Melee/prison_knife.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/knife.yml create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/equipped-BELT.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/prison_knife.rsi/meta.json 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 0000000000000000000000000000000000000000..8b714d814ea80e4441d8982fe6591fca2697dd82 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=8J;eVAr*7p-ZB(yaNu!07~H_b zlECh|oRxKpg+thibqg2oO8mF3Y0nnVY@lie`M1%lZyNh-&R=^?wS@8F$I#H{rQz@0 z?=c-&evJR(N01T*hCM$dJ#1&YA9s)MTl~2FMFj&x-3vzj$<9+e&nWqU6nMJ&xvXH$6>u0T3Dv%uBUck_xdBaojwDLybX{WD`r!HSxw}9!- hCkIiMC+!vt3~zri&R(G(@f&CugQu&X%Q~loCIB=oN5udD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b885d1e17688f93f08beef141d9ee0e824cd444c GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!gaUj*T!D05UEPu;ON@++l7Sos zhPG{2!hsZ9NswPK!+#K{s(kPdC=%!C;usRq`u3V3-vI?4=Rl_K`;C(piY#TF&Sm(= zJhk&=niE5VVD*gU-*vB9&YE}OUA?Er_P>)RJdqCjvHtB|Muvv@m8EM!wv>L2(NKN= pR-5zh_Xl1#f-k;b|H1dbL?b0T2G4*RFH?{kJYD@<);T3K0RU}#OQHY( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bd9c42937ad47ab52c7ee888f0a385ec1df23592 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!cmjMvT>t<7UsqRm|Nea=Bcs4e zFLQw6EG0pH!3;o&&AJX9Kz^vFi(^Pc>)UINd<+5t&Vh&jzSk+^Smbu-(f-=(GEpXm zD`#eQE;FCu8tyz>pV#x$a=rTF|9Ee0WnkE27L}E{_xDr1DSzdkPHnsSX|;Vv@aym& c;t%2_l|C_eo?=os1+;*{)78&qol`;+0E@3iSpWb4 literal 0 HcmV?d00001 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 + } + ] +}