From 0e11e0c04166895d4dbbf08f5f6908c935acc769 Mon Sep 17 00:00:00 2001
From: cib <blub@blub-Latitude-D430.(none)>
Date: Thu, 15 Nov 2012 17:48:13 +0100
Subject: [PATCH 01/14] Fix for issue #1947

Fire alarms now clear from computers when cancelled.
---
 code/game/area/areas.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 29eb5cd6763..e0e15c0ecd3 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -123,7 +123,7 @@
 					D.open()
 		for (var/mob/living/silicon/ai/aiPlayer in player_list)
 			aiPlayer.cancelAlarm("Fire", src, src)
-		for (var/obj/machinery/computer/station_alert/a in player_list)
+		for (var/obj/machinery/computer/station_alert/a in world)
 			a.cancelAlarm("Fire", src, src)
 	return
 

From 1213a50298ec1a3883e78fbdd51af4d261c64b0e Mon Sep 17 00:00:00 2001
From: cib <blub@blub-Latitude-D430.(none)>
Date: Thu, 15 Nov 2012 18:09:33 +0100
Subject: [PATCH 02/14] Removed alien player limit.

I don't want to know what will happen now, considering medbay *already* was more than 50% non-humans most of the time.
---
 code/modules/mob/new_player/new_player.dm | 54 +----------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 1d7a7705ec4..4c35e671d04 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -147,24 +147,7 @@
 			return 1
 
 		if(href_list["ready"])
-			var/num_old_slots = GetAvailableAlienPlayerSlots()
-			var/new_slots = num_old_slots
-			if(!ready)
-				if(num_old_slots >= 1 || preferences.species == "Human")
-					ready = 1
-					new_slots = GetAvailableAlienPlayerSlots()
-				else
-					src << "\red Unable to declare ready. Too many players have already elected to play as aliens."
-			else
-				ready = 0
-				new_slots = GetAvailableAlienPlayerSlots()
-
-			if(num_old_slots < 1 && new_slots >= 1)
-				for(var/mob/new_player/N in world)
-					N << "\blue A new alien player slot has opened."
-			else if(num_old_slots >= 1 && new_slots < 1)
-				for(var/mob/new_player/N in world)
-					N << "\red New alien players can no longer enter the game."
+			ready = !ready
 
 		if(href_list["refresh"])
 			src << browse(null, "window=playersetup") //closes the player setup window
@@ -205,9 +188,6 @@
 				if(!is_alien_whitelisted(src, preferences.species) && config.usealienwhitelist)
 					src << alert("You are currently not whitelisted to play [preferences.species].")
 					return 0
-				else if(GetAvailableAlienPlayerSlots() < 1)
-					src << "\red Unable to join game. Too many players have already joined as aliens."
-					return 0
 
 			LateChoices()
 
@@ -356,15 +336,10 @@
 			src << alert("[rank] is not available. Please try another.")
 			return 0
 
-		var/num_old_slots = GetAvailableAlienPlayerSlots()
-		var/new_slots = num_old_slots
 		if(preferences.species != "Human")
 			if(!is_alien_whitelisted(src, preferences.species) && config.usealienwhitelist)
 				src << alert("You are currently not whitelisted to play [preferences.species].")
 				return 0
-			else if(num_old_slots < 1)
-				src << "\red Unable to join game. Too many players have already joined as aliens."
-				return 0
 
 		job_master.AssignRole(src, rank, 1)
 
@@ -384,14 +359,6 @@
 			ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc.	//TODO!!!!! ~Carn
 			AnnounceArrival(character, rank)
 
-			new_slots = GetAvailableAlienPlayerSlots()
-			if(num_old_slots < 1 && new_slots >= 1)
-				for(var/mob/new_player/N in world)
-					N << "\blue A new alien player slot has opened."
-			else if(num_old_slots >= 1 && new_slots < 1)
-				for(var/mob/new_player/N in world)
-					N << "\red New alien players can no longer enter the game."
-
 		else
 			character.Robotize()
 		del(src)
@@ -492,22 +459,3 @@
 	proc/close_spawn_windows()
 		src << browse(null, "window=latechoices") //closes late choices window
 		src << browse(null, "window=playersetup") //closes the player setup window
-
-//limits the number of alien players in a game
-/proc/GetAvailableAlienPlayerSlots()
-	if(!config.limitalienplayers)
-		return 9999
-
-	var/num_players = 0
-
-	//check new players
-	for(var/mob/new_player/N in world)
-		if(N.preferences && N.ready)
-			num_players++
-
-	//check players already spawned, only count humans or aliens
-	for(var/mob/living/carbon/human/H in world)
-		if(H.ckey)
-			num_players++
-
-	return round(num_players * (config.alien_to_human_ratio / 100))

From 866a113494f37ac128f7b686fd8c8ea06b160958 Mon Sep 17 00:00:00 2001
From: cib <blub@blub-Latitude-D430.(none)>
Date: Thu, 15 Nov 2012 18:40:24 +0100
Subject: [PATCH 03/14] Fixes for issue #1872

---
 code/game/sound.dm        | 12 +++++++++++-
 code/modules/mob/emote.dm |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/code/game/sound.dm b/code/game/sound.dm
index 35d80594ac8..f943b9947e1 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -19,7 +19,7 @@
 
 	if (vary)
 		S.frequency = rand(32000, 55000)
-	for (var/mob/M in range(world.view+extrarange, source))       // Plays for people in range.
+	for (var/mob/M in range(world.view+extrarange, source))	   // Plays for people in range.
 		if(locate(/mob/, M))
 			var/mob/M2 = locate(/mob/, M)
 			if (M2.client)
@@ -48,6 +48,16 @@
 							S.pan = max(-100, min(100, dx/8.0 * 100))
 
 						M << S
