Species names should now use defines

2026-08-22 11:38:12 +01:00 · 2018-03-15 20:24:45 -05:00
parent b2b4329c4b
commit 5212fa152b
75 changed files with 340 additions and 302 deletions
@@ -23,7 +23,7 @@
 	var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access
 	var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
 	var/corpseidicon = null //For setting it to be a gold, silver, CentCom etc ID
-	var/species = "Human"
+	var/species = SPECIES_HUMAN
 	delete_me = TRUE

 /obj/effect/landmark/corpse/initialize()
@@ -152,7 +152,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
 	if(pref.species)
 		S = all_species[pref.species]
 	else
-		S = all_species["Human"]
+		S = all_species[SPECIES_HUMAN]
 	var/list/possible_genders = S.genders
 	if(!pref.organ_data || pref.organ_data[BP_TORSO] != "cyborg")
 		return possible_genders
@@ -69,7 +69,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O

 /datum/category_item/player_setup_item/general/body/sanitize_character(var/savefile/S)
 	if(!pref.species || !(pref.species in playable_species))
-		pref.species = "Human"
+		pref.species = SPECIES_HUMAN
 	pref.r_hair			= sanitize_integer(pref.r_hair, 0, 255, initial(pref.r_hair))
 	pref.g_hair			= sanitize_integer(pref.g_hair, 0, 255, initial(pref.g_hair))
 	pref.b_hair			= sanitize_integer(pref.b_hair, 0, 255, initial(pref.b_hair))
@@ -588,7 +588,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 					pref.rlimb_data[second_limb] = null

 			if("Prosthesis")
-				var/tmp_species = pref.species ? pref.species : "Human"
+				var/tmp_species = pref.species ? pref.species : SPECIES_HUMAN
 				var/list/usable_manufacturers = list()
 				for(var/company in chargen_robolimbs)
 					var/datum/robolimb/M = chargen_robolimbs[company]
@@ -727,7 +727,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O

 /datum/category_item/player_setup_item/general/body/proc/SetSpecies(mob/user)
 	if(!pref.species_preview || !(pref.species_preview in all_species))
-		pref.species_preview = "Human"
+		pref.species_preview = SPECIES_HUMAN
 	var/datum/species/current_species = all_species[pref.species_preview]
 	var/dat = "<body>"
 	dat += "<center><h2>[current_species.name] \[<a href='?src=\ref[src];show_species=1'>change</a>\]</h2></center><hr/>"
@@ -7,7 +7,7 @@
 /datum/gear/head/zhan_scarf
 	display_name = "Zhan headscarf"
 	path = /obj/item/clothing/head/tajaran/scarf
-	whitelisted = "Tajaran"
+	whitelisted = SPECIES_TAJ

 /datum/gear/suit/unathi_mantle
 	display_name = "hide mantle (Unathi)"
@@ -19,7 +19,7 @@
 	display_name = "headtail chain selection (Skrell)"
 	path = /obj/item/clothing/ears/skrell/chain
 	sort_category = "Xenowear"
-	whitelisted = "Skrell"
+	whitelisted = SPECIES_SKRELL

 /datum/gear/ears/skrell/chains/New()
 	..()
@@ -33,7 +33,7 @@
 	display_name = "headtail band selection (Skrell)"
 	path = /obj/item/clothing/ears/skrell/band
 	sort_category = "Xenowear"
-	whitelisted = "Skrell"
+	whitelisted = SPECIES_SKRELL

 /datum/gear/ears/skrell/bands/New()
 	..()
@@ -47,7 +47,7 @@
 	display_name = "short headtail cloth (Skrell)"
 	path = /obj/item/clothing/ears/skrell/cloth_male/black
 	sort_category = "Xenowear"
-	whitelisted = "Skrell"
+	whitelisted = SPECIES_SKRELL

 /datum/gear/ears/skrell/cloth/short/New()
 	..()
@@ -61,7 +61,7 @@
 	display_name = "long headtail cloth (Skrell)"
 	path = /obj/item/clothing/ears/skrell/cloth_female/black
 	sort_category = "Xenowear"
-	whitelisted = "Skrell"
+	whitelisted = SPECIES_SKRELL

 /datum/gear/ears/skrell/cloth/long/New()
 	..()
@@ -75,7 +75,7 @@
 	display_name = "Colored bands (Skrell)"
 	path = /obj/item/clothing/ears/skrell/colored/band
 	sort_category = "Xenowear"
-	whitelisted = "Skrell"
+	whitelisted = SPECIES_SKRELL

 /datum/gear/ears/skrell/colored/band/New()
 	..()
@@ -85,7 +85,7 @@
 	display_name = "Colored chain (Skrell)"
 	path = /obj/item/clothing/ears/skrell/colored/chain
 	sort_category = "Xenowear"
-	whitelisted = "Skrell"
+	whitelisted = SPECIES_SKRELL

 /datum/gear/ears/skrell/colored/chain/New()
 	..()
@@ -94,7 +94,7 @@
 /datum/gear/uniform/smock
 	display_name = "smock selection (Teshari)"
 	path = /obj/item/clothing/under/seromi/smock
-	whitelisted = "Teshari"
+	whitelisted = SPECIES_TESHARI
 	sort_category = "Xenowear"

 /datum/gear/uniform/smock/New()
@@ -108,7 +108,7 @@
 /datum/gear/uniform/undercoat
 	display_name = "undercoat selection (Teshari)"
 	path = /obj/item/clothing/under/seromi/undercoat
-	whitelisted = "Teshari"
+	whitelisted = SPECIES_TESHARI
 	sort_category = "Xenowear"

 /datum/gear/uniform/undercoat/New()
@@ -122,7 +122,7 @@
 /datum/gear/suit/cloak
 	display_name = "cloak selection (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak
-	whitelisted = "Teshari"
+	whitelisted = SPECIES_TESHARI
 	sort_category = "Xenowear"

 /datum/gear/suit/cloak/New()
@@ -46,7 +46,7 @@ datum/preferences
 	var/r_eyes = 0						//Eye color
 	var/g_eyes = 0						//Eye color
 	var/b_eyes = 0						//Eye color
-	var/species = "Human"               //Species datum to use.
+	var/species = SPECIES_HUMAN         //Species datum to use.
 	var/species_preview                 //Used for the species selection window.
 	var/list/alternate_languages = list() //Secondary language(s)
 	var/list/language_prefixes = list() //Kanguage prefix keys
@@ -84,15 +84,15 @@

 	//Set species_restricted list
 	switch(target_species)
-		if("Human", "Skrell")	//humanoid bodytypes
-			species_restricted = list("Human", "Skrell", "Promethean") //skrell/humans can wear each other's suits
+		if(SPECIES_HUMAN, SPECIES_SKRELL)	//humanoid bodytypes
+			species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_PROMETHEAN) //skrell/humans can wear each other's suits
 		else
 			species_restricted = list(target_species)

 	//Set icon
 	if (sprite_sheets_refit && (target_species in sprite_sheets_refit))
 		sprite_sheets[target_species] = sprite_sheets_refit[target_species]
-		
+
 	if (sprite_sheets_obj && (target_species in sprite_sheets_obj))
 		icon = sprite_sheets_obj[target_species]
 	else
@@ -104,8 +104,8 @@

 	//Set species_restricted list
 	switch(target_species)
-		if("Skrell")
-			species_restricted = list("Human", "Skrell", "Promethean") //skrell helmets fit humans too
+		if(SPECIES_SKRELL)
+			species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_PROMETHEAN) //skrell helmets fit humans too

 		else
 			species_restricted = list(target_species)
@@ -127,7 +127,7 @@
 	throwforce = 2
 	slot_flags = SLOT_EARS
 	sprite_sheets = list(
-		"Teshari" = 'icons/mob/species/seromi/ears.dmi')
+		SPECIES_TESHARI = 'icons/mob/species/seromi/ears.dmi')

 /obj/item/clothing/ears/attack_hand(mob/user as mob)
 	if (!user) return
