diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 74d50117ac..a62d2cd102 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -21,7 +21,7 @@ var/list/cam_plane_masters var/obj/screen/background/cam_background - interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_SET_MACHINE | INTERACT_MACHINE_REQUIRES_SIGHT + interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_SET_MACHINE //| INTERACT_MACHINE_REQUIRES_SIGHT /obj/machinery/computer/security/Initialize() . = ..() diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 2eb1aab925..97e2d4ea0a 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -26,7 +26,8 @@ if(COOLDOWN_FINISHED(src, massdriver_countdown)) timing = FALSE // alarm() sleeps, so we want to end processing first and can't rely on return PROCESS_KILL - end_processing() + // end_processing() + STOP_PROCESSING(SSmachines, src) alarm() /** @@ -102,11 +103,13 @@ timing = !timing if(timing) COOLDOWN_START(src, massdriver_countdown, time SECONDS) - begin_processing() + // begin_processing() + START_PROCESSING(SSmachines, src) else time = COOLDOWN_TIMELEFT(src, massdriver_countdown) * 0.1 COOLDOWN_RESET(src, massdriver_countdown) - end_processing() + // end_processing() + STOP_PROCESSING(SSmachines, src) return TRUE if("input") var/value = text2num(params["adjust"]) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 29298247cd..ab547f4ccd 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -69,7 +69,7 @@ if(M) MT.shock() log_game("[key_name(usr)] has activated remote EMP on exosuit [M], located at [loc_name(M)], which [M.occupant ? "has the occupants [M.occupant]." : "without a pilot."] ") - message_admins("[key_name_admin(usr)][ADMIN_FLW(usr)] has activated remote EMP on exosuit [M][ADMIN_JMP(M)], which is currently [M.occupants ? "occupied by [M.occupant][ADMIN_FLW(M)]." : "without a pilot."] ") + message_admins("[key_name_admin(usr)][ADMIN_FLW(usr)] has activated remote EMP on exosuit [M][ADMIN_JMP(M)], which is currently [M.occupant ? "occupied by [M.occupant][ADMIN_FLW(M)]." : "without a pilot."] ") . = TRUE /obj/item/mecha_parts/mecha_tracking