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
@@ -62,7 +62,7 @@
 	revert_to_reality(signal_source)

 /datum/component/virtual_reality/proc/you_only_live_once()
-	if(you_die_in_the_game_you_die_for_real)
+	if(you_die_in_the_game_you_die_for_real || vr_sleeper?.only_current_user_can_interact)
 		return FALSE
 	you_die_in_the_game_you_die_for_real = TRUE
 	return TRUE