@@ -208,8 +208,8 @@
 	slot_flags = SLOT_GLOVES
 	attack_verb = list("challenged")
 	sprite_sheets = list(
-		"Teshari" = 'icons/mob/species/seromi/gloves.dmi',
-		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		SPECIES_TESHARI = 'icons/mob/species/seromi/gloves.dmi',
+		SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi'
 		)

 /obj/item/clothing/gloves/update_clothing_icon()
@@ -242,8 +242,8 @@
 		name = "modified [name]"
 		desc = "[desc]<br>They have had the fingertips cut off of them."
 		if("exclude" in species_restricted)
-			species_restricted -= "Unathi"
-			species_restricted -= "Tajaran"
+			species_restricted -= SPECIES_UNATHI
+			species_restricted -= SPECIES_TAJ
 		return
 */

@@ -298,7 +298,7 @@
 	w_class = ITEMSIZE_TINY
 	icon = 'icons/obj/clothing/rings.dmi'
 	gender = NEUTER
-	species_restricted = list("exclude", "Diona")
+	species_restricted = list("exclude", SPECIES_DIONA)
 	siemens_coefficient = 1
 	glove_level = 1
 	fingerprint_chance = 100
@@ -325,8 +325,8 @@
 	var/image/helmet_light

 	sprite_sheets = list(
-		"Teshari" = 'icons/mob/species/seromi/head.dmi',
-		"Vox" = 'icons/mob/species/vox/head.dmi'
+		SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi',
+		SPECIES_VOX = 'icons/mob/species/vox/head.dmi'
 		)

 /obj/item/clothing/head/attack_self(mob/user)
@@ -403,7 +403,7 @@
 		if(!light_overlay_cache[cache_key])
 			var/use_icon = LAZYACCESS(sprite_sheets,body_type) || 'icons/mob/light_overlays.dmi'
 			light_overlay_cache[cache_key] = image(icon = use_icon, icon_state = "[light_overlay]")
-	
+
 	else if(helmet_light)
 		cut_overlay(helmet_light)
 		helmet_light = null
@@ -429,10 +429,10 @@
 	body_parts_covered = FACE|EYES
 	blood_sprite_state = "maskblood"
 	sprite_sheets = list(
-		"Teshari" = 'icons/mob/species/seromi/masks.dmi',
-		"Vox" = 'icons/mob/species/vox/masks.dmi',
-		"Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
-		"Unathi" = 'icons/mob/species/unathi/mask.dmi'
+		SPECIES_TESHARI = 'icons/mob/species/seromi/masks.dmi',
+		SPECIES_VOX = 'icons/mob/species/vox/masks.dmi',
+		SPECIES_TAJ = 'icons/mob/species/tajaran/mask.dmi',
+		SPECIES_UNATHI = 'icons/mob/species/unathi/mask.dmi'
 		)

 	var/voicechange = 0
@@ -477,10 +477,10 @@
 	slowdown = SHOES_SLOWDOWN
 	force = 2
 	var/overshoes = 0
-	species_restricted = list("exclude","Teshari", "Vox")
+	species_restricted = list("exclude",SPECIES_TESHARI, SPECIES_VOX)
 	sprite_sheets = list(
-		"Teshari" = 'icons/mob/species/seromi/shoes.dmi',
-		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		SPECIES_TESHARI = 'icons/mob/species/seromi/shoes.dmi',
+		SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi'
 		)

 /obj/item/clothing/shoes/proc/draw_knife()
@@ -578,8 +578,8 @@


 	sprite_sheets = list(
-		"Teshari" = 'icons/mob/species/seromi/suit.dmi',
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi',
+		SPECIES_VOX = 'icons/mob/species/vox/suit.dmi'
 		)

 	valid_accessory_slots = list("over", "armband")
@@ -618,8 +618,8 @@
 	var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 	var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
 	sprite_sheets = list(
-		"Teshari" = 'icons/mob/species/seromi/uniform.dmi',
-		"Vox" = 'icons/mob/species/vox/uniform.dmi'
+		SPECIES_TESHARI = 'icons/mob/species/seromi/uniform.dmi',
+		SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi'
 		)

 	//convenience var for defining the icon state for the overlay used when the clothing is worn.
@@ -46,7 +46,7 @@
 	icon = 'icons/obj/clothing/ears.dmi'
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
-	species_restricted = list("Skrell")
+	species_restricted = list(SPECIES_SKRELL)

 /obj/item/clothing/ears/skrell/chain
 	name = "Gold headtail chains"
@@ -10,8 +10,8 @@
 	desc = "an ultra rare hat. It commands a certain respect."
 	icon_state = "petehat"
 	sprite_sheets = list(
-		"Teshari" = 'icons/mob/species/seromi/head.dmi',
-		"Vox" = 'icons/mob/species/vox/head.dmi'
+		SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi',
+		SPECIES_VOX = 'icons/mob/species/vox/head.dmi'
 		)

 /obj/item/clothing/head/collectable/slime
@@ -153,8 +153,8 @@
 	icon_state = "swathelm"
 	item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
 	sprite_sheets = list(
-		"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
-		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
+		SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
+		SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
 		)

 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
@@ -58,7 +58,7 @@
 	body_parts_covered = 0 //Hack to allow vox to eat while wearing this mask.
 	item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | PHORONGUARD
 	phoronproof = 1
-	species_restricted = list("Vox")
+	species_restricted = list(SPECIES_VOX)
 	filtered_gases = list("oxygen", "sleeping_agent")

 /obj/item/clothing/mask/gas/syndicate
@@ -88,7 +88,7 @@
 	icon_state = "boots-vox"
 	item_flags = PHORONGUARD
 	phoronproof = 1
-	species_restricted = list("Vox")
+	species_restricted = list(SPECIES_VOX)

 	action_button_name = "Toggle the magclaws"

@@ -4,7 +4,7 @@
 	desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl."
 	armor = list(melee = 20, bullet = 20, laser = 20, energy = 50, bomb = 50, bio = 100, rad = 50)
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	species_restricted = list("Skrell","Human")
+	species_restricted = list(SPECIES_SKRELL,SPECIES_HUMAN)

 /obj/item/clothing/head/helmet/space/skrell/white
 	icon_state = "skrell_helmet_white"
@@ -19,7 +19,7 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	species_restricted = list("Skrell","Human")
+	species_restricted = list(SPECIES_SKRELL,SPECIES_HUMAN)

 /obj/item/clothing/suit/space/skrell/white
 	icon_state = "skrell_suit_white"
@@ -39,7 +39,7 @@
 	siemens_coefficient = 0.2
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	species_restricted = list("Vox")
+	species_restricted = list(SPECIES_VOX)

 /obj/item/clothing/head/helmet/space/vox
 	armor = list(melee = 60, bullet = 50, laser = 40, energy = 15, bomb = 30, bio = 100, rad = 50)
@@ -47,7 +47,7 @@
 	item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL | AIRTIGHT | PHORONGUARD
 	flags_inv = 0
 	phoronproof = 1
-	species_restricted = list("Vox")
+	species_restricted = list(SPECIES_VOX)

 /obj/item/clothing/head/helmet/space/vox/pressure
 	name = "alien helmet"
@@ -11,10 +11,10 @@
 	cold_protection =    HEAD|FACE|EYES
 	brightness_on = 4
 	sprite_sheets = list(
-		"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
-		"Skrell" = 'icons/mob/species/skrell/helmet.dmi',
-		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
-		"Vox" = 'icons/mob/species/vox/head.dmi'
+		SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
+		SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi',
+		SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
+		SPECIES_VOX = 'icons/mob/species/vox/head.dmi'
 		)
 	species_restricted = null

