Merge pull request #5872 from Citadel-Station-13/upstream-merge-36254
[MIRROR] Disables advanced shuttle navigation consoles during nuclear war ops
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
var/see_hidden = FALSE
|
||||
var/designate_time = 0
|
||||
var/turf/designating_target_loc
|
||||
var/jammed = FALSE
|
||||
|
||||
/obj/machinery/computer/camera_advanced/shuttle_docker/Initialize()
|
||||
. = ..()
|
||||
@@ -26,6 +27,12 @@
|
||||
. = ..()
|
||||
GLOB.navigation_computers -= src
|
||||
|
||||
/obj/machinery/computer/camera_advanced/shuttle_docker/attack_hand(mob/user)
|
||||
if(jammed)
|
||||
to_chat(user, "<span class='warning'>The Syndicate is jamming the console!</span>")
|
||||
return
|
||||
return ..()
|
||||
|
||||
/obj/machinery/computer/camera_advanced/shuttle_docker/GrantActions(mob/living/user)
|
||||
if(jumpto_ports.len)
|
||||
jump_action = new /datum/action/innate/camera_jump/shuttle_docker
|
||||
|
||||
@@ -18,3 +18,10 @@
|
||||
y_offset = -10
|
||||
designate_time = 100
|
||||
|
||||
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/Initialize()
|
||||
. = ..()
|
||||
GLOB.jam_on_wardec += src
|
||||
|
||||
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/Destroy()
|
||||
GLOB.jam_on_wardec -= src
|
||||
return ..()
|
||||
|
||||
Reference in New Issue
Block a user