12/21 modernizations from TG live (#103)

* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* Subsystem 12/21

Most Recent TG subsystem folder

* globalvars 12/21

Tossed out the flavor_misc and parallax files

* Onclick 12/21

as well as .dme updates

* _defines 12/21

ommited old _MC.dm

* _HELPERS 12/21

Preserved snowflake placement of furry sprites

* _defeines/genetics

reapplied narkism holdover for snowflake races.

* Oops forgot mutant colors

* modules porting 12/21 + Sounds/icons

Admin, Client and most of mob life files ommitted

* enviroment file

* Admin optimizations

ahelp log system kept

* Mob ports 12/21

Flavor text preserved

* datums ported 12/21

* Game ported 12/21

* batch of duplicate fixes/dogborg work

Dogborgs need to be modernized to refractored borg standards.

* moar fixes

* Maps and futher compile fixes

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

@@ -1,32 +1,34 @@
 /mob/living/carbon/monkey/can_equip(obj/item/I, slot, disable_warning = 0)
 	switch(slot)
-		if(slot_l_hand)
-			if(l_hand)
-				return 0
-			return 1
-		if(slot_r_hand)
-			if(r_hand)
-				return 0
-			return 1
+		if(slot_hands)
+			if(get_empty_held_indexes())
+				return TRUE
+			return FALSE
 		if(slot_wear_mask)
 			if(wear_mask)
-				return 0
+				return FALSE
 			if( !(I.slot_flags & SLOT_MASK) )
-				return 0
-			return 1
+				return FALSE
+			return TRUE
+		if(slot_neck)
+			if(wear_neck)
+				return FALSE
+			if( !(I.slot_flags & SLOT_NECK) )
+				return FALSE
+			return TRUE
 		if(slot_head)
 			if(head)
-				return 0
+				return FALSE
 			if( !(I.slot_flags & SLOT_HEAD) )
-				return 0
-			return 1
+				return FALSE
+			return TRUE
 		if(slot_back)
 			if(back)
-				return 0
+				return FALSE
 			if( !(I.slot_flags & SLOT_BACK) )
-				return 0
-			return 1
-	return 0 //Unsupported slot
+				return FALSE
+			return TRUE
+	return FALSE //Unsupported slot
 
 
 

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

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
 
 /mob/living/carbon/monkey
 
@@ -22,22 +22,24 @@
 
 	if (radiation)
 		if (radiation > 100)
+			if(!weakened)
+				emote("collapse")
 			Weaken(10)
 			src << "<span class='danger'>You feel weak.</span>"
-			emote("collapse")
 
 		switch(radiation)
 
 			if(50 to 75)
 				if(prob(5))
+					if(!weakened)
+						emote("collapse")
 					Weaken(3)
 					src << "<span class='danger'>You feel weak.</span>"
-					emote("collapse")
 
 			if(75 to 100)
 				if(prob(1))
 					src << "<span class='danger'>You mutate!</span>"
-					randmutb(src)
+					randmutb()
 					emote("gasp")
 					domutcheck()
 		..()
@@ -81,29 +83,29 @@
 		switch(bodytemperature)
 			if(360 to 400)
 				throw_alert("temp", /obj/screen/alert/hot, 1)
-				adjustFireLoss(2)
+				apply_damage(HEAT_DAMAGE_LEVEL_1, BURN)
 			if(400 to 460)
 				throw_alert("temp", /obj/screen/alert/hot, 2)
-				adjustFireLoss(3)
+				apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
 			if(460 to INFINITY)
 				throw_alert("temp", /obj/screen/alert/hot, 3)
 				if(on_fire)
-					adjustFireLoss(8)
+					apply_damage(HEAT_DAMAGE_LEVEL_3, BURN)
 				else
-					adjustFireLoss(3)
+					apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
 
 	else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
 		if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
 			switch(bodytemperature)
 				if(200 to 260)
 					throw_alert("temp", /obj/screen/alert/cold, 1)
-					adjustFireLoss(0.5)
+					apply_damage(COLD_DAMAGE_LEVEL_1, BURN)
 				if(120 to 200)
 					throw_alert("temp", /obj/screen/alert/cold, 2)
-					adjustFireLoss(1.5)
+					apply_damage(COLD_DAMAGE_LEVEL_2, BURN)
 				if(-INFINITY to 120)
 					throw_alert("temp", /obj/screen/alert/cold, 3)
-					adjustFireLoss(3)
+					apply_damage(COLD_DAMAGE_LEVEL_3, BURN)
 		else
 			clear_alert("temp")
 
@@ -140,7 +142,29 @@
 			return 1
 
 /mob/living/carbon/monkey/handle_fire()
-	if(..())
-		return
-	bodytemperature += BODYTEMP_HEATING_MAX
-	return
+	. = ..()
+	if(on_fire)
+
+		//the fire tries to damage the exposed clothes and items
+		var/list/burning_items = list()
+		//HEAD//
+		var/obj/item/clothing/head_clothes = null
+		if(wear_mask)
+			head_clothes = wear_mask
+		if(wear_neck)
+			head_clothes = wear_neck
+		if(head)
+			head_clothes = head
+		if(head_clothes)
+			burning_items += head_clothes
+
+		if(back)
+			burning_items += back
+
+		for(var/X in burning_items)
+			var/obj/item/I = X
+			if(!(I.resistance_flags & FIRE_PROOF))
+				I.take_damage(fire_stacks, BURN, "fire", 0)
+
+		bodytemperature += BODYTEMP_HEATING_MAX
+

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

@@ -3,16 +3,20 @@
 	voice_name = "monkey"
 	verb_say = "chimpers"
 	icon = 'icons/mob/monkey.dmi'
-	icon_state = "monkey1"
+	icon_state = ""
 	gender = NEUTER
 	pass_flags = PASSTABLE
 	languages_spoken = MONKEY
 	languages_understood = MONKEY
-	ventcrawler = 1
+	ventcrawler = VENTCRAWLER_NUDE
 	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
 	type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey
 	gib_type = /obj/effect/decal/cleanable/blood/gibs
 	unique_name = 1
+	bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey,
+					 /obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey)
+
+
 
 /mob/living/carbon/monkey/New()
 	verbs += /mob/living/proc/mob_sleep
