Merge branch 'master' into upstream-merge-36974

code/modules/VR/vr_sleeper.dm

@@ -27,6 +27,9 @@
 	update_icon()
 
 /obj/machinery/vr_sleeper/attack_hand(mob/user)
+	. = ..()
+	if(.)
+		return
 	if(occupant)
 		ui_interact(user)
 	else
@@ -35,15 +38,12 @@
 		else
 			open_machine()
 
-
 /obj/machinery/vr_sleeper/relaymove(mob/user)
 	open_machine()
 
-
 /obj/machinery/vr_sleeper/container_resist(mob/living/user)
 	open_machine()
 
-
 /obj/machinery/vr_sleeper/Destroy()
 	open_machine()
 	cleanup_vr_human()
@@ -57,11 +57,9 @@
 	you_die_in_the_game_you_die_for_real = TRUE
 	sparks.start()
 
-
 /obj/machinery/vr_sleeper/update_icon()
 	icon_state = "[initial(icon_state)][state_open ? "-open" : ""]"
 
-
 /obj/machinery/vr_sleeper/open_machine()
 	if(!state_open)
 		if(vr_human)
@@ -70,20 +68,17 @@
 			SStgui.close_user_uis(occupant, src)
 		..()
 
-
 /obj/machinery/vr_sleeper/close_machine()
 	..()
 	if(occupant)
 		ui_interact(occupant)
 
-
 /obj/machinery/vr_sleeper/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "vr_sleeper", "VR Sleeper", 475, 340, master_ui, state)
 		ui.open()
 
-
 /obj/machinery/vr_sleeper/ui_act(action, params)
 	if(..())
 		return
@@ -124,7 +119,6 @@
 				open_machine()
 			. = TRUE
 
-
 /obj/machinery/vr_sleeper/ui_data(mob/user)
 	var/list/data = list()
 	if(vr_human && !QDELETED(vr_human))
@@ -142,7 +136,6 @@
 	data["isoccupant"] = (user == occupant)
 	return data
 
-
 /obj/machinery/vr_sleeper/proc/get_vr_spawnpoint() //proc so it can be overriden for team games or something
 	return safepick(available_vr_spawnpoints[vr_category])
 
@@ -179,8 +172,7 @@
 
 /obj/machinery/vr_sleeper/proc/cleanup_vr_human()
 	if(vr_human)
-		vr_human.death(0)
-
+		vr_human.death(FALSE)
 
 /obj/effect/landmark/vr_spawn //places you can spawn in VR, auto selected by the vr_sleeper during get_vr_spawnpoint()
 	var/vr_category = "default" //So we can have specific sleepers, eg: "Basketball VR Sleeper", etc.