cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[s] fixes being able to PDA bomb other PDA uplinks and captain PDAs and AIs (#15512)

Browse Source 
* Update uplink.dm

* Update bomberman.dm
This commit is contained in:
ynot01
2022-08-29 17:13:19 -04:00
committed by GitHub
parent eaeb295acf
commit 3d3bd4399c
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/datums/components/uplink.dm
View File

@@ -49,6 +49,7 @@ GLOBAL_LIST_EMPTY(uplinks)
RegisterSignal(parent, COMSIG_PDA_CHECK_DETONATE, .proc/check_detonate) RegisterSignal(parent, COMSIG_PDA_CHECK_DETONATE, .proc/check_detonate)
else if(istype(parent, /obj/item/modular_computer)) else if(istype(parent, /obj/item/modular_computer))
RegisterSignal(parent, COMSIG_NTOS_CHANGE_RINGTONE, .proc/ntos_ringtone) RegisterSignal(parent, COMSIG_NTOS_CHANGE_RINGTONE, .proc/ntos_ringtone)
RegisterSignal(parent, COMSIG_PDA_CHECK_DETONATE, .proc/check_detonate)
else if(istype(parent, /obj/item/radio)) else if(istype(parent, /obj/item/radio))
RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, .proc/new_frequency) RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, .proc/new_frequency)
else if(istype(parent, /obj/item/pen)) else if(istype(parent, /obj/item/pen))

2
code/modules/modular_computers/file_system/programs/antagonist/bomberman.dm
View File

@@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(PDABombCodes)
if(targetid) // Adjust difficulty based on target's access if(targetid) // Adjust difficulty based on target's access
difficulty += BitCount(text2num(targetid.access_txt) & (ACCESS_MEDICAL | ACCESS_SECURITY | ACCESS_ENGINE | ACCESS_THEATRE | ACCESS_JANITOR | ACCESS_HEADS)) difficulty += BitCount(text2num(targetid.access_txt) & (ACCESS_MEDICAL | ACCESS_SECURITY | ACCESS_ENGINE | ACCESS_THEATRE | ACCESS_JANITOR | ACCESS_HEADS))
if(SEND_SIGNAL(target, COMSIG_PDA_CHECK_DETONATE) & COMPONENT_PDA_NO_DETONATE || prob(difficulty * 15)) if(SEND_SIGNAL(target_computer, COMSIG_PDA_CHECK_DETONATE) & COMPONENT_PDA_NO_DETONATE || prob(difficulty * 15))
computer.visible_message(span_notice("Detonation failed. [bomb.uses] charges remaining."), null, null, 1) computer.visible_message(span_notice("Detonation failed. [bomb.uses] charges remaining."), null, null, 1)
else else
log_bomber(usr, "triggered a PDA explosion on", target.username, "[!is_special_character(usr) ? "(TRIGGED BY NON-ANTAG)" : ""]") log_bomber(usr, "triggered a PDA explosion on", target.username, "[!is_special_character(usr) ? "(TRIGGED BY NON-ANTAG)" : ""]")