Merge remote-tracking branch 'refs/remotes/origin/master' into oties-and-wild-removed

code/modules/mob/living/death.dm

@@ -1,3 +1,8 @@
 /mob/living/death()
 	clear_fullscreens()
+	//VOREStation Edit - Mob spawner stuff
+	if(source_spawner)
+		source_spawner.get_death_report(src)
+		source_spawner = null
+	//VOREStation Edit End
 	. = ..()

code/modules/mob/living/living_defines_vr.dm

@@ -1,2 +1,3 @@
 /mob/living
-	var/ooc_notes = null
+	var/ooc_notes = null
+	var/obj/structure/mob_spawner/source_spawner = null

code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm

@@ -15,6 +15,7 @@
 	var/list/injection_chems = list("dexalin", "bicaridine", "kelotane","anti_toxin", "alkysine", "imidazoline", "spaceacillin", "paracetamol") //The borg is able to heal every damage type. As a nerf, they use 750 charge per injection.
 	var/eject_port = "ingestion"
 	var/list/items_preserved = list()
+	var/UI_open = 0
 
 /obj/item/device/dogborg/sleeper/New()
 	..()
@@ -50,6 +51,8 @@
 			user.visible_message("<span class='warning'>[hound.name]'s medical pod lights up as [target.name] slips inside into their [src.name].</span>", "<span class='notice'>Your medical pod lights up as [target] slips into your [src]. Life support functions engaged.</span>")
 			message_admins("[key_name(hound)] has eaten [key_name(patient)] as a dogborg. ([hound ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[hound.x];Y=[hound.y];Z=[hound.z]'>JMP</a>" : "null"])")
 			playsound(hound, 'sound/vore/gulp.ogg', 100, 1) //POLARISTODO
+			if(UI_open == 1)
+				sleeperUI(usr)
 
 /obj/item/device/dogborg/sleeper/proc/go_out(var/target)
 	hound = src.loc
@@ -88,6 +91,7 @@
 	if(..())
 		return
 	sleeperUI(user)
+	UI_open = 1
 
 /obj/item/device/dogborg/sleeper/proc/sleeperUI(mob/user)
 	var/dat
@@ -174,9 +178,11 @@
 	dat += "</div>"
 
 	var/datum/browser/popup = new(user, "sleeper", "Sleeper Console", 520, 540)	//Set up the popup browser window
-	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
+	//popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) //I have no idea what this is, but it feels irrelevant and causes runtimes idk.
 	popup.set_content(dat)
 	popup.open()
+	onclose(user, "sleeper")
+	UI_open = 0
 	return
 
 /obj/item/device/dogborg/sleeper/Topic(href, href_list)
@@ -292,6 +298,8 @@
 	patient_laststat = null
 	patient = null
 	hound.updateicon()
+	if(UI_open == 1)
+		sleeperUI(usr)
 	return
 
 //Gurgleborg process
@@ -390,6 +398,8 @@
 						T.drop_from_inventory(I, src)
 				qdel(T)
 				src.update_patient()
+				if(UI_open == 1)
+					sleeperUI(hound)
 
 		//Handle the target being anything but a /mob/living/carbon/human
 		else
@@ -438,6 +448,9 @@
 					contents -= T
 					qdel(T)
 					src.update_patient()
+				if(UI_open == 1)
+					sleeperUI(hound)
+
 		return
 
 /obj/item/device/dogborg/sleeper/process()
@@ -514,6 +527,8 @@
 			if(length(contents) > 11) //grow that tum after a certain junk amount
 				hound.sleeper_r = 1
 				hound.updateicon()
+			if(UI_open == 1)
+				sleeperUI(usr)
 		return
 
 	if(istype(target, /mob/living/simple_animal/mouse)) //Edible mice, dead or alive whatever. Mostly for carcass picking you cruel bastard :v
@@ -527,6 +542,8 @@
 			if(length(contents) > 11) //grow that tum after a certain junk amount
 				hound.sleeper_r = 1
 				hound.updateicon()
+			if(UI_open == 1)
+				sleeperUI(usr)
 		return
 
 	else if(ishuman(target))
@@ -547,6 +564,8 @@
 			playsound(hound, 'sound/vore/gulp.ogg', 80, 1)
 			hound.sleeper_r = 1
 			hound.updateicon()
+			if(UI_open == 1)
+				sleeperUI(usr)
 		return
 	return