+
+	for(var/obj/mecha/mech in range(world.view+extrarange, source))
+		var/mob/M = mech.occupant
+		if (M && M.client)
+			if(M.ear_deaf <= 0 || !M.ear_deaf)
+				if(isturf(source))
+					var/dx = source.x - M.x
+					S.pan = max(-100, min(100, dx/8.0 * 100))
+
+				M << S
 																		// Now plays for people in lockers!  -- Polymorph
 
 /mob/proc/playsound_local(var/atom/source, soundin, vol as num, vary, extrarange as num)
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 783f3404e85..9b4c459264b 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -31,13 +31,13 @@ mob/proc/custom_emote(var/m_type=1,var/message = null)
 			if (istype(M, /mob/new_player))
 				continue
 			if(findtext(message," snores.")) //Because we have so many sleeping people.
-				continue
+				break // can break here simply..
 			if(M.stat == 2 && M.client.ghost_sight && !(M in viewers(src,null)))
 				M.show_message(message)
 
 
 		if (m_type & 1)
-			for (var/mob/O in viewers(src, null))
+			for (var/mob/O in get_mobs_in_view(world.view,src))
 				if(istype(O,/mob/living/carbon/human))
 					for(var/mob/living/parasite/P in O:parasites)
 						P.show_message(message, m_type)

From b6f16cb62a2a7439fdc1e8dbc6524bedd367a777 Mon Sep 17 00:00:00 2001
From: cib <blub@blub-Latitude-D430.(none)>
Date: Thu, 15 Nov 2012 19:07:45 +0100
Subject: [PATCH 04/14] Fix for the emote fix.

---
 code/modules/mob/emote.dm                     | 4 ++--
 code/modules/mob/living/carbon/human/emote.dm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 9b4c459264b..4b6e4e17539 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -31,13 +31,13 @@ mob/proc/custom_emote(var/m_type=1,var/message = null)
 			if (istype(M, /mob/new_player))
 				continue
 			if(findtext(message," snores.")) //Because we have so many sleeping people.
-				break // can break here simply..
+				break
 			if(M.stat == 2 && M.client.ghost_sight && !(M in viewers(src,null)))
 				M.show_message(message)
 
 
 		if (m_type & 1)
-			for (var/mob/O in get_mobs_in_view(world.view,src))
+			for (var/mob/O in viewers(src, null))
 				if(istype(O,/mob/living/carbon/human))
 					for(var/mob/living/parasite/P in O:parasites)
 						P.show_message(message, m_type)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index f0407f0ec3f..6dff94c60c3 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -482,9 +482,9 @@
 
 
 		if (m_type & 1)
-			for (var/mob/O in viewers(src, null))
+			for (var/mob/O in get_mobs_in_view(world.view,src))
 				O.show_message(message, m_type)
 		else if (m_type & 2)
-			for (var/mob/O in hearers(src.loc, null))
+			for (var/mob/O in (hearers(src.loc, null) | get_mobs_in_view(world.view,src)))
 				O.show_message(message, m_type)
 

From 7b7a200155a768fbe27059ed9d56ace70fddb7d8 Mon Sep 17 00:00:00 2001
From: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date: Fri, 16 Nov 2012 18:53:03 +1000
Subject: [PATCH 05/14] added nullcheck to ZAS func, fix for severed powernets
 still being connected

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
---
 code/ZAS/FEA_system.dm      | 4 ++++
 code/modules/power/power.dm | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/code/ZAS/FEA_system.dm b/code/ZAS/FEA_system.dm
index 4434d9d2d40..11f48bfdb93 100644
--- a/code/ZAS/FEA_system.dm
+++ b/code/ZAS/FEA_system.dm
@@ -277,6 +277,10 @@ datum
 
 			proc/ConsiderRebuild(var/turf/simulated/T, var/turf/NT)
 
+				//zones should naturally spread to these tiles eventually
+				if(!T.zone || !NT.zone)
+					return
+
 				if(istype(NT, /turf/simulated) && NT.zone != T.zone)
 					T.zone.RemoveTurf(NT)
 					if(NT.zone)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 8fff49211e6..c5447698f18 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -119,6 +119,8 @@
 			if(!unmarked || !C.powernet)
 				if(C.d1 == fdir || C.d2 == fdir)
 					. += C
+				else if(C.d1 == turn(C.d2, 180))
+					. += C
 	return .
 
 

From 46bd2ce7e6b7ec27a0ded3222eff430135de8b18 Mon Sep 17 00:00:00 2001
From: Ater Ignis <aterdragon@gmail.com>
Date: Fri, 16 Nov 2012 15:19:20 +0400
Subject: [PATCH 06/14] human icon generation update, tajarnan darkseeing

*lying icon generated from standing one
*sprites for dismembering major races (tajarnan,skrell,soghun)
*tajarnans can see in darkness better than others
---
 code/datums/datacore.dm                       |  34 +--
 code/defines/procs/icon_procs.dm              |  10 +
 code/game/dna.dm                              |  20 +-
 code/modules/mob/living/carbon/human/human.dm |  23 ++-
 code/modules/mob/living/carbon/human/life.dm  |   6 +-
 .../mob/living/carbon/human/update_icons.dm   | 194 ++++++++++--------
 icons/mob/human_races/r_human.dmi             | Bin 0 -> 8316 bytes
 icons/mob/human_races/r_lizard.dmi            | Bin 0 -> 5698 bytes
 icons/mob/human_races/r_skeleton.dmi          | Bin 0 -> 2221 bytes
 icons/mob/human_races/r_skrell.dmi            | Bin 0 -> 1873 bytes
 icons/mob/human_races/r_tajaran.dmi           | Bin 0 -> 9309 bytes
 11 files changed, 177 insertions(+), 110 deletions(-)
 create mode 100644 icons/mob/human_races/r_human.dmi
 create mode 100644 icons/mob/human_races/r_lizard.dmi
 create mode 100644 icons/mob/human_races/r_skeleton.dmi
 create mode 100644 icons/mob/human_races/r_skrell.dmi
 create mode 100644 icons/mob/human_races/r_tajaran.dmi

diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 7358096104d..2522523e4d7 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -111,29 +111,31 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	var/g = "m"
 	if (H.gender == FEMALE)
 		g = "f"
+
+	var/icon/icobase
 	switch(H.get_species())
 		if("Tajaran")
