tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add flash immunity to welding masks (#7561)

Browse Source
This commit is contained in:
Julian Giebel
2022-04-16 00:51:56 +02:00
committed by GitHub
parent 996bc8d5fb
commit 456ccfc858
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Flash/FlashSystem.cs
View File

@@ -210,9 +210,12 @@ namespace Content.Server.Flash
private void OnInventoryFlashAttempt(EntityUid uid, InventoryComponent component, FlashAttemptEvent args) private void OnInventoryFlashAttempt(EntityUid uid, InventoryComponent component, FlashAttemptEvent args)
{ {
// Forward the event to a worn helmet, if one is equipped.
if (_inventorySystem.TryGetSlotEntity(uid, "head", out var maskSlotEntity, component))
RaiseLocalEvent(maskSlotEntity.Value, args);
// Forward the event to the glasses, if any. // Forward the event to the glasses, if any.
if(_inventorySystem.TryGetSlotEntity(uid, "eyes", out var slotEntity, component)) if(!args.Cancelled && _inventorySystem.TryGetSlotEntity(uid, "eyes", out var eyeSlotEntity, component))
RaiseLocalEvent(slotEntity.Value, args); RaiseLocalEvent(eyeSlotEntity.Value, args);
} }
private void OnFlashImmunityFlashAttempt(EntityUid uid, FlashImmunityComponent component, FlashAttemptEvent args) private void OnFlashImmunityFlashAttempt(EntityUid uid, FlashImmunityComponent component, FlashAttemptEvent args)

1
Resources/Prototypes/Entities/Clothing/Head/welding.yml
View File

@@ -5,6 +5,7 @@
abstract: true abstract: true
components: components:
- type: IngestionBlocker - type: IngestionBlocker
- type: FlashImmunity
- type: entity - type: entity
parent: WeldingMaskBase parent: WeldingMaskBase