Lots of stuff, will elaborate later.

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

@@ -201,4 +201,19 @@
 	for(var/t in organs)
 		if (istype(organs[text("[]", t)], /datum/organ/external))
 			L += organs[text("[]", t)]
-	return L
+	return L
+
+/mob/living/carbon/proc/UpdateDamage()
+
+	if (!(istype(src, /mob/living/carbon/human)))	//Added by Strumpetplaya - Invincible Monkey Fix
+		return										//Possibly helps with other invincible mobs like Aliens?
+	var/list/L = list(  )
+	for(var/t in organs)
+		if (istype(organs[text("[]", t)], /datum/organ/external))
+			L += organs[text("[]", t)]
+	bruteloss = 0
+	fireloss = 0
+	for(var/datum/organ/external/O in L)
+		bruteloss += O.get_damage_brute()
+		fireloss += O.get_damage_fire()
+	return

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

@@ -54,7 +54,6 @@
 
 	var/mutantrace = null
 
-	var/list/organs = list()
 	var/bloodloss = 0
 	var/debug_leftarm
 	var/debug_lefthand

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

@@ -22,6 +22,40 @@
 	if(name == "monkey")
 		name = text("monkey ([rand(1, 1000)])")
 	real_name = name
+	var/datum/organ/external/chest/chest = new /datum/organ/external/chest( src )
+	chest.owner = src
+	var/datum/organ/external/groin/groin = new /datum/organ/external/groin( src )
+	groin.owner = src
+	var/datum/organ/external/head/head = new /datum/organ/external/head( src )
+	head.owner = src
+	var/datum/organ/external/l_arm/l_arm = new /datum/organ/external/l_arm( src )
+	l_arm.owner = src
+	var/datum/organ/external/r_arm/r_arm = new /datum/organ/external/r_arm( src )
+	r_arm.owner = src
+	var/datum/organ/external/l_hand/l_hand = new /datum/organ/external/l_hand( src )
+	l_hand.owner = src
+	var/datum/organ/external/r_hand/r_hand = new /datum/organ/external/r_hand( src )
+	r_hand.owner = src
+	var/datum/organ/external/l_leg/l_leg = new /datum/organ/external/l_leg( src )
+	l_leg.owner = src
+	var/datum/organ/external/r_leg/r_leg = new /datum/organ/external/r_leg( src )
+	r_leg.owner = src
+	var/datum/organ/external/l_foot/l_foot = new /datum/organ/external/l_foot( src )
+	l_foot.owner = src
+	var/datum/organ/external/r_foot/r_foot = new /datum/organ/external/r_foot( src )
+	r_foot.owner = src
+
+	organs["chest"] = chest
+	organs["groin"] = groin
+	organs["head"] = head
+	organs["l_arm"] = l_arm
+	organs["r_arm"] = r_arm
+	organs["l_hand"] = l_hand
+	organs["r_hand"] = r_hand
+	organs["l_leg"] = l_leg
+	organs["r_leg"] = r_leg
+	organs["l_foot"] = l_foot
+	organs["r_foot"] = r_foot
 	..()
 	return
 

code/modules/power/singularity/singularity.dm

@@ -232,9 +232,7 @@ var/global/list/uneatable = list(
 			if (istype(A,/mob/living))//Mobs get gibbed
 				gain = 20
 				if(istype(A,/mob/living/carbon/human))
-					if(A:mind)
-						if((A:mind:assigned_role == "Station Engineer") || (A:mind:assigned_role == "Chief Engineer") )
-							gain = 100
+					gain = 100
 				spawn()
 					A:gib()
 				sleep(1)

code/modules/power/tracker.dm

@@ -16,8 +16,8 @@
 
 
 	// called by datum/sun/calc_position() as sun's angle changes
-	proc/set_angle(var/angle)
-		sun_angle = angle
+	proc/set_angle()
+		var/angle = sun.angle
 
 		//set icon dir to show sun illumination
 		dir = turn(NORTH, -angle - 22.5)	// 22.5 deg bias ensures, e.g. 67.5-112.5 is EAST