From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Mon, 19 Jan 2026 22:17:10 +0000 (-0800) Subject: Traitor Chemicals Rebalance (#42484) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=fa9173c0ec788b940524ead08181e5bcbc44ccc6;p=space-station-14.git Traitor Chemicals Rebalance (#42484) very small list of changes overall Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs index b5a208f2c7..a525925782 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs @@ -4,7 +4,6 @@ using Robust.Shared.Prototypes; namespace Content.Shared.EntityEffects.Effects.StatusEffects; -// TODO: When Electrocution is moved to new Status, make this use StatusEffectsContainerComponent. /// /// Electrocutes this entity for a given amount of damage and time. /// The shock damage applied by this effect is modified by scale. @@ -19,7 +18,13 @@ public sealed partial class ElectrocuteEntityEffectSystem : EntityEffectSystem /// /// Time we electrocute this entity /// - [DataField] public TimeSpan ElectrocuteTime = TimeSpan.FromSeconds(2); + [DataField] + public TimeSpan ElectrocuteTime = TimeSpan.FromSeconds(2); /// /// Shock damage we apply to the entity. /// - [DataField] public int ShockDamage = 5; + [DataField] + public int ShockDamage = 5; /// /// Do we refresh the duration? Or add more duration if it already exists. /// - [DataField] public bool Refresh = true; + [DataField] + public bool Refresh = true; /// /// Should we by bypassing insulation? /// - [DataField] public bool BypassInsulation = true; + [DataField] + public bool BypassInsulation = true; + + /// + /// How much electricity is being passed through the body basically. Lower means less oomph. + /// + [DataField] + public float SiemensCoefficient = 1f; public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) - => Loc.GetString("entity-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime.TotalSeconds)); + => Loc.GetString("entity-effect-guidebook-electrocute", ("chance", Probability), ("time", ElectrocuteTime.TotalSeconds), ("stuns", SiemensCoefficient > 0.5f)); } diff --git a/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl b/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl index fccc6291a8..3a453b3404 100644 --- a/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl +++ b/Resources/Locale/en-US/guidebook/entity-effects/effects.ftl @@ -335,8 +335,14 @@ entity-effect-guidebook-drunk = entity-effect-guidebook-electrocute = { $chance -> - [1] Electrocutes - *[other] electrocute + [1] { $stuns -> + [true] Electrocutes + *[false] Shocks + } + *[other] { $stuns -> + [true] electrocute + *[false] shock + } } the metabolizer for {NATURALFIXED($time, 3)} {MANY("second", $time)} entity-effect-guidebook-emote = diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml index 96d06ed30b..998a0cde42 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml @@ -30,7 +30,7 @@ - id: Dropper # It would be cool to have special "syndicate" chemical analysis goggles - id: ClothingEyesGlassesChemical - - id: SyringeStimulants + - id: Syringe - id: VestineChemistryVial amount: 2 - id: ChemistryEmptyVial diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 2e9510b337..dee58741b2 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -697,7 +697,7 @@ discountDownTo: Telecrystal: 2 cost: - Telecrystal: 5 + Telecrystal: 3 categories: - UplinkChemicals @@ -710,7 +710,7 @@ discountDownTo: Telecrystal: 2 cost: - Telecrystal: 4 + Telecrystal: 3 categories: - UplinkChemicals diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml index 0890fcffd5..538cfaffa0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml @@ -121,13 +121,13 @@ - type: SolutionContainerManager solutions: melee: - maxVol: 7 + maxVol: 10 - type: SolutionInjectOnEmbed - transferAmount: 7 + transferAmount: 10 blockSlots: NONE solution: melee - type: SolutionTransfer - maxTransferAmount: 7 + maxTransferAmount: 10 - type: entity name: dartboard diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index 2c6a0e0ffc..b4cb53747f 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -164,9 +164,11 @@ color: "#FDD023" metabolisms: Poison: + metabolismRate : 2.0 effects: - !type:Electrocute - probability: 0.35 + siemensCoefficient: 0.5 + probability: 0.5 - type: reagent id: Razorium diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 7ad463bfcc..df81a8db13 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -169,10 +169,10 @@ conditions: - !type:ReagentCondition reagent: Stimulants - min: 50 + min: 45 damage: types: - Poison: 1 + Poison: 3 # Interactions - !type:ModifyStatusEffect conditions: @@ -333,7 +333,7 @@ reagent: Nocturine min: 8 effectProto: StatusEffectForcedSleeping - time: 6 + time: 9 delay: 5 - type: reagent diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 6fb5d3aa7a..22aca1a7c1 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -674,9 +674,11 @@ color: "#FDD023" metabolisms: Poison: + metabolismRate : 2.0 effects: - !type:Electrocute - probability: 0.8 + electrocuteTime: 1 + probability: 0.5 - type: reagent id: Lipolicide