@@ -22,24 +26,13 @@
 		gender = pick(MALE, FEMALE)
 	real_name = name
 
-	//initialize limbs, currently only used to handle cavity implant surgery, no dismemberment.
-	bodyparts = newlist(/obj/item/bodypart/chest, /obj/item/bodypart/head, /obj/item/bodypart/l_arm,
-					 /obj/item/bodypart/r_arm, /obj/item/bodypart/r_leg, /obj/item/bodypart/l_leg)
-	for(var/X in bodyparts)
-		var/obj/item/bodypart/O = X
-		O.owner = src
+	//initialize limbs
+	create_bodyparts()
 
 	if(good_mutations.len) //genetic mutations have been set up.
-		initialize()
+		initialize() //initialize monkey dna
 
-	internal_organs += new /obj/item/organ/appendix
-	internal_organs += new /obj/item/organ/lungs
-	internal_organs += new /obj/item/organ/heart
-	internal_organs += new /obj/item/organ/brain
-	internal_organs += new /obj/item/organ/tongue
-
-	for(var/obj/item/organ/I in internal_organs)
-		I.Insert(src)
+	create_internal_organs()
 
 	..()
 
@@ -47,6 +40,15 @@
 	create_dna(src)
 	dna.initialize_dna(random_blood_type())
 
+
+/mob/living/carbon/monkey/create_internal_organs()
+	internal_organs += new /obj/item/organ/appendix
+	internal_organs += new /obj/item/organ/lungs
+	internal_organs += new /obj/item/organ/heart
+	internal_organs += new /obj/item/organ/brain
+	internal_organs += new /obj/item/organ/tongue
+	..()
+
 /mob/living/carbon/monkey/movement_delay()
 	if(reagents)
 		if(reagents.has_reagent("morphine"))
