shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compile

Browse Source
This commit is contained in:
kevinz000
2020-01-19 22:58:08 -07:00
parent 0b10b8cf89
commit ecddef2f21
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/PDA/PDA.dm
+24 -15
View File
@@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(PDAs)
var/overlays_y_offset = 0 var/overlays_y_offset = 0
var/underline_flag = TRUE //flag for underline var/underline_flag = TRUE //flag for underline
var/list/blocked_pdas var/list/blocked_pdas
/obj/item/pda/suicide_act(mob/living/carbon/user) /obj/item/pda/suicide_act(mob/living/carbon/user)
@@ -390,7 +390,7 @@ GLOBAL_LIST_EMPTY(PDAs)
if (P == src) if (P == src)
continue continue
if(P.owner in blocked_pdas) if(P.owner in blocked_pdas)
dat += "<li><a href='byond://?src=[REF(src)];unblock=[P.owner]'>(BLOCKED - CLICK TO UNBLOCK) [P.owner]</a>" dat += "<li><a href='byond://?src=[REF(src)];choice=unblock_pda;target=[P.owner]'>(BLOCKED - CLICK TO UNBLOCK) [P.owner]</a>"
else else
dat += "<li><a href='byond://?src=[REF(src)];choice=Message;target=[REF(P)]'>[P]</a>" dat += "<li><a href='byond://?src=[REF(src)];choice=Message;target=[REF(P)]'>[P]</a>"
if(cartridge) if(cartridge)
@@ -650,12 +650,15 @@ GLOBAL_LIST_EMPTY(PDAs)
if("MessageAll") if("MessageAll")
send_to_all(U) send_to_all(U)
if("block") if("toggle_block")
block_pda(usr, locate(href_list["block"])) toggle_blocking(usr, href_list["target"])
if("unblock") if("block_pda")
unblock_pda(usr, href_list["unblock"]) block_pda(usr, href_list["target"])
if("unblock_pda")
unblock_pda(usr, href_list["target"])
if("cart") if("cart")
if(cartridge) if(cartridge)
@@ -813,7 +816,7 @@ GLOBAL_LIST_EMPTY(PDAs)
last_everyone = world.time last_everyone = world.time
/obj/item/pda/proc/receive_message(datum/signal/subspace/pda/signal) /obj/item/pda/proc/receive_message(datum/signal/subspace/pda/signal)
tnote += "<i><b>&larr; From <a href='byond://?src=[REF(src)];choice=Message;target=[REF(signal.source)]'>[signal.data["name"]]</a> ([signal.data["job"]]):</b></i> <a href='byond://?src=[REF(src)];block=[REF(signal.source)]'>(BLOCK)</a><br>[signal.format_message()]<br>" tnote += "<i><b>&larr; From <a href='byond://?src=[REF(src)];choice=Message;target=[REF(signal.source)]'>[signal.data["name"]]</a> ([signal.data["job"]]):</b></i> <a href='byond://?src=[REF(src)];choice=toggle_block;target=[signal.data["name"]]'>(BLOCK/UNBLOCK)</a><br>[signal.format_message()]<br>"
if (!silent) if (!silent)
playsound(src, 'sound/machines/twobeep.ogg', 50, 1) playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
audible_message("[icon2html(src, hearers(src))] *[ttone]*", null, 3) audible_message("[icon2html(src, hearers(src))] *[ttone]*", null, 3)
@@ -845,13 +848,19 @@ GLOBAL_LIST_EMPTY(PDAs)
/obj/item/pda/proc/create_message(mob/living/U, obj/item/pda/P) /obj/item/pda/proc/create_message(mob/living/U, obj/item/pda/P)
send_message(U,list(P)) send_message(U,list(P))
/obj/item/pda/proc/block_pda(mob/user, obj/item/pda/P) /obj/item/pda/proc/toggle_blocking(mob/user, target)
to_chat(user, "<span class='notice'>[icon2html(src, user)] [P.owner] blocked from messages. Use the messenger PDA list to unblock.</span>") if(target in blocked_pdas)
LAZYOR(blocked_pdas, P.owner) unblock_pda(user, target)
else
block_pda(user, target)
/obj/item/pda/proc/unblock_pda(mob/user, unblock_target) /obj/item/pda/proc/block_pda(mob/user, target)
to_chat(user, "<span class='notice'>[icon2html(src, user)] [unblock_target] unblocked from messages.</span>") to_chat(user, "<span class='notice'>[icon2html(src, user)] [target] blocked from messages. Use the messenger PDA list to unblock.</span>")
LAZYREMOVE(blocked_pdas, unblock_target) LAZYOR(blocked_pdas, target)
/obj/item/pda/proc/unblock_pda(mob/user, target)
to_chat(user, "<span class='notice'>[icon2html(src, user)] [target] unblocked from messages.</span>")
LAZYREMOVE(blocked_pdas, target)
/obj/item/pda/AltClick(mob/user) /obj/item/pda/AltClick(mob/user)
. = ..() . = ..()