From 0d8e9795f6fab73fd7b1ced38b457b5790282526 Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Sat, 19 Feb 2022 18:56:07 -0500 Subject: [PATCH] Chem adjustments, pulped banana peels (#6792) --- .../Catalog/Fills/Boxes/general.yml | 2 +- .../Prototypes/Catalog/Fills/Items/belt.yml | 6 +- .../Catalog/Fills/Items/firstaidkits.yml | 20 ++-- .../Objects/Consumable/Food/produce.yml | 10 ++ .../Objects/Specific/Medical/hypospray.yml | 21 ++-- Resources/Prototypes/Reagents/medicine.yml | 100 ++++++++++-------- Resources/Prototypes/Reagents/narcotics.yml | 8 +- 7 files changed, 97 insertions(+), 70 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index d69b8e0cf2..b4fec9a01c 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -141,7 +141,7 @@ contents: - id: ClothingMaskBreath - id: EmergencyOxygenTankFilled - - id: EpinephrineMedipen + - id: EmergencyMedipen - id: Flare - id: FoodSnackChocolate - type: Sprite diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 01a8e7e951..115fa4dd9a 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -50,7 +50,7 @@ #- name: GrenadeChem #- name: GrenadeChem - id: FlashlightLantern - + - type: entity id: ClothingBeltMedicalFilled parent: ClothingBeltMedical @@ -62,8 +62,8 @@ amount: 3 - id: Ointment amount: 3 - - id: EpinephrineMedipen #You never know what people are going to latejoin into - + - id: EmergencyMedipen #You never know what people are going to latejoin into + - type: entity id: ClothingBeltPlantFilled parent: ClothingBeltPlant diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index 3456af02e3..71f7c4b8ce 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -14,7 +14,7 @@ amount: 2 # todo 1 Health Analyzer once it exists. Remove brutepack and ointment for suture, gauze, mesh and medipen? # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents - + - type: entity id: MedkitBurnFilled suffix: Filled @@ -28,7 +28,7 @@ amount: 3 - id: SyringeInaprovaline amount: 1 - + - type: entity id: MedkitBruteFilled suffix: Filled @@ -42,7 +42,7 @@ amount: 2 - id: Gauze amount: 2 - + - type: entity id: MedkitToxinFilled suffix: Filled @@ -54,7 +54,7 @@ amount: 1 - id: PillDylovene amount: 3 - + - type: entity id: MedkitOxygenFilled suffix: Filled @@ -62,13 +62,13 @@ components: - type: StorageFill contents: - - id: EpinephrineMedipen + - id: EmergencyMedipen amount: 1 - id: PillDexalin amount: 3 - id: SyringeInaprovaline amount: 1 - + - type: entity id: MedkitRadiationFilled suffix: Filled @@ -80,9 +80,9 @@ amount: 2 - id: PillHyronalin amount: 3 - - id: EpinephrineMedipen + - id: EmergencyMedipen amount: 1 - + - type: entity id: MedkitAdvancedFilled suffix: Filled @@ -98,7 +98,7 @@ amount: 1 - id: AntiPoisonMedipen amount: 1 - + - type: entity id: MedkitCombatFilled suffix: Filled @@ -113,4 +113,4 @@ - id: PillTricordrazine amount: 1 - id: AntiPoisonMedipen - amount: 1 \ No newline at end of file + amount: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index fe74e34427..17a1139e39 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -196,6 +196,16 @@ - type: Tag tags: - Trash + - type: SolutionContainerManager + solutions: + food: + maxVol: 4 + reagents: + - ReagentId: PulpedBananaPeel + Quantity: 4 + - type: Extractable + grindableSolutionName: food + - type: Recyclable - type: entity name: carrot diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 902c1e4e9a..b437bf112a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -55,10 +55,10 @@ - type: Recyclable - type: entity - name: epinephrine medipen + name: emergency medipen parent: ChemicalMedipen - id: EpinephrineMedipen - description: A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Beware, as it's easy to overdose on epinephrine. + id: EmergencyMedipen + description: A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Beware, as it's easy to overdose on epinephrine and tranexmic acid. components: - type: SolutionContainerManager solutions: @@ -66,13 +66,16 @@ maxVol: 15 reagents: - ReagentId: Epinephrine - Quantity: 15 + Quantity: 12 + - ReagentId: TranexamicAcid + Quantity: 3 + - type: entity - name: epinephrine medipen + name: anti-poison medipen parent: ChemicalMedipen id: AntiPoisonMedipen - description: A rapid dose of anti-poison. Contains ultravasculine, inaprovaline and epinephrine. + description: A rapid dose of anti-poison. Contains ultravasculine and epinephrine. components: - type: SolutionContainerManager solutions: @@ -80,8 +83,6 @@ maxVol: 15 reagents: - ReagentId: Ultravasculine - Quantity: 5 - - ReagentId: Inaprovaline - Quantity: 5 + Quantity: 10 - ReagentId: Epinephrine - Quantity: 5 \ No newline at end of file + Quantity: 5 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index a484c93eaf..cc53b9bff5 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -52,7 +52,7 @@ amount: -3.0 - !type:GenericStatusEffect key: Jitter - time: 1.0 + time: 3.0 type: Remove - type: reagent @@ -249,11 +249,11 @@ amount: 4 - !type:GenericStatusEffect key: Stun - time: 0.25 + time: 0.75 type: Remove - !type:GenericStatusEffect key: KnockedDown - time: 0.25 + time: 0.75 type: Remove - type: reagent @@ -400,6 +400,19 @@ color: "#fffbad" # TODO: Hallucinations. +- type: reagent + id: PulpedBananaPeel + name: pulped banana peel + group: Medicine + desc: Pulped banana peels have some effectiveness against bleeding. + physicalDesc: pulpy + color: "#FFE774" + metabolisms: + Medicine: + effects: + - !type:ModifyBleedAmount + amount: -0.5 + - type: reagent id: Ryetalyn name: ryetalyn @@ -408,6 +421,21 @@ physicalDesc: cloudy color: "#532fd4" +- type: reagent + id: Siderlac + name: siderlac + group: Medicine + desc: A powerful anti-caustic medicine derived from plants. + physicalDesc: milky + color: "#f4dab8" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Caustic: -5 + - type: reagent id: Spaceacillin name: spaceacillin @@ -416,6 +444,28 @@ physicalDesc: opaque color: "#9942f5" +- type: reagent + id: Stellibinin + name: stellibinin + group: Medicine + desc: A natual antitoxin with particular effectiveness against amatoxin. + physicalDesc: starry + color: "#2b2f77" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Poison: -1 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Amatoxin + min: 1 + reagent: Amatoxin + amount: -3 + - type: reagent id: Synaptizine name: synaptizine @@ -432,11 +482,11 @@ Poison: 3 - !type:GenericStatusEffect key: Stun - time: 1.0 + time: 3.0 type: Remove - !type:GenericStatusEffect key: KnockedDown - time: 1.0 + time: 3.0 type: Remove - type: reagent @@ -480,6 +530,9 @@ Medicine: effects: - !type:HealthChange + conditions: + - !type:TotalDamage + max: 50 damage: groups: Burn: -1 @@ -586,40 +639,3 @@ min: 1 reagent: Ultravasculine amount: 0.5 - -- type: reagent - id: Stellibinin - name: stellibinin - group: Medicine - desc: A natual antitoxin with particular effectiveness against amatoxin. - physicalDesc: starry - color: "#2b2f77" - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - types: - Poison: -1 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Amatoxin - min: 1 - reagent: Amatoxin - amount: -3 - -- type: reagent - id: Siderlac - name: siderlac - group: Medicine - desc: A powerful anti-caustic medicine derived from plants. - physicalDesc: milky - color: "#f4dab8" - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - groups: - Caustic: -5 diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 3603bb6f22..6502db22ff 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -33,11 +33,11 @@ - !type:Jitter - !type:GenericStatusEffect key: Stun - time: 1 + time: 3 type: Remove - !type:GenericStatusEffect key: KnockedDown - time: 1 + time: 3 type: Remove - type: reagent @@ -66,11 +66,11 @@ - !type:Jitter - !type:GenericStatusEffect key: Stun - time: 0.25 + time: 1 type: Remove - !type:GenericStatusEffect key: KnockedDown - time: 0.25 + time: 1 type: Remove - !type:PopupMessage messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"]