@@ -64,133 +66,6 @@
 		. += (283.222 - bodytemperature) / 10 * 1.75
 	return . + config.monkey_delay
 
-/mob/living/carbon/monkey/attack_paw(mob/living/M)
-	if(..()) //successful monkey bite.
-		var/damage = rand(1, 5)
-		if (stat != DEAD)
-			adjustBruteLoss(damage)
-			updatehealth()
-	return
-
-/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L)
-	if(..()) //successful larva bite.
-		var/damage = rand(1, 3)
-		if(stat != DEAD)
-			L.amount_grown = min(L.amount_grown + damage, L.max_grown)
-			adjustBruteLoss(damage)
-			updatehealth()
-
-/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M)
-	if(..())	//To allow surgery to return properly.
-		return
-
-	switch(M.a_intent)
-		if("help")
-			help_shake_act(M)
-		if("grab")
-			grabbedby(M)
-		if("harm")
-			M.do_attack_animation(src)
-			if (prob(75))
-				visible_message("<span class='danger'>[M] has punched [name]!</span>", \
-						"<span class='userdanger'>[M] has punched [name]!</span>")
-
-				playsound(loc, "punch", 25, 1, -1)
-				var/damage = rand(5, 10)
-				if (prob(40))
-					damage = rand(10, 15)
-					if ( (paralysis < 5)  && (health > 0) )
-						Paralyse(rand(10, 15))
-						visible_message("<span class='danger'>[M] has knocked out [name]!</span>", \
-									"<span class='userdanger'>[M] has knocked out [name]!</span>")
-				adjustBruteLoss(damage)
-				add_logs(M, src, "attacked")
-				updatehealth()
-			else
-				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-				visible_message("<span class='danger'>[M] has attempted to punch [name]!</span>", \
-						"<span class='userdanger'>[M] has attempted to punch [name]!</span>")
-		if("disarm")
-			if (!( paralysis ))
-				M.do_attack_animation(src)
-				if (prob(25))
-					Paralyse(2)
-					playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-					add_logs(M, src, "pushed")
-					visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
-							"<span class='userdanger'>[M] has pushed down [src]!</span>")
-				else
-					if(drop_item())
-						playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-						visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
-								"<span class='userdanger'>[M] has disarmed [src]!</span>")
-
-/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M)
-	if(..()) //if harm or disarm intent.
-		if (M.a_intent == "harm")
-			if ((prob(95) && health > 0))
-				playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
-				var/damage = rand(15, 30)
-				if (damage >= 25)
-					damage = rand(20, 40)
-					if (paralysis < 15)
-						Paralyse(rand(10, 15))
-					visible_message("<span class='danger'>[M] has wounded [name]!</span>", \
-							"<span class='userdanger'>[M] has wounded [name]!</span>")
-				else
-					visible_message("<span class='danger'>[M] has slashed [name]!</span>", \
-							"<span class='userdanger'>[M] has slashed [name]!</span>")
-
-				if (stat != DEAD)
-					adjustBruteLoss(damage)
-					updatehealth()
-				add_logs(M, src, "attacked")
-			else
-				playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
-				visible_message("<span class='danger'>[M] has attempted to lunge at [name]!</span>", \
-						"<span class='userdanger'>[M] has attempted to lunge at [name]!</span>")
-
-		if (M.a_intent == "disarm")
-			playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
-			if(prob(95))
-				Weaken(10)
-				visible_message("<span class='danger'>[M] has tackled down [name]!</span>", \
-						"<span class='userdanger'>[M] has tackled down [name]!</span>")
-			else
-				if(drop_item())
-					visible_message("<span class='danger'>[M] has disarmed [name]!</span>", \
-							"<span class='userdanger'>[M] has disarmed [name]!</span>")
-			add_logs(M, src, "disarmed")
-			updatehealth()
-	return
-
-/mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M)
-	if(..())
-		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
-		switch(M.melee_damage_type)
-			if(BRUTE)
-				adjustBruteLoss(damage)
-			if(BURN)
-				adjustFireLoss(damage)
-			if(TOX)
-				adjustToxLoss(damage)
-			if(OXY)
-				adjustOxyLoss(damage)
-			if(CLONE)
-				adjustCloneLoss(damage)
-			if(STAMINA)
-				adjustStaminaLoss(damage)
-		updatehealth()
-
-
-/mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M)
-	if(..()) //successful slime attack
-		var/damage = rand(5, 35)
-		if(M.is_adult)
-			damage = rand(20, 40)
-		adjustBruteLoss(damage)
-		updatehealth()
-
 /mob/living/carbon/monkey/Stat()
 	..()
 	if(statpanel("Status"))
