Merge branch 'master' into kevinz000-patch-85

code/_globalvars/lists/flavor_misc.dm

@@ -33,6 +33,7 @@ GLOBAL_LIST_EMPTY(animated_tails_list_human)
 GLOBAL_LIST_EMPTY(ears_list)
 GLOBAL_LIST_EMPTY(wings_list)
 GLOBAL_LIST_EMPTY(wings_open_list)
+GLOBAL_LIST_EMPTY(deco_wings_list)
 GLOBAL_LIST_EMPTY(r_wings_list)
 GLOBAL_LIST_EMPTY(insect_wings_list)
 GLOBAL_LIST_EMPTY(insect_fluffs_list)

code/_globalvars/lists/mobs.dm

@@ -58,3 +58,64 @@ GLOBAL_LIST_EMPTY(latejoiners) //CIT CHANGE - All latejoining people, for traito
 	for(var/i in GLOB.mob_list)
 		var/mob/M = i
 		M.update_config_movespeed()
+
+GLOBAL_LIST_INIT(noodle_taurs, list(
+		"Naga",
+		"Tentacle"
+		))
+
+GLOBAL_LIST_INIT(paw_taurs, list(
+		"Fox",
+		"Wolf",
+		"Otie",
+		"Drake",
+		"Lab",
+		"Shepherd",
+		"Husky",
+		"Eevee",
+		"Panther",
+		"Horse",
+		"Cow",
+		"Tiger"
+		))
+
+	//blood types
+GLOBAL_LIST_INIT(regular_bloods,list(
+		"O-",
+		"O+",
+		"A-",
+		"A+",
+		"B-",
+		"B+",
+		"AB-",
+		"AB+"
+		))
+
+GLOBAL_LIST_INIT(all_types_bloods,list(
+		"O-",
+		"O+",
+		"A-",
+		"A+",
+		"B-",
+		"B+",
+		"AB-",
+		"AB+",
+		"SY",
+		"X*",
+		"HF",
+		"L",
+		"U",
+		"GEL",
+		"BUG"
+		))
+
+GLOBAL_LIST_INIT(blood_types, list(
+		"blood",
+		"jellyblood"
+		))
+
+GLOBAL_LIST_INIT(blood_id_types, list(
+		"blood" = /datum/reagent/blood,
+		"jellyblood" = /datum/reagent/blood/jellyblood
+		))
+

code/_globalvars/lists/poll_ignore.dm

@@ -15,6 +15,7 @@
 #define POLL_IGNORE_DRONE "drone"
 #define POLL_IGNORE_DEMON "demon"
 #define POLL_IGNORE_WIZARD "wizard"
+#define POLL_IGNORE_CLONE "clone"
 
 GLOBAL_LIST_INIT(poll_ignore_desc, list(
 	POLL_IGNORE_SENTIENCE_POTION = "Sentience potion",
@@ -31,7 +32,8 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
 	POLL_IGNORE_SWARMER = "Swarmer shells",
 	POLL_IGNORE_DRONE = "Drone shells",
 	POLL_IGNORE_DEMON = "Demons",
-	POLL_IGNORE_WIZARD = "Wizards"
+	POLL_IGNORE_WIZARD = "Wizards",
+	POLL_IGNORE_CLONE = "Defective/SDGF clones"
 ))
 GLOBAL_LIST_INIT(poll_ignore, init_poll_ignore())