Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo

dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
parent 723decec2b b7673e234f
commit 7d0c3df2ad
33 changed files with 330 additions and 241 deletions
@@ -77,6 +77,8 @@
 	//For soft-restricting markings to species IDs
 	var/list/recommended_species

+	var/mutable_category // simply do not worry about this value
+
 /datum/sprite_accessory/proc/is_not_visible(var/mob/living/carbon/human/H, var/tauric) //return if the accessory shouldn't be shown
 	return FALSE

@@ -48,6 +48,7 @@
 	icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
 	mutant_part_string = "xhead"
 	relevant_layers = list(BODY_ADJ_LAYER)
+	mutable_category = "HEAD"

 /datum/sprite_accessory/xeno_head/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
 	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
@@ -49,6 +49,7 @@
 	relevant_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER)
 	mutant_part_string = "mandibles"
 	color_src = 0
+	mutable_category = "HEAD"

 /datum/sprite_accessory/arachnid_mandibles/none
 	name = "None"
@@ -2,6 +2,7 @@
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	color_src = HAIR
 	relevant_layers = list(BODY_ADJ_LAYER)
+	mutable_category = "HEAD"

 /datum/sprite_accessory/caps/round
 	name = "Round"
@@ -2,6 +2,7 @@
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	mutant_part_string = "ears"
 	relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER)
+	mutable_category = "HEAD"

 /datum/sprite_accessory/ears/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
 	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
@@ -4,6 +4,7 @@
 /datum/sprite_accessory/facial_hair
 	icon = 'icons/mob/hair.dmi'
 	gender = MALE // barf (unless you're a dorf, dorfs dig chix w/ beards :P)
+	mutable_category = "HEAD"

 // please make sure they're sorted alphabetically and categorized
 /datum/sprite_accessory/facial_hair/shaved //this is exempt from the alphabetical sort
@@ -3,6 +3,7 @@
 //////////////////////
 /datum/sprite_accessory/hair
 	icon = 'icons/mob/hair.dmi'	  // default icon for all hairs
+	mutable_category = "HEAD"

 	// please make sure they're sorted alphabetically and, where needed, categorized
 	// try to capitalize the names please~
@@ -2,6 +2,7 @@
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	color_src = HORNCOLOR
 	relevant_layers = list(HORNS_LAYER)
+	mutable_category = "HEAD"

 /datum/sprite_accessory/horns/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
 	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
@@ -6,6 +6,11 @@
 	icon = 'modular_citadel/icons/mob/ipc_screens.dmi'
 	color_src = null
 	relevant_layers = list(BODY_ADJ_LAYER)
+	mutable_category = "HEAD"
+
+/datum/sprite_accessory/screen/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
+	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
+	return (HD == null) // it's not visible if head is null

 /datum/sprite_accessory/screen/blank
 	name = "Blank"
@@ -133,6 +138,7 @@
 	relevant_layers = list(BODY_ADJ_LAYER)
 	recommended_species = list("ipc")
 	mutant_part_string = "ipc_antenna"
+	mutable_category = "HEAD"

 /datum/sprite_accessory/antenna/none
 	name = "None"
@@ -2,6 +2,7 @@
 	icon = 'icons/mob/mutant_bodyparts.dmi'
 	mutant_part_string = "snout"
 	relevant_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER)
+	mutable_category = "HEAD"

 /datum/sprite_accessory/snouts/is_not_visible(var/mob/living/carbon/human/H, var/tauric)
 	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
@@ -5,6 +5,7 @@
 	color_src = MUTCOLORS
 	name = "Synthetic Lizard - Snout"
 	icon_state = "synthliz_basic"
+	mutable_category = "HEAD"

 /datum/sprite_accessory/snouts/mam_snouts/synthliz/synthliz_under
 	icon = 'modular_citadel/icons/mob/synthliz_snouts.dmi'