@@ -50,9 +50,9 @@
 	resilience = 0.2
 	can_breach = 1
 	sprite_sheets = list(
-		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
-		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi',
+		SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi',
+		SPECIES_VOX = 'icons/mob/species/vox/suit.dmi'
 		)
 	supporting_limbs = list()
 	var/obj/item/weapon/material/knife/tacknife
@@ -28,14 +28,14 @@
 	siemens_coefficient = 0.2

 /obj/item/clothing/head/helmet/space/rig/breacher
-	species_restricted = list("Unathi")
+	species_restricted = list(SPECIES_UNATHI)
 	force = 5

 /obj/item/clothing/suit/space/rig/breacher
-	species_restricted = list("Unathi")
+	species_restricted = list(SPECIES_UNATHI)

 /obj/item/clothing/shoes/magboots/rig/breacher
-	species_restricted = list("Unathi")
+	species_restricted = list(SPECIES_UNATHI)

 /*
 *	VOX
@@ -62,27 +62,27 @@
 	glove_type = /obj/item/clothing/gloves/gauntlets/rig/vox

 /obj/item/clothing/head/helmet/space/rig/vox
-	species_restricted = list("Vox")
+	species_restricted = list(SPECIES_VOX)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	phoronproof = 1

 /obj/item/clothing/shoes/magboots/rig/vox
 	name = "talons"
-	species_restricted = list("Vox")
+	species_restricted = list(SPECIES_VOX)
 	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/shoes.dmi'
+		SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi'
 		)
 	phoronproof = 1

 /obj/item/clothing/suit/space/rig/vox
-	species_restricted = list("Vox")
+	species_restricted = list(SPECIES_VOX)
 	phoronproof = 1

 /obj/item/clothing/gloves/gauntlets/rig/vox
 	siemens_coefficient = 0
-	species_restricted = list("Vox")
+	species_restricted = list(SPECIES_VOX)
 	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/gloves.dmi'
+		SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi'
 		)
 	phoronproof = 1

@@ -14,7 +14,7 @@
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.9
-	species_restricted = list("exclude","Diona")
+	species_restricted = list("exclude",SPECIES_DIONA)
 	preserve_item = 1
 	phoronproof = 1
 	flash_protection = FLASH_PROTECTION_MAJOR
@@ -62,7 +62,7 @@
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.9
-	species_restricted = list("exclude","Diona")
+	species_restricted = list("exclude",SPECIES_DIONA)
 	preserve_item = 1
 	phoronproof = 1

@@ -13,16 +13,16 @@
 	//Species-specific stuff.
 	species_restricted = list("Human", "Promethean")
 	sprite_sheets_refit = list(
-		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
-		"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
-		"Skrell" = 'icons/mob/species/skrell/helmet.dmi'
+		SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
+		SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
+		SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi'
 		//Teshari have a general sprite sheet defined in modules/clothing/clothing.dm
 		)
 	sprite_sheets_obj = list(
-		"Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi',
-		"Tajaran" = 'icons/obj/clothing/species/tajaran/hats.dmi',
-		"Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi',
-		"Teshari" = 'icons/obj/clothing/species/seromi/hats.dmi'
+		SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi',
+		SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/hats.dmi',
+		SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi',
+		SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/hats.dmi'
 		)

 	light_overlay = "helmet_light"
@@ -38,18 +38,18 @@
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE

-	species_restricted = list("Human", "Skrell", "Promethean")
+	species_restricted = list("Human", SPECIES_SKRELL, "Promethean")
 	sprite_sheets_refit = list(
-		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
-		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
-		"Skrell" = 'icons/mob/species/skrell/suit.dmi'
+		SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi',
+		SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi',
+		SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi'
 		//Teshari have a general sprite sheet defined in modules/clothing/clothing.dm
 		)
 	sprite_sheets_obj = list(
-		"Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
-		"Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi',
-		"Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi',
-		"Teshari" = 'icons/obj/clothing/species/seromi/suits.dmi'
+		SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi',
+		SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/suits.dmi',
+		SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi',
+		SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/suits.dmi'
 		)

 	//Breach thresholds, should ideally be inherited by most (if not all) voidsuits.
@@ -5,7 +5,7 @@
 	icon_override = 'icons/mob/species/seromi/teshari_cloak.dmi'
 	icon_state = "tesh_cloak_bo"
 	item_state = "tesh_cloak_bo"
-	species_restricted = list("Teshari")
+	species_restricted = list(SPECIES_TESHARI)
 	body_parts_covered = UPPER_TORSO|ARMS

 /obj/item/clothing/suit/storage/seromi/cloak/black_orange
@@ -6,5 +6,5 @@
 	icon_state = "vox-scrap"
 	icon_state = "vox-scrap"
 	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS
-	species_restricted = list("Vox")
+	species_restricted = list(SPECIES_VOX)
 	siemens_coefficient = 1 //Its literally metal
@@ -14,7 +14,7 @@
 	var/concealed_holster = 0
 	var/mob/living/carbon/human/wearer = null //To check if the wearer changes, so species spritesheets change properly.

-	sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/ties.dmi') //Teshari can into webbing, too!
+	sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/ties.dmi') //Teshari can into webbing, too!

 /obj/item/clothing/accessory/Destroy()
 	on_removed()
@@ -1,7 +1,7 @@
 /obj/item/clothing/under/seromi
 	icon = 'icons/obj/clothing/species/seromi/uniform.dmi'
 	icon_state = "seromi_grey"
-	species_restricted = list("Teshari")
+	species_restricted = list(SPECIES_TESHARI)

 /obj/item/clothing/under/seromi/smock
 	name = "small grey smock"
@@ -1,6 +1,6 @@
 /obj/item/clothing/under/vox
 	has_sensor = 0
-	species_restricted = list("Vox")
+	species_restricted = list(SPECIES_VOX)
 	valid_accessory_slots = list("vox")
 	restricted_accessory_slots = list("vox")
 	phoronproof = 1
@@ -2,5 +2,5 @@
 	var/datum/supply_order/O = new /datum/supply_order()
 	O.ordernum = supply_controller.ordernum
 	O.object = supply_controller.supply_packs[pick(supply_controller.supply_packs)]
-	O.orderedby = random_name(pick(MALE,FEMALE), species = "Human")
+	O.orderedby = random_name(pick(MALE,FEMALE), species = SPECIES_HUMAN)
 	supply_controller.shoppinglist += O
@@ -9,8 +9,8 @@ var/list/holder_mob_icon_cache = list()
 	show_messages = 1

 	sprite_sheets = list(
-		"Teshari" = 'icons/mob/species/seromi/head.dmi',
-		"Vox" = 'icons/mob/species/vox/head.dmi'
+		SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi',
+		SPECIES_VOX = 'icons/mob/species/vox/head.dmi'
 		)

 	origin_tech = null
@@ -47,13 +47,13 @@
 	autohiss_extra_map = list(
 			"x" = list("ks", "kss", "ksss")
 		)
-	autohiss_exempt = list("Sinta'unathi")
+	autohiss_exempt = list(LANGUAGE_UNATHI)

 /datum/species/tajaran
 	autohiss_basic_map = list(
 			"r" = list("rr", "rrr", "rrrr")
 		)
-	autohiss_exempt = list("Siik","Akhani")
+	autohiss_exempt = list(LANGUAGE_SIIK,LANGUAGE_AKHANI)


 /datum/species/proc/handle_autohiss(message, datum/language/lang, mode)
@@ -23,7 +23,7 @@
 /mob/living/carbon/alien/diona/New()

 	..()
-	species = all_species["Diona"]
+	species = all_species[SPECIES_DIONA]
 	add_language(LANGUAGE_ROOTGLOBAL)
 	add_language(LANGUAGE_GALCOM)
 	verbs += /mob/living/carbon/alien/diona/proc/merge
@@ -19,7 +19,7 @@

 		if(istype(C,/mob/living/carbon/human))
 			var/mob/living/carbon/human/D = C
-			if(D.species && D.species.name == "Diona")
+			if(D.species && D.species.name == SPECIES_DIONA)
 				choices += C

 	var/mob/living/M = input(src,"Who do you wish to merge with?") in null|choices
@@ -1,6 +1,6 @@
 /mob/living/carbon/alien/diona/confirm_evolution()

-	if(!is_alien_whitelisted(src, all_species["Diona"]))
+	if(!is_alien_whitelisted(src, all_species[SPECIES_DIONA]))
 		src << alert("You are currently not whitelisted to play as a full diona.")
 		return null

@@ -16,4 +16,4 @@
 		qdel(L)

 	src.visible_message("<font color='red'>[src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.</font>","<font color='red'>You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.</font>")
-	return "Diona"
+	return SPECIES_DIONA
@@ -42,7 +42,7 @@
 	nutrition = rand(200,400)

 	human_mob_list |= src
-	
+
 	..()

 	hide_underwear.Cut()
@@ -1029,7 +1029,7 @@
 	else
 		bloody_hands = 0
 		germ_level = 0
-	
+
 	//Sometimes do shoes if asked (or feet if no shoes)
 	if(washshoes && shoes)
 		shoes.clean_blood()
@@ -1039,7 +1039,7 @@
 		LAZYCLEARLIST(feet_blood_DNA)
 		feet_blood_DNA = null
 		feet_blood_color = null
-	
+
 	update_bloodied()

 /mob/living/carbon/human/get_visible_implants(var/class = 0)
@@ -1117,7 +1117,7 @@

 	if(!dna)
 		if(!new_species)
-			new_species = "Human"
+			new_species = SPECIES_HUMAN
 	else
 		if(!new_species)
 			new_species = dna.species
@@ -1126,7 +1126,7 @@

 	// No more invisible screaming wheelchairs because of set_species() typos.
 	if(!all_species[new_species])
-		new_species = "Human"
+		new_species = SPECIES_HUMAN

 	if(species)

@@ -12,42 +12,42 @@

 /mob/living/carbon/human/skrell/New(var/new_loc)
 	h_style = "Skrell Short Tentacles"
-	..(new_loc, "Skrell")
+	..(new_loc, SPECIES_SKRELL)

 /mob/living/carbon/human/tajaran/New(var/new_loc)
 	h_style = "Tajaran Ears"
-	..(new_loc, "Tajaran")
+	..(new_loc, SPECIES_TAJ)

 /mob/living/carbon/human/unathi/New(var/new_loc)
 	h_style = "Unathi Horns"
-	..(new_loc, "Unathi")
+	..(new_loc, SPECIES_UNATHI)

 /mob/living/carbon/human/vox/New(var/new_loc)
 	h_style = "Short Vox Quills"
-	..(new_loc, "Vox")
+	..(new_loc, SPECIES_VOX)

 /mob/living/carbon/human/diona/New(var/new_loc)
-	..(new_loc, "Diona")
+	..(new_loc, SPECIES_DIONA)

 /mob/living/carbon/human/teshari/New(var/new_loc)
 	h_style = "Teshari Default"
-	..(new_loc, "Teshari")
+	..(new_loc, SPECIES_TESHARI)

 /mob/living/carbon/human/promethean/New(var/new_loc)
-	..(new_loc, "Promethean")
+	..(new_loc, SPECIES_PROMETHEAN)

 /mob/living/carbon/human/machine/New(var/new_loc)
 	h_style = "blue IPC screen"
 	..(new_loc, "Machine")

 /mob/living/carbon/human/monkey/New(var/new_loc)
-	..(new_loc, "Monkey")
+	..(new_loc, SPECIES_MONKEY)

 /mob/living/carbon/human/farwa/New(var/new_loc)
-	..(new_loc, "Farwa")
+	..(new_loc, SPECIES_MONKEY_TAJ)

 /mob/living/carbon/human/neaera/New(var/new_loc)
-	..(new_loc, "Neaera")
+	..(new_loc, SPECIES_MONKEY_SKRELL)

 /mob/living/carbon/human/stok/New(var/new_loc)
-	..(new_loc, "Stok")
+	..(new_loc, SPECIES_MONKEY_UNATHI)
@@ -267,7 +267,7 @@
 					Weaken(3)
 					if(!lying)
 						emote("collapse")
-				if(prob(5) && prob(100 * RADIATION_SPEED_COEFFICIENT) && species.get_bodytype() == "Human") //apes go bald
+				if(prob(5) && prob(100 * RADIATION_SPEED_COEFFICIENT) && species.get_bodytype() == SPECIES_HUMAN) //apes go bald
 					if((h_style != "Bald" || f_style != "Shaved" ))
 						src << "<span class='warning'>Your hair falls out.</span>"
 						h_style = "Bald"
@@ -1672,7 +1672,7 @@
 					else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Released"))
 						holder.icon_state = "hudreleased"
 						break
-		
+
 		apply_hud(WANTED_HUD, holder)

 	if (  BITTEST(hud_updateflag, IMPLOYAL_HUD) \
@@ -1710,7 +1710,7 @@
 			else
 				holder.icon_state = "hudsyndicate"
 		apply_hud(SPECIALROLE_HUD, holder)
-	
+
 	hud_updateflag = 0

 /mob/living/carbon/human/handle_stunned()
@@ -1,5 +1,5 @@
 /datum/species/shadow
-	name = "Shadow"
+	name = SPECIES_SHADOW
 	name_plural = "shadows"

 	icobase = 'icons/mob/human_races/r_shadow.dmi'
@@ -1,5 +1,5 @@
 /datum/species/skeleton
-	name = "Skeleton"
+	name = SPECIES_SKELETON
 	name_plural = "Skeletons"
 	icobase = 'icons/mob/human_races/r_skeleton.dmi'
 	primitive_form = "Monkey"
@@ -1,5 +1,5 @@
 /datum/species/vox
-	name = "Vox"
+	name = SPECIES_VOX
 	name_plural = "Vox"
 	icobase = 'icons/mob/human_races/r_vox.dmi'
 	deform = 'icons/mob/human_races/r_def_vox.dmi'
@@ -13,7 +13,7 @@ var/list/wrapped_species_by_ref = list()

 	var/list/valid_transform_species = list()
 	var/monochromatic
-	var/default_form = "Human"
+	var/default_form = SPECIES_HUMAN

 /datum/species/shapeshifter/get_valid_shapeshifter_forms(var/mob/living/carbon/human/H)
 	return valid_transform_species
@@ -1,5 +1,5 @@
 /datum/species/golem
-	name = "Golem"
+	name = SPECIES_GOLEM
 	name_plural = "golems"

 	icobase = 'icons/mob/human_races/r_golem.dmi'
@@ -33,7 +33,7 @@
 */

 /datum/species/human/vatgrown
