From 5534b89a30a48adb6958d974b51538bc8cdce605 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sun, 9 Feb 2025 20:17:41 +1300 Subject: [PATCH 1/2] requested by stonylogray --- .../_Goobstation/Changeling/ChangelingSystem.Abilities.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs index 0d26c4407664..412d4da5a7e4 100644 --- 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(target, out var blindable) || blindable.IsBlind) return; - _blindable.AdjustEyeDamage((target, blindable), 2); - var timeSpan = TimeSpan.FromSeconds(5f); + var timeSpan = TimeSpan.FromSeconds(7f); _statusEffect.TryAddStatusEffect(target, TemporaryBlindnessSystem.BlindingStatusEffect, timeSpan, false, TemporaryBlindnessSystem.BlindingStatusEffect); } private void OnStingCryo(EntityUid uid, ChangelingComponent comp, ref StingCryoEvent args) From 1940165cb8c8e3554bb11ade990ed3a9a2148c04 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sun, 9 Feb 2025 20:30:28 +1300 Subject: [PATCH 2/2] requested by puffle --- .../Changeling/ChangelingSystem.Abilities.cs | 2 +- .../Locale/en-US/_Impstation/markings/scars.ftl | 2 ++ .../Changeling/Actions/changeling.yml | 4 ++-- .../Mobs/Customization/Markings/scars.yml | 10 ++++++++++ .../scars.rsi/head_twisting_flipped.png | Bin 0 -> 989 bytes .../Mobs/Customization/scars.rsi/meta.json | 4 ++++ 6 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/scars.rsi/head_twisting_flipped.png diff --git a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs index 412d4da5a7e4..29179f582b68 100644 --- a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs +++ b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs @@ -419,7 +419,7 @@ private void OnStingBlind(EntityUid uid, ChangelingComponent comp, ref StingBlin if (!TryComp(target, out var blindable) || blindable.IsBlind) return; - var timeSpan = TimeSpan.FromSeconds(7f); + 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 index 1a626045d5bf..474db2fb532c 100644 --- 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 index 3da83a212a42..d820eb06710b 100644 --- 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 index 4b4038d042de..92a77f45bb01 100644 --- 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/Resources/Textures/_Impstation/Mobs/Customization/scars.rsi/head_twisting_flipped.png b/Resources/Textures/_Impstation/Mobs/Customization/scars.rsi/head_twisting_flipped.png new file mode 100644 index 0000000000000000000000000000000000000000..a949a9aa36e3a530a841e55e890800c96a786a22 GIT binary patch literal 989 zcmeAS@N?(olHy`uVBq!ia0vp^4j?SR1|)y|TsxP6fw48y**U<|*;%2WC_gPTCzXLg zV`A+@YmdVLB5nVdb@4~Z=x96=*kEh(2cA3S(G z>FU9wk>Tv&jsi6eJGlM2^nxDk^jzrL!>;%J@&4!kcYcp?$OxH{Rp!bVy16IBMlG#) zb<%n58VM(XT8YUsR;pj>maMpT-L^FNu4~1#^852eLq4f7*C-WEdD-T=$I)hY=F2(X zJDu04XdZcfWHMXqgdY=MZ#tbnr<;%4#yBM<=<^Z9q>VQY7O`)hv{2~0K)Yz@;u^)* zn+{cWZ;o2I@tW;VZsy8d)w88hi#w7zIaL&$+;~$%5)_?wyLEMn%sp=NN4d}5Q*UNW zszH&?0xr=>kJ-`{M?eK|NUNP(?n|BY|QEiP>4HhI16Z*9))v%&}d^TcH4)^BAz zQ#&axKl`C_LW1;;9eLTGO>_%)p?h48n{ROYO^mg6t)pzOL*q8D%+D&Adb`UIK+AOI#yLobz*YQ}ap~oQqNu zOHxx5$}>wc6x=<11Hv2m#DVcW%hSa%q~g}wI~)6&90VF3eoabF((zQ;*l_HJ%!La# zy-p_we3sa9z462R~bSPD+t@^5pe*`Tk{@Qrv34&i1S@ZoD)7 zYxPf_guCbdJuIE*v%q+%X-d+j%gc?LR&R|@XUgX9^2;;|yzbR_CY-%$-4uRcIG_RV zGxz3d%No8em1uidQU7jRMoq*y(+OMbJRg+q-l4t3^v%yVzxS0d@Qq`#zbc}+ewX`& zZE8Wb_32&>ISp4&eXqSQF_&?fUqj9Nl2xyFEi>6u!#3kp-P|nc|LfI{O`H5bUDaXT z@>_?#KDTh1X2V(&#`Wa*gEHykg*N|^k9~}omg>p5;hAB;{G6Kt?am^u6AiCt-`=*? ykVOv7l|L4h3oMIv6x}&<4N!(JHNrE^*Ox&H$mW2myc7&d3=E#GelF{r5}E*