From 89114787e378e91575d1d950dc2b9032a844c883 Mon Sep 17 00:00:00 2001
From: DJSnapshot <trevornaze@gmail.com>
Date: Wed, 5 Mar 2014 23:44:03 -0800
Subject: [PATCH] Non-whitelisted IPCS

Had to do a hacky fix. there was no real way around it.
Also, a couple balances with IPCs
And a totally silly death animation (Which has been commented out for now)
---
 code/game/jobs/whitelist.dm                   |  2 ++
 code/modules/mob/living/carbon/human/human.dm |  3 ++-
 code/modules/mob/living/carbon/human/life.dm  |  4 ++--
 code/modules/mob/living/carbon/species.dm     | 17 ++++++++++++-----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm
index 98efaf9273..2feb525441 100644
--- a/code/game/jobs/whitelist.dm
+++ b/code/game/jobs/whitelist.dm
@@ -36,6 +36,8 @@ var/list/whitelist = list()
 		return 1
 	if(species == "human" || species == "Human")
 		return 1
+	if(species == "machine" || species == "Machine")
+		return 1
 	if(check_rights(R_ADMIN, 0))
 		return 1
 	if(!alien_whitelist)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 7dc0594a8f..d665ac31d6 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -37,8 +37,9 @@
 	..()
 
 /mob/living/carbon/human/machine/New()
-	species = new /datum/species/machine(src)
 	h_style = "blue IPC screen"
+	set_species("Machine")
+	..()
 
 /mob/living/carbon/human/New()
 
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 6e5e65c297..7769752abd 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1072,7 +1072,7 @@
 				E = get_visible_implants(0)
 				if(!E.len)
 					embedded_flag = 0
-				
+
 
 			//Eyes
 			if(sdisabilities & BLIND)	//disabled-blind, doesn't get better on its own
@@ -1296,7 +1296,7 @@
 						if(2)	healths.icon_state = "health7"
 						else
 							//switch(health - halloss)
-							switch(100 - ((species && species.flags & NO_PAIN) ? 0 : traumatic_shock))
+							switch(100 - ((species && species.flags & NO_PAIN & !IS_SYNTHETIC) ? 0 : traumatic_shock))
 								if(100 to INFINITY)		healths.icon_state = "health0"
 								if(80 to 100)			healths.icon_state = "health1"
 								if(60 to 80)			healths.icon_state = "health2"
diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm
index b046cce9c9..384774f14f 100644
--- a/code/modules/mob/living/carbon/species.dm
+++ b/code/modules/mob/living/carbon/species.dm
@@ -53,6 +53,13 @@
 	return
 
 /datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
+	if(flags & IS_SYNTHETIC)
+		//H.make_jittery(200) //S-s-s-s-sytem f-f-ai-i-i-i-i-lure-ure-ure-ure
+		H.h_style = ""
+		spawn(100)
+			//H.is_jittery = 0
+			//H.jitteriness = 0
+			H.update_hair()
 	return
 
 /datum/species/human
@@ -219,8 +226,8 @@
 	punch_damage = 2
 
 	eyes = "blank_eyes"
-	brute_mod = 1.5
-	burn_mod = 1.5
+	brute_mod = 0.5
+	burn_mod = 1
 
 	warning_low_pressure = 50
 	hazard_low_pressure = 10
@@ -233,7 +240,7 @@
 	heat_level_2 = 3000
 	heat_level_3 = 4000
 
-	flags = NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC
+	flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC
 
-	blood_color = "#FFFFFF"
-	flesh_color = "#AAAAAA"
\ No newline at end of file
+	blood_color = "#1F181F"
+	flesh_color = "#575757"