Merge pull request #11504 from PsiOmegaDelta/151122-EMPSafeShuttle

Makes shuttle control consoles sturdier.
This commit is contained in:
GinjaNinja32
2015-11-23 09:28:03 +00:00

View File

@@ -15,7 +15,7 @@
if(!allowed(user))
user << "\red Access Denied."
return 1
ui_interact(user)
/obj/machinery/computer/shuttle_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
@@ -94,4 +94,10 @@
..()
/obj/machinery/computer/shuttle_control/bullet_act(var/obj/item/projectile/Proj)
visible_message("[Proj] ricochets off [src]!")
visible_message("\The [Proj] ricochets off \the [src]!")
/obj/machinery/computer/shuttle_control/ex_act()
return
/obj/machinery/computer/shuttle_control/emp_act()
return