Borer Tweaks and Changes (#8682)

Spawned borers now get added to the Ghostspawner menu, allowing players to inhabit them even if they didn't catch the original request.
    Borers have gained the ability to survey their host's health, allowing them to better choose when to administer certain chemicals.
    Borers now regenerate chemicals even if their host is unconscious.
    Awakening psionics now take 15 seconds instead of 10, and the host now gets a message about feeling something bad coming on, allowing them to make a dash to safety and or seclusion.
    Skrell returning from Srom no longer eject controlling borers to the lobby by replacing their ckey into the aether.
    Skrell no longer spontaneously die when entering Srom on a map that doesn't have a Srom location.

code/modules/mob/living/carbon/slime/items.dm

@@ -216,8 +216,6 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle17"
 
-var/list/global/golem_runes = list()
-
 /obj/effect/golemrune
 	anchored = TRUE
 	desc = "A strange rune used to create golems. It glows when spirits are nearby."
@@ -233,25 +231,15 @@ var/list/global/golem_runes = list()
 	. = ..()
 	START_PROCESSING(SSprocessing, src)
 	announce_to_ghosts()
-	golem_runes += src
-	if(length(golem_runes) == 1)
-		for(var/role_spawner in SSghostroles.spawners)
-			if(role_spawner == "golem")
-				var/datum/ghostspawner/human/golem/golem_spawner = SSghostroles.spawners[role_spawner]
-				golem_spawner.enable()
+	SSghostroles.add_spawn_atom("golem", src)
 
 /obj/effect/golemrune/random_type/Initialize()
 	. = ..()
 	golem_type = pick(golem_types)
 
 /obj/effect/golemrune/Destroy()
-	. = ..()
-	golem_runes -= src
-	if(!length(golem_runes))
-		for(var/role_spawner in SSghostroles.spawners)
-			if(role_spawner == "golem")
-				var/datum/ghostspawner/human/golem/golem_spawner = SSghostroles.spawners[role_spawner]
-				golem_spawner.disable()
+	SSghostroles.remove_spawn_atom("golem", src)
+	return ..()
 
 /obj/effect/golemrune/process()
 	var/mob/abstract/observer/ghost

code/modules/mob/living/simple_animal/borer/borer.dm

@@ -21,7 +21,7 @@
 	maxHealth = 40
 	health = 40
 	pass_flags = PASSTABLE
-	universal_understand = 1
+	universal_understand = TRUE
 	holder_type = /obj/item/holder/borer
 	mob_size = 1
 	hunger_enabled = FALSE
@@ -33,10 +33,10 @@
 	var/mob/living/captive_brain/host_brain // Used for swapping control of the body back and forth.
 	var/controlling                         // Used in human death check.
 	var/has_reproduced
-	var/roundstart
+	var/request_player = TRUE
 
 /mob/living/simple_animal/borer/roundstart
-	roundstart = TRUE
+	request_player = FALSE
 
 /mob/living/simple_animal/borer/LateLogin()
 	..()
@@ -52,15 +52,23 @@
 	verbs += /mob/living/proc/hide
 
 	truename = "[pick("Primary","Secondary","Tertiary","Quaternary")]-[rand(1000,9999)]"
-	if(!roundstart)
-		request_player()
+	if(request_player && !ckey && !client)
+		SSghostroles.add_spawn_atom("borer", src)
+		var/area/A = get_area(src)
+		if(A)
+			say_dead_direct("A borer has been birthed in [A.name]! Spawn in as it by using the ghost spawner menu in the ghost tab.")
+
+/mob/living/simple_animal/borer/death(gibbed, deathmessage)
+	SSghostroles.remove_spawn_atom("borer", src)
+	return ..(gibbed,deathmessage)
 
 /mob/living/simple_animal/borer/Life()
 	..()
 	if(host)
-		if(!stat && !host.stat)
+		if(!stat && host.stat != DEAD)
 			if(chemicals < 250)
 				chemicals++
+		if(host && !host.stat)
 			if(controlling && prob(host.getBrainLoss()/20))
 				host.say("*[pick(list("blink","blink_r","choke","drool","twitch","twitch_s","gasp"))]")
 
@@ -152,10 +160,10 @@
 	host = null
 	return
 
-//Procs for grabbing players.
-/mob/living/simple_animal/borer/proc/request_player()
-	var/datum/ghosttrap/G = get_ghost_trap("cortical borer")
-	G.request_player(src, "A cortical borer needs a player.")
+/mob/living/simple_animal/borer/proc/spawn_into_borer(var/mob/user)
+	ckey = user.ckey
+	qdel(user)
+	SSghostroles.remove_spawn_atom("borer", src)
 
 /mob/living/simple_animal/borer/cannot_use_vents()
 	return

code/modules/mob/living/simple_animal/borer/borer_powers.dm

@@ -414,7 +414,7 @@
 /mob/living/simple_animal/borer/verb/awaken_psionics()
 	set category = "Abilities"
 	set name = "Awaken Host Psionics (150)"
-	set desc = "Probe into your host an unlock their psionic potential."
+	set desc = "Probe into your host and unlock their psionic potential. Note, it will give them a seizure as their brain realizes its potential."
 
 	if(!host)
 		to_chat(src, span("notice", "You are not inside a host body."))
@@ -437,7 +437,8 @@
 	chemicals -= 150
 	to_chat(src, span("notice", "You probe your tendrils deep within your host's zona bovinae, seeking to unleash their potential."))
 	to_chat(host, span("danger", "You feel some tendrils probe at the back of your head..."))
-	addtimer(CALLBACK(src, .proc/jumpstart_psi), 100)
+	to_chat(host, FONT_LARGE(SPAN_WARNING("You feel something terrible coming on...")))
+	addtimer(CALLBACK(src, .proc/jumpstart_psi), 150)
 
 /mob/living/simple_animal/borer/proc/jumpstart_psi()
 	to_chat(src, span("notice", "You succeed in interfacing with the host's zona bovinae, this will be a painful process for them."))
@@ -486,3 +487,17 @@
 	to_chat(src, span("notice", "You successfully manage to upgrade your host's [selected_faculty] faculty."))
 	to_chat(host, span("good", "A breeze of fresh air washes over your mind, you feel powerful!"))
 	to_chat(host, span("notice", "You have been psionically enlightened. You are now a [psychic_ranks_to_strings[host.psi.ranks[selected_faculty]]] in the [selected_faculty] faculty."))
+
+/mob/living/simple_animal/borer/verb/host_health_scan()
+	set category = "Abilities"
+	set name = "Inspect Host Health"
+	set desc = "Survey your host for injuries, allowing you to better treat them."
+
+	if(!host)
+		to_chat(src, SPAN_WARNING("You have no host to scan."))
+		return
+	if(stat)
+		to_chat(src, SPAN_WARNING("You cannot do that in your current state."))
+		return
+
+	health_scan_mob(host, src, TRUE, TRUE)