-			preview_icon = new /icon('icons/effects/species.dmi', "tajaran_[g]_s")
-			preview_icon.Blend(new /icon('icons/effects/species.dmi', "tajtail_s"), ICON_OVERLAY)
+			icobase = 'icons/mob/human_races/r_tajaran.dmi'
 		if( "Soghun")
-			preview_icon = new /icon('icons/effects/species.dmi', "lizard_[g]_s")
-			preview_icon.Blend(new /icon('icons/effects/species.dmi', "sogtail_s"), ICON_OVERLAY)
+			icobase = 'icons/mob/human_races/r_lizard.dmi'
 		if("Skrell")
-			preview_icon = new /icon('icons/effects/species.dmi', "skrell_[g]_s")
+			icobase = 'icons/mob/human_races/r_skrell.dmi'
 		else
-			preview_icon = new /icon('human.dmi', "torso_[g]_s")
-			preview_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY)
-			preview_icon.Blend(new /icon('human.dmi', "groin_[g]_s"), ICON_OVERLAY)
-			preview_icon.Blend(new /icon('human.dmi', "head_[g]_s"), ICON_OVERLAY)
+			icobase = 'icons/mob/human_races/r_human.dmi'
 
-			for(var/datum/organ/external/E in H.organs)
-				if(E.status & ORGAN_CUT_AWAY) continue
+	preview_icon = new /icon(icobase, "torso_[g]")
+	var/icon/temp
+	temp = new /icon(icobase, "groin_[g]")
+	preview_icon.Blend(temp, ICON_OVERLAY)
+	temp = new /icon(icobase, "head_[g]")
+	preview_icon.Blend(temp, ICON_OVERLAY)
 
-				var/icon/temp = new /icon('human.dmi', "[E.name]_s")
-				if(E.status & ORGAN_ROBOT)
-					temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
-
-				preview_icon.Blend(temp, ICON_OVERLAY)
+	for(var/datum/organ/external/E in H.organs)
+		if(E.status & ORGAN_CUT_AWAY || E.status & ORGAN_DESTROYED) continue
+		temp = new /icon(icobase, "[E.name]")
+		if(E.status & ORGAN_ROBOT)
+			temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
+		preview_icon.Blend(temp, ICON_OVERLAY)
 
 	// Skin tone
 	if(H.get_species() == "Human")
diff --git a/code/defines/procs/icon_procs.dm b/code/defines/procs/icon_procs.dm
index c8d731bcde1..ce56408ead4 100644
--- a/code/defines/procs/icon_procs.dm
+++ b/code/defines/procs/icon_procs.dm
@@ -7,6 +7,16 @@
 #define TO_HEX_DIGIT(n) ascii2text((n&15) + ((n&15)<10 ? 48 : 87))
 
 icon
+	proc/MakeLying()
+		var/icon/I = new(src,dir=SOUTH)
+		I.BecomeLying()
+		return I
+
+	proc/BecomeLying()
+		Turn(90)
+		Shift(SOUTH,6)
+		Shift(EAST,1)
+
 	// Multiply all alpha values by this float
 	proc/ChangeOpacity(opacity = 1.0)
 		MapColors(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,opacity, 0,0,0,0)
diff --git a/code/game/dna.dm b/code/game/dna.dm
index d4628e6f9a7..80a250620f0 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -399,9 +399,17 @@
 	var/old_mutations = M.mutations
 	M.mutations = list()
 
-	M.see_in_dark = 2
-	M.see_invisible = 0
+//	M.see_in_dark = 2
+//	M.see_invisible = 0
 
+	if(PLANT in old_mutations)
+		M.mutations.Add(PLANT)
+	if(SKELETON in old_mutations)
+		M.mutations.Add(SKELETON)
+	if(FAT in old_mutations)
+		M.mutations.Add(FAT)
+	if(HUSK in old_mutations)
+		M.mutations.Add(HUSK)
 
 	if(ismuton(NOBREATHBLOCK,M))
 		if(probinj(45,inj) || (mNobreath in old_mutations))
@@ -478,9 +486,9 @@
 	if (isblockon(getblock(M.dna.struc_enzymes, XRAYBLOCK,3),XRAYBLOCK))
 		if(probinj(30,inj) || (XRAY in old_mutations))
 			M << "\blue The walls suddenly disappear."
-			M.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
-			M.see_in_dark = 8
-			M.see_invisible = 2
+//			M.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
+//			M.see_in_dark = 8
+//			M.see_invisible = 2
 			M.mutations.Add(XRAY)
 	if (isblockon(getblock(M.dna.struc_enzymes, NERVOUSBLOCK,3),NERVOUSBLOCK))
 		M.disabilities |= NERVOUS
@@ -1648,4 +1656,4 @@
 		src.add_fingerprint(usr)
 		src.updateUsrDialog()
 	return
-/////////////////////////// DNA MACHINES
\ No newline at end of file
+/////////////////////////// DNA MACHINES
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index a8f55c066f8..d164c4fb9d9 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -821,6 +821,12 @@
 /mob/living/carbon/human/proc/morph()
 	set name = "Morph"
 	set category = "Superpower"
+	
+	if(stat!=CONSCIOUS)
+		reset_view(0)
+		remoteview_target = null
+		return
+
 	if(!(mMorph in mutations))
 		src.verbs -= /mob/living/carbon/human/proc/morph
 		return
@@ -894,6 +900,12 @@
 /mob/living/carbon/human/proc/remotesay()
 	set name = "Project mind"
 	set category = "Superpower"
+
+	if(stat!=CONSCIOUS)
+		reset_view(0)
+		remoteview_target = null
+		return
+
 	if(!(mRemotetalk in src.mutations))
 		src.verbs -= /mob/living/carbon/human/proc/remotesay
 		return
@@ -917,12 +929,19 @@
 	set name = "Remote View"
 	set category = "Superpower"
 
+	if(stat!=CONSCIOUS)
+		remoteview_target = null
+		reset_view(0)
+		return
+
 	if(!(mRemote in src.mutations))
