minor fixes, compile but still bugged
This commit is contained in:
@@ -21,7 +21,7 @@
|
|||||||
var/list/cam_plane_masters
|
var/list/cam_plane_masters
|
||||||
var/obj/screen/background/cam_background
|
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()
|
/obj/machinery/computer/security/Initialize()
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
@@ -26,7 +26,8 @@
|
|||||||
if(COOLDOWN_FINISHED(src, massdriver_countdown))
|
if(COOLDOWN_FINISHED(src, massdriver_countdown))
|
||||||
timing = FALSE
|
timing = FALSE
|
||||||
// alarm() sleeps, so we want to end processing first and can't rely on return PROCESS_KILL
|
// 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()
|
alarm()
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -102,11 +103,13 @@
|
|||||||
timing = !timing
|
timing = !timing
|
||||||
if(timing)
|
if(timing)
|
||||||
COOLDOWN_START(src, massdriver_countdown, time SECONDS)
|
COOLDOWN_START(src, massdriver_countdown, time SECONDS)
|
||||||
begin_processing()
|
// begin_processing()
|
||||||
|
START_PROCESSING(SSmachines, src)
|
||||||
else
|
else
|
||||||
time = COOLDOWN_TIMELEFT(src, massdriver_countdown) * 0.1
|
time = COOLDOWN_TIMELEFT(src, massdriver_countdown) * 0.1
|
||||||
COOLDOWN_RESET(src, massdriver_countdown)
|
COOLDOWN_RESET(src, massdriver_countdown)
|
||||||
end_processing()
|
// end_processing()
|
||||||
|
STOP_PROCESSING(SSmachines, src)
|
||||||
return TRUE
|
return TRUE
|
||||||
if("input")
|
if("input")
|
||||||
var/value = text2num(params["adjust"])
|
var/value = text2num(params["adjust"])
|
||||||
|
|||||||
@@ -69,7 +69,7 @@
|
|||||||
if(M)
|
if(M)
|
||||||
MT.shock()
|
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."] ")
|
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
|
. = TRUE
|
||||||
|
|
||||||
/obj/item/mecha_parts/mecha_tracking
|
/obj/item/mecha_parts/mecha_tracking
|
||||||
|
|||||||
Reference in New Issue
Block a user