From 6bdcadfde33e107c7555ff85777e553c8a9a8761 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Mon, 26 May 2025 15:29:34 +0200 Subject: [PATCH 1/2] hotfix the hotfix, slot blocker changelog (#37845) remove changelog for slot blockers due to being reverted --- Resources/Changelog/Changelog.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index fa93a8b45f..1d05a5781c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -3243,14 +3243,6 @@ id: 8464 time: '2025-05-12T16:28:16.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/37361 -- author: Winkarst-cpu - changes: - - message: Now certain clothes (like hardsuits and their helmets) can prevent from - changing clothes, goggles, etc. - type: Add - id: 8465 - time: '2025-05-12T17:35:42.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/35172 - author: Gentleman-Bird changes: - message: Added muffin tins to the kitchen dinnerware crate From 02fe5b4ac544bbf9b868e043ac1179663229f5f0 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Mon, 26 May 2025 16:49:34 +0200 Subject: [PATCH 2/2] HOTFIX Cryochem revert (#37844) * Revert "Traumoxadone (#37236)" This reverts commit 55ec2632a8fb09d4e6eab3549bf127a55f7a1564. * Revert "Cryoxadone Tweaks (#37132)" This reverts commit 406bfa33088e62bd9be0c520bb981fd4e3eb0d4f. * Revert "Stelloxadone (#37131)" This reverts commit f415ad51c36bf264fad9c85bc328db3f0c9bf284. * whitespace test fail evasive maneuver * changelog 1984 --- Resources/Changelog/Changelog.yml | 27 ---------- .../Locale/en-US/reagents/meta/medicine.ftl | 8 +-- Resources/Prototypes/Reagents/medicine.yml | 51 ++----------------- .../Prototypes/Recipes/Reactions/medicine.yml | 30 ----------- 4 files changed, 5 insertions(+), 111 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1d05a5781c..312fb80702 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -3651,33 +3651,6 @@ id: 8519 time: '2025-05-18T08:57:23.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/37069 -- author: ScarKy0 - changes: - - message: Added Stelloxadone! A cryochemical used to treat poison and radiation - damage in living patients as well as corpses, though it comes at a cost of genetic - damage. - type: Add - id: 8520 - time: '2025-05-18T09:11:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37131 -- author: ScarKy0 - changes: - - message: Cryoxadone now works on the dead. - type: Tweak - - message: Cryoxadone has been reworked. It no longer heals basic damage types. - Instead it heals asphyxiation, bloodloss and increases blood level. - type: Tweak - id: 8521 - time: '2025-05-18T09:11:51.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37132 -- author: ScarKy0 - changes: - - message: Added Traumoxadone! A cryochemical used to treat brute damage in living - patients as well as corpses. - type: Add - id: 8522 - time: '2025-05-18T09:11:59.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37236 - author: ScarKy0 changes: - message: Aloxadone has been tweaked. The recipe has been altered to be simplier diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl index c4d2eb518b..1d2dac1bf5 100644 --- a/Resources/Locale/en-US/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl @@ -14,7 +14,7 @@ reagent-name-bicaridine = bicaridine reagent-desc-bicaridine = An analgesic which is highly effective at treating brute damage. It's useful for stabilizing people who have been severely beaten, as well as treating less life-threatening injuries. reagent-name-cryoxadone = cryoxadone -reagent-desc-cryoxadone = Required for the proper function of cryogenics. Used to treat bloodloss and asphyxiation, as well as to restore bodily fluids such as blood. It can treat and rejuvenate plants when applied in small doses. Works regardless of the patient being alive or dead. +reagent-desc-cryoxadone = Required for the proper function of cryogenics. Heals all standard types of damage, but only works in temperatures under 213K. It can treat and rejuvenate plants when applied in small doses. reagent-name-doxarubixadone = doxarubixadone reagent-desc-doxarubixadone = A cryogenics chemical. Heals cellular damage caused by dangerous gasses and chemicals. @@ -136,9 +136,6 @@ reagent-desc-necrosol = A necrotic substance that seems to be able to heal froze reagent-name-aloxadone = aloxadone reagent-desc-aloxadone = A cryogenics chemical. Used to treat severe burns and frostbite via regeneration of the affected tissue. Works regardless of the patient being alive or dead. -reagent-name-traumoxadone = traumoxadone -reagent-desc-traumoxadone = A cryogenics chemical. Used to treat severe trauma to tissues via patching them with tiny particles within the liquid. Works regardless of the patient being alive or dead. - reagent-name-mannitol = mannitol reagent-desc-mannitol = Efficiently restores brain damage. @@ -150,6 +147,3 @@ reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by reagent-name-haloperidol = haloperidol reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness. - -reagent-name-stelloxadone = stelloxadone -reagent-desc-stelloxadone = A cryogenics chemical. Used to aggressively dissolve toxins from the body. Works regardless of the patient being alive or dead. diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 682a0e2bea..d553b8065d 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -174,7 +174,6 @@ physicalDesc: reagent-physical-desc-fizzy flavor: medicine color: "#0091ff" - worksOnTheDead: true plantMetabolism: - !type:PlantAdjustToxins amount: -5 @@ -184,8 +183,6 @@ metabolisms: Medicine: effects: - - !type:ModifyBloodLevel - amount: 4 - !type:HealthChange conditions: - !type:Temperature @@ -194,7 +191,10 @@ damage: # todo scale with temp like SS13 groups: - Airloss: -10 + Airloss: -6 + Brute: -4 + Burn: -6 + Toxin: -4 - type: reagent id: Doxarubixadone @@ -1286,25 +1286,6 @@ Shock: -4.0 Caustic: -1.5 -- type: reagent - id: Traumoxadone - name: reagent-name-traumoxadone - group: Medicine - desc: reagent-desc-traumoxadone - physicalDesc: reagent-physical-desc-cloudy - flavor: medicine - color: "#69304D" - worksOnTheDead: true - metabolisms: - Medicine: - effects: - - !type:EvenHealthChange - conditions: - - !type:Temperature - max: 213.0 - damage: - Brute: -4 - - type: reagent id : Mannitol # currently this is just a way to create psicodine name: reagent-name-mannitol @@ -1447,27 +1428,3 @@ - !type:AdjustReagent reagent: MindbreakerToxin amount: -3.0 - -- type: reagent - id: Stelloxadone - name: reagent-name-stelloxadone - group: Medicine - desc: reagent-desc-stelloxadone - physicalDesc: reagent-physical-desc-murky - flavor: medicine - color: "#FFC683" - worksOnTheDead: true - metabolisms: - Medicine: - effects: - - !type:HealthChange - conditions: - - !type:Temperature - max: 213.0 - damage: - groups: - Brute: 3 - Genetic: 1 - types: - Poison: -6 - Radiation: -3 diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index 0e0a7f13fc..f710f5c471 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -662,33 +662,3 @@ amount: 1 products: Haloperidol: 5 - -- type: reaction - id: Traumoxadone - impact: Medium - reactants: - Cryoxadone: - amount: 1 - Bicaridine: - amount: 1 - Fersilicite: - amount: 1 - Lipozine: - amount: 1 - products: - Traumoxadone: 3 - -- type: reaction - id: Stelloxadone - impact: Medium - reactants: - Stellibinin: - amount: 5 - Cryoxadone: - amount: 3 - Arithrazine: - amount: 2 - products: - Stelloxadone: 5 - Water: 3 - Fiber: 2