From 96d80901e4d4a1a5150ffe37a5ae8ddaaeadd4ea Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Wed, 17 Feb 2021 17:26:45 +0000 Subject: [PATCH 1/2] Update PDA.dm --- code/game/objects/items/devices/PDA/PDA.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index c09d23aafb..24680971b9 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -665,7 +665,8 @@ GLOBAL_LIST_EMPTY(PDAs) create_message(U, locate(href_list["target"])) if("MessageAll") - send_to_all(U) + if(cartridge && cartridge.spam_enabled) + send_to_all(U) if("toggle_block") toggle_blocking(usr, href_list["target"]) From 746ca01823818297b04c376f5102e65ac1d27b30 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 19 Feb 2021 02:10:03 +0000 Subject: [PATCH 2/2] Update code/game/objects/items/devices/PDA/PDA.dm Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com> --- code/game/objects/items/devices/PDA/PDA.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 24680971b9..2820b11312 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -665,7 +665,7 @@ GLOBAL_LIST_EMPTY(PDAs) create_message(U, locate(href_list["target"])) if("MessageAll") - if(cartridge && cartridge.spam_enabled) + if(cartridge?.spam_enabled) send_to_all(U) if("toggle_block")