cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Threating and actually using a signaler deadman switch now admin logged.

Browse Source
This commit is contained in:
PsiOmega
2015-04-18 12:18:14 +02:00
parent 98756f0966
commit 860fb4946f
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/assembly/signaler.dm
View File

@@ -169,4 +169,5 @@
set desc = "BOOOOM!" set desc = "BOOOOM!"
deadman = 1 deadman = 1
processing_objects.Add(src) processing_objects.Add(src)
log_and_message_admins("is threatening to trigger a signaler deadman's switch")
usr.visible_message("\red [usr] moves their finger over [src]'s signal button...") usr.visible_message("\red [usr] moves their finger over [src]'s signal button...")

1
code/modules/mob/living/living_defense.dm
View File

@@ -52,6 +52,7 @@
if(istype(equipped(),/obj/item/device/assembly/signaler)) if(istype(equipped(),/obj/item/device/assembly/signaler))
var/obj/item/device/assembly/signaler/signaler = equipped() var/obj/item/device/assembly/signaler/signaler = equipped()
if(signaler.deadman && prob(80)) if(signaler.deadman && prob(80))
log_and_message_admins("has triggered a signaler deadman's switch")
src.visible_message("\red [src] triggers their deadman's switch!") src.visible_message("\red [src] triggers their deadman's switch!")
signaler.signal() signaler.signal()