+		remoteview_target = null
 		reset_view(0)
 		src.verbs -= /mob/living/carbon/human/proc/remoteobserve
 		return
 
 	if(client.eye != client.mob)
+		remoteview_target = null
 		reset_view(0)
 		return
 
@@ -930,15 +949,17 @@
 
 	for(var/mob/living/carbon/h in world)
 		var/turf/temp_turf = get_turf(h)
-		if(temp_turf.z != 1 && temp_turf.z != 5) //Not on mining or the station.
+		if((temp_turf.z != 1 && temp_turf.z != 5) || h.stat==DEAD) //Not on mining or the station. Or dead
 			continue
 		creatures += h
 
 	var/mob/target = input ("Who do you want to project your mind to ?") as mob in creatures
 
 	if (target)
+		remoteview_target = target
 		reset_view(target)
 	else
+		remoteview_target = null
 		reset_view(0)
 
 /mob/living/carbon/human/proc/get_visible_gender()
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 92522f701be..6908d550ae4 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1295,9 +1295,13 @@
 			sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
 			if(dna)
 				switch(dna.mutantrace)
-					if("lizard","metroid")
+					if("metroid")
 						see_in_dark = 3
 						see_invisible = SEE_INVISIBLE_LEVEL_ONE
+					if("lizard")
+						see_in_dark = 3
+					if("tajaran")
+						see_in_dark = 5
 					else
 						see_in_dark = 2
 
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 13c2a87ac08..5de8d28fd18 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -218,107 +218,127 @@ proc/get_damage_icon_part(damage_state, body_part)
 /mob/living/carbon/human/proc/update_body(var/update_icons=1)
 	if(stand_icon)	del(stand_icon)
 	if(lying_icon)	del(lying_icon)
-	if(dna && dna.mutantrace)	return
+
+	var/husk_color_mod = rgb(96,88,80)
+	var/hulk_color_mod = rgb(24,72,24)
+	var/plant_color_mod = rgb(144,224,144)
 
 	var/husk = (HUSK in src.mutations)  //100% unnecessary -Agouri	//nope, do you really want to iterate through src.mutations repeatedly? -Pete
 	var/fat = (FAT in src.mutations)
+	var/hulk = (HULK in src.mutations)
 	var/skeleton = (SKELETON in src.mutations)
+	var/plant = (PLANT in src.mutations)
 
 	var/g = "m"
 	if(gender == FEMALE)	g = "f"
 
-	// whether to draw the individual limbs
-	var/individual_limbs = 0
-
-	//Base mob icon
-	if(husk)
-		stand_icon = new /icon('icons/mob/human.dmi', "husk_s")
-		lying_icon = new /icon('icons/mob/human.dmi', "husk_l")
-	else if(fat)
-		stand_icon = new /icon('icons/mob/human.dmi', "fatbody_s")
-		lying_icon = new /icon('icons/mob/human.dmi', "fatbody_l")
-	else if(skeleton)
-		stand_icon = new /icon('icons/mob/human.dmi', "skeleton_s")
-		lying_icon = new /icon('icons/mob/human.dmi', "skeleton_l")
+	var/icon/icobase
+	if(skeleton)
+		icobase = 'icons/mob/human_races/r_skeleton.dmi'
+	else if(dna)
+		switch(dna.mutantrace)
+			if("tajaran")
+				icobase = 'icons/mob/human_races/r_tajaran.dmi'
+			if("lizard")
+				icobase = 'icons/mob/human_races/r_lizard.dmi'
+			if("skrell")
+				icobase = 'icons/mob/human_races/r_skrell.dmi'
+			else
+				icobase = 'icons/mob/human_races/r_human.dmi'
 	else
-		stand_icon = new /icon('icons/mob/human.dmi', "torso_[g]_s")
-		lying_icon = new /icon('icons/mob/human.dmi', "torso_[g]_l")
-		individual_limbs = 1
+		icobase = 'icons/mob/human_races/r_human.dmi'
 
-	// Draw each individual limb
-	if(individual_limbs)
-		stand_icon.Blend(new /icon('icons/mob/human.dmi', "chest_[g]_s"), ICON_OVERLAY)
-		lying_icon.Blend(new /icon('icons/mob/human.dmi', "chest_[g]_l"), ICON_OVERLAY)
+	if(!skeleton)
+		stand_icon = new /icon(icobase, "torso_[g][fat?"_fat":""]")
+		if(husk)
+			stand_icon.ColorTone(husk_color_mod)
+		else if(hulk)
+			stand_icon.ColorTone(hulk_color_mod)
+		else if(plant)
+			stand_icon.ColorTone(plant_color_mod)
+	else
+		stand_icon = new /icon(icobase, "torso")
 
-		var/datum/organ/external/head = get_organ("head")
-		if(head && !(head.status & ORGAN_DESTROYED))
-			stand_icon.Blend(new /icon('icons/mob/human.dmi', "head_[g]_s"), ICON_OVERLAY)
-			lying_icon.Blend(new /icon('icons/mob/human.dmi', "head_[g]_l"), ICON_OVERLAY)
+	var/datum/organ/external/head = get_organ("head")
+	var/has_head = 0
+	if(head && !(head.status & ORGAN_DESTROYED))
+		has_head = 1
 
