From 8afd024a6571f3cf9a0fc6769e9368e761888c87 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 31 May 2017 08:48:04 -0500 Subject: [PATCH] Fixes ghosts using marker beacon --- code/modules/mining/equipment/marker_beacons.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index 2770897c34..ba9c0e0b42 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -55,14 +55,14 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( var/obj/structure/marker_beacon/M = new(user.loc, picked_color) transfer_fingerprints_to(M) -/obj/item/stack/marker_beacon/AltClick(mob/user) - if(user.incapacitated()) +/obj/item/stack/marker_beacon/AltClick(mob/living/user) + if(user.incapacitated() || !istype(user)) to_chat(user, "You can't do that right now!") return if(!in_range(src, user)) return var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors - if(user.incapacitated() || !in_range(src, user)) + if(user.incapacitated() || !istype(user) || !in_range(src, user)) return if(input_color) picked_color = input_color @@ -127,15 +127,15 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( else return ..() -/obj/structure/marker_beacon/AltClick(mob/user) +/obj/structure/marker_beacon/AltClick(mob/living/user) ..() - if(user.incapacitated()) + if(user.incapacitated() || !istype(user)) to_chat(user, "You can't do that right now!") return if(!in_range(src, user)) return var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors - if(user.incapacitated() || !in_range(src, user)) + if(user.incapacitated() || !istype(user) || !in_range(src, user)) return if(input_color) picked_color = input_color