From 1a9092fe9de4269169a4ac4118a3f6aa00aeb11a Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 9 May 2026 10:39:46 +1000 Subject: [PATCH] Reskinning Neoavians to Hrok for Pyrelight. --- maps/karzerfeste/karzerfeste.dm | 1 + maps/shaded_hills/jobs/_jobs.dm | 4 ++++ maps/shaded_hills/shaded_hills.dm | 1 + mods/content/fantasy/datum/cultures.dm | 15 ------------ .../patches/drakes/fantasy_drakes.dm | 15 ++++++++++++ mods/~compatibility/patches/neoavians.dm | 9 ++++++++ .../patches/neoavians/fantasy_birds.dm | 23 +++++++++++++++++++ .../patches/neoavians/undead_birds.dm | 9 ++++++++ mods/~compatibility/~compatibility.dm | 4 ++++ 9 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 mods/~compatibility/patches/neoavians.dm create mode 100644 mods/~compatibility/patches/neoavians/fantasy_birds.dm create mode 100644 mods/~compatibility/patches/neoavians/undead_birds.dm diff --git a/maps/karzerfeste/karzerfeste.dm b/maps/karzerfeste/karzerfeste.dm index 6b8304b7961..f656491c44f 100644 --- a/maps/karzerfeste/karzerfeste.dm +++ b/maps/karzerfeste/karzerfeste.dm @@ -5,6 +5,7 @@ #include "../../mods/content/mouse_highlights/_mouse_highlight.dme" #include "../../mods/content/scaling_descriptors.dm" #include "../../mods/species/drakes/_drakes.dme" // include before _fantasy.dme so overrides work + #include "../../mods/species/neoavians/_neoavians.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" diff --git a/maps/shaded_hills/jobs/_jobs.dm b/maps/shaded_hills/jobs/_jobs.dm index 7eb2719f661..46d7f2efdbf 100644 --- a/maps/shaded_hills/jobs/_jobs.dm +++ b/maps/shaded_hills/jobs/_jobs.dm @@ -31,6 +31,10 @@ ), ) species_to_job_blacklist = list( + /decl/species/neoavian = list( + /datum/job/shaded_hills/inn/innkeeper, + /datum/job/shaded_hills/shrine/keeper + ), /decl/species/kobaloi = list( /datum/job/shaded_hills/visitor/beggar_knight, /datum/job/shaded_hills/inn/innkeeper, diff --git a/maps/shaded_hills/shaded_hills.dm b/maps/shaded_hills/shaded_hills.dm index d680a153227..9e43e4d16b0 100644 --- a/maps/shaded_hills/shaded_hills.dm +++ b/maps/shaded_hills/shaded_hills.dm @@ -5,6 +5,7 @@ #include "../../mods/content/mouse_highlights/_mouse_highlight.dme" #include "../../mods/content/scaling_descriptors.dm" #include "../../mods/species/drakes/_drakes.dme" // include before _fantasy.dme so overrides work + #include "../../mods/species/neoavians/_neoavians.dme" // include before _fantasy.dme so overrides work #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" diff --git a/mods/content/fantasy/datum/cultures.dm b/mods/content/fantasy/datum/cultures.dm index f7d0ad5b0bc..f54e47531b2 100644 --- a/mods/content/fantasy/datum/cultures.dm +++ b/mods/content/fantasy/datum/cultures.dm @@ -53,18 +53,3 @@ /decl/background_detail/religion/other name = "Other Religion" description = "You practice no religion, or a small or relatively unknown religion distinct from the major faiths." - -// Reskin to remove Icelandic, references to Sif, etc. -/decl/background_detail/heritage/grafadreka - name = "Meredrake Culture" - description = "You are a meredrake. Widely assumed to be cousins to true dragons, drakes are intelligent, arguably sapient pack predators without anything in the way of technology or culture, but they can be trained to use tools, and have been known to work well alongside humans or hnoll as companions and working animals." - -/decl/background_detail/location/grafadreka - name = "Wilderness" - description = "You are from the unsettled tundras and steppe of the Grass Ocean, or the forested downlands, where you probably eked out a life hunting deer or chasing rabbits." - -/decl/background_detail/faction/grafadreka - name = "Meredrake Pack" - -/decl/background_detail/religion/grafadreka - name = "Meredrake Religion" diff --git a/mods/~compatibility/patches/drakes/fantasy_drakes.dm b/mods/~compatibility/patches/drakes/fantasy_drakes.dm index 7c9279184ba..6eadc43b408 100644 --- a/mods/~compatibility/patches/drakes/fantasy_drakes.dm +++ b/mods/~compatibility/patches/drakes/fantasy_drakes.dm @@ -16,3 +16,18 @@ /decl/mob_modifier/sifsap_salve name = "Drakespittle Salve" desc = "glowing spittle" + +// Reskin to remove Icelandic, references to Sif, etc. +/decl/background_detail/heritage/grafadreka + name = "Meredrake Culture" + description = "You are a meredrake. Widely assumed to be cousins to true dragons, drakes are intelligent, arguably sapient pack predators without anything in the way of technology or culture, but they can be trained to use tools, and have been known to work well alongside humans or hnoll as companions and working animals." + +/decl/background_detail/location/grafadreka + name = "Wilderness" + description = "You are from the unsettled tundras and steppe of the Grass Ocean, or the forested downlands, where you probably eked out a life hunting deer or chasing rabbits." + +/decl/background_detail/faction/grafadreka + name = "Meredrake Pack" + +/decl/background_detail/religion/grafadreka + name = "Meredrake Religion" diff --git a/mods/~compatibility/patches/neoavians.dm b/mods/~compatibility/patches/neoavians.dm new file mode 100644 index 00000000000..ac3775eb303 --- /dev/null +++ b/mods/~compatibility/patches/neoavians.dm @@ -0,0 +1,9 @@ +// Override bird lore and names for the fantasy modpack. +#ifdef MODPACK_FANTASY +#include "neoavians/fantasy_birds.dm" +#endif + +// Undead drakes +#ifdef MODPACK_UNDEAD +#include "neoavians/undead_birds.dm" +#endif diff --git a/mods/~compatibility/patches/neoavians/fantasy_birds.dm b/mods/~compatibility/patches/neoavians/fantasy_birds.dm new file mode 100644 index 00000000000..e97f2d634d4 --- /dev/null +++ b/mods/~compatibility/patches/neoavians/fantasy_birds.dm @@ -0,0 +1,23 @@ +/decl/species/neoavian + name = "Hrok" + name_plural = "Hroks" + description = "Birdlike nomads originating from the arid, open regions of the downlands. " + available_background_info = list( + /decl/background_category/heritage = list( + /decl/background_detail/heritage/neoavian, + /decl/background_detail/heritage/other + ) + ) + +/decl/language/corvid + name = "Hrok Tongue" + desc = "The common tongue of the hrok." + +/decl/background_detail/heritage/neoavian + name = "Nomad Scavenger" + description = "Traditional hrok society is structured around roaming family groups that forage and scavenge as they travel the land." + language = /decl/language/corvid + secondary_langs = list( + /decl/language/corvid, + /decl/language/sign + ) diff --git a/mods/~compatibility/patches/neoavians/undead_birds.dm b/mods/~compatibility/patches/neoavians/undead_birds.dm new file mode 100644 index 00000000000..048e7ec5652 --- /dev/null +++ b/mods/~compatibility/patches/neoavians/undead_birds.dm @@ -0,0 +1,9 @@ +/mob/living/human/skeleton/avian/Initialize(mapload, species_uid, datum/mob_snapshot/supplied_appearance) + if(!species_uid) + species_uid = /decl/species/neoavian::uid + . = ..() + +/mob/living/human/zombie/avian/Initialize(mapload, species_uid, datum/mob_snapshot/supplied_appearance) + if(!species_uid) + species_uid = /decl/species/neoavian::uid + . = ..() diff --git a/mods/~compatibility/~compatibility.dm b/mods/~compatibility/~compatibility.dm index ea29d9c2d73..ebbd3838819 100644 --- a/mods/~compatibility/~compatibility.dm +++ b/mods/~compatibility/~compatibility.dm @@ -42,3 +42,7 @@ #ifdef CONTENT_PACK_EXPLORATION #include "patches/exploration.dm" #endif + +#ifdef CONTENT_PACK_NEOAVIANS +#include "patches/neoavians.dm" +#endif \ No newline at end of file