-		for(var/datum/organ/external/part in organs)
-			if(!istype(part, /datum/organ/external/groin) \
-				&& !istype(part, /datum/organ/external/chest) \
-				&& !istype(part, /datum/organ/external/head) \
-				&& !(part.status & ORGAN_DESTROYED))
-				var/icon/temp = new /icon('human.dmi', "[part.icon_name]_s")
-				if(part.status & ORGAN_ROBOT) temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
+	for(var/datum/organ/external/part in organs)
+		if(!istype(part, /datum/organ/external/chest) && !(part.status & ORGAN_DESTROYED))
+			var/icon/temp
+			if(istype(part, /datum/organ/external/groin))
+				if(skeleton)
+					temp = new /icon(icobase, "groin")
+				else
+					temp = new /icon(icobase, "groin_[g]")
+			else if(istype(part, /datum/organ/external/head))
+				if(skeleton)
+					temp = new /icon(icobase, "head")
+				else
+					temp = new /icon(icobase, "head_[g]")
+			else
+				temp = new /icon(icobase, "[part.icon_name]")
+			if(part.status & ORGAN_ROBOT)
+				temp.GrayScale()
+			else if(!skeleton)
+				if(husk)
+					temp.ColorTone(husk_color_mod)
+				else if(hulk)
+					temp.ColorTone(hulk_color_mod)
+				else if(plant)
+					temp.ColorTone(plant_color_mod)
+
+			if(part.icon_position&(LEFT|RIGHT))
+				var/icon/temp2 = new('icons/mob/human.dmi',"blank")
+				temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH)
+				temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH)
+				if(!(part.icon_position & LEFT))
+					temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
+				if(!(part.icon_position & RIGHT))
+					temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
+				stand_icon.Blend(temp2, ICON_OVERLAY)
+				temp2 = new('icons/mob/human.dmi',"blank")
+				if(part.icon_position & LEFT)
+					temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
+				if(part.icon_position & RIGHT)
+					temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
+				stand_icon.Blend(temp2, ICON_UNDERLAY)
+			else
 				stand_icon.Blend(temp, ICON_OVERLAY)
-				temp = new /icon('human.dmi', "[part.icon_name]_l")
-				if(part.status & ORGAN_ROBOT) temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
-				lying_icon.Blend(temp , ICON_OVERLAY)
-
-		stand_icon.Blend(new /icon('human.dmi', "groin_[g]_s"), ICON_OVERLAY)
-		lying_icon.Blend(new /icon('human.dmi', "groin_[g]_l"), ICON_OVERLAY)
-
-	if (husk)
-		var/icon/husk_s = new /icon('human.dmi', "husk_s")
-		var/icon/husk_l = new /icon('human.dmi', "husk_l")
-
-		for(var/datum/organ/external/part in organs)
-			if(!istype(part, /datum/organ/external/groin) \
-				&& !istype(part, /datum/organ/external/chest) \
-				&& !istype(part, /datum/organ/external/head) \
-				&& (part.status & ORGAN_DESTROYED))
-				husk_s.Blend(new /icon('dam_mask.dmi', "[part.icon_name]"), ICON_SUBTRACT)
-				husk_l.Blend(new /icon('dam_mask.dmi', "[part.icon_name]2"), ICON_SUBTRACT)
-
-		stand_icon.Blend(husk_s, ICON_OVERLAY)
-		lying_icon.Blend(husk_l, ICON_OVERLAY)
 
 	//Skin tone
-	if(!skeleton)
+	if(!skeleton && !husk && !hulk && !plant)
 		if(s_tone >= 0)
 			stand_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
-			lying_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
 		else
 			stand_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
-			lying_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
 
-	//Eyes
-	if(!skeleton)
-		var/icon/eyes_s = new/icon('icons/mob/human_face.dmi', "eyes_s")
-		var/icon/eyes_l = new/icon('icons/mob/human_face.dmi', "eyes_l")
-		eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-		eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-		stand_icon.Blend(eyes_s, ICON_OVERLAY)
-		lying_icon.Blend(eyes_l, ICON_OVERLAY)
-	// Note: These used to be in update_face(), and the fact they're here will make it difficult to create a disembodied head
-	var/icon/eyes_s = new/icon('icons/mob/human_face.dmi', "eyes_s")
-	var/icon/eyes_l = new/icon('icons/mob/human_face.dmi', "eyes_l")
-	eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-	eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-	stand_icon.Blend(eyes_s, ICON_OVERLAY)
-	lying_icon.Blend(eyes_l, ICON_OVERLAY)
+	if(husk)
+		var/icon/mask = new(stand_icon)
+		var/icon/husk_over = new(icobase,"overlay_husk")
+		mask.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,0)
+		husk_over.Blend(mask, ICON_ADD)
+		stand_icon.Blend(husk_over, ICON_OVERLAY)
+
+	if(has_head)
+		//Eyes
+		if(!skeleton)
+			var/icon/eyes_s = new/icon('icons/mob/human_face.dmi', "eyes_s")
+			eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+			stand_icon.Blend(eyes_s, ICON_OVERLAY)
 
 	//Mouth	(lipstick!)
 	if(lip_style)	//skeletons are allowed to wear lipstick no matter what you think, agouri.
 		stand_icon.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_s"), ICON_OVERLAY)
-		lying_icon.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_l"), ICON_OVERLAY)
 
 	//Underwear
 	if(underwear >0 && underwear < 12)
 		if(!fat && !skeleton)
 			stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
+
+	lying_icon = stand_icon.MakeLying()
+
 	if(update_icons)
 		update_icons()
 
@@ -417,27 +437,29 @@ proc/get_damage_icon_part(damage_state, body_part)
 	var/fat
 	if( FAT in mutations )
 		fat = "fat"
-	var/g = "m"
-	if (gender == FEMALE)	g = "f"
+//	var/g = "m"
+//	if (gender == FEMALE)	g = "f"
 //BS12 EDIT
 	if(dna)
 		switch(dna.mutantrace)
 			if("golem","metroid")
-				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_l")
-				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_s")
-			if("lizard", "tajaran", "skrell")
-				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[g]_l")
-				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[g]_s")
-			if("plant")
-				if(stat == DEAD)	//TODO
-					overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_d")
-				else
-					overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_l")
-					overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s")
+				var/icon/I = new('icons/effects/genetics.dmi',"[dna.mutantrace][fat]_s")
+				overlays_standing[MUTANTRACE_LAYER]	= image(I)
+				overlays_lying[MUTANTRACE_LAYER]	= image(I.MakeLying())
+//			if("lizard", "tajaran", "skrell")
+//				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[g]_l")
+//				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[g]_s")
+//			if("plant")
+//				if(stat == DEAD)	//TODO
+//					overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_d")
+//				else
+//					overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_l")
+//					overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s")
 			else
 				overlays_lying[MUTANTRACE_LAYER]	= null
 				overlays_standing[MUTANTRACE_LAYER]	= null
