Integrating pyrelight content with backported content that went to Neb main.

Author: MistakeNot4892

maps/karzerfeste/karzerfeste.dm

@@ -6,6 +6,8 @@
 	#include "../../mods/content/scaling_descriptors.dm"
 	#include "../../mods/species/drakes/_drakes.dme" // include before _fantasy.dme so overrides work
 	#include "../../mods/content/fantasy/_fantasy.dme"
+	#include "../../mods/content/undead/_undead.dme"
+	#include "../../mods/content/biomods/_biomods.dme"
 	#include "../../mods/pyrelight/_pyrelight.dme" // include after _fantasy.dme so overrides work
 
 	#include "areas/_area.dm"

maps/shaded_hills/shaded_hills.dm

@@ -8,6 +8,8 @@
 	#include "../../mods/content/item_sharpening/_item_sharpening.dme"
 	#include "../../mods/content/anima/_anima.dme"   // include before _fantasy.dme so skill overrides work
 	#include "../../mods/content/fantasy/_fantasy.dme"
+	#include "../../mods/content/undead/_undead.dme"
+	#include "../../mods/content/biomods/_biomods.dme"
 	#include "../../mods/pyrelight/_pyrelight.dme" // include after _fantasy.dme so overrides work
 	#include "../../mods/content/blacksmithy/_blacksmithy.dme"
 

mods/pyrelight/_pyrelight.dme

@@ -20,8 +20,5 @@
 #include "plants\plants_fruit_template.dm"
 #include "plants\fruit_subtypes\nightweave.dm"
 #include "plants\plant_subtypes\nightweave.dm"
-#include "undead\undead.dm"
-#include "undead\undead_skeleton.dm"
-#include "undead\undead_zombie.dm"
 #endif
 // END_INCLUDE

mods/pyrelight/datum/wyrdling/ears.dm

@@ -1,31 +1,2 @@
-/decl/sprite_accessory/ears/wyrdling
-	abstract_type   = /decl/sprite_accessory/ears/wyrdling
-	icon            = 'mods/pyrelight/icons/wyrdling/ears.dmi'
+/decl/sprite_accessory/ears/biomods/animal
 	required_traits = list(/decl/trait/wyrd/wild)
-	accessory_metadata_types = list(SAM_COLOR, SAM_COLOR_INNER)
-
-/decl/sprite_accessory/ears/wyrdling/animal
-	name       = "Animal Ears"
-	icon_state = "ears_plain"
-	uid        = "accessory_ears_animal"
-
-/decl/sprite_accessory/ears/wyrdling/lupine
-	name       = "Lupine Ears"
-	icon_state = "wolf"
-	uid        = "accessory_ears_wolf"
-
-/decl/sprite_accessory/ears/wyrdling/fennec
-	name       = "Fennec Ears"
-	icon_state = "fennec"
-	uid        = "accessory_ears_fennec"
-
-/decl/sprite_accessory/ears/wyrdling/vulpine
-	name       = "Vulpine Ears"
-	icon_state = "fox"
-	uid        = "accessory_ears_fox"
-
-/decl/sprite_accessory/ears/wyrdling/antlers
-	name       = "Antlers"
-	icon_state = "antlers"
-	uid        = "accessory_ears_antlers"
-	accessory_metadata_types = list(SAM_COLOR)

mods/pyrelight/datum/wyrdling/mask.dm

@@ -48,37 +48,6 @@
 /mob/living/proc/copy_wyrd_eyes_color(new_color)
 	return
 
