Stable master merge (#37850)

This commit is contained in:
Myra
2025-05-26 17:30:30 +02:00
committed by GitHub
4 changed files with 5 additions and 119 deletions

View File

@@ -3121,14 +3121,6 @@
id: 8464 id: 8464
time: '2025-05-12T16:28:16.0000000+00:00' time: '2025-05-12T16:28:16.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/37361 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 - author: Gentleman-Bird
changes: changes:
- message: Added muffin tins to the kitchen dinnerware crate - message: Added muffin tins to the kitchen dinnerware crate
@@ -3537,33 +3529,6 @@
id: 8519 id: 8519
time: '2025-05-18T08:57:23.0000000+00:00' time: '2025-05-18T08:57:23.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/37069 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 - author: ScarKy0
changes: changes:
- message: Aloxadone has been tweaked. The recipe has been altered to be simplier - message: Aloxadone has been tweaked. The recipe has been altered to be simplier

View File

@@ -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-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-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-name-doxarubixadone = doxarubixadone
reagent-desc-doxarubixadone = A cryogenics chemical. Heals cellular damage caused by dangerous gasses and chemicals. 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-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-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-name-mannitol = mannitol
reagent-desc-mannitol = Efficiently restores brain damage. 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-name-haloperidol = haloperidol
reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness. 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.

View File

@@ -174,7 +174,6 @@
physicalDesc: reagent-physical-desc-fizzy physicalDesc: reagent-physical-desc-fizzy
flavor: medicine flavor: medicine
color: "#0091ff" color: "#0091ff"
worksOnTheDead: true
plantMetabolism: plantMetabolism:
- !type:PlantAdjustToxins - !type:PlantAdjustToxins
amount: -5 amount: -5
@@ -184,8 +183,6 @@
metabolisms: metabolisms:
Medicine: Medicine:
effects: effects:
- !type:ModifyBloodLevel
amount: 4
- !type:HealthChange - !type:HealthChange
conditions: conditions:
- !type:Temperature - !type:Temperature
@@ -194,7 +191,10 @@
damage: damage:
# todo scale with temp like SS13 # todo scale with temp like SS13
groups: groups:
Airloss: -10 Airloss: -6
Brute: -4
Burn: -6
Toxin: -4
- type: reagent - type: reagent
id: Doxarubixadone id: Doxarubixadone
@@ -1286,25 +1286,6 @@
Shock: -4.0 Shock: -4.0
Caustic: -1.5 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 - type: reagent
id : Mannitol # currently this is just a way to create psicodine id : Mannitol # currently this is just a way to create psicodine
name: reagent-name-mannitol name: reagent-name-mannitol
@@ -1447,27 +1428,3 @@
- !type:AdjustReagent - !type:AdjustReagent
reagent: MindbreakerToxin reagent: MindbreakerToxin
amount: -3.0 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

View File

@@ -662,33 +662,3 @@
amount: 1 amount: 1
products: products:
Haloperidol: 5 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