Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

requested hotfixes #1622

Merged
merged 2 commits into from
Feb 10, 2025
Merged

requested hotfixes #1622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5534b89
requested by stonylogray
AftrLite Feb 9, 2025
1940165
requested by puffle
AftrLite Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_Impstation/markings/scars.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Goobstation/Changeling/Actions/changeling.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -273,7 +273,7 @@
state: sting_blind
event: !type:StingBlindEvent {}
- type: ChangelingAction
chemicalCost: 35
chemicalCost: 50
useInLesserForm: true

- type: entity
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/scars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file added ...ces/Textures/_Impstation/Mobs/Customization/scars.rsi/head_twisting_flipped.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions Resources/Textures/_Impstation/Mobs/Customization/scars.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@
"name": "head_twisting",
"directions": 4
},
{
"name": "head_twisting_flipped",
"directions": 4
},
{
"name": "leg_l_prosthetic",
"directions": 4
Expand Down
Loading