From f8d783ae70803dd269102592e5eecf7c22f9f72d Mon Sep 17 00:00:00 2001
From: vuonojenmustaturska <naksu@youzen.ext.b2.fi>
Date: Thu, 8 Mar 2018 17:21:41 +0200
Subject: [PATCH] Disables advanced shuttle navigation consoles during nuclear
 war ops

---
 code/modules/shuttle/navigation_computer.dm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index e657cfde37..5d65a303da 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -26,6 +26,15 @@
 	. = ..()
 	GLOB.navigation_computers -= src
 
+<<<<<<< HEAD
+=======
+/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 ..()
+
+>>>>>>> 2a00750... US english memes
 /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