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

Fixed issue #4439 (Detomax ignores status of messaging server)

Browse Source
This commit is contained in:
Joey Haas
2014-02-17 00:18:28 +01:00
parent cf1a35d8e3
commit 296e839f03
1 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
code/game/objects/items/devices/PDA/PDA.dm
View File

@@ -682,7 +682,33 @@ var/global/list/obj/item/device/pda/PDAs = list()
M.close() M.close()
if("Detonate")//Detonate PDA if("Detonate")//Detonate PDA
// check if telecomms I/O route 1459 is stable
//var/telecomms_intact = telecomms_process(P.owner, owner, t)
var/obj/machinery/message_server/useMS = null
if(message_servers)
for (var/obj/machinery/message_server/MS in message_servers)
//PDAs are now dependant on the Message Server.
if(MS.active)
useMS = MS
break
var/datum/signal/signal = src.telecomms_process()
var/useTC = 0
if(signal)
if(signal.data["done"])
useTC = 1
var/turf/pos = get_turf(src)
if(pos.z in signal.data["level"])
useTC = 2
if(istype(cartridge, /obj/item/weapon/cartridge/syndicate)) if(istype(cartridge, /obj/item/weapon/cartridge/syndicate))
if(!(useMS && useTC))
U.show_message("\red An error flashes on your [src]: Connection unavailable", 1)
return
if(useTC != 2) // Does our recepient have a broadcaster on their level?
U.show_message("\red An error flashes on your [src]: Recipient unavailable", 1)
return
var/obj/item/device/pda/P = locate(href_list["target"]) var/obj/item/device/pda/P = locate(href_list["target"])
if(!isnull(P)) if(!isnull(P))
if (!P.toff && cartridge.charges > 0) if (!P.toff && cartridge.charges > 0)
@@ -801,7 +827,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(useMS && useTC) // only send the message if it's stable if(useMS && useTC) // only send the message if it's stable
if(useTC != 2) // Does our recepient have a broadcaster on their level? if(useTC != 2) // Does our recepient have a broadcaster on their level?
U << "ERROR: Cannot reach recepient." U << "ERROR: Cannot reach recipient."
return return
useMS.send_pda_message("[P.owner]","[owner]","[t]") useMS.send_pda_message("[P.owner]","[owner]","[t]")
tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]"))) tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]")))