-	name = "Vatborn"
+	name = SPECIES_HUMAN_VATBORN
 	name_plural = "Vatborn"
 	blurb = "With cloning on the forefront of human scientific advancement, cheap mass production \
 	of bodies is a very real and rather ethically grey industry. Vat-grown or Vatborn humans tend to be \
@@ -1,5 +1,5 @@
 /datum/species/monkey
-	name = "Monkey"
+	name = SPECIES_MONKEY
 	name_plural = "Monkeys"
 	blurb = "Ook."

@@ -10,7 +10,7 @@
 	blood_mask = 'icons/mob/human_races/masks/blood_monkey.dmi'
 	language = null
 	default_language = "Chimpanzee"
-	greater_form = "Human"
+	greater_form = SPECIES_HUMAN
 	mob_size = MOB_SMALL
 	has_fine_manipulation = 0
 	show_ssd = null
@@ -66,26 +66,26 @@
 	return "[lowertext(name)] ([rand(100,999)])"

 /datum/species/monkey/tajaran
-	name = "Farwa"
+	name = SPECIES_MONKEY_TAJ
 	name_plural = "Farwa"

 	icobase = 'icons/mob/human_races/monkeys/r_farwa.dmi'
 	deform = 'icons/mob/human_races/monkeys/r_farwa.dmi'

