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

2019-09-15 04:05:14 +02:00
parent 5d1cac62da b2cde8e121
commit c813555697
969 changed files with 9394 additions and 2958 deletions
@@ -53,7 +53,7 @@
 	only_current_user_can_interact = TRUE

 /obj/machinery/vr_sleeper/hugbox/emag_act(mob/user)
-	return
+	return SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT)

 /obj/machinery/vr_sleeper/emag_act(mob/user)
 	. = ..()
@@ -63,6 +63,7 @@
 	you_die_in_the_game_you_die_for_real = TRUE
 	sparks.start()
 	addtimer(CALLBACK(src, .proc/emagNotify), 150)
+	return TRUE

 /obj/machinery/vr_sleeper/update_icon()
 	icon_state = "[initial(icon_state)][state_open ? "-open" : ""]"