From 52581f5c792ff4263db0c98cb87b8c67c0109df4 Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Mon, 9 Oct 2023 21:11:45 -0700 Subject: [PATCH] zonespace request 2 --- code/game/objects/items/handheld_distress_beacon.dm | 5 +++-- code/modules/admin/topic/topic.dm | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/handheld_distress_beacon.dm b/code/game/objects/items/handheld_distress_beacon.dm index 098906898e25..699c45c256b2 100644 --- a/code/game/objects/items/handheld_distress_beacon.dm +++ b/code/game/objects/items/handheld_distress_beacon.dm @@ -44,10 +44,11 @@ name = "\improper CMB handheld distress beacon" desc = "An emergency beacon. This one is branded with a Colonial Marshal Bureau star and 'ANCHORPOINT STATION' is etched in stencil on the side. This device is issued to CMB Marshals and features an extended relay antenna." icon = 'icons/obj/items/handheld_distress_beacon.dmi' - icon_state = "beacon_inactive" /// beacon starts inactive, changes sprite when activated, cannot be turned off once turned on + icon_state = "beacon_inactive" w_class = SIZE_SMALL - var/active = FALSE /// whether or not the beacon is turned on, when activated sends message to admins requesting Anchorpoint ERT +/// whether or not the beacon is turned on, when activated sends message to admins requesting Anchorpoint ERT and changes sprite + var/active = FALSE /obj/item/handheld_distress_beacon_CMB/get_examine_text(mob/user) . = ..() diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index 86a6213d0517..31f99870fe43 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -2108,7 +2108,8 @@ log_game("[key_name_admin(approver)] has sent a randomized distress beacon, requested by [key_name_admin(ref_person)]") message_admins("[key_name_admin(approver)] has sent a randomized distress beacon, requested by [key_name_admin(ref_person)]") -/datum/admins/proc/accept_cmb_ert(mob/approver, mob/ref_person) /// tells admins which admin has sent the Anchorpoint ERT in response to CMB distress +/// tells admins which admin has sent the Anchorpoint ERT in response to CMB distress +/datum/admins/proc/accept_cmb_ert(mob/approver, mob/ref_person) if(distress_cancel) return distress_cancel = TRUE @@ -2116,7 +2117,8 @@ log_game("[key_name_admin(approver)] has sent an Anchorpoint Station Colonial Marine QRF response, requested by [key_name_admin(ref_person)]") message_admins("[key_name_admin(approver)] has sent an Anchorpoint Station Colonial Marine QRF response, requested by [key_name_admin(ref_person)]") -/datum/admins/proc/accept_cmb_alt_ert(mob/approver, mob/ref_person) /// tells admins which admin has sent the CMB ERT in response to CMB distress +/// tells admins which admin has sent the CMB ERT in response to CMB distress +/datum/admins/proc/accept_cmb_alt_ert(mob/approver, mob/ref_person) if(distress_cancel) return distress_cancel = TRUE