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
@@ -46,7 +46,7 @@
 /obj/machinery/modular_computer/emag_act(mob/user)
 	. = ..()
 	if(cpu)
-		return cpu.emag_act(user)
+		. |= cpu.emag_act(user)

 /obj/machinery/modular_computer/update_icon()
 	cut_overlays()