@@ -209,24 +84,6 @@
 	internal = null
 	return
 
-/mob/living/carbon/monkey/ex_act(severity, target)
-	..()
-	switch(severity)
-		if(1)
-			gib()
-			return
-		if(2)
-			adjustBruteLoss(60)
-			adjustFireLoss(60)
-			adjustEarDamage(30,120)
-		if(3)
-			adjustBruteLoss(30)
-			if (prob(50))
-				Paralyse(10)
-			adjustEarDamage(15,60)
-
-	updatehealth()
-	return
 
 /mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools
 	return 0
@@ -249,46 +106,27 @@
 	//Lasertag bullshit
 	if(lasercolor)
 		if(lasercolor == "b")//Lasertag turrets target the opposing team, how great is that? -Sieve
-			if((istype(r_hand,/obj/item/weapon/gun/energy/laser/redtag)) || (istype(l_hand,/obj/item/weapon/gun/energy/laser/redtag)))
+			if(is_holding_item_of_type(/obj/item/weapon/gun/energy/laser/redtag))
 				threatcount += 4
 
 		if(lasercolor == "r")
-			if((istype(r_hand,/obj/item/weapon/gun/energy/laser/bluetag)) || (istype(l_hand,/obj/item/weapon/gun/energy/laser/bluetag)))
+			if(is_holding_item_of_type(/obj/item/weapon/gun/energy/laser/bluetag))
 				threatcount += 4
 
 		return threatcount
 
 	//Check for weapons
 	if(judgebot.weaponscheck)
-		if(judgebot.check_for_weapons(l_hand))
-			threatcount += 4
-		if(judgebot.check_for_weapons(r_hand))
-			threatcount += 4
+		for(var/obj/item/I in held_items)
+			if(judgebot.check_for_weapons(I))
+				threatcount += 4
 
 	//mindshield implants imply trustworthyness
-	if(isloyal(src))
+	if(isloyal())
 		threatcount -= 1
 
 	return threatcount
 
-/mob/living/carbon/monkey/acid_act(acidpwr, toxpwr, acid_volume)
-	if(wear_mask)
-		if(!wear_mask.unacidable)
-			wear_mask.acid_act(acidpwr)
-			update_inv_wear_mask()
-		else
-			src << "<span class='warning'>Your mask protects you from the acid.</span>"
-		return
-
-	take_organ_damage(min(6*toxpwr, acid_volume * acidpwr/10))
-
-/mob/living/carbon/monkey/help_shake_act(mob/living/carbon/M)
-	if(health < 0 && ishuman(M))
-		var/mob/living/carbon/human/H = M
-		H.do_cpr(src)
-	else
-		..()
-
 /mob/living/carbon/monkey/get_permeability_protection()
 	var/protection = 0
 	if(head)
@@ -298,13 +136,6 @@
 	protection = protection/7 //the rest of the body isn't covered.
 	return protection
 
-/mob/living/carbon/monkey/check_eye_prot()
-	var/number = ..()
-	if(istype(src.wear_mask, /obj/item/clothing/mask))
-		var/obj/item/clothing/mask/MFP = src.wear_mask
-		number += MFP.flash_protect
-	return number
-
 /mob/living/carbon/monkey/fully_heal(admin_revive = 0)
 	if(!getorganslot("lungs"))
 		var/obj/item/organ/lungs/L = new()

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

