Merge pull request #1622 from AftrLite:requested-changeling-hotfix

requested hotfixes
impstation · Feb 10, 2025 · 8025dcd · 8025dcd
2 parents 9e20022 + 1940165
commit 8025dcd
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs
@@ -419,8 +419,7 @@ private void OnStingBlind(EntityUid uid, ChangelingComponent comp, ref StingBlin
         if (!TryComp<BlindableComponent>(target, out var blindable) || blindable.IsBlind)
             return;
 
-        _blindable.AdjustEyeDamage((target, blindable), 2);
-        var timeSpan = TimeSpan.FromSeconds(5f);
+        var timeSpan = TimeSpan.FromSeconds(18f);
         _statusEffect.TryAddStatusEffect(target, TemporaryBlindnessSystem.BlindingStatusEffect, timeSpan, false, TemporaryBlindnessSystem.BlindingStatusEffect);
     }
     private void OnStingCryo(EntityUid uid, ChangelingComponent comp, ref StingCryoEvent args)

diff --git a/Resources/Locale/en-US/_Impstation/markings/scars.ftl b/Resources/Locale/en-US/_Impstation/markings/scars.ftl
@@ -29,7 +29,9 @@ marking-HandTwistingRight-hand_r_twisting = Twisted Scar (Right Hand)
 marking-SmileScars = The Jonker
 marking-SmileScars-head_smile = The Jonker
 marking-HeadTwisting = Twisted Scar
+marking-HeadTwistingFlipped = Twisted Scar, Flipped
 marking-HeadTwisting-head_twisting = Twisted Scar
+marking-HeadTwisting-head_twisting_flipped = Twisted Scar, Flipped
 marking-LegProstheticLeft = Prosthetic (Left Leg)
 marking-LegProstheticLeft-leg_l_prosthetic = Prosthetic (Left Leg)
 marking-LegTwistingLeft = Twisted Scar (Left Leg)

diff --git a/Resources/Prototypes/_Goobstation/Changeling/Actions/changeling.yml b/Resources/Prototypes/_Goobstation/Changeling/Actions/changeling.yml
@@ -258,7 +258,7 @@
 - type: entity
   id: ActionStingBlind
   name: Blind Sting
-  description: We sting a target, blinding them temporarily. Costs a medium amount of chemicals.
+  description: We sting a target, blinding them temporarily. Costs a sizeable amount of chemicals. Stinging multiple times won't intensify the effect.
   categories: [ HideSpawnMenu ]
   components:
   - type: EntityTargetAction
@@ -273,7 +273,7 @@
       state: sting_blind
     event: !type:StingBlindEvent {}
   - type: ChangelingAction
-    chemicalCost: 35
+    chemicalCost: 50
     useInLesserForm: true
 
 - type: entity

diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/scars.yml
@@ -188,6 +188,16 @@
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: head_twisting
 
+- type: marking
+  id: HeadTwistingFlipped
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf, SlimePerson]
+  followSkinColor: false
+  sprites:
+  - sprite: _Impstation/Mobs/Customization/scars.rsi
+    state: head_twisting_flipped
+
 - type: marking
   id: LegProstheticLeft
   bodyPart: LLeg

diff --git a/...ces/Textures/_Impstation/Mobs/Customization/scars.rsi/head_twisting_flipped.png b/...ces/Textures/_Impstation/Mobs/Customization/scars.rsi/head_twisting_flipped.png
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/scars.rsi/meta.json
@@ -71,6 +71,10 @@
           "name": "head_twisting",
           "directions": 4
       },
+      {
+          "name": "head_twisting_flipped",
+          "directions": 4
+      },
       {
           "name": "leg_l_prosthetic",
           "directions": 4