-	greater_form = "Tajaran"
+	greater_form = SPECIES_TAJ
 	default_language = "Farwa"
 	flesh_color = "#AFA59E"
 	base_color = "#333333"
 	tail = "farwatail"

 /datum/species/monkey/skrell
-	name = "Neaera"
+	name = SPECIES_MONKEY_SKRELL
 	name_plural = "Neaera"

 	icobase = 'icons/mob/human_races/monkeys/r_neaera.dmi'
 	deform = 'icons/mob/human_races/monkeys/r_neaera.dmi'

-	greater_form = "Skrell"
+	greater_form = SPECIES_SKRELL
 	default_language = "Neaera"
 	flesh_color = "#8CD7A3"
 	blood_color = "#1D2CBF"
@@ -93,14 +93,14 @@
 	tail = null

 /datum/species/monkey/unathi
-	name = "Stok"
+	name = SPECIES_MONKEY_UNATHI
 	name_plural = "Stok"

 	icobase = 'icons/mob/human_races/monkeys/r_stok.dmi'
 	deform = 'icons/mob/human_races/monkeys/r_stok.dmi'

 	tail = "stoktail"
-	greater_form = "Unathi"
+	greater_form = SPECIES_UNATHI
 	default_language = "Stok"
 	flesh_color = "#34AF10"
 	base_color = "#066000"
@@ -3,7 +3,7 @@ var/datum/species/shapeshifter/promethean/prometheans
 // Species definition follows.
 /datum/species/shapeshifter/promethean

-	name =             "Promethean"
+	name =             SPECIES_PROMETHEAN
 	name_plural =      "Prometheans"
 	blurb =            "What has Science done?"
 	show_ssd =         "totally quiescent"
@@ -88,7 +88,7 @@ var/datum/species/shapeshifter/promethean/prometheans
 		/mob/living/carbon/human/proc/regenerate
 		)

-	valid_transform_species = list("Human", "Vatborn", "Unathi", "Tajaran", "Skrell", "Diona", "Teshari", "Monkey")
+	valid_transform_species = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_DIONA, SPECIES_TESHARI, SPECIES_MONKEY)

 	var/heal_rate = 0.5 // Temp. Regen per tick.

@@ -1,5 +1,5 @@
 /datum/species/teshari
-	name = "Teshari"
+	name = SPECIES_TESHARI
 	name_plural = "Tesharii"
 	blurb = "A race of feathered raptors who developed alongside the Skrell, inhabiting \
 	the polar tundral regions outside of Skrell territory. Extremely fragile, they developed \
@@ -1,7 +1,7 @@
 /datum/species/human
-	name = "Human"
+	name = SPECIES_HUMAN
 	name_plural = "Humans"
-	primitive_form = "Monkey"
+	primitive_form = SPECIES_MONKEY
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite)
 	blurb = "Humanity originated in the Sol system, and over the last five centuries has spread \
 	colonies across a wide swathe of space. They hold a wide range of forms and creeds.<br/><br/> \
@@ -20,17 +20,17 @@
 	appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR

 /datum/species/human/get_bodytype(var/mob/living/carbon/human/H)
-	return "Human"
+	return SPECIES_HUMAN

 /datum/species/unathi
-	name = "Unathi"
+	name = SPECIES_UNATHI
 	name_plural = "Unathi"
 	icobase = 'icons/mob/human_races/r_lizard.dmi'
 	deform = 'icons/mob/human_races/r_def_lizard.dmi'
 	tail = "sogtail"
 	tail_animation = 'icons/mob/species/unathi/tail.dmi'
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
-	primitive_form = "Stok"
+	primitive_form = SPECIES_MONKEY_UNATHI
 	darksight = 3
 	ambiguous_genders = TRUE
 	gluttonous = 1
@@ -132,7 +132,7 @@
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)

 /datum/species/tajaran
-	name = "Tajaran"
+	name = SPECIES_TAJ
 	name_plural = "Tajaran"
 	icobase = 'icons/mob/human_races/r_tajaran.dmi'
 	deform = 'icons/mob/human_races/r_def_tajaran.dmi'
@@ -180,7 +180,7 @@
 	breath_heat_level_2 = 430	//Default 450
 	breath_heat_level_3 = 1000	//Default 1250

-	primitive_form = "Farwa"
+	primitive_form = SPECIES_MONKEY_TAJ

 	spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
 	appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
@@ -215,11 +215,11 @@
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)

 /datum/species/skrell
-	name = "Skrell"
+	name = SPECIES_SKRELL
 	name_plural = "Skrell"
 	icobase = 'icons/mob/human_races/r_skrell.dmi'
 	deform = 'icons/mob/human_races/r_def_skrell.dmi'
-	primitive_form = "Neaera"
+	primitive_form = SPECIES_MONKEY_SKRELL
 	unarmed_types = list(/datum/unarmed_attack/punch)
 	blurb = "An amphibious species, Skrell come from the star system known as Qerr'Vallis, which translates to 'Star of \
 	the royals' or 'Light of the Crown'.<br/><br/>Skrell are a highly advanced and logical race who live under the rule \
@@ -288,7 +288,7 @@
 	return TRUE

 /datum/species/diona
-	name = "Diona"
+	name = SPECIES_DIONA
 	name_plural = "Dionaea"
 	icobase = 'icons/mob/human_races/r_diona.dmi'
 	deform = 'icons/mob/human_races/r_def_plant.dmi'
@@ -5,7 +5,7 @@
 // Species definition follows.
 /datum/species/shapeshifter/promethean/avatar

-	name =             "Virtual Reality Avatar"
+	name =             SPECIES_VR
 	name_plural =      "Virtual Reality Avatars"
 	blurb =            "A 3-dimensional representation of some sort of animate object used to display the presence and actions of some-one or -thing using a virtual reality program."
 	show_ssd =         "eerily still"
@@ -57,7 +57,7 @@
 		shapeshifter_change_species("Virtual Reality [src.species.get_bodytype(src)]")
 	else
 		icon_state = "promethean"
-		shapeshifter_change_species("Virtual Reality Avatar")
+		shapeshifter_change_species(SPECIES_VR)


 // enter_vr is called on the original mob, and puts the mind into the supplied vr mob
@@ -2,7 +2,7 @@
 	for(var/mob/living/carbon/human/Q in living_mob_list)
 		if(self && ignore_self && self == Q)
 			continue
-		if(Q.species.name != "Xenomorph Queen")
+		if(Q.species.name != SPECIES_XENO_QUEEN)
 			continue
 		if(!Q.key || !Q.client || Q.stat)
 			continue
@@ -1,6 +1,6 @@
 //Stand-in until this is made more lore-friendly.
 /datum/species/xenos
-	name = "Xenomorph"
+	name = SPECIES_XENO
 	name_plural = "Xenomorphs"

 	default_language = "Xenomorph"
@@ -77,7 +77,7 @@
 		)

 /datum/species/xenos/get_bodytype()
-	return "Xenomorph"
+	return SPECIES_XENO

 /datum/species/xenos/get_random_name()
 	return "alien [caste_name] ([alien_number])"
@@ -164,7 +164,7 @@
 */

 /datum/species/xenos/drone
-	name = "Xenomorph Drone"
+	name = SPECIES_XENO_DRONE
 	caste_name = "drone"
 	weeds_plasma_rate = 15
 	slowdown = 1
