From 323fa2fe9c1a12e7754614b0ed65c8eb2764b9de Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Mon, 19 Aug 2013 16:25:13 -0700
Subject: [PATCH] Reapplying carbon changes to borers, accidentally overwrote
 'em.

---
 .../modules/mob/living/simple_animal/borer.dm | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm
index b457f4b15b..d3166dd974 100644
--- a/code/modules/mob/living/simple_animal/borer.dm
+++ b/code/modules/mob/living/simple_animal/borer.dm
@@ -154,9 +154,9 @@
 			host.ckey = src.ckey
 			controlling = 1
 
-			host.verbs += /mob/living/carbon/human/proc/release_control
-			host.verbs += /mob/living/carbon/human/proc/punish_host
-			host.verbs += /mob/living/carbon/human/proc/spawn_larvae
+			host.verbs += /mob/living/carbon/proc/release_control
+			host.verbs += /mob/living/carbon/proc/punish_host
+			host.verbs += /mob/living/carbon/proc/spawn_larvae
 
 /mob/living/simple_animal/borer/verb/secrete_chemicals()
 	set category = "Alien"
@@ -220,8 +220,11 @@ mob/living/simple_animal/borer/proc/detatch()
 
 	if(!host) return
 
-	var/datum/organ/external/head = host.get_organ("head")
-	head.implants -= src
+	if(istype(host,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = host
+		var/datum/organ/external/head = H.get_organ("head")
+		head.implants -= src
+
 	src.loc = get_turf(host)
 	controlling = 0
 
@@ -231,9 +234,9 @@ mob/living/simple_animal/borer/proc/detatch()
 	host.reset_view(null)
 	host.machine = null
 
-	host.verbs -= /mob/living/carbon/human/proc/release_control
-	host.verbs -= /mob/living/carbon/human/proc/punish_host
-	host.verbs -= /mob/living/carbon/human/proc/spawn_larvae
+	host.verbs -= /mob/living/carbon/proc/release_control
+	host.verbs -= /mob/living/carbon/proc/punish_host
+	host.verbs -= /mob/living/carbon/proc/spawn_larvae
 
 	if(host_brain.ckey)
 		src.ckey = host.ckey
@@ -244,7 +247,7 @@ mob/living/simple_animal/borer/proc/detatch()
 
 	host = null
 
-/mob/living/simple_animal/borer/verb/infest(var/mob/living/carbon/human/H)
+/mob/living/simple_animal/borer/verb/infest()
 	set category = "Alien"
 	set name = "Infest"
 	set desc = "Infest a suitable humanoid host."
@@ -258,11 +261,11 @@ mob/living/simple_animal/borer/proc/detatch()
 		return
 
 	var/list/choices = list()
-	for(var/mob/living/carbon/human/C in view(1,src))
-		if(istype(C,/mob/living/carbon/human) && C.stat != 2)
+	for(var/mob/living/carbon/C in view(1,src))
+		if(C.stat != 2)
 			choices += C
 
-	var/mob/living/carbon/human/M = input(src,"Who do you wish to infest?") in null|choices
+	var/mob/living/carbon/M = input(src,"Who do you wish to infest?") in null|choices
 
 	if(!M || !src) return
 
@@ -293,10 +296,13 @@ mob/living/simple_animal/borer/proc/detatch()
 			M << "Something disgusting and slimy wiggles into your ear!"
 
 		src.host = M
-		var/datum/organ/external/head = M.get_organ("head")
-		head.implants += src
 		src.loc = M
 
+		if(istype(M,/mob/living/carbon/human))
+			var/mob/living/carbon/human/H = M
+			var/datum/organ/external/head = H.get_organ("head")
+			head.implants += src
+
 		host_brain.name = M.name
 		host_brain.real_name = M.real_name