Adds a very basic soft restriction system. There's definite room for improvement, but this is good enough for now. Am too hongry for this.

2020-03-03 17:44:10 -05:00
parent 519de6a83d
commit 49ad376e5e
11 changed files with 86 additions and 22 deletions
@@ -22,7 +22,7 @@
 	if(!pref_species)
 		var/rando_race = pick(GLOB.roundstart_races)
 		pref_species = new rando_race()
-	features = random_features()
+	features = random_features(pref_species?.id)
 	age = rand(AGE_MIN,AGE_MAX)

 /datum/preferences/proc/update_preview_icon(equip_job = TRUE)
@@ -71,6 +71,9 @@

 	//for snowflake/donor specific sprites
 	var/list/ckeys_allowed
+	
+	//For soft-restricting markings to species IDs
+	var/list/recommended_species

 /datum/sprite_accessory/underwear
 	icon = 'icons/mob/underwear.dmi'
@@ -38,6 +38,7 @@
 	color_src = MATRIXED
 	gender_specific = 0
 	icon = 'modular_citadel/icons/mob/mam_markings.dmi'
+	recommended_species = list("mammal", "xeno", "slimeperson", "podweak")

 /datum/sprite_accessory/mam_body_markings/none
 	name = "None"
@@ -132,10 +132,12 @@
 /datum/sprite_accessory/antenna
 	icon = 'modular_citadel/icons/mob/ipc_antennas.dmi'
 	color_src = MUTCOLORS2
+	recommended_species = list("ipc")

 /datum/sprite_accessory/antenna/none
 	name = "None"
 	icon_state = "None"
+	recommended_species = null

 /datum/sprite_accessory/antenna/antennae
 	name = "Angled Antennae"
@@ -151,11 +151,12 @@
 /datum/sprite_accessory/mam_snouts
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_snouts.dmi'
+	recommended_species = list("mammal", "slimeperson", "insect", "podweak")

 /datum/sprite_accessory/mam_snouts/none
 	name = "None"
 	icon_state = "none"
-
+	recommended_species = null

 /datum/sprite_accessory/mam_snouts/bird
 	name = "Beak"
@@ -1,5 +1,6 @@
 //Synth snouts (This is the most important part)
-/datum/sprite_accessory/mam_snouts/synthliz/synthliz_basic
+/datum/sprite_accessory/mam_snouts/synthliz
+	recommended_species = list("synthliz")
 	icon = 'modular_citadel/icons/mob/synthliz_snouts.dmi'
 	color_src = MUTCOLORS
 	name = "Synthetic Lizard - Snout"
@@ -24,7 +25,8 @@
 	icon_state = "synthliz_tertunder"

 //Synth body markings
-/datum/sprite_accessory/mam_body_markings/synthliz/synthliz_scutes
+/datum/sprite_accessory/mam_body_markings/synthliz
+	recommended_species = list("synthliz")
 	icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi'
 	name = "Synthetic Lizard - Plates"
 	icon_state = "synthlizscutes"
@@ -40,26 +42,23 @@
 	icon_state = "synthlizpecslight"

 //Synth tails
-/datum/sprite_accessory/mam_tails/synthliz/synthliz_tail
+/datum/sprite_accessory/mam_tails/synthliz
+	recommended_species = list("synthliz")
 	icon = 'modular_citadel/icons/mob/synthliz_tails.dmi'
 	color_src = MUTCOLORS
 	name = "Synthetic Lizard"
 	icon_state = "synthliz"

-/datum/sprite_accessory/mam_tails_animated/synthliz/synthliz_tail
+/datum/sprite_accessory/mam_tails_animated/synthliz
+	recommended_species = list("synthliz")
 	icon = 'modular_citadel/icons/mob/synthliz_tails.dmi'
 	color_src = MUTCOLORS
 	name = "Synthetic Lizard"
 	icon_state = "synthliz"

 //Synth Antennae
-/datum/sprite_accessory/antenna/synthliz/synthliz_none
-	icon = 'modular_citadel/icons/mob/synthliz_antennas.dmi'
-	color_src = MUTCOLORS
-	name = "None"
-	icon_state = "None"
-
-/datum/sprite_accessory/antenna/synthliz/synthliz_antennae
+/datum/sprite_accessory/antenna/synthliz
+	recommended_species = list("synthliz")
 	icon = 'modular_citadel/icons/mob/synthliz_antennas.dmi'
 	color_src = MUTCOLORS
 	name = "Synthetic Lizard - Antennae"
@@ -501,10 +501,12 @@
 /datum/sprite_accessory/mam_tails
 	color_src = MATRIXED
 	icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+	recommended_species = list("mammal", "slimeperson", "podweak", "felinid", "insect")

 /datum/sprite_accessory/mam_tails/none
 	name = "None"
 	icon_state = "none"
+	recommended_species = null

 /datum/sprite_accessory/mam_tails_animated
 	color_src = MATRIXED