tajarans see_in_dark -> 8, disembodied organs rendering correction

code/datums/organs/organ_external.dm

@@ -7,7 +7,6 @@
 	var/body_part = null
 	var/icon_position = 0
 
-	var/dropped = 0
 	var/damage_state = "00"
 	var/brute_dam = 0
 	var/burn_dam = 0
@@ -325,11 +324,12 @@
 				O.amputated=amputated
 
 	proc/droplimb(var/override = 0,var/no_explode = 0)
-		if(dropped) return
+		if(destspawn) return
 		if(override)
 			status |= ORGAN_DESTROYED
 		if(status & ORGAN_DESTROYED)
-			dropped = 1
+			if(body_part == UPPER_TORSO)
+				return
 
 			if(status & ORGAN_SPLINTED)
 				status &= ~ORGAN_SPLINTED
@@ -404,20 +404,24 @@
 					if(ismonkey(owner))
 						H.icon_state = "l_foot_l"
 					owner.u_equip(owner.shoes)
-			if(ismonkey(owner))
-				H.icon = 'monkey.dmi'
-			else if(owner.dna && owner.dna.mutantrace)
-				var/icon/I
-				switch(owner.dna.mutantrace)
-					if("tajaran")
-						I = 'icons/mob/human_races/r_tajaran.dmi'
-					if("lizard")
-						I = 'icons/mob/human_races/r_lizard.dmi'
-					if("skrell")
-						I = 'icons/mob/human_races/r_skrell.dmi'
-				if(I)
-					I.BecomeLying()
-					H.icon = I
+			if(H)
+				if(ismonkey(owner))
+					H.icon = 'monkey.dmi'
+				else if(ishuman(owner) && owner.dna)
+					var/icon/I
+					switch(owner.dna.mutantrace)
+						if("tajaran")
+							I = new('icons/mob/human_races/r_tajaran.dmi')
+						if("lizard")
+							I = new('icons/mob/human_races/r_lizard.dmi')
+						if("skrell")
+							I = new('icons/mob/human_races/r_skrell.dmi')
+						else
+							I = new('icons/mob/human_races/r_human.dmi')
+					if(I)
+						H.icon = I.MakeLying()
+				else
+					H.icon_state = initial(H.icon_state)+"_l"
 
 			var/lol = pick(cardinal)
 			step(H,lol)
@@ -652,7 +656,7 @@
 ****************************************************/
 
 obj/item/weapon/organ
-	icon = 'icons/mob/human.dmi'
+	icon = 'icons/mob/human_races/r_human.dmi'
 
 obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
 	..(loc)
@@ -743,25 +747,25 @@ obj/item/weapon/organ/head/attackby(obj/item/weapon/W as obj, mob/user as mob)
 
 obj/item/weapon/organ/l_arm
 	name = "left arm"
-	icon_state = "l_arm_l"
+	icon_state = "l_arm"
 obj/item/weapon/organ/l_foot
 	name = "left foot"
-	icon_state = "l_foot_l"
+	icon_state = "l_foot"
 obj/item/weapon/organ/l_hand
 	name = "left hand"
-	icon_state = "l_hand_l"
+	icon_state = "l_hand"
 obj/item/weapon/organ/l_leg
 	name = "left leg"
-	icon_state = "l_leg_l"
+	icon_state = "l_leg"
 obj/item/weapon/organ/r_arm
 	name = "right arm"
-	icon_state = "r_arm_l"
+	icon_state = "r_arm"
 obj/item/weapon/organ/r_foot
 	name = "right foot"
-	icon_state = "r_foot_l"
+	icon_state = "r_foot"
 obj/item/weapon/organ/r_hand
 	name = "right hand"
-	icon_state = "r_hand_l"
+	icon_state = "r_hand"
 obj/item/weapon/organ/r_leg
 	name = "right leg"
-	icon_state = "r_leg_l"
+	icon_state = "r_leg"

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

@@ -1004,7 +1004,8 @@
 	proc/handle_chemicals_in_body()
 		if(reagents) reagents.metabolize(src)
 
-		if(dna && dna.mutantrace == "plant") //couldn't think of a better place to place it, since it handles nutrition -- Urist
+//		if(dna && dna.mutantrace == "plant") //couldn't think of a better place to place it, since it handles nutrition -- Urist
+		if(PLANT in mutations)
 			var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
 			if(isturf(loc)) //else, there's considered to be no light
 				var/turf/T = loc
@@ -1050,7 +1051,8 @@
 			if(overeatduration > 1)
 				overeatduration -= 2 //doubled the unfat rate
 
-		if(dna && dna.mutantrace == "plant")
+//		if(dna && dna.mutantrace == "plant")
+		if(PLANT in mutations)
 			if(nutrition < 200)
 				take_overall_damage(2,0)
 
@@ -1301,7 +1303,7 @@
 					if("lizard")
 						see_in_dark = 3
 					if("tajaran")
-						see_in_dark = 5
+						see_in_dark = 8
 					else
 						see_in_dark = 2
 
@@ -1474,7 +1476,11 @@
 			if(machine)
 				if(!machine.check_eye(src))		reset_view(null)
 			else
-				if(!(remoteview_target && mRemote in mutations && remoteview_target.stat==CONSCIOUS) && !client.adminobs)
+				var/isRemoteObserve = 0
+				if((mRemote in mutations) && remoteview_target)
+					if(remoteview_target.stat==CONSCIOUS)
+						isRemoteObserve = 1
+				if(!isRemoteObserve && !client.adminobs)
 					remoteview_target = null
 					reset_view(null)
 		return 1