-	update_body(0)
+	if(!dna || !(dna.mutantrace in list("golem","metroid")))
+		update_body(0)
 	update_hair(0)
 	if(update_icons)   update_icons()
 
diff --git a/icons/mob/human_races/r_human.dmi b/icons/mob/human_races/r_human.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..3fec1061f6478eacfe9f7fbc006b74f38acc4d4a
GIT binary patch
literal 8316
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

literal 0
HcmV?d00001

diff --git a/icons/mob/human_races/r_lizard.dmi b/icons/mob/human_races/r_lizard.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..70d29e573eb76229f2d7e739005e086b2cbea5d6
GIT binary patch
literal 5698
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
N40Nt(zrSQ3^FJxv#Q6XK

literal 0
HcmV?d00001

diff --git a/icons/mob/human_races/r_skeleton.dmi b/icons/mob/human_races/r_skeleton.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..cbf854161d9918c83fe3689728227c9d1ab417cd
GIT binary patch
literal 2221
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

literal 0
HcmV?d00001

diff --git a/icons/mob/human_races/r_skrell.dmi b/icons/mob/human_races/r_skrell.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..daf33ee223e48d80e0e53cc9d06ba8ca6e8b2016
GIT binary patch
literal 1873
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

literal 0
HcmV?d00001

diff --git a/icons/mob/human_races/r_tajaran.dmi b/icons/mob/human_races/r_tajaran.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..def8ba83d27f225f199cb83902fa82c0289713b2
GIT binary patch
literal 9309
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

literal 0
HcmV?d00001


From c140e3b7d018cd3c2bdb6ae58be3e122064de9da Mon Sep 17 00:00:00 2001
From: Ater Ignis <aterdragon@gmail.com>
Date: Fri, 16 Nov 2012 15:55:41 +0400
Subject: [PATCH 07/14] update to remote view

---
 code/modules/mob/living/carbon/human/human.dm | 2 +-
 code/modules/mob/living/carbon/human/life.dm  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index d164c4fb9d9..dadf5a4a8c5 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -949,7 +949,7 @@
 
 	for(var/mob/living/carbon/h in world)
 		var/turf/temp_turf = get_turf(h)
-		if((temp_turf.z != 1 && temp_turf.z != 5) || h.stat==DEAD) //Not on mining or the station. Or dead
+		if((temp_turf.z != 1 && temp_turf.z != 5) || h.stat!=CONSCIOUS) //Not on mining or the station. Or dead
 			continue
 		creatures += h
 
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 6908d550ae4..851ab7e435a 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1474,7 +1474,7 @@
 			if(machine)
 				if(!machine.check_eye(src))		reset_view(null)
 			else
-				if(!(mRemote in mutations) && !client.adminobs)
+				if(!(remoteview_target && mRemote in mutations && remoteview_target.stat==CONSCIOUS) && !client.adminobs)
 					reset_view(null)
 		return 1
 

From cc79346c3b70881d655a80224c14d4deda51c0bf Mon Sep 17 00:00:00 2001
From: Ater Ignis <aterdragon@gmail.com>
Date: Fri, 16 Nov 2012 16:02:36 +0400
Subject: [PATCH 08/14] forgot one row

---
 baystation12.dme                             | 2 +-
 code/modules/mob/living/carbon/human/life.dm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/baystation12.dme b/baystation12.dme
index 1c5182a856f..5ab7609868a 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -237,6 +237,7 @@
 #define FILE_DIR "icons/mecha"
 #define FILE_DIR "icons/misc"
 #define FILE_DIR "icons/mob"
+#define FILE_DIR "icons/mob/human_races"
 #define FILE_DIR "icons/obj"
 #define FILE_DIR "icons/obj/assemblies"
 #define FILE_DIR "icons/obj/atmospherics"
@@ -252,7 +253,6 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "maps/RandomZLevels"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 851ab7e435a..599b262c2bc 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1475,6 +1475,7 @@
 				if(!machine.check_eye(src))		reset_view(null)
 			else
 				if(!(remoteview_target && mRemote in mutations && remoteview_target.stat==CONSCIOUS) && !client.adminobs)
+					remoteview_target = null
 					reset_view(null)
 		return 1
 

From 7f55f25ead2483461de1a7c6a1b235d537565f68 Mon Sep 17 00:00:00 2001
From: Ater Ignis <aterdragon@gmail.com>
Date: Fri, 16 Nov 2012 17:06:47 +0400
Subject: [PATCH 09/14] comments, and better hulk color

---
 code/modules/mob/living/carbon/human/update_icons.dm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 5de8d28fd18..b81fe7ecbbc 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -220,7 +220,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 	if(lying_icon)	del(lying_icon)
 
 	var/husk_color_mod = rgb(96,88,80)
-	var/hulk_color_mod = rgb(24,72,24)
+	var/hulk_color_mod = rgb(48,224,40)
 	var/plant_color_mod = rgb(144,224,144)
 
 	var/husk = (HUSK in src.mutations)  //100% unnecessary -Agouri	//nope, do you really want to iterate through src.mutations repeatedly? -Pete
@@ -253,7 +253,9 @@ proc/get_damage_icon_part(damage_state, body_part)
 		if(husk)
 			stand_icon.ColorTone(husk_color_mod)
 		else if(hulk)
-			stand_icon.ColorTone(hulk_color_mod)
+//			stand_icon.ColorTone(hulk_color_mod)
+			var/list/TONE = ReadRGB(hulk_color_mod)
+			stand_icon.MapColors(rgb(TONE[1],0,0),rgb(0,TONE[2],0),rgb(0,0,TONE[3]))
 		else if(plant)
 			stand_icon.ColorTone(plant_color_mod)
 	else
@@ -285,10 +287,14 @@ proc/get_damage_icon_part(damage_state, body_part)
 				if(husk)
 					temp.ColorTone(husk_color_mod)
 				else if(hulk)
-					temp.ColorTone(hulk_color_mod)
+//					temp.ColorTone(hulk_color_mod)
+					var/list/TONE = ReadRGB(hulk_color_mod)
+					temp.MapColors(rgb(TONE[1],0,0),rgb(0,TONE[2],0),rgb(0,0,TONE[3]))
 				else if(plant)
 					temp.ColorTone(plant_color_mod)
 
+			//That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST
+			//And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part)
 			if(part.icon_position&(LEFT|RIGHT))
 				var/icon/temp2 = new('icons/mob/human.dmi',"blank")
 				temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH)

