diff --git a/Content.Shared/_DV/EntityEffects/EffectConditions/MultiMobStateCondition.cs b/Content.Shared/_DV/EntityEffects/EffectConditions/MultiMobStateCondition.cs deleted file mode 100644 index 05084c208f..0000000000 --- a/Content.Shared/_DV/EntityEffects/EffectConditions/MultiMobStateCondition.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Content.Shared.EntityEffects; -using Content.Shared.Localizations; -using Content.Shared.Mobs; -using Content.Shared.Mobs.Components; -using Robust.Shared.Prototypes; - -namespace Content.Shared._DV.EntityEffects.EffectConditions; - -/// -/// This works like the upstream MobStateCondition, but it accepts a list of states instead of just one. -/// Helps with de-cluttering the guidebook for stuff that does one thing for dead mobs and a different one -/// for critical and alive mobs. -/// -public sealed partial class MultiMobStateCondition : EntityEffectCondition -{ - [DataField(required: true)] - public List States = new(); - - public override bool Condition(EntityEffectBaseArgs args) - { - if (args.EntityManager.TryGetComponent(args.TargetEntity, out MobStateComponent? mobState)) - { - return States.Contains(mobState.CurrentState); - } - - return false; - } - - public override string GuidebookExplanation(IPrototypeManager prototype) - { - var stateStrings = new List(States.Count); - foreach (var state in States) - { - stateStrings.Add(state.ToString().ToLower()); - } - var formattedStates = ContentLocalizationManager.FormatListToOr(stateStrings); - - return Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", formattedStates)); - } -} diff --git a/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl b/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl index 9ca2f63c4f..fa0af8b32d 100644 --- a/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl @@ -12,7 +12,4 @@ reagent-desc-unholy-water = Water treated with blood and sulfur. Just looking at reagent-name-anodynafil = anodynafil reagent-desc-anodynafil = An effective short-lasting anesthetic that doesn't interfere with consciousness, but results in prolonged pain suppression. -reagent-name-trinoxadone = trinoxadone -reagent-desc-trinoxadone = A complex cryogenics chemical. Treats most damage types in alive and critical patients at a slower metabolism rate, however, only offers limited tissue regeneration in dead patients. - reagent-desc-dexalin-deltav = Used for treating minor oxygen deprivation and bloodloss. A required reagent for salbutamol and convermol. diff --git a/Resources/Prototypes/_DV/Reagents/medicine.yml b/Resources/Prototypes/_DV/Reagents/medicine.yml index bf4ae26a84..b3b18ac99a 100644 --- a/Resources/Prototypes/_DV/Reagents/medicine.yml +++ b/Resources/Prototypes/_DV/Reagents/medicine.yml @@ -84,39 +84,4 @@ type: Add - !type:MovespeedModifier walkSpeedModifier: 0.5 - sprintSpeedModifier: 0.5 - -- type: reagent - id: Trinoxadone - name: reagent-name-trinoxadone - group: Medicine - desc: reagent-desc-trinoxadone - physicalDesc: reagent-physical-desc-cloudy - flavor: medicine - color: "#4f3670" - worksOnTheDead: true - metabolisms: - Medicine: - effects: - - !type:EvenHealthChange - conditions: - - !type:TemperatureCondition - max: 213.0 - - !type:MultiMobStateCondition - states: [ Alive, Critical ] - damage: - Brute: -1.5 - Burn: -1.5 - Toxin: -2 - - !type:EvenHealthChange - conditions: - - !type:TemperatureCondition - max: 213.0 - - !type:MobStateCondition - mobstate: Dead - - !type:TotalDamage - min: 210 - max: 350 - damage: - Brute: -2 - Burn: -2 + sprintSpeedModifier: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml index 802a935281..dfab0252a0 100644 --- a/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml @@ -46,14 +46,4 @@ Iodine: amount: 1 products: - Anodynafil: 4 - -- type: reaction - id: Trinoxadone - reactants: - Cryoxadone: - amount: 1 - Tricordrazine: - amount: 1 - products: - Trinoxadone: 2 + Anodynafil: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_Funkystation/Reagents/medicine.yml b/Resources/Prototypes/_Funkystation/Reagents/medicine.yml index bc69408628..79786db2be 100644 --- a/Resources/Prototypes/_Funkystation/Reagents/medicine.yml +++ b/Resources/Prototypes/_Funkystation/Reagents/medicine.yml @@ -259,7 +259,7 @@ conditions: - !type:TemperatureCondition min: 343.3 # completely arbitrary - damage: # Better than Trinox + damage: # Better than Trinox (RIP Trinox) Brute: -3 # Was -4 with HealthChange Burn: -3 # Was -6 with HealthChange Airloss: -3 # Was -6 with HealthChange diff --git a/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml b/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml index 66d8a9d540..0a25fc45e0 100644 --- a/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml +++ b/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml @@ -46,7 +46,6 @@ Cryochemicals, such as Opporozidone and Netinadone can even reverse rotting on b The standard pressure for a gas pump is 100.325 kpa. Cryoxadone works at under 213K body temperature, but it is standard practice to set the freezer to 100K for faster freezing. -