@@ -0,0 +1,216 @@
+
+/mob/living/carbon/monkey/get_eye_protection()
+	var/number = ..()
+	if(istype(src.wear_mask, /obj/item/clothing/mask))
+		var/obj/item/clothing/mask/MFP = src.wear_mask
+		number += MFP.flash_protect
+	return number
+
+/mob/living/carbon/monkey/help_shake_act(mob/living/carbon/M)
+	if(health < 0 && ishuman(M))
+		var/mob/living/carbon/human/H = M
+		H.do_cpr(src)
+	else
+		..()
+
+/mob/living/carbon/monkey/attack_paw(mob/living/M)
+	if(..()) //successful monkey bite.
+		var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
+		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+		if(!affecting)
+			affecting = get_bodypart("chest")
+		if(M.limb_destroyer)
+			dismembering_strike(M, affecting.body_zone)
+		if(stat != DEAD)
+			var/dmg = rand(1, 5)
+			apply_damage(dmg, BRUTE, affecting)
+			damage_clothes(dmg, BRUTE, "melee", affecting.body_zone)
+
+
+
+/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L)
+	if(..()) //successful larva bite.
+		var/damage = rand(1, 3)
+		if(stat != DEAD)
+			L.amount_grown = min(L.amount_grown + damage, L.max_grown)
+			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.zone_selected))
+			if(!affecting)
+				affecting = get_bodypart("chest")
+			apply_damage(damage, BRUTE, affecting)
+			damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
+
+/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M)
+	if(..())	//To allow surgery to return properly.
+		return
+
+	switch(M.a_intent)
+		if("help")
+			help_shake_act(M)
+		if("grab")
+			grabbedby(M)
+		if("harm")
+			M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
+			if (prob(75))
+				visible_message("<span class='danger'>[M] has punched [name]!</span>", \
+						"<span class='userdanger'>[M] has punched [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+
+				playsound(loc, "punch", 25, 1, -1)
+				var/damage = rand(5, 10)
+				if (prob(40))
+					damage = rand(10, 15)
+					if ( (paralysis < 5)  && (health > 0) )
+						Paralyse(rand(10, 15))
+						visible_message("<span class='danger'>[M] has knocked out [name]!</span>", \
+									"<span class='userdanger'>[M] has knocked out [name]!</span>", null, 5)
+				var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+				if(!affecting)
+					affecting = get_bodypart("chest")
+				apply_damage(damage, BRUTE, affecting)
+				damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
+				add_logs(M, src, "attacked")
+
+			else
+				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+				visible_message("<span class='danger'>[M] has attempted to punch [name]!</span>", \
+					"<span class='userdanger'>[M] has attempted to punch [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+		if("disarm")
+			if (!paralysis)
+				M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
+				if (prob(25))
+					Paralyse(2)
+					playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+					add_logs(M, src, "pushed")
+					visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
+						"<span class='userdanger'>[M] has pushed down [src]!</span>", null, COMBAT_MESSAGE_RANGE)
+				else
+					if(drop_item())
+						playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+						visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
+							"<span class='userdanger'>[M] has disarmed [src]!</span>", null, COMBAT_MESSAGE_RANGE)
+
+/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M)
+	if(..()) //if harm or disarm intent.
+		if (M.a_intent == INTENT_HARM)
+			if ((prob(95) && health > 0))
+				playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+				var/damage = rand(15, 30)
+				if (damage >= 25)
+					damage = rand(20, 40)
+					if (paralysis < 15)
+						Paralyse(rand(10, 15))
+					visible_message("<span class='danger'>[M] has wounded [name]!</span>", \
+							"<span class='userdanger'>[M] has wounded [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+				else
+					visible_message("<span class='danger'>[M] has slashed [name]!</span>", \
+							"<span class='userdanger'>[M] has slashed [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+
+				var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+				add_logs(M, src, "attacked")
+				if(!affecting)
+					affecting = get_bodypart("chest")
+				if(!dismembering_strike(M, affecting.body_zone)) //Dismemberment successful
+					return 1
+				apply_damage(damage, BRUTE, affecting)
+				damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
+
+			else
+				playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
+				visible_message("<span class='danger'>[M] has attempted to lunge at [name]!</span>", \
+						"<span class='userdanger'>[M] has attempted to lunge at [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+		if (M.a_intent == INTENT_DISARM)
+			playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
+			if(prob(95))
+				Weaken(10)
+				visible_message("<span class='danger'>[M] has tackled down [name]!</span>", \
+						"<span class='userdanger'>[M] has tackled down [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+			else
+				if(drop_item())
+					visible_message("<span class='danger'>[M] has disarmed [name]!</span>", \
+							"<span class='userdanger'>[M] has disarmed [name]!</span>", null, COMBAT_MESSAGE_RANGE)
+			add_logs(M, src, "disarmed")
+			updatehealth()
+
+
+/mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M)
+	if(..())
+		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+		var/dam_zone = dismembering_strike(M, pick("chest", "l_hand", "r_hand", "l_leg", "r_leg"))
+		if(!dam_zone) //Dismemberment successful
+			return 1
+		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+		if(!affecting)
+			affecting = get_bodypart("chest")
+		apply_damage(damage, M.melee_damage_type, affecting)
+		damage_clothes(damage, M.melee_damage_type, "melee", affecting.body_zone)
+
+
+
+/mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M)
+	if(..()) //successful slime attack
+		var/damage = rand(5, 35)
+		if(M.is_adult)
+			damage = rand(20, 40)
+		var/dam_zone = dismembering_strike(M, pick("head", "chest", "l_arm", "r_arm", "l_leg", "r_leg"))
+		if(!dam_zone) //Dismemberment successful
+			return 1
+		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+		if(!affecting)
+			affecting = get_bodypart("chest")
+		apply_damage(damage, BRUTE, affecting)
+		damage_clothes(damage, BRUTE, "melee", affecting.body_zone)
+
+
+/mob/living/carbon/monkey/acid_act(acidpwr, acid_volume, bodyzone_hit)
+	. = 1
+	if(!bodyzone_hit || bodyzone_hit == "head")
+		if(wear_mask)
+			if(!(wear_mask.resistance_flags & UNACIDABLE))
+				wear_mask.acid_act(acidpwr)
+			else
+				src << "<span class='warning'>Your mask protects you from the acid.</span>"
+			return
+		if(head)
+			if(!(head.resistance_flags & UNACIDABLE))
+				head.acid_act(acidpwr)
+			else
+				src << "<span class='warning'>Your hat protects you from the acid.</span>"
+			return
+	take_bodypart_damage(acidpwr * min(0.6, acid_volume*0.1))
+
+
+/mob/living/carbon/monkey/ex_act(severity, target, origin)
+	if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))
+		return
+	..()
+
+	switch (severity)
+		if (1)
+			gib()
+			return
+
+		if (2)
+			take_overall_damage(60, 60)
+			damage_clothes(200, BRUTE, "bomb")
+			adjustEarDamage(30, 120)
+			if(prob(70))
+				Paralyse(10)
+
+		if(3)
+			take_overall_damage(30, 0)
+			damage_clothes(50, BRUTE, "bomb")
+			adjustEarDamage(15,60)
+			if (prob(50))
+				Paralyse(8)
+
+
+	//attempt to dismember bodyparts
+	if(severity <= 2)
+		var/max_limb_loss = round(4/severity) //so you don't lose four limbs at severity 3.
+		for(var/X in bodyparts)
+			var/obj/item/bodypart/BP = X
+			if(prob(50/severity) && BP.body_zone != "chest")
+				BP.brute_dam = BP.max_damage
+				BP.dismember()
+				max_limb_loss--
+				if(!max_limb_loss)
+					break

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