From 3d88251a3faddf095118f7fd42152bfb41ed3e38 Mon Sep 17 00:00:00 2001
From: Ater Ignis <aterdragon@gmail.com>
Date: Fri, 16 Nov 2012 17:12:17 +0400
Subject: [PATCH 10/14] limbs patch

*don't drop limbs if already did that
*subraces icons for limbs
*left and right legs
---
 code/datums/organs/organ_external.dm | 39 +++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm
index 4e44edf173d..3478c0e6e1a 100644
--- a/code/datums/organs/organ_external.dm
+++ b/code/datums/organs/organ_external.dm
@@ -5,7 +5,9 @@
 	name = "external"
 	var/icon_name = null
 	var/body_part = null
+	var/icon_position = 0
 
+	var/dropped = 0
 	var/damage_state = "00"
 	var/brute_dam = 0
 	var/burn_dam = 0
@@ -63,8 +65,7 @@
 			var/nux = brute * rand(10,15)
 			if(config.limbs_can_break && brute_dam >= max_damage * config.organ_health_multiplier)
 				if(prob(5 * brute))
-					status |= ORGAN_DESTROYED
-					droplimb()
+					droplimb(1)
 					return
 
 			else if(prob(nux))
@@ -75,8 +76,7 @@
 		else if(brute > 20)
 			if(config.limbs_can_break && brute_dam >= max_damage * config.organ_health_multiplier)
 				if(prob(5 * brute))
-					status |= ORGAN_DESTROYED
-					droplimb()
+					droplimb(1)
 					return
 
 		// If the limbs can break, make sure we don't exceed the maximum damage a limb can take before breaking
@@ -319,10 +319,18 @@
 			return 1
 		return 0
 
+	proc/setAmputatedTree()
+		for(var/datum/organ/external/O in owner.organs)
+			if(O.parent == src)
+				O.amputated=amputated
+
 	proc/droplimb(var/override = 0,var/no_explode = 0)
+		if(dropped) return
 		if(override)
 			status |= ORGAN_DESTROYED
 		if(status & ORGAN_DESTROYED)
+			dropped = 1
+
 			if(status & ORGAN_SPLINTED)
 				status &= ~ORGAN_SPLINTED
 			if(implant)
@@ -337,8 +345,8 @@
 
 			var/obj/item/weapon/organ/H
 			switch(body_part)
-	//			if(UPPER_TORSO)				just no.
-	//				owner.gib()
+//				if(UPPER_TORSO)
+//					owner.gib()
 				if(LOWER_TORSO)
 					owner << "\red You are now sterile."
 				if(HEAD)
@@ -398,6 +406,19 @@
 					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
+
 			var/lol = pick(cardinal)
 			step(H,lol)
 			destspawn = 1
@@ -573,6 +594,7 @@
 	max_damage = 75
 	min_broken_damage = 30
 	body_part = LEG_LEFT
+	icon_position = LEFT
 
 /datum/organ/external/r_arm
 	name = "r_arm"
@@ -589,6 +611,7 @@
 	max_damage = 75
 	min_broken_damage = 30
 	body_part = LEG_RIGHT
+	icon_position = RIGHT
 
 /datum/organ/external/l_foot
 	name = "l_foot"
@@ -597,6 +620,7 @@
 	max_damage = 40
 	min_broken_damage = 15
 	body_part = FOOT_LEFT
+	icon_position = LEFT
 
 /datum/organ/external/r_foot
 	name = "r_foot"
@@ -605,6 +629,7 @@
 	max_damage = 40
 	min_broken_damage = 15
 	body_part = FOOT_RIGHT
+	icon_position = RIGHT
 
 /datum/organ/external/r_hand
 	name = "r_hand"
@@ -627,7 +652,7 @@
 ****************************************************/
 
 obj/item/weapon/organ
-	icon = 'human.dmi'
+	icon = 'icons/mob/human.dmi'
 
 obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
 	..(loc)

From 4ed9b40cb9a713b630d797b0c173acd24ba92d2d Mon Sep 17 00:00:00 2001
From: Ater Ignis <aterdragon@gmail.com>
Date: Fri, 16 Nov 2012 18:41:26 +0400
Subject: [PATCH 11/14] tajarans see_in_dark -> 8, disembodied organs rendering
 correction