@@ -202,7 +202,7 @@
 	..()

 /datum/species/xenos/hunter
-	name = "Xenomorph Hunter"
+	name = SPECIES_XENO_HUNTER
 	weeds_plasma_rate = 5
 	caste_name = "hunter"
 	slowdown = -2
@@ -230,7 +230,7 @@
 		)

 /datum/species/xenos/sentinel
-	name = "Xenomorph Sentinel"
+	name = SPECIES_XENO_SENTINEL
 	weeds_plasma_rate = 10
 	caste_name = "sentinel"
 	slowdown = 0
@@ -261,7 +261,7 @@

 /datum/species/xenos/queen

-	name = "Xenomorph Queen"
+	name = SPECIES_XENO_QUEEN
 	total_health = 250
 	weeds_heal_rate = 5
 	weeds_plasma_rate = 20
@@ -10,22 +10,22 @@ proc/create_new_xenomorph(var/alien_caste,var/target)
 /mob/living/carbon/human/xdrone/New(var/new_loc)
 	h_style = "Bald"
 	faction = "xeno"
-	..(new_loc, "Xenomorph Drone")
+	..(new_loc, SPECIES_XENO_DRONE)

 /mob/living/carbon/human/xsentinel/New(var/new_loc)
 	h_style = "Bald"
 	faction = "xeno"
-	..(new_loc, "Xenomorph Sentinel")
+	..(new_loc, SPECIES_XENO_SENTINEL)

 /mob/living/carbon/human/xhunter/New(var/new_loc)
 	h_style = "Bald"
 	faction = "xeno"
-	..(new_loc, "Xenomorph Hunter")
+	..(new_loc, SPECIES_XENO_HUNTER)

 /mob/living/carbon/human/xqueen/New(var/new_loc)
 	h_style = "Bald"
 	faction = "xeno"