-/mob/living/simple_animal/proc/get_default_animal_colours()
-	return
-
-/mob/living/simple_animal/passive/fox/get_default_animal_colours()
-	var/static/list/default_colors = list(
-		"base"     = "#ed5a20",
-		"markings" = "#efe9e6",
-		"socks"    = "#36221b"
-	)
-	return default_colors
-
-/mob/living/simple_animal/passive/deer/get_default_animal_colours()
-	var/static/list/default_colors = list(
-		"base"     = "#b39161",
-		"markings" = "#3a3329",
-		"socks"    = "#ddd5c9"
-	)
-	return default_colors
-
-/mob/living/simple_animal/passive/rabbit/get_default_animal_colours()
-	var/static/list/default_colors = list(
-		"base"     = "#e6e5da",
-		"markings" = "#c8b1a5",
-		"socks"    = "#e6e5da"
-	)
-	return default_colors
-
-/mob/living/simple_animal/proc/get_default_animal_colour(marking_type)
-	var/list/colors = get_default_animal_colours()
-	return LAZYACCESS(colors, marking_type) || COLOR_BLACK
-
 /mob/living/simple_animal/copy_wyrd_fur_color(new_color)
 	if(!new_color || new_color == COLOR_BLACK)
 		new_color = get_default_animal_colour("base")

mods/pyrelight/datum/wyrdling/tails.dm

@@ -1,69 +1,2 @@
-/decl/sprite_accessory/tail/wyrdling
-	abstract_type   = /decl/sprite_accessory/tail/wyrdling
-	icon            = 'mods/pyrelight/icons/wyrdling/tails.dmi'
+/decl/sprite_accessory/ears/biomods/animal
 	required_traits = list(/decl/trait/wyrd/wild)
-	accessory_metadata_types = list(SAM_COLOR)
-
-/decl/sprite_accessory/tail/wyrdling/twotone
-	abstract_type = /decl/sprite_accessory/tail/wyrdling/twotone
-	accessory_metadata_types = list(SAM_COLOR, SAM_COLOR_INNER)
-
-/decl/sprite_accessory/tail/wyrdling/twotone/skunk
-	name       = "Skunk Tail"
-	icon_state = "skunktail"
-	uid        = "acc_tail_skunk"
-
-/decl/sprite_accessory/tail/wyrdling/twotone/vulpine
-	name       = "Vulpine Tail"
-	icon_state = "vulptail"
-	uid        = "acc_tail_vulpine"
-
-/decl/sprite_accessory/tail/wyrdling/twotone/tuft
-	name       = "Tuft Tail"
-	icon_state = "deertail"
-	uid        = "acc_tail_deer"
-
-/decl/sprite_accessory/tail/wyrdling/twotone/long_tuft
-	name       = "Long Tufted Tail"
-	icon_state = "easterntail"
-	uid        = "acc_tail_eastern"
-
-/decl/sprite_accessory/tail/wyrdling/horse
-	name       = "Horse Tail"
-	icon_state = "horse"
-	uid        = "acc_tail_horse"
-
-/decl/sprite_accessory/tail/wyrdling/fantail
-	name       = "Fantail"
-	icon_state = "fantail"
-	uid        = "acc_tail_fan"
-
-/decl/sprite_accessory/tail/wyrdling/wagtail
-	name       = "Wagtail"
-	icon_state = "wagtail"
-	uid        = "acc_tail_wag"
-
-/decl/sprite_accessory/tail/wyrdling/mouse
-	name       = "Mouse Tail"
-	icon_state = "mouse"
-	uid        = "acc_tail_mouse"
-
-/decl/sprite_accessory/tail/wyrdling/straight
-	name       = "Straight Tail"
-	icon_state = "straighttail"
-	uid        = "acc_tail_straight"
-
-/decl/sprite_accessory/tail/wyrdling/spiky
-	name       = "Spiky Tail"
-	icon_state = "ztail"
-	uid        = "acc_tail_ztail"
-
-/decl/sprite_accessory/tail/wyrdling/fox
-	name       = "Fox Tail"
-	icon_state = "fox_tail"
-	uid        = "acc_tail_fox"
-
-/decl/sprite_accessory/tail/wyrdling/wolf
-	name       = "Wolf Tail"
-	icon_state = "wolf_tail"
-	uid        = "acc_tail_wolf"