Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28

2019-07-03 03:24:28 +02:00
parent d5279c8373 d01eb661cd
commit ffecca8c11
328 changed files with 9909 additions and 6862 deletions
@@ -12,7 +12,7 @@
 /obj/machinery/computer/shuttle/ferry/emag_act(mob/user)
 	if(!allow_emag)
 		to_chat(user, "<span class='warning'>[src]'s security firewall is far too powerful for you to bypass.</span>")
-		return FALSE
+		return SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT)
 	return ..()

 /obj/machinery/computer/shuttle/ferry/attack_ai()