@@ -11,14 +11,10 @@
 
 /mob/living/carbon/monkey/punpun/New()
 	Read_Memory()
-	if(relic_hat)
-		equip_to_slot_or_del(new relic_hat, slot_head)
-	if(relic_mask)
-		equip_to_slot_or_del(new relic_mask, slot_wear_mask)
 	if(ancestor_name)
 		name = ancestor_name
 		if(ancestor_chain > 1)
-			name += " [num2roman(ancestor_chain)]"
+			name += " \Roman[ancestor_chain]"
 	else
 		if(prob(5))
 			name = pick(rare_pet_monkey_names)
@@ -27,6 +23,14 @@
 		gender = pick(MALE, FEMALE)
 	..()
 
+	//These have to be after the parent new to ensure that the monkey
+	//bodyparts are actually created before we try to equip things to 
+	//those slots
+	if(relic_hat)
+		equip_to_slot_or_del(new relic_hat, slot_head)
+	if(relic_mask)
+		equip_to_slot_or_del(new relic_mask, slot_wear_mask)
+
 /mob/living/carbon/monkey/punpun/Life()
 	if(ticker.current_state == GAME_STATE_FINISHED && !memory_saved)
 		Write_Memory(0)

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

@@ -1,29 +1,47 @@
 
 /mob/living/carbon/monkey/regenerate_icons()
 	if(!..())