---
 code/datums/organs/organ_external.dm         |  56 ++++++++++---------
 code/modules/mob/living/carbon/human/life.dm |  14 +++--
 icons/mob/human_races/r_human.dmi            | Bin 8316 -> 8306 bytes
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm
index 3478c0e6e1a..3073edccdbf 100644
--- a/code/datums/organs/organ_external.dm
+++ b/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"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 599b262c2bc..45cca8c29f2 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/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
diff --git a/icons/mob/human_races/r_human.dmi b/icons/mob/human_races/r_human.dmi
index 3fec1061f6478eacfe9f7fbc006b74f38acc4d4a..16324b2bee52a7c41a9f399f7e97890d3c575afa 100644
GIT binary patch
delta 7346
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
U&&iwJ0QAzmX`oen-SNf$0UtP_+5i9m

delta 7382
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
V;kr{YLICu7cu!ZO;;voD{{b|zt1<up


From 8c5b8f8d50b7669327cf17dae2718d63495c95f6 Mon Sep 17 00:00:00 2001
From: Ater Ignis <aterdragon@gmail.com>
Date: Fri, 16 Nov 2012 18:54:43 +0400
Subject: [PATCH 12/14] final pass of merging with my branch

I hope I have not forgot anything
Still, it compiled for me at least, and passes test cases i did
---
 code/game/machinery/hydroponics.dm                    | 5 +++--
 code/modules/mob/living/carbon/human/human_defines.dm | 4 +++-
 code/modules/projectiles/projectile/special.dm        | 6 ++++--
 code/modules/reagents/Chemistry-Reagents.dm           | 3 ++-
 code/setup.dm                                         | 4 ++++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm
index 16fd85b8dc6..b611b974a30 100644
--- a/code/game/machinery/hydroponics.dm
+++ b/code/game/machinery/hydroponics.dm
@@ -941,8 +941,9 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 		if(se)
 			podman.dna.struc_enzymes = se
 		if(!prob(potency)) //if it fails, plantman!
-			if(podman.dna)
-				podman.dna.mutantrace = "plant"
+			if(podman)
+//				podman.dna.mutantrace = "plant"
+				podman.mutations.Add(PLANT)
 		podman.update_mutantrace()
 
 	else //else, one packet of seeds. maybe two
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 1cf5788612d..cf91b4b43a8 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -55,4 +55,6 @@
 
 	var/failed_last_breath = 0 //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks.
 
-	var/xylophone = 0 //For the spoooooooky xylophone cooldown
\ No newline at end of file
+	var/xylophone = 0 //For the spoooooooky xylophone cooldown
+
+	var/mob/remoteview_target = null
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 7225b022cf0..99be701f987 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -79,7 +79,8 @@
 
 	on_hit(var/atom/target, var/blocked = 0)
 		var/mob/living/M = target
-		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays.
+//		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays.
+		if(ishuman(target) && (PLANT in M.mutations)) //Plantmen possibly get mutated and damaged by the rays.
 			if(prob(15))
 				M.apply_effect((rand(30,80)),IRRADIATE)
 				M.Weaken(5)
@@ -116,7 +117,8 @@
 
 	on_hit(var/atom/target, var/blocked = 0)
 		var/mob/M = target
-		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //These rays make plantmen fat.
+//		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //These rays make plantmen fat.
+		if(ishuman(target) && (PLANT in M.mutations)) //These rays make plantmen fat.
 			if(M.nutrition < 500) //sanity check
 				M.nutrition += 30
 		else if (istype(target, /mob/living/carbon/))
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 5d140703ac2..355ee6a84d9 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -1146,7 +1146,8 @@ datum
 					if(ishuman(M))
 						var/mob/living/carbon/human/H = M
 						if(H.dna)
-							if(H.dna.mutantrace == "plant") //plantmen take a LOT of damage
+//							if(H.dna.mutantrace == "plant") //plantmen take a LOT of damage
+							if(PLANT in H.mutations) //plantmen take a LOT of damage
 								H.adjustToxLoss(10)
 
 		plasma
diff --git a/code/setup.dm b/code/setup.dm
index 731245a5402..3837273bd45 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -351,6 +351,7 @@ var/MAX_EXPLOSION_RANGE = 14
 
 	//2spooky
 #define SKELETON 29
+#define PLANT 30
 
 // Other Mutations:
 #define mNobreath		100 	// no need to breathe
@@ -595,3 +596,6 @@ var/list/TAGGERLOCATIONS = list("Disposals",
 #define HOSTILE_STANCE_ATTACK 3
 #define HOSTILE_STANCE_ATTACKING 4
 #define HOSTILE_STANCE_TIRED 5
+
+#define LEFT 1
+#define RIGHT 2

From a96e4c360051c1f0d0dc793d4c1b19c477c7d29c Mon Sep 17 00:00:00 2001
From: Ater Ignis <aterdragon@gmail.com>
Date: Fri, 16 Nov 2012 19:00:45 +0400
Subject: [PATCH 13/14] if amputated full arm or leg, make hand or foot
 amputated too

---
 code/WorkInProgress/surgery.dm       | 1 +
 code/datums/organs/organ_external.dm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/code/WorkInProgress/surgery.dm b/code/WorkInProgress/surgery.dm
index 5d773037370..a008a058594 100644
--- a/code/WorkInProgress/surgery.dm
+++ b/code/WorkInProgress/surgery.dm
@@ -959,6 +959,7 @@ proc/spread_germs_to_organ(datum/organ/external/E, mob/living/carbon/human/user)
 		"\blue You have finished adjusting the area around [target]'s [affected.display_name] with \the [tool].")
 		affected.status |= ORGAN_ATTACHABLE
 		affected.amputated = 1
+		affected.setAmputatedTree()
 		affected.open = 0
 
 	fail_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm
index 3073edccdbf..7494acc189b 100644
--- a/code/datums/organs/organ_external.dm
+++ b/code/datums/organs/organ_external.dm
@@ -322,6 +322,7 @@
 		for(var/datum/organ/external/O in owner.organs)
 			if(O.parent == src)
 				O.amputated=amputated
+				O.setAmputatedTree()
 
 	proc/droplimb(var/override = 0,var/no_explode = 0)
 		if(destspawn) return

From 137ed48938f189bcb25bf7e5c4b18db7b79e885f Mon Sep 17 00:00:00 2001
From: Ater Ignis <aterdragon@gmail.com>
Date: Fri, 16 Nov 2012 19:18:28 +0400
Subject: [PATCH 14/14] clean out

---
 code/datums/organs/organ_external.dm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm
index 7494acc189b..18aa9ee5b7b 100644
--- a/code/datums/organs/organ_external.dm
+++ b/code/datums/organs/organ_external.dm
@@ -319,10 +319,9 @@
 		return 0
 
 	proc/setAmputatedTree()
-		for(var/datum/organ/external/O in owner.organs)
-			if(O.parent == src)
-				O.amputated=amputated
-				O.setAmputatedTree()
+		for(var/datum/organ/external/O in children)
+			O.amputated=amputated
+			O.setAmputatedTree()
 
 	proc/droplimb(var/override = 0,var/no_explode = 0)
 		if(destspawn) return