diff --git a/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs b/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs index ae64eace9a..d031fd5be4 100644 --- a/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs +++ b/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs @@ -34,7 +34,7 @@ public sealed class GuideEntryPrototypeTests }); // Avoid styleguide update limit - await client.WaitRunTicks(1); + await client.WaitRunTicks(10); // DeltaV - didn't avoid hard enough } await pair.CleanReturnAsync(); diff --git a/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl b/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl index 5499ee3805..367250d9de 100644 --- a/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl @@ -1,9 +1,3 @@ -reagent-name-hemoxadone = hemoxadone -reagent-desc-hemoxadone = A cryogenics chemical. Used to treat severe blood loss by regenerating red blood cells and promoting reperfusion. Works regardless of the patient being alive or dead. - -reagent-name-cyanoxadone = cyanoxadone -reagent-desc-cyanoxadone = A cryogenics chemical. Used to treat severe blood loss in blue-blooded creatures by regenerating hemocyanin and promoting reperfusion. Works regardless of the patient being alive or dead. - reagent-desc-doxarubixadone-deltav = A cryogenics chemical. Heals certain types of cellular damage caused by dangerous gases and chemicals. Works regardless of the patient being alive or dead. reagent-name-netinadone = netinadone diff --git a/Resources/Prototypes/_DV/Reagents/medicine.yml b/Resources/Prototypes/_DV/Reagents/medicine.yml index 8eb16e8c9c..7cff1199c3 100644 --- a/Resources/Prototypes/_DV/Reagents/medicine.yml +++ b/Resources/Prototypes/_DV/Reagents/medicine.yml @@ -1,85 +1,3 @@ -- type: reagent - id: Hemoxadone - name: reagent-name-hemoxadone - group: Medicine - desc: reagent-desc-hemoxadone - physicalDesc: reagent-physical-desc-metallic - flavor: medicine - color: "#ee0044" - worksOnTheDead: true - metabolisms: - Poison: - effects: - - !type:HealthChange - conditions: - - !type:OrganType - type: Arachnid - shouldHave: true - damage: - types: - Poison: 2 - Medicine: - effects: - - !type:HealthChange - conditions: - - !type:Temperature - max: 213.0 - - !type:OrganType - type: Arachnid - shouldHave: false - damage: - types: - Bloodloss: -6 - - !type:ModifyBloodLevel - conditions: - - !type:Temperature - max: 213.0 - - !type:OrganType - type: Arachnid - shouldHave: false - amount: 6 - -- type: reagent - id: Cyanoxadone - name: reagent-name-cyanoxadone - group: Medicine - desc: reagent-desc-cyanoxadone - physicalDesc: reagent-physical-desc-metallic - flavor: medicine - color: "#00eeff" - worksOnTheDead: true - metabolisms: - Poison: - effects: - - !type:HealthChange - conditions: - - !type:OrganType - type: Arachnid - shouldHave: false - damage: - types: - Poison: 2 - Medicine: - effects: - - !type:HealthChange - conditions: - - !type:Temperature - max: 213.0 - - !type:OrganType - type: Arachnid - shouldHave: true - damage: - types: - Bloodloss: -6 - - !type:ModifyBloodLevel - conditions: - - !type:Temperature - max: 213.0 - - !type:OrganType - type: Arachnid - shouldHave: true - amount: 6 - - type: reagent id: Netinadone name: reagent-name-netinadone diff --git a/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml index e07b33e5b3..f6e2172742 100644 --- a/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml @@ -1,31 +1,3 @@ -- type: reaction - id: Hemoxadone - minTemp: 370 - reactants: - Iron: - amount: 2 - Traumoxadone: - amount: 1 - Blood: - amount: 1 - catalyst: true - products: - Hemoxadone: 2 - -- type: reaction - id: Cyanoxadone - minTemp: 370 - reactants: - Copper: - amount: 2 - Traumoxadone: - amount: 1 - CopperBlood: - amount: 1 - catalyst: true - products: - Cyanoxadone: 2 - - type: reaction id: Netinadone minTemp: 400 diff --git a/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml b/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml index 14a486a13c..89b5ae5f1d 100644 --- a/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml +++ b/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml @@ -48,8 +48,6 @@ The standard pressure for a gas pump is 100.325 kpa. Cryoxadone works at under 1 - -