Merge pull request #200 from TheDZD/minor-fixes

Borer Bugfixes

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

@@ -237,7 +237,7 @@
 
 /mob/living/carbon/can_use_vents()
 	return
-	
+
 /mob/living/proc/handle_ventcrawl(var/obj/machinery/atmospherics/unary/vent_pump/vent_found = null, var/ignore_items = 0) // -- TLE -- Merged by Carn
 	if(stat)
 		src << "You must be conscious to do this!"
@@ -557,7 +557,7 @@
 
 /mob/living/carbon/proc/spawn_larvae()
 	set category = "Alien"
-	set name = "Reproduce"
+	set name = "Reproduce (100)"
 	set desc = "Spawn several young."
 
 	var/mob/living/simple_animal/borer/B = has_brain_worms()

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

@@ -334,6 +334,7 @@
 		src << "You wiggle out of [host]'s ear and plop to the ground."
 
 		detatch()
+		leave_host()
 
 mob/living/simple_animal/borer/proc/detatch()
 
@@ -344,15 +345,11 @@ mob/living/simple_animal/borer/proc/detatch()
 		var/datum/organ/external/head = H.get_organ("head")
 		head.implants -= src
 
-	src.loc = get_turf(host)
 	controlling = 0
 
 	reset_view(null)
 	machine = null
 
-	host.reset_view(null)
-	host.machine = null
-
 	host.verbs -= /mob/living/carbon/proc/release_control
 	host.verbs -= /mob/living/carbon/proc/punish_host
 	host.verbs -= /mob/living/carbon/proc/spawn_larvae
@@ -390,11 +387,23 @@ mob/living/simple_animal/borer/proc/detatch()
 
 	del(host_brain)
 
+	return
+
+/mob/living/simple_animal/borer/proc/leave_host()
+
+	if(!host)	return
+
+	src.loc = get_turf(host)
+
+	reset_view(null)
+	machine = null
+
+	host.reset_view(null)
+	host.machine = null
+
 	var/mob/living/H = host
 	H.status_flags &= ~PASSEMOTES
-
 	host = null
-
 	return
 
 /mob/living/simple_animal/borer/verb/infest()