From f1fd06810480a9ff12cb7d560bec3d69e4c5c80d Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Wed, 30 Oct 2013 10:32:33 -0400
Subject: [PATCH] Making human a standardized species

---
 code/modules/mob/living/carbon/human/human.dm | 8 ++++++--
 code/modules/mob/living/carbon/species.dm     | 6 +++---
 code/modules/mob/new_player/new_player.dm     | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 74a8ee3f3c5..ef869d917e8 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -54,10 +54,14 @@
 	species = new /datum/species/skellington(src)
 	..()
 
+/mob/living/carbon/human/human/New()
+	species = new /datum/species/human(src)
+	..()
+
 /mob/living/carbon/human/New()
 
 	if(!species)
-		set_species()
+		set_species("Human")
 
 	if(species.language)
 		var/datum/language/L = all_languages[species.language]
@@ -1330,7 +1334,7 @@ mob/living/carbon/human/yank_out_object()
 		new_species = "Human"
 
 	if(species && (species.name && species.name == new_species))
-		return
+		return 1
 
 	species = all_species[new_species]
 
diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm
index f1c0d666209..cab30ace028 100644
--- a/code/modules/mob/living/carbon/species.dm
+++ b/code/modules/mob/living/carbon/species.dm
@@ -46,8 +46,10 @@
 
 /datum/species/human
 	name = "Human"
+	icobase = 'icons/mob/human_races/r_human.dmi'
+	deform = 'icons/mob/human_races/r_def_human.dmi'
 	primitive = /mob/living/carbon/monkey
-	path = /mob/living/carbon/human
+	path = /mob/living/carbon/human/human
 	flags = HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR | CAN_BE_FAT
 
 /datum/species/unathi
@@ -187,6 +189,4 @@
 	max_hurt_damage = 3 // From 5 (for humans)
 	default_mutations=list(mRemotetalk) // TK is also another candidate, but TK is overpowered as fuck.
 
-	primitive = /mob/living/carbon/monkey // TODO
-
 	flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | CAN_BE_FAT
\ No newline at end of file
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 7c7bf9c3dfb..1b7f10db1ca 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -374,7 +374,7 @@
 					if("Grey")
 						new_character = new /mob/living/carbon/human/grey(loc)
 					if("Human")
-						new_character = new /mob/living/carbon/human(loc)
+						new_character = new /mob/living/carbon/human/human(loc)
 //				new_character.set_species(client.prefs.species)
 				if(chosen_species.language)
 					new_character.add_language(chosen_species.language)