From b4c251472f58c81649cf2136642cd4217125e932 Mon Sep 17 00:00:00 2001 From: Arendian <137322659+Arendian@users.noreply.github.com> Date: Mon, 10 Jul 2023 04:22:10 +0200 Subject: [PATCH] Adds Advanced ointment and bruisepack recipes (#17583) * Adds Advanced ointment and bruisepack recipes * Changes the sprites to the ones from /tg * Changed names and sprites, slight tweaks * Formatting * Solve Conflict * Formatting * Fix issues found in check * Fix Oopsie --- .../Objects/Specific/Medical/healing.yml | 82 ++++++++++++++++++ .../Recipes/Cooking/meal_recipes.yml | 26 ++++++ .../Prototypes/Stacks/medical_stacks.yml | 18 ++++ .../medicated-suture-inhand-left.png | Bin 0 -> 191 bytes .../medicated-suture-inhand-right.png | Bin 0 -> 217 bytes .../Medical/medical.rsi/medicated-suture.png | Bin 0 -> 290 bytes .../Specific/Medical/medical.rsi/meta.json | 23 +++++ .../regenerative-mesh-inhand-left.png | Bin 0 -> 223 bytes .../regenerative-mesh-inhand-right.png | Bin 0 -> 230 bytes .../Medical/medical.rsi/regenerative-mesh.png | Bin 0 -> 523 bytes 10 files changed, 149 insertions(+) create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 7d6ab12a93..0f68f94499 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -57,6 +57,48 @@ - type: Item size: 1 +- type: entity + name: regenerative mesh + description: Used to treat even the nastiest burns. Also effective against caustic burns. + parent: BaseHealingItem + id: RegenerativeMesh + components: + - type: Tag + tags: + - Ointment + - type: Sprite + state: regenerative-mesh + - type: Item + heldPrefix: regenerative-mesh + - type: Healing + damageContainers: + - Biological + damage: + types: + Heat: -10 + Cold: -10 + Shock: -10 + Caustic: -10 + healingBeginSound: + path: "/Audio/Items/Medical/ointment_begin.ogg" + healingEndSound: + path: "/Audio/Items/Medical/ointment_end.ogg" + - type: Stack + stackType: RegenerativeMesh + count: 10 + - type: StackPrice + price: 20 + +- type: entity + id: OintmentAdvanced1 + parent: RegenerativeMesh + components: + - type: Stack + stackType: RegenerativeMesh + count: 1 + - type: Item + size: 1 + - type: entity name: bruise pack description: A therapeutic gel pack and bandages designed to treat blunt-force trauma. @@ -96,6 +138,46 @@ - type: Item size: 1 +- type: entity + name: medicated suture + description: A suture soaked in medicine, treats blunt-force trauma effectively and closes wounds. + parent: BaseHealingItem + id: MedicatedSuture + components: + - type: Tag + tags: + - Brutepack + - type: Sprite + state: medicated-suture + - type: Item + heldPrefix: medicated-suture + - type: Healing + damageContainers: + - Biological + damage: + groups: + Brute: -30 # 10 for each type in the group + bloodlossModifier: -10 # a suture should stop ongoing bleeding + healingBeginSound: + path: "/Audio/Items/Medical/brutepack_begin.ogg" + healingEndSound: + path: "/Audio/Items/Medical/brutepack_end.ogg" + - type: Stack + stackType: MedicatedSuture + count: 10 + - type: StackPrice + price: 20 + +- type: entity + id: BrutepackAdvanced1 + parent: MedicatedSuture + components: + - type: Stack + stackType: MedicatedSuture + count: 1 + - type: Item + size: 1 + - type: entity name: blood pack description: Contains a groundbreaking universal blood replacement created by Nanotrasen's advanced medical science. diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 2e05a28793..3c2f549f40 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1504,6 +1504,32 @@ solids: FoodAloe: 1 +- type: microwaveMealRecipe + id: RecipeMedicatedSuture + name: medicated suture recipe + result: MedicatedSuture + time: 10 + solids: + FoodPoppy: 1 + Brutepack: 1 + MaterialCloth1: 1 + reagents: + TranexamicAcid: 50 + Spaceacillin: 50 + +- type: microwaveMealRecipe + id: RecipeRegenerativeMesh + name: regenerative mesh recipe + result: RegenerativeMesh + time: 10 + solids: + FoodAloe: 1 + Ointment: 1 + MaterialCloth1: 1 + reagents: + Sigynate: 50 + Dermaline: 50 + # Suppermatter - type: microwaveMealRecipe id: RecipeSuppermatter diff --git a/Resources/Prototypes/Stacks/medical_stacks.yml b/Resources/Prototypes/Stacks/medical_stacks.yml index b15c099529..9d2b77ec93 100644 --- a/Resources/Prototypes/Stacks/medical_stacks.yml +++ b/Resources/Prototypes/Stacks/medical_stacks.yml @@ -37,3 +37,21 @@ spawn: Bloodpack maxCount: 10 itemSize: 1 + +- type: stack + id: MedicatedSuture + name: medicated-suture + icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: medicated-suture } + spawn: MedicatedSuture + maxCount: 10 + itemSize: 1 + +- type: stack + id: RegenerativeMesh + name: regenerative-mesh + icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: regenerative-mesh} + spawn: RegenerativeMesh + maxCount: 10 + itemSize: 1 + + diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3bb8e8b1ea4519e6c743fea7471291d40c76eb21 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Dm`5sLn`LH zy?L6~Nl}0`VAf*hd&lG!m?m3aKC@#{Bm1!h&qWF*|9q3D2~^C$z`gF;rYS*HvOAUY zpPjj*{Ke|i&x)t7gvy@QxUN@LR(c=zE=yPW(V2(KuWq+}^_CH=r=kC5>{0obFSu%_ kU)B1j{^#ol28QxIj9(J$l$+)3g+OXNUHx3vIVCg!0G$6xo&W#< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..33252a3b74a6dbd15c036990e450772a76828548 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|CVRR#hE&XX zd-EXYAqN46i-I`^+orrtDBjqw0vzs2)=K=!t4yQJ&PrfEiJ@60N$j{L2<_d7FK z-vRp~X@&tpY LtDnm{r-UW|f9O}A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medicated-suture.png new file mode 100644 index 0000000000000000000000000000000000000000..e643cda1cc18921a8b47898d4f78f4470618587b GIT binary patch literal 290 zcmV+-0p0$IP)-KuBOWGjZ1N5x$#fJq-?buphq99*eo(_AKfNg!smzqQ-u z+m4!!Rnd7W00001bW%=J06^y0W&i*Hlu1NER5*?8j>`_hFbo7!)^6>j4u$^zzmk_g z4W$)V#9p%UjO;k~&-WRIODzC)IT4SAr!wtv5y=Kh(KqfT5YG%HF=IjOIDAMC&wBNi zODDwiv89yC)1hU{ot8=Fq=oxl7(?UWNfFwjm*9Aebw7itfcKekPO^>j6)6J?6ik2Q3%{1p;2t>i_@%07*qoM6N<$f=HTrfB*mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json index 7519973cb8..137f1849cf 100644 --- a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json @@ -2,6 +2,7 @@ "version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93 and Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/a3568da5634e756d0849480104afda402c6f1c3c/icons/obj/medical/stack_medical.dmi", "size": { "x": 32, "y": 32 @@ -40,6 +41,28 @@ }, { "name": "bloodpack" + }, + { + "name": "medicated-suture" + }, + { + "name": "medicated-suture-inhand-left", + "directions": 4 + }, + { + "name": "medicated-suture-inhand-right", + "directions": 4 + }, + { + "name": "regenerative-mesh" + }, + { + "name": "regenerative-mesh-inhand-left", + "directions": 4 + }, + { + "name": "regenerative-mesh-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6f757a4968f2360ceb77a0e72ba5629226e744c5 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_r3fhE&XX zduzAgAp-$chd|bi#!5<|k0xpt#BOmgbmgn+sjHe3(# z`co7a?yVV^-J2OVJEv;a^%Yy))_Yrg<(T`-^xX99Dtq~trTcT^7Kffw{I)OVwWrmQ zAg?EL%w-jx-^qQ$2r`5r!J$5O{#K2EG=2J~bWHGga-n){>>umc@4-w!eGK<_ zmu`tqk4U<_C)R#jRCf2KmW5NovU6kY>!y4+_2wfgcvD$|!-9db;|#taD0e0s!&IS;GJT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/regenerative-mesh.png new file mode 100644 index 0000000000000000000000000000000000000000..49b2bbe8fab89687482244d78a6892d2827ae2cb GIT binary patch literal 523 zcmV+m0`&cfP)u%-`sPUd;4tLrk7##bahX_6YvB8 zpES|l-fBp5BX8dI-J3upvS6;RELUH={?IaBJv;wzez|^zy}i|tO59q4)s^My%-i?O zO;0iy93gjFWH30wpIRC9w4L?y8phZwHokrl?U=X+226z-=qC_*{Et4Pjb>n&lR{BC ztz00N&vSH~#rfvA{8cz}Pu0-+H7^}74zmSv)~a%s$%4EuG* zJ0R|Xd?w@8KAX$8)js)sue&|)C>Z3TQgLg26T8v_W4;on`#V^G1yE>meP@$cIO;xA zfad@YezPkSxbs=Cp4e>RT|+3){Hw;}j>}j$3P3CzCH`Zt<$W_QWiv}IrJp~oHRfjL zsZ`3h<{l=JluAVwmp+Ql0+GPAgeVcji+3c@t?2oM#1rrYJb|7ITmfj9$EVz8-g5u| N002ovPDHLkV1jyz^9=w1 literal 0 HcmV?d00001