cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-adds stealth removed signaler deadman switch. (#8596)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
tacoguy7765093
2024-07-18 01:49:06 -04:00
committed by GitHub
parent 4203bff263
commit 395f7696b8
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@
var/airlock_wire = null var/airlock_wire = null
var/datum/wires/connected = null var/datum/wires/connected = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
var/deadman = FALSE //CHOMPAdd
/obj/item/device/assembly/signaler/Initialize() /obj/item/device/assembly/signaler/Initialize()
. = ..() . = ..()
@@ -129,6 +130,28 @@
radio_controller.remove_object(src, frequency) radio_controller.remove_object(src, frequency)
frequency = new_frequency frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT) radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
//CHOMPedit BEGIN re-adds stealth removal
/obj/item/device/assembly/signaler/process()
if(!deadman)
STOP_PROCESSING(SSobj, src)
var/mob/M = src.loc
if(!M || !ismob(M))
if(prob(5))
signal()
deadman = FALSE
STOP_PROCESSING(SSobj, src)
else if(prob(5))
M.visible_message("[M]'s finger twitches a bit over [src]'s signal button!")
/obj/item/device/assembly/signaler/verb/deadman_it()
set src in usr
set name = "Threaten to push the button!"
set desc = "BOOOOM!"
deadman = TRUE
START_PROCESSING(SSobj, src)
log_and_message_admins("is threatening to trigger a signaler deadman's switch")
usr.visible_message("<font color='red'>[usr] moves their finger over [src]'s signal button...</font>")
//CHOMPedit end
/obj/item/device/assembly/signaler/Destroy() /obj/item/device/assembly/signaler/Destroy()
if(radio_controller) if(radio_controller)

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

@@ -100,6 +100,14 @@
ai_holder.react_to_attack(L) ai_holder.react_to_attack(L)
/mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone) /mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone)
//CHOMPedit begin, re-adds stealth removed feature
if(istype(get_active_hand(),/obj/item/device/assembly/signaler))
var/obj/item/device/assembly/signaler/signaler = get_active_hand()
if(signaler.deadman && prob(80))
log_and_message_admins("has triggered a signaler deadman's switch")
src.visible_message("<font color='red'>[src] triggers their deadman's switch!</font>")
signaler.signal()
//CHOMPedit end
if(ai_holder && P.firer) if(ai_holder && P.firer)
ai_holder.react_to_attack(P.firer) ai_holder.react_to_attack(P.firer)