From cafcd3be356d078da9f9234530630e3ef3920af3 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Mon, 8 Jun 2026 19:38:16 -0400 Subject: [PATCH 01/15] p1 --- Resources/Prototypes/Reagents/medicine.yml | 401 ------------------ Resources/Prototypes/Reagents/narcotics.yml | 69 --- .../Prototypes/Recipes/Reactions/medicine.yml | 241 ----------- .../Recipes/Reactions/pyrotechnic.yml | 19 - 4 files changed, 730 deletions(-) diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 3beb29fc3df..475987d459e 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -78,28 +78,6 @@ - !type:PlantAdjustHealth amount: 1 -- type: reagent - id: Diphenhydramine - name: reagent-name-diphenhydramine - group: Medicine - desc: reagent-desc-diphenhydramine - physicalDesc: reagent-physical-desc-chalky - flavor: medicine - color: "#64ffe6" - metabolisms: - Medicine: - effects: - - !type:AdjustReagent - reagent: Histamine - amount: -3.0 - - !type:GenericStatusEffect - key: Jitter - time: 3.0 - type: Remove - - !type:HealthChange - damage: - types: - Poison: -3 - type: reagent id: Ethylredoxrazine @@ -495,40 +473,6 @@ - !type:ChemAddMoodlet moodPrototype: MildPainkiller -- type: reagent - id: Leporazine - name: reagent-name-leporazine - group: Medicine - desc: reagent-desc-leporazine - physicalDesc: reagent-physical-desc-pungent - flavor: medicine - color: "#ff7db5" - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - types: - Cold: -4 - - !type:AdjustTemperature - conditions: - - !type:Temperature - max: 288.15 - amount: 100000 # thermal energy, not temperature! - - !type:AdjustTemperature - conditions: - - !type:Temperature - min: 298.15 - amount: -10000 - - !type:PopupMessage - type: Local - visualType: Medium - messages: [ "leporazine-effect-temperature-adjusting" ] - probability: 0.2 - - !type:AdjustReagent - reagent: Fresium - amount: -5 - - type: reagent id: Barozine name: reagent-name-barozine @@ -626,49 +570,6 @@ - !type:ModifyBleedAmount amount: -0.25 -- type: reagent - id: Ambuzol - name: reagent-name-ambuzol - group: Medicine - desc: reagent-desc-ambuzol - physicalDesc: reagent-physical-desc-crisp - flavor: medicine - color: "#86caf7" - metabolisms: - Medicine: - effects: - - !type:CureZombieInfection - conditions: - - !type:ReagentThreshold - min: 10 - - !type:ChemRemoveMoodlet - moodPrototype: RomerolEffect - conditions: - - !type:ReagentThreshold - min: 10 - -- type: reagent - id: AmbuzolPlus - name: reagent-name-ambuzol-plus - group: Medicine - desc: reagent-desc-ambuzol-plus - physicalDesc: reagent-physical-desc-crisp - flavor: medicine - color: "#1274b5" - metabolisms: - Medicine: - effects: - - !type:CureZombieInfection - innoculate: true - conditions: - - !type:ReagentThreshold - min: 5 - - !type:ChemRemoveMoodlet - moodPrototype: RomerolEffect - conditions: - - !type:ReagentThreshold - min: 5 - - type: reagent id: PulpedBananaPeel name: reagent-name-pulped-banana-peel @@ -699,22 +600,6 @@ - !type:ModifyBloodLevel amount: 6 -- type: reagent - id: Siderlac - name: reagent-name-siderlac - group: Medicine - desc: reagent-desc-siderlac - physicalDesc: reagent-physical-desc-milky - flavor: medicine - color: "#f4dab8" - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - types: - Caustic: -5 - - type: reagent id: Stellibinin name: reagent-name-stellibinin @@ -821,20 +706,6 @@ - !type:ChemAddMoodlet moodPrototype: MildPainkiller -- type: reagent - id: Lipozine - name: reagent-name-lipozine - group: Medicine - desc: reagent-desc-lipozine - physicalDesc: reagent-physical-desc-oily - flavor: medicine - color: "#2690b5" - metabolisms: - Medicine: - effects: - # what the hell, this isn't satiating at all!! - - !type:SatiateHunger - factor: -1 # Should heal quite literally everything, use in very small amounts - type: reagent @@ -856,48 +727,6 @@ Airloss: -3 Brute: -3 # Was 2, Buffed due to limb damage changes -- type: reagent - id: Ultravasculine - name: reagent-name-ultravasculine - group: Medicine - desc: reagent-desc-ultravasculine - physicalDesc: reagent-physical-desc-thick-and-grainy - flavor: medicine - color: "#520e30" - metabolisms: - Medicine: - effects: - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 0 - max: 30 - damage: - groups: - Toxin: -3 - Brute: 0.5 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 30 - damage: - groups: - Toxin: -1 - Brute: 3 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Histamine - min: 1 - reagent: Histamine - amount: -1 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Histamine - min: 1 - reagent: Ultravasculine - amount: 0.5 - type: reagent id: Oculine @@ -912,22 +741,6 @@ effects: - !type:ChemHealEyeDamage -- type: reagent - id: Cognizine - name: reagent-name-cognizine - desc: reagent-desc-cognizine - group: Medicine - physicalDesc: reagent-physical-desc-enigmatic - flavor: magical - color: "#b50ee8" - metabolisms: - Medicine: - effects: - - !type:MakeSentient - conditions: - - !type:ReagentThreshold - min: 5 - - type: reagent id: Ethyloxyephedrine name: reagent-name-ethyloxyephedrine @@ -982,46 +795,6 @@ type: Local probability: 0.1 -- type: reagent - id: Sigynate - name: reagent-name-sigynate - group: Medicine - desc: reagent-desc-sigynate - physicalDesc: reagent-physical-desc-thick - flavor: sweet - color: "#e0a5b9" - metabolisms: - Medicine: - effects: - - !type:HealthChange - damage: - types: - Caustic: -3 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 16 - damage: - types: - Heat: 2 - - !type:Jitter - conditions: - - !type:ReagentThreshold - min: 20 - - !type:PopupMessage - conditions: - - !type:ReagentThreshold - min: 20 - type: Local - visualType: Medium - messages: [ "generic-reagent-effect-nauseous" ] - probability: 0.2 - - !type:ChemVomit - conditions: - - !type:ReagentThreshold - min: 30 - probability: 0.02 - - type: reagent id: Lacerinol name: reagent-name-lacerinol @@ -1191,180 +964,6 @@ emote: Scream probability: 0.2 -- type: reagent - id: Insuzine - name: reagent-name-insuzine - group: Medicine - desc: reagent-desc-insuzine - physicalDesc: reagent-physical-desc-frosty - flavor: metallic - color: "#8147ff" - metabolisms: - Medicine: - effects: - # heals shocks and removes shock chems - - !type:HealthChange - damage: - types: - Shock: -4 - - !type:AdjustReagent - reagent: Licoxide - amount: -4 - - !type:AdjustReagent - reagent: Tazinide - amount: -4 - # makes you a little chilly when not oding - - !type:AdjustTemperature - amount: -5000 - # od makes you freeze to death - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 12 - damage: - types: - Cold: 2 - - !type:AdjustTemperature - conditions: - - !type:ReagentThreshold - min: 12 - amount: -30000 - - !type:Jitter - conditions: - - !type:ReagentThreshold - min: 12 - -- type: reagent - id: Opporozidone #Name based of an altered version of the startreck chem "Opporozine" - name: reagent-name-opporozidone - group: Medicine - desc: reagent-desc-opporozidone - physicalDesc: reagent-physical-desc-sickly - flavor: acid - color: "#b5e36d" - worksOnTheDead: true - metabolisms: - Medicine: - effects: - - !type:ReduceRotting - seconds: 20 - conditions: - #Patient must be dead and in a cryo tube (or something cold) - - !type:Temperature - max: 213.0 # WD EDIT: 150.0 -> 213.0 - - !type:MobStateCondition - mobstate: Dead - -- type: reagent - id: Necrosol - name: reagent-name-necrosol - group: Medicine - desc: reagent-desc-necrosol - physicalDesc: reagent-physical-desc-necrotic - flavor: medicine - color: "#86a5bd" - worksOnTheDead: true - plantMetabolism: - # WD EDIT START - # - !type:PlantAdjustToxins - # amount: -5 - # WD EDIT END - - !type:PlantAdjustHealth - amount: 5 - - !type:PlantCryoxadone {} - metabolisms: - Medicine: - effects: - - !type:HealthChange - conditions: - - !type:Temperature - max: 213.0 - damage: - groups: - Brute: -8 # WD EDIT - -- type: reagent - id : Aloxadone - name: reagent-name-aloxadone - group: Medicine - desc: reagent-desc-aloxadone - physicalDesc: reagent-physical-desc-soothing - flavor: medicine - color: "#89f77f" - worksOnTheDead: true - metabolisms: - Medicine: - effects: - - !type:HealthChange - conditions: - - !type:Temperature - max: 213.0 - damage: - types: - # WD EDIT START - Heat: -6.0 - Shock: -6.0 - Cold: -6.0 - # WD EDIT END - -- type: reagent - id : Mannitol # currently this is just a way to create psicodine - name: reagent-name-mannitol - group: Medicine - desc: reagent-desc-mannitol - physicalDesc: reagent-physical-desc-opaque - flavor: sweet - color: "#A0A0A0" - metabolisms: - Medicine: - effects: - - !type:PopupMessage - conditions: - - !type:ReagentThreshold - min: 15 - type: Local - visualType: Medium - messages: [ "mannitol-effect-enlightened" ] - probability: 0.2 - -- type: reagent - id: Psicodine - name: reagent-name-psicodine - group: Medicine - desc: reagent-desc-psicodine - physicalDesc: reagent-physical-desc-shiny - flavor: bitter - color: "#07E79E" - metabolisms: - Medicine: - effects: - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 30 - damage: - types: - Poison: 2 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - min: 30 - key: SeeingRainbows - component: SeeingRainbows - type: Add - time: 8 - refresh: false - - !type:GenericStatusEffect - key: Jitter - time: 2.0 - type: Remove - - !type:GenericStatusEffect - key: Drunk - time: 6.0 - type: Remove - - !type:ChemAddMoodlet - moodPrototype: PsicodineEffect - - type: reagent id: PotassiumIodide name: reagent-name-potassium-iodide diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 58a09661a26..d181aeb4414 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -258,34 +258,6 @@ moodPrototype: NicotineBenefit # TODO: Replace these nonstandardized effects with generic brain damage -- type: reagent - id: Impedrezene - name: reagent-name-impedrezene - group: Narcotics - desc: reagent-desc-impedrezene - physicalDesc: reagent-physical-desc-acrid - flavor: bitter - color: "#215263" - metabolisms: - Narcotic: - effects: - - !type:MovespeedModifier - walkSpeedModifier: 0.65 - sprintSpeedModifier: 0.65 - - !type:HealthChange - damage: - types: - Poison: 2 - - !type:GenericStatusEffect - key: SeeingRainbows - component: SeeingRainbows - type: Add - time: 10 - refresh: false - - !type:ChemVomit # Vomiting is a symptom of brain damage - probability: 0.05 - - !type:Drunk # Headaches and slurring are major symptoms of brain damage, this is close enough - boozePower: 5 - type: reagent id: SpaceDrugs @@ -461,47 +433,6 @@ - !type:ChemAddMoodlet moodPrototype: TearGasEffect -- type: reagent - id: Happiness - name: reagent-name-happiness - group: Narcotics - desc: reagent-desc-happiness - physicalDesc: reagent-physical-desc-soothing - flavor: paintthinner - color: "#EE35FF" - metabolisms: - Narcotic: - effects: - - !type:Emote - emote: Laugh - showInChat: true - probability: 0.1 - conditions: - - !type:ReagentThreshold - max: 20 - - !type:Emote - emote: Whistle - showInChat: true - probability: 0.1 - conditions: - - !type:ReagentThreshold - max: 20 - - !type:Emote - emote: Crying - showInChat: true - probability: 0.1 - conditions: - - !type:ReagentThreshold - min: 20 - - !type:ChemAddMoodlet - moodPrototype: PsicodineEffect - - !type:GenericStatusEffect - key: SeeingRainbows - component: SeeingRainbows - type: Add - time: 5 - refresh: false - - type: reagent id: Cryanobalamin name: reagent-name-cryanobalamin diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index 986eb382bf2..ba75b0a2809 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -181,19 +181,6 @@ products: Kelotane: 2 -- type: reaction - id: Leporazine - reactants: - Copper: - amount: 1 - Fersilicite: - amount: 1 - Plasma: - amount: 1 - catalyst: true - products: - Leporazine: 2 - - type: reaction id: Phalanximine reactants: @@ -206,42 +193,6 @@ products: Phalanximine: 3 -- type: reaction - id: Ambuzol - reactants: - Dylovene: - amount: 1 - Ammonia: - amount: 1 - ZombieBlood: - amount: 2 - products: - Ambuzol: 4 - -- type: reaction - id: AmbuzolPlus - reactants: - Ambuzol: - amount: 5 - Necrosol: - amount: 1 - Plasma: - amount: 5 - products: - AmbuzolPlus: 10 - -- type: reaction - id: Synaptizine - reactants: - Lithium: - amount: 1 - Sugar: - amount: 1 - Water: - amount: 1 - products: - Synaptizine: 3 - - type: reaction id: Tricordrazine reactants: @@ -262,19 +213,6 @@ products: HeartbreakerToxin: 2 -- type: reaction - id: Impedrezene - minTemp: 370 - reactants: - Mercury: - amount: 1 - Oxygen: - amount: 1 - Water: - amount: 1 - products: - Impedrezene: 1 - - type: reaction id: Lexorin impact: High @@ -288,18 +226,6 @@ products: Lexorin: 2 -- type: reaction - id: Lipozine - reactants: - TableSalt: - amount: 1 - Ethanol: - amount: 1 - Radium: - amount: 1 - products: - Lipozine: 3 - - type: reaction id: Mannitol reactants: @@ -337,17 +263,6 @@ products: SpaceDrugs: 3 -- type: reaction - id: Ultravasculine - reactants: - Histamine: - amount: 2 - Plasma: - amount: 1 - catalyst: true - products: - Ultravasculine: 2 - - type: reaction id: Oculine reactants: @@ -360,46 +275,6 @@ products: Oculine: 4 -- type: reaction - id: Siderlac - reactants: - Aloe: - amount: 1 - Stellibinin: - amount: 1 - products: - Siderlac: 2 - -- type: reaction - id: Cognizine - reactants: - CarpoToxin: - amount: 1 - Siderlac: - amount: 1 - Acetone: - amount: 1 - products: - Cognizine: 1 - -- type: reaction - id: Sigynate - impact: Medium - minTemp: 370 - reactants: - SodiumCarbonate: - amount: 1 - SodiumHydroxide: - amount: 1 - Kelotane: - amount: 1 - Water: - amount: 1 - Sugar: - amount: 1 - products: - Sigynate: 4 - - type: reaction id: Saline reactants: @@ -513,24 +388,6 @@ products: Razorium: 1 -- type: reaction - id: Diphenhydramine - impact: Medium - minTemp: 377.59 - reactants: - Diethylamine: - amount: 1 - Oil: - amount: 1 - TableSalt: - amount: 1 - Carbon: - amount: 1 - Ethanol: - amount: 1 - products: - Diphenhydramine: 3 - - type: reaction id: Pyrazine impact: Medium @@ -545,104 +402,6 @@ products: Pyrazine: 3 -- type: reaction - id: Insuzine - impact: Medium - minTemp: 433 - reactants: - Leporazine: - amount: 1 - Kelotane: - amount: 1 - Silicon: - amount: 1 - products: - Insuzine: 3 - -- type: reaction - id: Opporozidone - minTemp: 400 #Maybe if a method of reducing reagent temp exists one day, this could be -50 - reactants: - #WWDP edit start - Necrosol: - amount: 2 - Doxarubixadone: - amount: 2 - products: - Opporozidone: 2 - #WWDP edit end - -- type: reaction - id: Necrosol - impact: Medium - minTemp: 370 - reactants: - #WWDP edit start - Bicaridine: - amount: 2 - Iron: - amount: 1 - Cryoxadone: - amount: 1 - products: - Necrosol: 4 - #WWDP edit end - -- type: reaction - id: Aloxadone - impact: Medium - reactants: - #WWDP edit start - Cryoxadone: - amount: 1 - Dermaline: - amount: 2 - Hydrogen: - amount: 1 - products: - Aloxadone: 4 - #WWDP edit end - -- type: reaction - id: Psicodine - impact: Medium - reactants: - Mannitol: - amount: 2 - Impedrezene: - amount: 1 - Water: - amount: 2 - products: - Psicodine: 4 - -- type: reaction - id: Lipolicide - reactants: - Ephedrine: - amount: 1 - Diethylamine: - amount: 1 - Mercury: - amount: 1 - products: - Lipolicide: 3 - -- type: reaction - id: Happiness - reactants: - Laughter: - amount: 2 - Epinephrine: - amount: 1 - Ethanol: - amount: 1 - Plasma: - amount: 5 - catalyst: true - products: - Happiness: 4 - - type: reaction id: PotassiumIodide reactants: diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml index 5e99ce6374d..4b72d985da0 100644 --- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml +++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml @@ -10,25 +10,6 @@ products: Napalm: 3 -- type: reaction - id: Phlogiston - reactants: - Phosphorus: - amount: 1 - SulfuricAcid: - amount: 1 - Plasma: - amount: 1 - effects: - - !type:CreateGas - gas: Plasma - - !type:PopupMessage - visualType: LargeCaution - messages: [ "phlogiston-plasma-created" ] - type: Pvs - products: - Phlogiston: 3 - - type: reaction id: ChlorineTrifluoride minTemp: 370 From 18574f1cc838c6f2ca7a56e8699183063bc7a2a8 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Mon, 8 Jun 2026 20:40:28 -0400 Subject: [PATCH 02/15] Delete meat.yml --- .../Entities/Objects/Consumable/Food/meat.yml | 61 ------------------- 1 file changed, 61 deletions(-) delete mode 100644 Resources/Prototypes/_EE/Entities/Objects/Consumable/Food/meat.yml diff --git a/Resources/Prototypes/_EE/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_EE/Entities/Objects/Consumable/Food/meat.yml deleted file mode 100644 index 74ee80cb4a3..00000000000 --- a/Resources/Prototypes/_EE/Entities/Objects/Consumable/Food/meat.yml +++ /dev/null @@ -1,61 +0,0 @@ - -- type: entity - name: xelthia tentacle - # bacon is cured so not raw = cant rot - parent: FoodMeatBase - id: FoodMeatXelthiaTentacle - description: A xelthia tentacle. Edible...? - components: - - type: Tag - tags: - - Raw - - Meat - - type: Sprite - sprite: _EE/Objects/Consumable/Food/meat.rsi - state: xelthia-tentacle - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Protein - Quantity: 5 - - ReagentId: Fat - Quantity: 5 - - type: InternalTemperature - thickness: 0.02 - area: 0.02 # arbitrary numbers - - type: SliceableFood - count: 3 - slice: FoodMeatCutlet - - type: Construction - graph: Xelthiarm - node: start - defaultTarget: xelthiarm - -- type: entity - name: xelthia calamari - parent: FoodMeatBase - id: FoodMeatXelthiaTentacleCooked - description: This was someone's arm at one point, but now it's some weird Calamari. They probably don't mind. - components: - - type: FlavorProfile - flavors: - - xelthia - - type: Tag - tags: - - Cooked - - Meat - - type: Sprite - sprite: _EE/Objects/Consumable/Food/meat.rsi - state: xelthia-tentacle-cooked - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Protein - Quantity: 5 - - type: Construction - graph: Xelthiarm - node: xelthiarm \ No newline at end of file From f9b334c579cebebfce2823eaa42cba78b2a4ac70 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Mon, 8 Jun 2026 20:48:18 -0400 Subject: [PATCH 03/15] damm stubborn chems --- Resources/Prototypes/Reagents/narcotics.yml | 40 +++++++++++++++++++ .../Prototypes/Recipes/Reactions/medicine.yml | 15 +++++++ 2 files changed, 55 insertions(+) diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index d181aeb4414..434cbbdee50 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -483,3 +483,43 @@ types: Cellular: 0.3 +- type: reagent + id: Happiness + name: reagent-name-happiness + group: Narcotics + desc: reagent-desc-happiness + physicalDesc: reagent-physical-desc-soothing + flavor: paintthinner + color: "#EE35FF" + metabolisms: + Narcotic: + effects: + - !type:Emote + emote: Laugh + showInChat: true + probability: 0.1 + conditions: + - !type:ReagentThreshold + max: 20 + - !type:Emote + emote: Whistle + showInChat: true + probability: 0.1 + conditions: + - !type:ReagentThreshold + max: 20 + - !type:Emote + emote: Crying + showInChat: true + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 20 + - !type:ChemAddMoodlet + moodPrototype: PsicodineEffect + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index ba75b0a2809..9076c664734 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -442,3 +442,18 @@ amount: 3 products: Artiplates: 12 + +- type: reaction + id: Happiness + reactants: + Laughter: + amount: 2 + Epinephrine: + amount: 1 + Ethanol: + amount: 1 + Plasma: + amount: 5 + catalyst: true + products: + Happiness: 4 From 026fa5e7b6206a7ae15782e393514a399bd9c473 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Mon, 8 Jun 2026 20:59:17 -0400 Subject: [PATCH 04/15] grr --- .../Prototypes/Entities/Mobs/NPCs/Rslimes.yml | 203 ------------------ .../Entities/Mobs/NPCs/elemental.yml | 26 +-- .../Objects/Specific/Mail/Items/misc.yml | 12 -- .../Objects/Specific/Medical/morgue.yml | 2 - .../ServerInfo/Guidebook/Service/Botany.xml | 3 +- 5 files changed, 2 insertions(+), 244 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml index 7a41ac52ec8..f820f9b1636 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml @@ -66,159 +66,6 @@ state: alive color: "#77b58e" -- type: entity - id: ReagentSlimeBuzzachloricbees - parent: ReagentSlime - suffix: Buzzachloricbees - components: - - type: Bloodstream - bloodReagent: BuzzochloricBees - - type: PointLight - color: "#FFD35D" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#FFD35D" - -- type: entity - id: ReagentSlimeWehjuice - parent: ReagentSlime - suffix: Wehjuice - components: - - type: Bloodstream - bloodReagent: JuiceThatMakesYouWeh - - type: PointLight - color: "#59b23a" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#59b23a" - -- type: entity - id: ReagentCognizine - parent: ReagentSlime - suffix: Cognizine - components: - - type: Bloodstream - bloodReagent: Cognizine - - type: PointLight - color: "#b50ee8" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#b50ee8" - -- type: entity - id: ReagentSlimeNecrosol - parent: ReagentSlime - suffix: Necrosol - components: - - type: Bloodstream - bloodReagent: Necrosol - - type: PointLight - color: "#86a5bd" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#86a5bd" - -- type: entity - id: ReagentSlimeSpaceDrugs - parent: ReagentSlime - suffix: SpaceDrugs - components: - - type: Bloodstream - bloodReagent: SpaceDrugs - - type: PointLight - color: "#63806e" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#63806e" - -- type: entity - id: ReagentSlimeUnstableMutagen - parent: ReagentSlime - suffix: UnstableMutagen - components: - - type: Bloodstream - bloodReagent: UnstableMutagen - - type: PointLight - color: "#00ff5f" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#00ff5f" - -- type: entity - id: ReagentSlimeLead - parent: ReagentSlime - suffix: Lead - components: - - type: Bloodstream - bloodReagent: Lead - - type: PointLight - color: "#5C6274" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#5C6274" - -- type: entity - id: ReagentSlimechlorinetriflouride - parent: ReagentSlime - suffix: chlorinetriflouride - components: - - type: Bloodstream - bloodReagent: ChlorineTrifluoride - - type: PointLight - color: "#FFC8C8" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#FFC8C8" - -- type: entity - id: ReagentSlimePotassium - parent: ReagentSlime - suffix: Potassium - components: - - type: Bloodstream - bloodReagent: Potassium - - type: PointLight - color: "#c6c8cc" - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/elemental.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: alive - color: "#c6c8cc" - - type: entity id: reagentslimeVents parent: BaseGameRule @@ -233,55 +80,5 @@ duration: 60 - type: VentCrittersRule entries: - - id: ReagentSlimeBeer - prob: 0.003 - - id: ReagentSlimePax - prob: 0.001 - - id: ReagentSlimeNocturine - prob: 0.001 - - id: ReagentSlimeTHC - prob: 0.002 - id: ReagentSlimeBicaridine prob: 0.002 - - id: ReagentSlimeToxin - prob: 0.002 - - id: ReagentSlimeNapalm - prob: 0.002 - - id: ReagentSlimeOmnizine - prob: 0.003 - - id: ReagentSlimeMuteToxin - prob: 0.002 - - id: ReagentSlimeNorepinephricAcid - prob: 0.002 - - id: ReagentSlimeEphedrine - prob: 0.002 - - id: ReagentSlimeRobustHarvest - prob: 0.003 - - id: ReagentSlimeIchor - prob: 0.002 - - id: ReagentSlimeBleach - prob: 0.002 - - id: ReagentSlimeSoap - prob: 0.002 - - id: ReagentSlimeSpacelube - prob: 0.002 - - id: ReagentSlimeBuzzachloricbees - prob: 0.002 - - id: ReagentSlimeWehjuice - prob: 0.003 - - id: ReagentCognizine - prob: 0.003 - - id: ReagentSlimeNecrosol - prob: 0.002 - - id: ReagentSlimeSpaceDrugs - prob: 0.003 - - id: ReagentSlimeUnstableMutagen - prob: 0.001 - - id: ReagentSlimeLead - prob: 0.001 - - id: ReagentSlimechlorinetriflouride - prob: 0.002 - - id: ReagentSlimePotassium - prob: 0.002 - - id: ReagentSlimeLotophagoiOil - prob: 0.001 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml index 6abee031fc3..4a3d65e5d6c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml @@ -331,32 +331,8 @@ - type: RandomSpawner prototypes: - ReagentSlime - - ReagentSlimeBeer - - ReagentSlimePax - - ReagentSlimeNocturine - - ReagentSlimeTHC - ReagentSlimeBicaridine - - ReagentSlimeToxin - - ReagentSlimeNapalm - - ReagentSlimeOmnizine - - ReagentSlimeMuteToxin - - ReagentSlimeNorepinephricAcid - - ReagentSlimeEphedrine - - ReagentSlimeRobustHarvest - - ReagentSlimeIchor - - ReagentSlimeBleach - - ReagentSlimeSoap - - ReagentSlimeSpacelube - - ReagentSlimeBuzzachloricbees - - ReagentSlimeWehjuice - - ReagentCognizine - - ReagentSlimeNecrosol - - ReagentSlimeSpaceDrugs - - ReagentSlimeUnstableMutagen - - ReagentSlimeLead - - ReagentSlimechlorinetriflouride - - ReagentSlimePotassium - - ReagentSlimeLotophagoiOil + chance: 1 - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml index 6f9c3157e96..de11e539d86 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml @@ -65,18 +65,6 @@ # - ReagentId: Opporozidone # Quantity: 15 -- type: entity - id: NecrosolChemistryBottle - parent: BaseChemistryBottleFilled - name: necrosol bottle - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Necrosol - Quantity: 30 # Premium Alcohol: wait, it's just marketing? # TODO: different sprites would be nice. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 29819bf89d6..e9ad6bc8e89 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -156,8 +156,6 @@ reagents: - ReagentId: Ash Quantity: 5 - - ReagentId: Necrosol - Quantity: 5 - ReagentId: Ectoplasm # DeltaV - for normality crystals Quantity: 30 # DeltaV - type: GuideHelp diff --git a/Resources/ServerInfo/Guidebook/Service/Botany.xml b/Resources/ServerInfo/Guidebook/Service/Botany.xml index de841dc8aca..c2ed068e069 100644 --- a/Resources/ServerInfo/Guidebook/Service/Botany.xml +++ b/Resources/ServerInfo/Guidebook/Service/Botany.xml @@ -13,7 +13,7 @@ There are many tools that can be used to keep your crops healthy and growing. Th -It's a hydroponics tray, it grows plants with water. First fill the tray with water, then add seeds. +It's a hydroponics tray, it grows plants with water. First fill the tray with water, then add seeds. Hydroponics tray lights indicate different things depending on color and position: - [color=red]Red Light, Left[/color]: Dead plant that needs re-planting. Use a spade to remove the plant. - [color=orange]Flashing Orange Light, Center[/color]: The environment is sub-optimal. Check what is affecting the plant by Shift Clicking on it. It is likely weeds but it could be undesirable pressure or lack of oxygen. If weeds, use a mini hoe or spray 1 time with weed spray. Be warned, however, that overuse of weed killers can lead to unhealthy plants, possibly killing them. @@ -80,7 +80,6 @@ Some chemicals have special effects on plants. - From cc2a076078375ce45e7f0a67a7dda93704559e94 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 16:24:07 -0400 Subject: [PATCH 05/15] runnit --- .../Objects/Specific/chemistry-bottles.yml | 15 --- .../Objects/Specific/Medical/hypospray.yml | 4 +- .../Hydroponics/randomChemicals.yml | 109 +----------------- Resources/Prototypes/Hydroponics/seeds.yml | 4 - .../XenoArch/Effects/normal_effects.yml | 1 - 5 files changed, 2 insertions(+), 131 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/chemistry-bottles.yml index 7c85194de65..48c7f260002 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/chemistry-bottles.yml @@ -14,18 +14,3 @@ tags: - Bottle -- type: entity - id: UltravasculineChemistryBottle - name: ultravasculine bottle - parent: BaseChemistryEmptyBottle - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Ultravasculine - Quantity: 30 - - type: Tag - tags: - - Bottle diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 9518a485289..c9c7ea596ab 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -165,7 +165,7 @@ name: poison auto-injector parent: ChemicalMedipen id: AntiPoisonMedipen - description: A rapid dose of anti-poison. Contains ultravasculine and epinephrine. + description: A rapid dose of anti-poison. Contains Pearcats and epinephrine. components: - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi @@ -181,8 +181,6 @@ pen: maxVol: 15 reagents: - - ReagentId: Ultravasculine - Quantity: 10 - ReagentId: Epinephrine Quantity: 5 - type: Tag diff --git a/Resources/Prototypes/Hydroponics/randomChemicals.yml b/Resources/Prototypes/Hydroponics/randomChemicals.yml index c5f82d45df2..221a618fcf6 100644 --- a/Resources/Prototypes/Hydroponics/randomChemicals.yml +++ b/Resources/Prototypes/Hydroponics/randomChemicals.yml @@ -1,121 +1,14 @@ - type: weightedRandomFillSolution id: RandomPickBotanyReagent fills: - - quantity: 5 - weight: 0.5 - reagents: - - Omnizine - - Nocturine - - Lexorin - - Honk - - BuzzochloricBees - - Stimulants - quantity: 5 weight: 1 reagents: - - Cognizine - - Toxin - - Leporazine - Epinephrine - CarpoToxin - SulfuricAcid - - Licoxide - - Napalm - - ChlorineTrifluoride - Radium - Gold - Uranium - Phosphorus - - AtomicBomb - - Neurotoxin - - ChangelingSting - - CogChamp - - JuiceThatMakesYouWeh - # Goobstation - Start - - Genecide - - quantity: 5 - weight: 2 - reagents: - - Desoxyephedrine - - ChloralHydrate - - Ipecac - - Hyronalin - - Pax - - Cryoxadone - - Ethylredoxrazine - - Dylovene - - Histamine - - Blood - - WeldingFuel - - Mercury - - Silver - - Phenol - - Ultravasculine - - Carbon - - THC - - Nicotine - - DoctorsDelight - - IceCream - - Cola - - Diphenhydramine - - Iron - - Ibuprofen - - quantity: 10 - weight: 3 - reagents: - - Bicaridine - - Dermaline - - Ephedrine - - NorepinephricAcid - - Tricordrazine - - Saline - - PulpedBananaPeel - - Cryptobiolin - - EZNutrient - - Ammonia - - RobustHarvest - - SpaceLube - - Theobromine - - Allicin - - Acetone - - Ash - - SodiumCarbonate - - SpaceDrugs - - MuteToxin - - JuiceBerryPoison - - Pilk - - Posca - - Ethanol - - FourteenLoko - - LemonLime - - LemonLimeCranberry - - Enzyme - - Vinegar - - Potassium - - Fluorine - - Aluminium - # Goobstation - Start - - Tirimol - - Probital - - quantity: 10 - weight: 3.5 - reagents: - - Vitamin - - Kelotane - - Inaprovaline - - Oil - - Slime - - Fiber - - Water - - Sugar - - Cream - - SodaWater - - Ice - - JuiceCarrot - - JuicePotato - - Protein - - Flour - - Soysauce - - TableSalt - - Chlorine - - Mercury + diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 75136d7a68b..4238dda5e7c 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1250,10 +1250,6 @@ growthStages: 3 waterConsumption: 0.60 chemicals: - Ultravasculine: - Min: 1 - Max: 20 - PotencyDivisor: 5 Epinephrine: Min: 1 Max: 20 diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index 160d5adbaa5..bc93356e6ce 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -499,7 +499,6 @@ - Toxin - Epinephrine - Cognizine - - Ultravasculine - Desoxyephedrine - Pax - Siderlac From 6b7d9cfd30ce8ee97c61bdc8622d009c9a9ec0ef Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 16:32:21 -0400 Subject: [PATCH 06/15] w --- Resources/Locale/en-US/reagents/meta/medicine.ftl | 4 ---- .../Prototypes/Entities/Objects/Consumable/Food/produce.yml | 2 -- 2 files changed, 6 deletions(-) diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl index 3c510377473..76ca74bbdfa 100644 --- a/Resources/Locale/en-US/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl @@ -85,10 +85,6 @@ reagent-desc-lipozine = A chemical that accelerates metabolism, causing the user reagent-name-omnizine = omnizine reagent-desc-omnizine = A soothing milky liquid with an iridescent gleam. A well known conspiracy theory says that its origins remain a mystery because revealing the secrets of its production would render most commercial pharmaceuticals obsolete. -reagent-name-ultravasculine = ultravasculine -reagent-desc-ultravasculine = A complicated anti-toxin solution that quickly flushes out toxin while causing minor stress on the body. Reacts with histamine, duplicating itself while flushing it out. Overdose causes extreme pain. - -reagent-name-oculine = oculine reagent-desc-oculine = A simple saline compound used to treat the eyes via ingestion. reagent-name-ethylredoxrazine = ethylredoxrazine diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 20735488e07..e3b51c7178d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1545,8 +1545,6 @@ food: maxVol: 40 reagents: - - ReagentId: Ultravasculine - Quantity: 20 - ReagentId: Epinephrine Quantity: 20 - type: Sprite From 4ad71815b576c3a0b53b58f63edc13e50101fbcb Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 16:41:38 -0400 Subject: [PATCH 07/15] psicodine --- .../Objects/Consumable/Smokeables/Cigarettes/joints.yml | 4 ---- .../Entities/Objects/Specific/Hydroponics/leaves.yml | 6 ------ Resources/Prototypes/Hydroponics/seeds.yml | 5 ----- Resources/Prototypes/Mood/drugs.yml | 5 ----- 4 files changed, 20 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml index 172f44615f2..282b71b76a9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml @@ -54,8 +54,6 @@ Quantity: 2.66 # - ReagentId: ColorfulReagent # Quantity: 1.33 - - ReagentId: Psicodine - Quantity: 0.8 - type: entity id: Blunt @@ -113,5 +111,3 @@ Quantity: 2.66 # - ReagentId: ColorfulReagent # Quantity: 1.33 - - ReagentId: Psicodine - Quantity: 0.8 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml index e544c91876e..d7614cd218d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -123,8 +123,6 @@ Quantity: 2 # - ReagentId: ColorfulReagent # Quantity: 1 - - ReagentId: Psicodine - Quantity: 0.6 - type: entity name: dried rainbow cannabis leaves @@ -150,8 +148,6 @@ Quantity: 1.6 # - ReagentId: ColorfulReagent # Quantity: 0.8 - - ReagentId: Psicodine - Quantity: 0.48 - type: Sprite sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi state: dried @@ -179,8 +175,6 @@ Quantity: 2.66 # - ReagentId: ColorfulReagent # Quantity: 1.33 - - ReagentId: Psicodine - Quantity: 0.8 - type: Sprite sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi state: powderpile_rainbow diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 4238dda5e7c..992b0e55205 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1001,11 +1001,6 @@ # Min: 0 # Max: 5 # PotencyDivisor: 20 - Psicodine: - Min: 0 - Max: 5 - PotencyDivisor: 33 - - type: seed id: tobacco name: seeds-tobacco-name diff --git a/Resources/Prototypes/Mood/drugs.yml b/Resources/Prototypes/Mood/drugs.yml index c10c9dc1d95..76057c1ff5e 100644 --- a/Resources/Prototypes/Mood/drugs.yml +++ b/Resources/Prototypes/Mood/drugs.yml @@ -75,11 +75,6 @@ moodChange: -3 timeout: 300 #5 minutes -- type: moodEffect - id: PsicodineEffect - moodChange: 8 - timeout: 300 #5 minutes - - type: moodEffect id: MildPaincauser moodChange: -1 From 148ae92edb3fef18c427c918242efd77ff242864 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 16:50:30 -0400 Subject: [PATCH 08/15] Update narcotics.yml --- Resources/Prototypes/Reagents/narcotics.yml | 41 --------------------- 1 file changed, 41 deletions(-) diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 434cbbdee50..5d631829541 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -482,44 +482,3 @@ damage: types: Cellular: 0.3 - -- type: reagent - id: Happiness - name: reagent-name-happiness - group: Narcotics - desc: reagent-desc-happiness - physicalDesc: reagent-physical-desc-soothing - flavor: paintthinner - color: "#EE35FF" - metabolisms: - Narcotic: - effects: - - !type:Emote - emote: Laugh - showInChat: true - probability: 0.1 - conditions: - - !type:ReagentThreshold - max: 20 - - !type:Emote - emote: Whistle - showInChat: true - probability: 0.1 - conditions: - - !type:ReagentThreshold - max: 20 - - !type:Emote - emote: Crying - showInChat: true - probability: 0.1 - conditions: - - !type:ReagentThreshold - min: 20 - - !type:ChemAddMoodlet - moodPrototype: PsicodineEffect - - !type:GenericStatusEffect - key: SeeingRainbows - component: SeeingRainbows - type: Add - time: 5 - refresh: false From caca38ae71cd325df2bd9b092aeb7747169aa621 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 17:55:15 -0400 Subject: [PATCH 09/15] Revert "Update narcotics.yml" This reverts commit 148ae92edb3fef18c427c918242efd77ff242864. --- Resources/Prototypes/Reagents/narcotics.yml | 41 +++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 5d631829541..434cbbdee50 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -482,3 +482,44 @@ damage: types: Cellular: 0.3 + +- type: reagent + id: Happiness + name: reagent-name-happiness + group: Narcotics + desc: reagent-desc-happiness + physicalDesc: reagent-physical-desc-soothing + flavor: paintthinner + color: "#EE35FF" + metabolisms: + Narcotic: + effects: + - !type:Emote + emote: Laugh + showInChat: true + probability: 0.1 + conditions: + - !type:ReagentThreshold + max: 20 + - !type:Emote + emote: Whistle + showInChat: true + probability: 0.1 + conditions: + - !type:ReagentThreshold + max: 20 + - !type:Emote + emote: Crying + showInChat: true + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 20 + - !type:ChemAddMoodlet + moodPrototype: PsicodineEffect + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false From 6721761139dca5c317553c4bb885343d7fc45c75 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 17:55:50 -0400 Subject: [PATCH 10/15] Update drugs.yml --- Resources/Prototypes/Mood/drugs.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Mood/drugs.yml b/Resources/Prototypes/Mood/drugs.yml index 76057c1ff5e..66d0b093155 100644 --- a/Resources/Prototypes/Mood/drugs.yml +++ b/Resources/Prototypes/Mood/drugs.yml @@ -131,6 +131,12 @@ moodChange: 100 timeout: 60 #1 minute +- type: moodEffect + id: PsicodineEffect + moodChange: 8 + timeout: 300 #5 minutes + + # Food - type: moodEffect id: SweetenerEffect From 8b5540db80bf7a25e5f213e54804e654ee07e949 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 17:59:23 -0400 Subject: [PATCH 11/15] curious --- Resources/Migrations/migration.yml | 2 +- .../Entities/Objects/Specific/rehydrateable.yml | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 Resources/Prototypes/_Goobstation/Entities/Objects/Specific/rehydrateable.yml diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index 40286289f9e..2e7a5c37c41 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -495,7 +495,7 @@ WallRockBasaltBSCrystal: WallRockBasaltBluespace AirlockHydroponics: AirlockHydroponicsLocked Biogenerator: null FloraGreyStalagmite: null -FelinidCube: TajaranCube +FelinidCube: null # 2025-06-21 ClothingNeckHeadphones: ClothingMultipleHeadphones diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/rehydrateable.yml deleted file mode 100644 index 5b76f1559d0..00000000000 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/rehydrateable.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: MonkeyCube - id: VulpkaninCube - name: vulpkanin cube - components: - - type: Rehydratable - possibleSpawns: - - MobVulpkaninRandom - -- type: entity - parent: MonkeyCube - id: TajaranCube - name: tajaran cube - components: - - type: Rehydratable - possibleSpawns: - - MobTajaranRandom From 7b6c73a10bcd433d95dcefd1fd96d64d40e11c14 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 18:01:55 -0400 Subject: [PATCH 12/15] Revert "curious" This reverts commit 8b5540db80bf7a25e5f213e54804e654ee07e949. --- Resources/Migrations/migration.yml | 2 +- .../Entities/Objects/Specific/rehydrateable.yml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_Goobstation/Entities/Objects/Specific/rehydrateable.yml diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index 2e7a5c37c41..40286289f9e 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -495,7 +495,7 @@ WallRockBasaltBSCrystal: WallRockBasaltBluespace AirlockHydroponics: AirlockHydroponicsLocked Biogenerator: null FloraGreyStalagmite: null -FelinidCube: null +FelinidCube: TajaranCube # 2025-06-21 ClothingNeckHeadphones: ClothingMultipleHeadphones diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/rehydrateable.yml new file mode 100644 index 00000000000..5b76f1559d0 --- /dev/null +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/rehydrateable.yml @@ -0,0 +1,17 @@ +- type: entity + parent: MonkeyCube + id: VulpkaninCube + name: vulpkanin cube + components: + - type: Rehydratable + possibleSpawns: + - MobVulpkaninRandom + +- type: entity + parent: MonkeyCube + id: TajaranCube + name: tajaran cube + components: + - type: Rehydratable + possibleSpawns: + - MobTajaranRandom From 394348b4e4ee9c84b9436ba98b41cb02c1fd456c Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 18:17:56 -0400 Subject: [PATCH 13/15] i seee --- .../Objects/Specific/Mail/Items/misc.yml | 13 ---- .../Objects/Specific/Medical/healing.yml | 74 +------------------ .../Objects/Specific/Medical/hypospray.yml | 4 +- .../Objects/Specific/chemistry-bottles.yml | 15 ---- .../Structures/Specific/Anomaly/anomalies.yml | 4 - .../Nyanotrasen/Recipes/Reactions/drink.yml | 4 - Resources/Prototypes/Reagents/medicine.yml | 4 +- .../Recipes/Cooking/meal_recipes.yml | 5 +- .../Recipes/Cooking/medical_recipes.yml | 1 - .../Recipes/Reactions/chemicals.yml | 4 +- .../Prototypes/Recipes/Reactions/medicine.yml | 16 ---- .../XenoArch/Effects/normal_effects.yml | 2 - .../Prototypes/XenoArch/artifact_triggers.yml | 2 +- .../Recipes/Reactions/toxins.yml | 4 - .../Objects/Specific/Medical/hypospray.yml | 8 +- .../_Goobstation/Reagents/toxins.yml | 3 - .../Recipes/Reactions/medicine.yml | 6 -- .../Recipes/Reactions/narcotics.yml | 2 - .../Objects/Specific/Medical/hypospray.yml | 6 +- 19 files changed, 12 insertions(+), 165 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml index de11e539d86..32d64b8d5d7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/misc.yml @@ -39,19 +39,6 @@ # Miscellaneous Items -- type: entity - id: SyringeCognizine - parent: Syringe - name: cognizine syringe - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 15 - reagents: - - ReagentId: Cognizine - Quantity: 15 # Surely three friends is enough. - - type: entity id: SyringeOpporozidone parent: Syringe diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index f61f5ea80c6..4f1b64c9c9c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -763,40 +763,6 @@ - ReagentId: Romerol Quantity: 10 -- type: entity - suffix: Ambuzol 10u - parent: Pill - id: PillAmbuzol - components: - - type: Label - currentLabel: ambuzol 10u - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Ambuzol - Quantity: 10 - -- type: entity - suffix: Ambuzol plus 5u - parent: Pill - id: PillAmbuzolPlus - components: - - type: Pill - pillType: 2 - - type: Sprite - state: pill3 - - type: Label - currentLabel: ambuzol plus 5u - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: AmbuzolPlus - Quantity: 5 - - type: entity parent: PillCanister id: PillCanisterRandom @@ -848,14 +814,6 @@ prob: 0.10 maxAmount: 7 orGroup: RandomPill - - id: PillAmbuzol - prob: 0.075 - maxAmount: 7 - orGroup: RandomPill - - id: PillAmbuzolPlus - prob: 0.075 - maxAmount: 7 - orGroup: RandomPill - id: PillSpaceDrugs prob: 0.075 maxAmount: 7 @@ -970,37 +928,7 @@ reagents: - ReagentId: Ipecac Quantity: 15 - -- type: entity - suffix: ambuzol - parent: PrefilledSyringe - id: SyringeAmbuzol - components: - - type: Label - currentLabel: reagent-name-ambuzol - - type: SolutionContainerManager - solutions: - injector: - maxVol: 15 - reagents: - - ReagentId: Ambuzol - Quantity: 15 - -- type: entity - suffix: sigynate - parent: PrefilledSyringe - id: SyringeSigynate - components: - - type: Label - currentLabel: reagent-name-sigynate - - type: SolutionContainerManager - solutions: - injector: - maxVol: 15 - reagents: - - ReagentId: Sigynate - Quantity: 15 - + - type: entity name: ethylredoxrazine syringe parent: PrefilledSyringe diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index c9c7ea596ab..9a1e2d961db 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -222,7 +222,7 @@ name: burn auto-injector parent: ChemicalMedipen id: BurnAutoInjector - description: A rapid dose of dermaline and leporazine, intended for combat applications. + description: A rapid dose of dermaline and pearcat, intended for combat applications. components: - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi @@ -245,8 +245,6 @@ reagents: - ReagentId: Dermaline Quantity: 10 - - ReagentId: Leporazine - Quantity: 10 - type: Tag tags: [] diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index b884923c7ce..fb873d67553 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -343,21 +343,6 @@ - ReagentId: Omnizine Quantity: 30 -- type: entity - parent: BaseChemistryBottleFilled - id: CognizineChemistryBottle - suffix: cognizine - components: - - type: Label - currentLabel: reagent-name-cognizine - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Cognizine - Quantity: 30 - - type: entity id: PaxChemistryBottle suffix: pax diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index cb422c49566..df47bc41405 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -815,8 +815,6 @@ - Dexalin - DexalinPlus - Epinephrine - - Leporazine - - Ambuzol - Tricordrazine - Artifexium - Ethylredoxrazine @@ -834,11 +832,9 @@ - NorepinephricAcid - Pax - Ipecac - - Cognizine - Beer - SpaceGlue - SpaceLube - - CogChamp - Honk - Carpetium - JuiceThatMakesYouWeh diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml index 66192e9ace8..2330a0724d0 100644 --- a/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml +++ b/Resources/Prototypes/Nyanotrasen/Recipes/Reactions/drink.yml @@ -3,10 +3,6 @@ reactants: GrapeSoda: amount: 1 - Diphenhydramine: - amount: 1 - Impedrezene: - amount: 1 FourteenLoko: amount: 1 products: diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 475987d459e..9ecfdf282ad 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -730,8 +730,8 @@ - type: reagent id: Oculine - name: reagent-name-oculine - desc: reagent-desc-oculine + name: pearcat + desc: pearcat group: Medicine physicalDesc: reagent-physical-desc-translucent flavor: medicine diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index acb5beb712b..07ca6a76a86 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1674,7 +1674,6 @@ group: Cake reagents: Milk: 15 - Cognizine: 5 solids: FoodCakePlain: 1 FoodSnackRaisins: 1 @@ -1686,8 +1685,6 @@ result: MobBreadDog time: 15 group: Breads - reagents: - Cognizine: 5 solids: FoodBreadSausage: 1 OrganAnimalHeart: 1 @@ -1727,7 +1724,7 @@ solids: LeftLegHarpy: 1 RightLegHarpy: 1 - + #Donks i guess - type: microwaveMealRecipe id: RecipeWarmDonkpocket diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml index 206ab848f6d..fac23d2a25d 100644 --- a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml @@ -32,5 +32,4 @@ Ointment: 1 MaterialCloth1: 1 reagents: - Sigynate: 20 Dermaline: 20 diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index 8c16384b6fd..e9d4d5938ef 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -484,8 +484,8 @@ id: Nocturine impact: High reactants: - Impedrezene: - amount: 2 + Oxygen: + amount: 1 Vestine: amount: 1 products: diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index 9076c664734..b9cc6abb679 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -221,23 +221,9 @@ amount: 1 Plasma: amount: 3 - Impedrezene: - amount: 3 products: Lexorin: 2 -- type: reaction - id: Mannitol - reactants: - Hydrogen: - amount: 1 - Water: - amount: 1 - Sugar: - amount: 1 - products: - Mannitol: 3 - - type: reaction id: MindbreakerToxin minTemp: 370 @@ -393,8 +379,6 @@ impact: Medium minTemp: 540 reactants: - Leporazine: - amount: 1 Dermaline: amount: 1 Carbon: diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index bc93356e6ce..3b426f06a1e 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -498,10 +498,8 @@ - Napalm - Toxin - Epinephrine - - Cognizine - Desoxyephedrine - Pax - - Siderlac # Goobstation - Start - Ibuprofen - Tirimol diff --git a/Resources/Prototypes/XenoArch/artifact_triggers.yml b/Resources/Prototypes/XenoArch/artifact_triggers.yml index 1966469a135..61abd591e13 100644 --- a/Resources/Prototypes/XenoArch/artifact_triggers.yml +++ b/Resources/Prototypes/XenoArch/artifact_triggers.yml @@ -126,7 +126,7 @@ groups: Acidic: [ Touch ] reactions: - - reagents: [ Dylovene, Diphenhydramine, Arithrazine, Bicaridine, Dermaline, Dexalin, DexalinPlus, Tricordrazine, Leporazine, Bruizine, Lacerinol, Puncturase, Pyrazine, Insuzine, Kelotane, Hyronalin, Inaprovaline, Epinephrine, Probital, Tirimol, Syriniver, Ebifin, ProcenylLazide, Multiver, Monover, Calomel, AmmoniatedMercury, SilverSulfadiazine, StypticPowder, SalicylicAcid, Oxandrolone, PentenicAcid, Atropine ] # Goobstation - Probital and above + - reagents: [ Dylovene, henhydramine, Arithrazine, Bicaridine, Dermaline, Dexalin, DexalinPlus, Tricordrazine, Bruizine, Lacerinol, Puncturase, Pyrazine, Kelotane, Hyronalin, Inaprovaline, Epinephrine, Probital, Tirimol, Syriniver, Ebifin, ProcenylLazide, Multiver, Monover, Calomel, AmmoniatedMercury, SilverSulfadiazine, StypticPowder, SalicylicAcid, Oxandrolone, PentenicAcid, Atropine ] # Goobstation - Probital and above methods: [ Touch ] effects: - !type:ActivateArtifact diff --git a/Resources/Prototypes/_Funkystation/Recipes/Reactions/toxins.yml b/Resources/Prototypes/_Funkystation/Recipes/Reactions/toxins.yml index 3b77ead3626..d7d5c835822 100644 --- a/Resources/Prototypes/_Funkystation/Recipes/Reactions/toxins.yml +++ b/Resources/Prototypes/_Funkystation/Recipes/Reactions/toxins.yml @@ -33,8 +33,6 @@ reactants: Haloperidol: amount: 1 - Impedrezene: - amount: 1 Radium: amount: 1 products: @@ -46,8 +44,6 @@ reactants: PotassiumIodide: amount: 1 - Impedrezene: - amount: 1 Aluminium: amount: 1 products: diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Medical/hypospray.yml index 175503569e8..1ff105192cb 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Medical/hypospray.yml @@ -160,7 +160,7 @@ - type: entity name: burn autoinjector cartridge parent: BaseAutoinjectorCartridge - description: Contains 4u of kelotane, 3u of dermaline, 2u of oxandrolone and 1u of sigynate, used in a cartridge autoinjector. + description: Contains 4u of kelotane, 3u of dermaline, 2u of oxandrolone and 1u of pearcat, used in a cartridge autoinjector. id: CartridgeDermaline components: - type: Sprite @@ -179,8 +179,6 @@ Quantity: 3 - ReagentId: Oxandrolone Quantity: 2 - - ReagentId: Sigynate - Quantity: 1 # Finely tuned mix, heals up to 114 total burn split between 4 types, twice as good for heat/cold/shock than for caustic, equivalent of 3.25 ointments - type: entity @@ -243,7 +241,7 @@ - type: entity name: sedative autoinjector cartridge parent: BaseAutoinjectorCartridge - description: Contains 4u of tirizene, 3u of impedrezene and 3u of haloperidol, used in a cartridge autoinjector. + description: Contains 4u of tirizene, 3u of pearcat and 3u of haloperidol, used in a cartridge autoinjector. id: CartridgeTirizene components: - type: Sprite @@ -258,7 +256,5 @@ reagents: - ReagentId: Tirizene Quantity: 4 - - ReagentId: Impedrezene - Quantity: 3 - ReagentId: Haloperidol Quantity: 3 diff --git a/Resources/Prototypes/_Goobstation/Reagents/toxins.yml b/Resources/Prototypes/_Goobstation/Reagents/toxins.yml index fc8900d35cc..c12dff9bc32 100644 --- a/Resources/Prototypes/_Goobstation/Reagents/toxins.yml +++ b/Resources/Prototypes/_Goobstation/Reagents/toxins.yml @@ -86,9 +86,6 @@ - !type:BloodReagentThreshold reagent: Calomel max: 0.1 - - !type:BloodReagentThreshold - reagent: Diphenhydramine - max: 0.1 - !type:AdjustReagent group: Medicine amount: -0.5 diff --git a/Resources/Prototypes/_Goobstation/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_Goobstation/Recipes/Reactions/medicine.yml index 0f801e3843e..93fd88bddab 100644 --- a/Resources/Prototypes/_Goobstation/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/_Goobstation/Recipes/Reactions/medicine.yml @@ -90,8 +90,6 @@ reactants: Silver: # check 1 amount: 2 - Diphenhydramine: # check 2 - amount: 2 Fluorine: amount: 1 Aluite: @@ -106,8 +104,6 @@ reactants: Gold: # check 1 amount: 2 - Sigynate: # check 2 - amount: 2 Silicon: amount: 1 Aluite: @@ -282,8 +278,6 @@ amount: 1 Phenol: amount: 1 - Leporazine: - amount: 1 products: Oxandrolone: 4 diff --git a/Resources/Prototypes/_Goobstation/Recipes/Reactions/narcotics.yml b/Resources/Prototypes/_Goobstation/Recipes/Reactions/narcotics.yml index 677ccc23079..aaac130021e 100644 --- a/Resources/Prototypes/_Goobstation/Recipes/Reactions/narcotics.yml +++ b/Resources/Prototypes/_Goobstation/Recipes/Reactions/narcotics.yml @@ -5,7 +5,5 @@ amount: 1 Epinephrine: amount: 1 - Diphenhydramine: - amount: 1 products: Aranesp: 1 diff --git a/Resources/Prototypes/_Lavaland/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_Lavaland/Entities/Objects/Specific/Medical/hypospray.yml index be153063eab..ea9b9a8cca2 100644 --- a/Resources/Prototypes/_Lavaland/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/_Lavaland/Entities/Objects/Specific/Medical/hypospray.yml @@ -2,7 +2,7 @@ name: survival medipen parent: ChemicalMedipen id: SurvivalMedipen - description: A cocktail of powerful healing chemicals. Contains Leporazine, and Miner's Salve. Slowly heals damage and stabilizes body temperature. You can overdose on these if you use more than one in quick succession. + description: A cocktail of powerful healing chemicals. Contains pearcat, and Miner's Salve. Slowly heals damage and stabilizes body temperature. You can overdose on these if you use more than one in quick succession. components: - type: Sprite sprite: /Textures/_Lavaland/Objects/Specific/Medical/medipen.rsi @@ -19,7 +19,7 @@ transferAmount: 40 onlyAffectsMobs: false injectOnly: true - maxPressure: 50 + maxPressure: 50 injectTime: 5 - type: SolutionContainerManager solutions: @@ -28,5 +28,3 @@ reagents: - ReagentId: MinersSalve Quantity: 20 - - ReagentId: Leporazine - Quantity: 20 From 5e9f0c559e06e41443c1589741902edcc12ee4d6 Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 18:18:31 -0400 Subject: [PATCH 14/15] a --- Resources/Prototypes/StartingGear/base.yml | 1 - .../_EE/Voice/speech_emote_sounds.yml | 42 ------------------- .../Prototypes/_EE/Voice/speech_sounds.yml | 9 ---- .../Prototypes/_EE/Voice/speech_verbs.yml | 6 --- 4 files changed, 58 deletions(-) delete mode 100644 Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml diff --git a/Resources/Prototypes/StartingGear/base.yml b/Resources/Prototypes/StartingGear/base.yml index 09e27677a44..4b60d0302d3 100644 --- a/Resources/Prototypes/StartingGear/base.yml +++ b/Resources/Prototypes/StartingGear/base.yml @@ -20,7 +20,6 @@ - SynthHuman - Tajaran - Vulpkanin - - Xelthia - type: startingGear id: NitrogenBreather diff --git a/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml deleted file mode 100644 index 85e7f7be027..00000000000 --- a/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml +++ /dev/null @@ -1,42 +0,0 @@ -# species -- type: emoteSounds - id: UnisexXelthia - params: - variation: 0.125 - sounds: - Scream: - path: /Audio/_EE/Voice/Xelthia/scream.ogg - Laugh: - path: /Audio/_EE/Voice/Xelthia/laugh.ogg - Sneeze: - path: /Audio/_EE/Voice/Xelthia/sneeze.ogg - Cough: - path: /Audio/_EE/Voice/Xelthia/cough.ogg - CatMeow: - collection: CatMeows - CatHisses: - collection: CatHisses - MonkeyScreeches: - collection: MonkeyScreeches - RobotBeep: - collection: RobotBeeps - Yawn: - collection: MaleYawn - Snore: - collection: Snores - Honk: - collection: BikeHorn - Sigh: - collection: MaleSigh - Crying: - path: /Audio/_EE/Voice/Xelthia/cry.ogg - Whistle: - collection: Whistles - Weh: - collection: Weh - Hew: - collection: Hew - Gasp: - collection: FemaleGasp - DefaultDeathgasp: - collection: FemaleDeathGasp diff --git a/Resources/Prototypes/_EE/Voice/speech_sounds.yml b/Resources/Prototypes/_EE/Voice/speech_sounds.yml index 54accc90df0..cbd12f3687d 100644 --- a/Resources/Prototypes/_EE/Voice/speech_sounds.yml +++ b/Resources/Prototypes/_EE/Voice/speech_sounds.yml @@ -37,12 +37,3 @@ path: /Audio/_EE/Supermatter/status/bloblarm.ogg exclaimSound: path: /Audio/_EE/Supermatter/status/bloblarm.ogg - -- type: speechSounds - id: Xelthia - saySound: - path: /Audio/_EE/Voice/Xelthia/say.ogg - askSound: - path: /Audio/_EE/Voice/Xelthia/ask.ogg - exclaimSound: - path: /Audio/_EE/Voice/Xelthia/exclaim.ogg diff --git a/Resources/Prototypes/_EE/Voice/speech_verbs.yml b/Resources/Prototypes/_EE/Voice/speech_verbs.yml index 51c62394849..72373bd99fd 100644 --- a/Resources/Prototypes/_EE/Voice/speech_verbs.yml +++ b/Resources/Prototypes/_EE/Voice/speech_verbs.yml @@ -3,9 +3,3 @@ name: chat-speech-verb-name-supermatter speechVerbStrings: - chat-speech-verb-supermatter - -- type: speechVerb - id: Xelthia - name: chat-speech-verb-name-xelthia - speechVerbStrings: - - chat-speech-verb-default From 5c6bcfd0f103c6a7004bafca7bcc651a1840b16d Mon Sep 17 00:00:00 2001 From: trcmrt Date: Wed, 10 Jun 2026 18:28:52 -0400 Subject: [PATCH 15/15] final --- Resources/Locale/en-US/_Crescent/linter.ftl | 2 + .../Catalog/Fills/Backpacks/duffelbag.yml | 6 -- .../Clothing/Back/smuggler_tables.yml | 2 - .../Objects/Specific/Medical/hypospray.yml | 2 - .../Prototypes/Procedural/salvage_loot.yml | 1 - .../Prototypes/Procedural/salvage_rewards.yml | 1 - Resources/Prototypes/Reagents/medicine.yml | 4 +- .../Roles/Jobs/Fun/visitors_startinggear.yml | 2 - .../Prototypes/XenoArch/artifact_triggers.yml | 2 +- .../Prototypes/_EE/Reagents/biological.yml | 77 ------------------- .../Construction/Graphs/food/steak.yml | 15 ---- 11 files changed, 5 insertions(+), 109 deletions(-) delete mode 100644 Resources/Prototypes/_EE/Reagents/biological.yml delete mode 100644 Resources/Prototypes/_EE/Recipes/Construction/Graphs/food/steak.yml diff --git a/Resources/Locale/en-US/_Crescent/linter.ftl b/Resources/Locale/en-US/_Crescent/linter.ftl index b6decaf7475..01dcbed3e5e 100644 --- a/Resources/Locale/en-US/_Crescent/linter.ftl +++ b/Resources/Locale/en-US/_Crescent/linter.ftl @@ -41,3 +41,5 @@ marking-ResomiRLegFeathers = Pearkitty marking-ResomiTail = Pearkitty marking-ResomiTailFeathers = Pearkitty marking-SnakeLargeTailAnimated = Pearkitty + +placeholder-CrescentEdit = pearcat diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index a95fdbb1917..661813f4c08 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -27,9 +27,6 @@ amount: 2 - id: GrenadeFlashBang amount: 2 - - id: PillAmbuzolPlus - - id: PillAmbuzol - amount: 4 # WD EDIT START - id: MedicatedSuture - id: RegenerativeMesh @@ -351,9 +348,6 @@ - id: SyringeRomerol - id: WeaponRevolverPython - id: MagazineBoxMagnumIncendiary - - id: PillAmbuzolPlus - - id: PillAmbuzol - amount: 3 - type: entity parent: ClothingBackpackDuffelSyndicateMedicalBundle diff --git a/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml b/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml index ced58e7d300..710de959d77 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml @@ -125,7 +125,6 @@ amount: !type:RangeNumberSelector range: 1, 5 - id: OmnizineChemistryBottle - - id: CognizineChemistryBottle - id: ToxinChemistryBottle - id: NocturineChemistryBottle - id: VestineChemistryVial @@ -527,7 +526,6 @@ children: - id: SpaceCash100 weight: 10 - - id: SyringeAmbuzol - id: SyringeHyronalin - id: SyringeDermaline - id: SyringeBicaridine diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 9a1e2d961db..cd46dc7874c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -402,8 +402,6 @@ pen: maxVol: 30 reagents: - - ReagentId: Leporazine - Quantity: 10 - ReagentId: Barozine Quantity: 20 - type: Tag diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index e8d35fb5f37..36e95984bdf 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -26,7 +26,6 @@ cost: 2 - proto: CloningPodMachineCircuitboard cost: 2 - - proto: CognizineChemistryBottle - proto: FoodBoxDonkpocketCarp prob: 0.5 - proto: CrateSalvageEquipment diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index cf148e3e0d2..774f24e13ac 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -68,7 +68,6 @@ # rare armor ClothingOuterArmorARC: 1.0 # DeltaV - ClothingOuterArmorRiot replaced in favour of ARC suit # rare chemicals - CognizineChemistryBottle: 1.0 OmnizineChemistryBottle: 1.0 # money SpaceCash2500: 1.0 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 9ecfdf282ad..8243194ec59 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -730,8 +730,8 @@ - type: reagent id: Oculine - name: pearcat - desc: pearcat + name: placeholder-CrescentEdit + desc: placeholder-CrescentEdit group: Medicine physicalDesc: reagent-physical-desc-translucent flavor: medicine diff --git a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml index b14c3119612..61de6fa406d 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml @@ -695,8 +695,6 @@ outerClothing: ClothingOuterCoatLabViro pocket1: PillCanisterTricordrazine pocket2: PillCanisterRandom - inhand: - - SyringeSigynate - type: startingGear id: VisitorVirologistAlt diff --git a/Resources/Prototypes/XenoArch/artifact_triggers.yml b/Resources/Prototypes/XenoArch/artifact_triggers.yml index 61abd591e13..ab80544f65a 100644 --- a/Resources/Prototypes/XenoArch/artifact_triggers.yml +++ b/Resources/Prototypes/XenoArch/artifact_triggers.yml @@ -126,7 +126,7 @@ groups: Acidic: [ Touch ] reactions: - - reagents: [ Dylovene, henhydramine, Arithrazine, Bicaridine, Dermaline, Dexalin, DexalinPlus, Tricordrazine, Bruizine, Lacerinol, Puncturase, Pyrazine, Kelotane, Hyronalin, Inaprovaline, Epinephrine, Probital, Tirimol, Syriniver, Ebifin, ProcenylLazide, Multiver, Monover, Calomel, AmmoniatedMercury, SilverSulfadiazine, StypticPowder, SalicylicAcid, Oxandrolone, PentenicAcid, Atropine ] # Goobstation - Probital and above + - reagents: [ Dylovene, Arithrazine, Bicaridine, Dermaline, Dexalin, DexalinPlus, Tricordrazine, Bruizine, Lacerinol, Puncturase, Pyrazine, Kelotane, Hyronalin, Inaprovaline, Epinephrine, Probital, Tirimol, Syriniver, Ebifin, ProcenylLazide, Multiver, Monover, Calomel, AmmoniatedMercury, SilverSulfadiazine, StypticPowder, SalicylicAcid, Oxandrolone, PentenicAcid, Atropine ] # Goobstation - Probital and above methods: [ Touch ] effects: - !type:ActivateArtifact diff --git a/Resources/Prototypes/_EE/Reagents/biological.yml b/Resources/Prototypes/_EE/Reagents/biological.yml deleted file mode 100644 index 1dd3ea70464..00000000000 --- a/Resources/Prototypes/_EE/Reagents/biological.yml +++ /dev/null @@ -1,77 +0,0 @@ -- type: reagent - parent: Blood - id: AcidBlood - name: reagent-name-acid-blood - group: Biological - desc: reagent-desc-acid-blood - flavor: acid - color: "#00FF69" - recognizable: true - physicalDesc: reagent-physical-desc-strong-smelling - slippery: true - plantMetabolism: - - !type:PlantAdjustToxins - amount: 20 - - !type:PlantAdjustWeeds - amount: -4 - - !type:PlantAdjustHealth - amount: -8 - reactiveEffects: - Acidic: - methods: [ Touch ] - effects: - - !type:HealthChange - scaleByQuantity: true - ignoreResistances: false - damage: - types: - Caustic: 0.5 - - !type:Emote - emote: Scream - probability: 0.3 - metabolisms: - Poison: - metabolismRate : 3.00 # High damage, high metabolism rate. You need a lot of units to crit. Simulates acid burning through you fast. - effects: - - !type:HealthChange - damage: - types: - Caustic: 11.0 - - !type:PopupMessage - type: Local - visualType: Large - messages: [ "generic-reagent-effect-burning-insides" ] - probability: 0.33 - - !type:Emote - emote: Scream - probability: 0.3 -# conditions: # TODO: Figure out how to make this work properly, it doesnt seem like it wants to do anything when uncommented lol -# - !type:OrganType -# type: Xelthia -# shouldHave: false - -- type: reagent - id: XelthiaArmJuice - name: reagent-name-armjuice - group: Biological - desc: reagent-desc-armjuice - flavor: acid - color: "#00FF69" - physicalDesc: reagent-physical-desc-viscous - metabolisms: - Medicine: - effects: - - !type:SatiateThirst - factor: -4 - - !type:SatiateHunger - factor: -4 - - !type:HealthChange - conditions: - - !type:TotalDamage - max: 50 - damage: - groups: - Brute: -1.5 - types: - Heat: -0.4 - \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Recipes/Construction/Graphs/food/steak.yml b/Resources/Prototypes/_EE/Recipes/Construction/Graphs/food/steak.yml deleted file mode 100644 index 7249dad05a0..00000000000 --- a/Resources/Prototypes/_EE/Recipes/Construction/Graphs/food/steak.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Xelthia Arm "steak" -- type: constructionGraph - id: Xelthiarm - start: start - graph: - - node: start - edges: - - to: xelthiarm - completed: - - !type:PlaySound - sound: /Audio/Effects/sizzle.ogg - steps: - - minTemperature: 345 - - node: xelthiarm - entity: FoodMeatXelthiaTentacleCooked \ No newline at end of file