-	..(new_loc, "Xenomorph Queen")
+	..(new_loc, SPECIES_XENO_QUEEN)

 // I feel like we should generalize/condense down all the various icon-rendering antag procs.
 /*----------------------------------------
@@ -517,7 +517,7 @@ proc/is_blind(A)
 		if(istype(belt, /obj/item/weapon/gun) || istype(belt, /obj/item/weapon/melee))
 			threatcount += 2

-		if(species.name != "Human")
+		if(species.name != SPECIES_HUMAN)
 			threatcount += 2

 	if(check_records || check_arrest)
@@ -642,7 +642,7 @@ var/global/image/backplane
 	if(!hud_used.inventory_shown && slot > slot_r_store)
 		item.screen_loc = null
 		return
-		
+
 	var/screen_place = hud_used.slot_info["[slot]"]
 	if(!screen_place)
 		item.screen_loc = null
@@ -519,12 +519,12 @@
 		chosen_species = all_species[client.prefs.species]

 	if(!chosen_species)
-		return "Human"
+		return SPECIES_HUMAN

 	if(is_alien_whitelisted(chosen_species))
 		return chosen_species.name

-	return "Human"
+	return SPECIES_HUMAN

 /mob/new_player/get_gender()
 	if(!client || !client.prefs) ..()
@@ -29,7 +29,7 @@
 	var/gender = NEUTER

 	// Restrict some styles to specific species
-	var/list/species_allowed = list("Human","Promethean","Vatborn")
+	var/list/species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN)

 	// Whether or not the accessory can be affected by colouration
 	var/do_colouration = 1
@@ -52,7 +52,7 @@
 		name = "Bald"
 		icon_state = "bald"
 		gender = MALE
-		species_allowed = list("Human","Unathi","Promethean","Vatborn")
+		species_allowed = list(SPECIES_HUMAN,SPECIES_UNATHI,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_VOX)

 	short
 		name = "Short Hair"	  // try to capatilize the names please~
@@ -208,12 +208,12 @@
 	bobcurl
 		name = "Bobcurl"
 		icon_state = "hair_bobcurl"
-		species_allowed = list("Human","Promethean","Vatborn","Unathi")
+		species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI)

 	bob
 		name = "Bob"
 		icon_state = "hair_bobcut"
-		species_allowed = list("Human","Promethean","Vatborn","Unathi")
+		species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI)

 	bobcutalt
 		name = "Chin Length Bob"
@@ -238,7 +238,7 @@
 	buzz
 		name = "Buzzcut"
 		icon_state = "hair_buzzcut"
-		species_allowed = list("Human","Promethean","Vatborn","Unathi")
+		species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI)

 	shavehair
 		name = "Shaved Hair"
@@ -343,7 +343,7 @@
 	mohawk
 		name = "Mohawk"
 		icon_state = "hair_d"
-		species_allowed = list("Human","Promethean","Vatborn","Unathi")
+		species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI)

 	jensen
 		name = "Adam Jensen Hair"
@@ -360,7 +360,7 @@
 	spiky
 		name = "Spiky"
 		icon_state = "hair_spikey"
-		species_allowed = list("Human","Promethean","Vatborn","Unathi")
+		species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI)

 	kusangi
 		name = "Kusanagi Hair"
@@ -665,7 +665,7 @@
 		name = "Shaved"
 		icon_state = "bald"
 		gender = NEUTER
-		species_allowed = list("Human","Vatborn","Unathi","Tajaran","Skrell", "Machine","Teshari", "Vox","Promethean")
+		species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI,SPECIES_TAJ,SPECIES_SKRELL, "Machine", SPECIES_TESHARI, SPECIES_TESHARI,SPECIES_PROMETHEAN)

 	watson
 		name = "Watson Mustache"
@@ -706,7 +706,7 @@
 	elvis
 		name = "Elvis Sideburns"
 		icon_state = "facial_elvis"
-		species_allowed = list("Human","Promethean","Vatborn","Unathi")
+		species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI)

 	abe
 		name = "Abraham Lincoln Beard"
@@ -803,326 +803,326 @@
 	una_spines_long
 		name = "Long Unathi Spines"
 		icon_state = "soghun_longspines"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_spines_short
 		name = "Short Unathi Spines"
 		icon_state = "soghun_shortspines"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_frills_long
 		name = "Long Unathi Frills"
 		icon_state = "soghun_longfrills"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_frills_short
 		name = "Short Unathi Frills"
 		icon_state = "soghun_shortfrills"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_horns
 		name = "Unathi Horns"
 		icon_state = "soghun_horns"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_bighorns
 		name = "Unathi Big Horns"
 		icon_state = "unathi_bighorn"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_smallhorns
 		name = "Unathi Small Horns"
 		icon_state = "unathi_smallhorn"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_ramhorns
 		name = "Unathi Ram Horns"
 		icon_state = "unathi_ramhorn"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_sidefrills
 		name = "Unathi Side Frills"
 		icon_state = "unathi_sidefrills"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 //Skrell 'hairstyles'
 	skr_tentacle_veryshort
 		name = "Skrell Very Short Tentacles"
 		icon_state = "skrell_hair_veryshort"
-		species_allowed = list("Skrell")
+		species_allowed = list(SPECIES_SKRELL)
 		gender = MALE

 	skr_tentacle_short
 		name = "Skrell Short Tentacles"
 		icon_state = "skrell_hair_short"
-		species_allowed = list("Skrell")
+		species_allowed = list(SPECIES_SKRELL)

 	skr_tentacle_average
 		name = "Skrell Average Tentacles"
 		icon_state = "skrell_hair_average"
-		species_allowed = list("Skrell")
+		species_allowed = list(SPECIES_SKRELL)

 	skr_tentacle_verylong
 		name = "Skrell Long Tentacles"
 		icon_state = "skrell_hair_verylong"
-		species_allowed = list("Skrell")
+		species_allowed = list(SPECIES_SKRELL)
 		gender = FEMALE

 //Tajaran hairstyles
 	taj_ears
 		name = "Tajaran Ears"
 		icon_state = "ears_plain"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_clean
 		name = "Tajaran Clean"
 		icon_state = "hair_clean"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_bangs
 		name = "Tajaran Bangs"
 		icon_state = "hair_bangs"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_braid
 		name = "Tajaran Braid"
 		icon_state = "hair_tbraid"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_shaggy
 		name = "Tajaran Shaggy"
 		icon_state = "hair_shaggy"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_mohawk
 		name = "Tajaran Mohawk"
 		icon_state = "hair_mohawk"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_plait
 		name = "Tajaran Plait"
 		icon_state = "hair_plait"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_straight
 		name = "Tajaran Straight"
 		icon_state = "hair_straight"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_long
 		name = "Tajaran Long"
 		icon_state = "hair_long"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_rattail
 		name = "Tajaran Rat Tail"
 		icon_state = "hair_rattail"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_spiky
 		name = "Tajaran Spiky"
 		icon_state = "hair_tajspiky"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_messy
 		name = "Tajaran Messy"
 		icon_state = "hair_messy"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_curls
 		name = "Tajaran Curly"
 		icon_state = "hair_curly"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_wife
 		name = "Tajaran Housewife"
 		icon_state = "hair_wife"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_victory
 		name = "Tajaran Victory Curls"
 		icon_state = "hair_victory"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_bob
 		name = "Tajaran Bob"
 		icon_state = "hair_tbob"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_ears_fingercurl
 		name = "Tajaran Finger Curls"
 		icon_state = "hair_fingerwave"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 //Teshari things
 	teshari
 		name = "Teshari Default"
 		icon_state = "teshari_default"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_altdefault
 		name = "Teshari Alt. Default"
 		icon_state = "teshari_ears"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_tight
 		name = "Teshari Tight"
 		icon_state = "teshari_tight"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_excited
 		name = "Teshari Spiky"
 		icon_state = "teshari_spiky"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_spike
 		name = "Teshari Spike"
 		icon_state = "teshari_spike"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_long
 		name = "Teshari Overgrown"
 		icon_state = "teshari_long"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_burst
 		name = "Teshari Starburst"
 		icon_state = "teshari_burst"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_shortburst
 		name = "Teshari Short Starburst"
 		icon_state = "teshari_burst_short"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_mohawk
 		name = "Teshari Mohawk"
 		icon_state = "teshari_mohawk"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_pointy
 		name = "Teshari Pointy"
 		icon_state = "teshari_pointy"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_upright
 		name = "Teshari Upright"
 		icon_state = "teshari_upright"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_mane
 		name = "Teshari Mane"
 		icon_state = "teshari_mane"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_droopy
 		name = "Teshari Droopy"
 		icon_state = "teshari_droopy"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 	teshari_mushroom
 		name = "Teshari Mushroom"
 		icon_state = "teshari_mushroom"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)

 // Vox things
 	vox_braid_long
 		name = "Long Vox braid"
 		icon_state = "vox_longbraid"
-		species_allowed = list("Vox")
+		species_allowed = list(SPECIES_VOX)

 	vox_braid_short
 		name = "Short Vox Braid"
 		icon_state = "vox_shortbraid"
-		species_allowed = list("Vox")
+		species_allowed = list(SPECIES_VOX)

 	vox_quills_short
 		name = "Short Vox Quills"
 		icon_state = "vox_shortquills"
-		species_allowed = list("Vox")
+		species_allowed = list(SPECIES_VOX)

 	vox_quills_kingly
 		name = "Kingly Vox Quills"
 		icon_state = "vox_kingly"
-		species_allowed = list("Vox")
+		species_allowed = list(SPECIES_VOX)

 	vox_quills_mohawk
 		name = "Quill Mohawk"
 		icon_state = "vox_mohawk"
-		species_allowed = list("Vox")
+		species_allowed = list(SPECIES_VOX)

 /datum/sprite_accessory/facial_hair

 	taj_sideburns
 		name = "Tajaran Sideburns"
 		icon_state = "facial_sideburns"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_mutton
 		name = "Tajaran Mutton"
 		icon_state = "facial_mutton"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_pencilstache
 		name = "Tajaran Pencilstache"
 		icon_state = "facial_pencilstache"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_moustache
 		name = "Tajaran Moustache"
 		icon_state = "facial_moustache"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_goatee
 		name = "Tajaran Goatee"
 		icon_state = "facial_goatee"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_smallstache
 		name = "Tajaran Smallsatche"
 		icon_state = "facial_smallstache"
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 //unathi horn beards and the like

 	una_chinhorn
 		name = "Unathi Chin Horn"
 		icon_state = "facial_chinhorns"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_hornadorns
 		name = "Unathi Horn Adorns"
 		icon_state = "facial_hornadorns"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_spinespikes
 		name = "Unathi Spine Spikes"
 		icon_state = "facial_spikes"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_dorsalfrill
 		name = "Unathi Dorsal Frill"
 		icon_state = "facial_dorsalfrill"
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)


 //Teshari things
 	teshari_beard
 		name = "Teshari Beard"
 		icon_state = "teshari_chin"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)
 		gender = NEUTER

 	teshari_scraggly
 		name = "Teshari Scraggly"
 		icon_state = "teshari_scraggly"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)
 		gender = NEUTER

 	teshari_chops
 		name = "Teshari Chops"
 		icon_state = "teshari_gap"
-		species_allowed = list("Teshari")
+		species_allowed = list(SPECIES_TESHARI)
 		gender = NEUTER

 /*
@@ -1176,55 +1176,55 @@
 		name = "Socks Coloration (Taj)"
 		icon_state = "taj_pawsocks"
 		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	una_paw_socks
 		name = "Socks Coloration (Una)"
 		icon_state = "una_pawsocks"
 		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	paw_socks
 		name = "Socks Coloration (Generic)"
 		icon_state = "pawsocks"
 		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
-		species_allowed = list("Tajaran", "Unathi")
+		species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI)

 	paw_socks_belly
 		name = "Socks,Belly Coloration (Generic)"
 		icon_state = "pawsocksbelly"
 		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
-		species_allowed = list("Tajaran", "Unathi")
+		species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI)

 	belly_hands_feet
 		name = "Hands,Feet,Belly Color (Minor)"
 		icon_state = "bellyhandsfeetsmall"
 		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
-		species_allowed = list("Tajaran", "Unathi")
+		species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI)

 	hands_feet_belly_full
 		name = "Hands,Feet,Belly Color (Major)"
 		icon_state = "bellyhandsfeet"
 		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
-		species_allowed = list("Tajaran", "Unathi")
+		species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI)

 	hands_feet_belly_full_female
 		name = "Hands,Feet,Belly Color (Major, Female)"
 		icon_state = "bellyhandsfeet_female"
 		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	patches
 		name = "Color Patches"
 		icon_state = "patches"
 		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	patchesface
 		name = "Color Patches (Face)"
 		icon_state = "patchesface"
 		body_parts = list(BP_HEAD)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	bands
 		name = "Color Bands"
@@ -1240,7 +1240,7 @@
 		name = "Tiger Stripes"
 		icon_state = "tiger"
 		body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN)
-		species_allowed = list("Tajaran") //There's a tattoo for non-cats
+		species_allowed = list(SPECIES_TAJ) //There's a tattoo for non-cats

 	tigerhead
 		name = "Tiger Stripes (Head, Minor)"
@@ -1251,7 +1251,7 @@
 		name = "Tiger Stripes (Head, Major)"
 		icon_state = "tigerface"
 		body_parts = list(BP_HEAD)
-		species_allowed = list("Tajaran") //There's a tattoo for non-cats
+		species_allowed = list(SPECIES_TAJ) //There's a tattoo for non-cats

 	backstripe
 		name = "Back Stripe"
@@ -1263,74 +1263,74 @@
 		name = "Belly Fur (Taj)"
 		icon_state = "taj_belly"
 		body_parts = list(BP_TORSO)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_bellyfull
 		name = "Belly Fur Wide (Taj)"
 		icon_state = "taj_bellyfull"
 		body_parts = list(BP_TORSO)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_earsout
 		name = "Outer Ear (Taj)"
 		icon_state = "taj_earsout"
 		body_parts = list(BP_HEAD)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_earsin
 		name = "Inner Ear (Taj)"
 		icon_state = "taj_earsin"
 		body_parts = list(BP_HEAD)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_nose
 		name = "Nose Color (Taj)"
 		icon_state = "taj_nose"
 		body_parts = list(BP_HEAD)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_crest
 		name = "Chest Fur Crest (Taj)"
 		icon_state = "taj_crest"
 		body_parts = list(BP_TORSO)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_muzzle
 		name = "Muzzle Color (Taj)"
 		icon_state = "taj_muzzle"
 		body_parts = list(BP_HEAD)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_face
 		name = "Cheeks Color (Taj)"
 		icon_state = "taj_face"
 		body_parts = list(BP_HEAD)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	taj_all
 		name = "All Taj Head (Taj)"
 		icon_state = "taj_all"
 		body_parts = list(BP_HEAD)
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	//Una specific stuff
 	una_face
 		name = "Face Color (Una)"
 		icon_state = "una_face"
 		body_parts = list(BP_HEAD)
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_facelow
 		name = "Face Color Low (Una)"
 		icon_state = "una_facelow"
 		body_parts = list(BP_HEAD)
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	una_scutes
 		name = "Scutes (Una)"
 		icon_state = "una_scutes"
 		body_parts = list(BP_TORSO)
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 //skin styles - WIP
 //going to have to re-integrate this with surgery
@@ -1341,27 +1341,27 @@
 	human
 		name = "Default human skin"
 		icon_state = "default"
-		species_allowed = list("Human","Vatborn")
+		species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN)

 	human_tatt01
 		name = "Tatt01 human skin"
 		icon_state = "tatt1"
-		species_allowed = list("Human","Vatborn")
+		species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN)

 	tajaran
 		name = "Default tajaran skin"
 		icon_state = "default"
 		icon = 'icons/mob/human_races/r_tajaran.dmi'
-		species_allowed = list("Tajaran")
+		species_allowed = list(SPECIES_TAJ)

 	unathi
 		name = "Default Unathi skin"
 		icon_state = "default"
 		icon = 'icons/mob/human_races/r_lizard.dmi'
-		species_allowed = list("Unathi")
+		species_allowed = list(SPECIES_UNATHI)

 	skrell
 		name = "Default skrell skin"
 		icon_state = "default"
 		icon = 'icons/mob/human_races/r_skrell.dmi'
-		species_allowed = list("Skrell")
+		species_allowed = list(SPECIES_SKRELL)
@@ -52,7 +52,7 @@ var/list/organ_cache = list()
 	if(istype(holder))
 		src.owner = holder
 		src.w_class = max(src.w_class + mob_size_difference(holder.mob_size, MOB_MEDIUM), 1) //smaller mobs have smaller organs.
-		species = all_species["Human"]
+		species = all_species[SPECIES_HUMAN]
 		if(holder.dna)
 			dna = holder.dna.Clone()
 			species = all_species[dna.species]
@@ -106,7 +106,7 @@ var/global/list/limb_icon_cache = list()
 	if(owner && owner.gender == MALE)
 		gender = "m"

-	icon_cache_key = "[icon_name]_[species ? species.name : "Human"]"
+	icon_cache_key = "[icon_name]_[species ? species.name : SPECIES_HUMAN]"

 	if(force_icon)
 		mob_icon = new /icon(force_icon, "[icon_name][gendered_icon ? "_[gender]" : ""]")
@@ -162,7 +162,7 @@ var/global/list/limb_icon_cache = list()

 	if(nonsolid)
 		applying.MapColors("#4D4D4D","#969696","#1C1C1C", "#000000")
-		if(species && species.get_bodytype(owner) != "Human")
+		if(species && species.get_bodytype(owner) != SPECIES_HUMAN)
 			applying.SetIntensity(1.5) // Unathi, Taj and Skrell have -very- dark base icons.
 		else
 			applying.SetIntensity(0.7)
@@ -42,7 +42,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	var/lifelike										 // If set, appears organic.
 	var/skin_tone										 // If set, applies skin tone rather than part color
 	var/blood_color = "#030303"
-	var/list/species_cannot_use = list("Teshari")
+	var/list/species_cannot_use = list(SPECIES_TESHARI)
 	var/list/monitor_styles			 		 			 //If empty, the model of limbs offers a head compatible with monitors.
 	var/parts = BP_ALL						 			 //Defines what parts said brand can replace on a body.
 	var/health_hud_intensity = 1						 // Intensity modifier for the health GUI indicator.
@@ -1,5 +1,5 @@
 /datum/reagent/blood
-	data = new/list("donor" = null, "viruses" = null, "species" = "Human", "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, "antibodies" = list())
+	data = new/list("donor" = null, "viruses" = null, "species" = SPECIES_HUMAN, "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, "antibodies" = list())
 	name = "Blood"
 	id = "blood"
 	taste_description = "iron"
@@ -10,7 +10,7 @@
 	var/list/datum/disease2/effectholder/effects = list()
 	var/antigen = list() // 16 bits describing the antigens, when one bit is set, a cure with that bit can dock here
 	var/max_stage = 4
-	var/list/affected_species = list("Human","Unathi","Skrell","Tajaran")
+	var/list/affected_species = list(SPECIES_HUMAN,SPECIES_UNATHI,SPECIES_SKRELL,SPECIES_TAJ)
 	var/resistance = 10 // % chance a disease will resist cure, up to 100

 /datum/disease2/disease/New()
@@ -441,7 +441,7 @@
 /datum/disease2/effect/hair/activate(var/mob/living/carbon/mob,var/multiplier)
 	if(istype(mob, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = mob
-		if(H.species.name == "Human" && !(H.h_style == "Bald") && !(H.h_style == "Balding Hair"))
+		if(H.species.name == SPECIES_HUMAN && !(H.h_style == "Bald") && !(H.h_style == "Balding Hair"))
 			H << "<span class='danger'>Your hair starts to fall out in clumps...</span>"
 			spawn(50)
 				H.h_style = "Balding Hair"
@@ -565,7 +565,7 @@
 		S.enrage()

 	for(var/mob/living/carbon/human/H in view(get_turf(holder.my_atom)))
-		if(H.species.name == "Promethean")
+		if(H.species.name == SPECIES_PROMETHEAN)
 			H.add_modifier(/datum/modifier/berserk, 30 SECONDS)
 			to_chat(H, "<span class='warning'>An intense wave of rage is felt from inside, but you remain in control of yourself.</span>")

@@ -24,7 +24,7 @@
 	// Prometheans.
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
-		if(H.species && H.species.name == "Promethean" && status)
+		if(H.species && H.species.name == SPECIES_PROMETHEAN && status)
 			var/agony_to_apply = 60 - agonyforce
 			H.apply_damage(agony_to_apply, HALLOSS)
 	..()
@@ -115,7 +115,7 @@
 		// Prometheans.
 		if(ishuman(L))
 			var/mob/living/carbon/human/H = L
-			if(H.species && H.species.name == "Promethean")
+			if(H.species && H.species.name == SPECIES_PROMETHEAN)
 				if(agony == initial(agony))
 					agony = round((14 * agony) - agony) //60-4 = 56, 56 / 4 = 14. Prior was flat 60 - agony of the beam to equate to 60.
 	..()