+		update_body_parts()
+		update_hair()
 		update_inv_wear_mask()
 		update_inv_head()
 		update_inv_back()
-		update_icons()
 		update_transform()
 
-/mob/living/carbon/monkey/update_icons()
-	cut_overlays()
-	icon_state = "monkey1"
-	for(var/image/I in overlays_standing)
-		add_overlay(I)
 
 ////////
 
+
+/mob/living/carbon/monkey/update_hair()
+	remove_overlay(HAIR_LAYER)
+
+	var/obj/item/bodypart/head/HD = get_bodypart("head")
+	if(!HD) //Decapitated
+		return
+
+	if(disabilities & HUSK)
+		return
+
+	var/hair_hidden = 0
+
+	if(head)
+		var/obj/item/I = head
+		if(I.flags_inv & HIDEHAIR)
+			hair_hidden = 1
+	if(wear_mask)
+		var/obj/item/clothing/mask/M = wear_mask
+		if(M.flags_inv & HIDEHAIR)
+			hair_hidden = 1
+	if(!hair_hidden)
+		if(!getorgan(/obj/item/organ/brain)) //Applies the debrained overlay if there is no brain
+			var/image/I = image("icon"='icons/mob/human_face.dmi', "icon_state" = "debrained_s", "layer" = -HAIR_LAYER)
+			overlays_standing[HAIR_LAYER] = I
+			apply_overlay(HAIR_LAYER)
+
+
 /mob/living/carbon/monkey/update_fire()
 	..("Monkey_burning")
 
-/mob/living/carbon/monkey/update_inv_handcuffed()
-	remove_overlay(HANDCUFF_LAYER)
-	if(handcuffed)
-		overlays_standing[HANDCUFF_LAYER] = image("icon"='icons/mob/mob.dmi', "icon_state"="handcuff1", "layer"=-HANDCUFF_LAYER)
-		apply_overlay(HANDCUFF_LAYER)
-
 /mob/living/carbon/monkey/update_inv_legcuffed()
 	remove_overlay(LEGCUFF_LAYER)
 	if(legcuffed)
@@ -47,6 +65,12 @@
 		I.screen_loc = ui_monkey_mask
 		client.screen += I
 
+//update whether our neck item appears on our hud.
+/mob/living/carbon/monkey/update_hud_neck(obj/item/I)
+	if(client && hud_used && hud_used.hud_shown)
+		I.screen_loc = ui_monkey_mask
+		client.screen += I
+
 //update whether our back item appears on our hud.
 /mob/living/carbon/monkey/update_hud_back(obj/item/I)
 	if(client && hud_used && hud_used.hud_shown)