Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Aghosts and other powerful beings no longer burn their hands on lights. (#23879)

Browse Source 
Make aghosts and other things that can't take burn damage not burn their
hand when changing lightbolbs
This commit is contained in:
nikthechampiongr
2024-01-10 23:39:56 +02:00
committed by GitHub
parent 464f24d040
commit 7aee192d52
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Light/EntitySystems/PoweredLightSystem.cs
View File

@@ -127,19 +127,20 @@ namespace Content.Server.Light.EntitySystems
var burnedHand = light.CurrentLit && res < lightBulb.BurningTemperature; var burnedHand = light.CurrentLit && res < lightBulb.BurningTemperature;
if (burnedHand) if (burnedHand)
{ {
// apply damage to users hands and show message with sound
var burnMsg = Loc.GetString("powered-light-component-burn-hand");
_popupSystem.PopupEntity(burnMsg, uid, userUid);
var damage = _damageableSystem.TryChangeDamage(userUid, light.Damage, origin: userUid); var damage = _damageableSystem.TryChangeDamage(userUid, light.Damage, origin: userUid);
// If damage is null then the entity could not take heat damage so they did not get burned.
if (damage != null) if (damage != null)
{
var burnMsg = Loc.GetString("powered-light-component-burn-hand");
_popupSystem.PopupEntity(burnMsg, uid, userUid);
_adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} burned their hand on {ToPrettyString(args.Target):target} and received {damage.Total:damage} damage"); _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} burned their hand on {ToPrettyString(args.Target):target} and received {damage.Total:damage} damage");
_audio.PlayEntity(light.BurnHandSound, Filter.Pvs(uid), uid, true);
_audio.PlayEntity(light.BurnHandSound, Filter.Pvs(uid), uid, true); args.Handled = true;
return;
args.Handled = true; }
return;
} }
} }