From a6e54e8846d3838b757fb44afb678bf8d97e41c7 Mon Sep 17 00:00:00 2001 From: Name Date: Fri, 27 Sep 2024 21:14:53 -0400 Subject: [PATCH 1/8] Gene-Mod Mutant Colors --- .../modular_species/species_types/genemod/genemod.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_doppler/modular_species/species_types/genemod/genemod.dm b/modular_doppler/modular_species/species_types/genemod/genemod.dm index 5485bd67482f9..bf1d24a08136d 100644 --- a/modular_doppler/modular_species/species_types/genemod/genemod.dm +++ b/modular_doppler/modular_species/species_types/genemod/genemod.dm @@ -8,7 +8,7 @@ examine_limb_id = SPECIES_HUMAN inherent_traits = list( TRAIT_ANIMALISTIC, - TRAIT_USES_SKINTONES, + TRAIT_MUTANT_COLORS, ) changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT @@ -38,7 +38,7 @@ human_for_preview.dna.features["ears_color_2"] = "#F4B1C8" human_for_preview.set_haircolor("#3a2d22", update = FALSE) human_for_preview.set_hairstyle("Short twintails", update = TRUE) - human_for_preview.skin_tone = "mixed3" + human_for_preview.dna.features["mcolor"] = "#725547" human_for_preview.eye_color_left = "#442B12" human_for_preview.eye_color_right = "#442B12" regenerate_organs(human_for_preview) From 9b39ba7b205341b7c596cb40ab0bdb14185dc7fa Mon Sep 17 00:00:00 2001 From: Name Date: Sat, 28 Sep 2024 01:14:06 -0400 Subject: [PATCH 2/8] Stops blowed up screenshot tests --- code/__DEFINES/~doppler_defines/is_helpers.dm | 2 +- .../hearthkin/primitive_genemod/code/objects.dm | 8 ++++---- .../hearthkin/primitive_genemod/code/spawner.dm | 4 ++-- .../species_types/genemod/genemod.dm | 14 +++++++------- .../primitive_genemod/primitive_genemod.dm | 14 +++++++------- modular_doppler/reagent_forging/code/forge.dm | 8 ++++---- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/code/__DEFINES/~doppler_defines/is_helpers.dm b/code/__DEFINES/~doppler_defines/is_helpers.dm index 0b00d1d1b7187..42a6bd2521ce8 100644 --- a/code/__DEFINES/~doppler_defines/is_helpers.dm +++ b/code/__DEFINES/~doppler_defines/is_helpers.dm @@ -1,5 +1,5 @@ //Species -#define isprimitive(A) (is_species(A, /datum/species/human/genemod/primitive)) +#define isprimitive(A) (is_species(A, /datum/species/genemod/primitive)) //Customization bases #define isinsectoid(A) (is_species(A, /datum/species/insectoid)) #define issnail(A) (is_species(A, /datum/species/snail)) diff --git a/modular_doppler/hearthkin/primitive_genemod/code/objects.dm b/modular_doppler/hearthkin/primitive_genemod/code/objects.dm index bf74c086cc3e7..8aced5c08dffc 100644 --- a/modular_doppler/hearthkin/primitive_genemod/code/objects.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/objects.dm @@ -9,7 +9,7 @@ var/being_used = FALSE /obj/item/anointing_oil/attack(mob/living/target_mob, mob/living/user, params) - if (!is_species(user, /datum/species/human/genemod/primitive)) + if (!is_species(user, /datum/species/genemod/primitive)) to_chat(user, span_warning("You have no idea what this disgusting concoction is used for.")) return if(being_used || !ismob(target_mob)) //originally this was going to check if the mob was friendly, but if an icecat wants to name some terror mob while it's tearing chunks out of them, why not? @@ -48,7 +48,7 @@ /obj/item/anointing_oil/examine(mob/user) . = ..() - if(is_species(user, /datum/species/human/genemod/primitive)) + if(is_species(user, /datum/species/genemod/primitive)) . += span_info("Using this on the local wildlife will allow you to give them a name.") /datum/crafting_recipe/anointing_oil @@ -74,7 +74,7 @@ w_class = WEIGHT_CLASS_TINY /obj/item/frozen_breath/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) - if (!is_species(user, /datum/species/human/genemod/primitive)) + if (!is_species(user, /datum/species/genemod/primitive)) to_chat(user, span_warning("You have no idea how to use this freezing concoction.")) return @@ -94,7 +94,7 @@ /obj/item/frozen_breath/examine(mob/user) . = ..() - if(is_species(user, /datum/species/human/genemod/primitive)) + if(is_species(user, /datum/species/genemod/primitive)) . += span_info("Using this on a pair of organic lungs transforms them into hardy lungs. This will remove any other special features from the old lungs, if there were any.") /datum/crafting_recipe/frozen_breath diff --git a/modular_doppler/hearthkin/primitive_genemod/code/spawner.dm b/modular_doppler/hearthkin/primitive_genemod/code/spawner.dm index 329469d585ccb..3b75448ebffed 100644 --- a/modular_doppler/hearthkin/primitive_genemod/code/spawner.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/spawner.dm @@ -4,7 +4,7 @@ prompt_name = "icemoon dweller" icon = 'icons/mob/simple/lavaland/nest.dmi' icon_state = "hole" - mob_species = /datum/species/human/genemod/primitive + mob_species = /datum/species/genemod/primitive outfit = /datum/outfit/primitive_genemod density = FALSE you_are_text = "You are an icemoon dweller." @@ -20,7 +20,7 @@ /// The team the spawner will assign players to and use to keep track of people that have already used the spawner var/datum/team/primitive_genemods/team - restricted_species = list(/datum/species/human/genemod/primitive) + restricted_species = list(/datum/species/genemod/primitive) infinite_use = TRUE deletes_on_zero_uses_left = FALSE diff --git a/modular_doppler/modular_species/species_types/genemod/genemod.dm b/modular_doppler/modular_species/species_types/genemod/genemod.dm index bf1d24a08136d..af7025f35b52b 100644 --- a/modular_doppler/modular_species/species_types/genemod/genemod.dm +++ b/modular_doppler/modular_species/species_types/genemod/genemod.dm @@ -1,7 +1,7 @@ /mob/living/carbon/human/species/genemod - race = /datum/species/human/genemod + race = /datum/species/genemod -/datum/species/human/genemod +/datum/species/genemod name = "Gene-Mod" id = SPECIES_GENEMOD preview_outfit = /datum/outfit/genemod_preview @@ -16,22 +16,22 @@ name = "Gene-Mod (Species Preview)" uniform = /obj/item/clothing/under/dress/sundress -/datum/species/human/genemod/get_physical_attributes() +/datum/species/genemod/get_physical_attributes() return "N/a." -/datum/species/human/genemod/get_species_description() +/datum/species/genemod/get_species_description() return "N/a." -/datum/species/human/genemod/get_species_lore() +/datum/species/genemod/get_species_lore() return list( "N/a.", ) -/datum/species/human/genemod/on_species_gain(mob/living/carbon/human/target, datum/species/old_species, pref_load) +/datum/species/genemod/on_species_gain(mob/living/carbon/human/target, datum/species/old_species, pref_load) apply_animal_trait(target, find_animal_trait(target)) return ..() -/datum/species/human/genemod/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) +/datum/species/genemod/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) human_for_preview.dna.ear_type = DOG human_for_preview.dna.features["ears"] = "Fold" human_for_preview.dna.features["ears_color_1"] = "#4E3E30" diff --git a/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm b/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm index 8e4e5778d0d7a..054daa6caae8f 100644 --- a/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm +++ b/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm @@ -1,5 +1,5 @@ /mob/living/carbon/human/species/genemod/primitive - race = /datum/species/human/genemod/primitive + race = /datum/species/genemod/primitive /datum/language_holder/primitive_genemod understood_languages = list( @@ -12,7 +12,7 @@ ) selected_language = /datum/language/primitive_genemod -/datum/species/human/genemod/primitive +/datum/species/genemod/primitive name = "Primitive Gene-Mod" id = SPECIES_GENEMOD_PRIMITIVE preview_outfit = /datum/outfit/genemod_primitive_preview @@ -40,7 +40,7 @@ neck = /obj/item/clothing/neck/scarf/primitive_genemod_scarf back = /obj/item/forging/reagent_weapon/axe/fake_copper -/datum/species/human/genemod/primitive/on_species_gain(mob/living/carbon/new_primitive, datum/species/old_species, pref_load) +/datum/species/genemod/primitive/on_species_gain(mob/living/carbon/new_primitive, datum/species/old_species, pref_load) . = ..() var/mob/living/carbon/human/hearthkin = new_primitive if(!istype(hearthkin)) @@ -53,14 +53,14 @@ mutation.mutadone_proof = TRUE mutation.instability = 0 -/datum/species/human/genemod/primitive/on_species_loss(mob/living/carbon/former_primitive, datum/species/new_species, pref_load) +/datum/species/genemod/primitive/on_species_loss(mob/living/carbon/former_primitive, datum/species/new_species, pref_load) . = ..() var/mob/living/carbon/human/hearthkin = former_primitive if(!istype(hearthkin)) return hearthkin.dna.remove_mutation(/datum/mutation/human/olfaction) -/datum/species/human/genemod/primitive/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) +/datum/species/genemod/primitive/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) human_for_preview.dna.ear_type = CAT human_for_preview.dna.features["ears"] = "Coeurl" human_for_preview.dna.features["ears_color_1"] = "#e9eff5" @@ -74,7 +74,7 @@ regenerate_organs(human_for_preview) human_for_preview.update_body(is_creating = TRUE) -/datum/species/human/genemod/primitive/get_species_description() +/datum/species/genemod/primitive/get_species_description() return list( "Genetically modified humanoids believed to be descendants of a now centuries old colony \ ship from the pre-bluespace travel era. Still having at least some human traits, they \ @@ -82,7 +82,7 @@ the icemoon's many fauna." ) -/datum/species/human/genemod/primitive/get_species_lore() +/datum/species/genemod/primitive/get_species_lore() return list( "The Hearthkin are a culture of disparate Scandinavian groups all sharing a common origin \ as descendents from demihuman genemodders aboard the good ship Stjarndrakkr, or Star Dragon; \ diff --git a/modular_doppler/reagent_forging/code/forge.dm b/modular_doppler/reagent_forging/code/forge.dm index 54e8fdf6fd501..b183b392662c1 100644 --- a/modular_doppler/reagent_forging/code/forge.dm +++ b/modular_doppler/reagent_forging/code/forge.dm @@ -156,7 +156,7 @@ . += span_notice("
[src] is currently [forge_temperature] degrees hot, going towards [target_temperature] degrees.
") - if(reagent_forging && (is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/human/genemod/primitive))) + if(reagent_forging && (is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/genemod/primitive))) . += span_warning("[src] has a fine gold trim, it is ready to imbue chemicals into reagent objects.") return . @@ -408,7 +408,7 @@ if(SKILL_LEVEL_LEGENDARY) if(!forced) - if(is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/human/genemod/primitive)) + if(is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/genemod/primitive)) to_chat(user, span_notice("With just the right heat treating technique, metal could be made to accept reagents...")) create_reagent_forge() if(forge_level == FORGE_LEVEL_MASTER) @@ -573,7 +573,7 @@ return var/mob/living/carbon/human/human_user = user - if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/human/genemod/primitive)) + if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/genemod/primitive)) to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time return @@ -623,7 +623,7 @@ return var/mob/living/carbon/human/human_user = user - if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/human/genemod/primitive)) + if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/genemod/primitive)) to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time return From 420d0a7ebe4faf81775c08ee9b33b2fbca279772 Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Sat, 28 Sep 2024 12:47:12 +0200 Subject: [PATCH 3/8] ci --- ...enshot_humanoids__datum_species_genemod.png} | Bin 985 -> 985 bytes ...anoids__datum_species_genemod_primitive.png} | Bin 985 -> 985 bytes .../primitive_genemod/primitive_genemod.dm | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename code/modules/unit_tests/screenshots/{screenshot_humanoids__datum_species_human_genemod.png => screenshot_humanoids__datum_species_genemod.png} (80%) rename code/modules/unit_tests/screenshots/{screenshot_humanoids__datum_species_human_genemod_primitive.png => screenshot_humanoids__datum_species_genemod_primitive.png} (80%) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_genemod.png similarity index 80% rename from code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png rename to code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_genemod.png index 475c07f50deedc69ee8dd9ecfb22392e9592886f..1fbfa6cf0d41ea2c728bc3092995e6031d024f4b 100644 GIT binary patch delta 49 zcmV-10M7r}2iXUZEFJ)~008a)0RI30*#MNkwg3PCiHV5-#{jUfumFqzkxD-VO)!n6 Hv5iavt}YRF delta 49 zcmV-10M7r}2iXUZEFRjPlKIib|KQQ;zqFLUwg3PCiHV8fucolDu)KS5kxD-Vd--jt Hv5iav!k!xm diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_genemod_primitive.png similarity index 80% rename from code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png rename to code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_genemod_primitive.png index 475c07f50deedc69ee8dd9ecfb22392e9592886f..1fbfa6cf0d41ea2c728bc3092995e6031d024f4b 100644 GIT binary patch delta 49 zcmV-10M7r}2iXUZEFJ)~008a)0RI30*#MNkwg3PCiHV5-#{jUfumFqzkxD-VO)!n6 Hv5iavt}YRF delta 49 zcmV-10M7r}2iXUZEFRjPlKIib|KQQ;zqFLUwg3PCiHV8fucolDu)KS5kxD-Vd--jt Hv5iav!k!xm diff --git a/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm b/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm index 054daa6caae8f..b3eff4f7d8029 100644 --- a/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm +++ b/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm @@ -31,7 +31,7 @@ TRAIT_ANIMALISTIC, TRAIT_VIRUSIMMUNE, TRAIT_RESISTCOLD, - TRAIT_USES_SKINTONES, + TRAIT_MUTANT_COLORS, ) /datum/outfit/genemod_primitive_preview @@ -68,7 +68,7 @@ human_for_preview.dna.features["ears_color_3"] = "#222222" human_for_preview.set_haircolor("#E9EFF5", update = FALSE) human_for_preview.set_hairstyle("Fluffy long", update = TRUE) - human_for_preview.skin_tone = "albino" + human_for_preview.dna.features["mcolor"] = "#FFFFFF" human_for_preview.eye_color_left = "#96dbe7" human_for_preview.eye_color_right = "#96dbe7" regenerate_organs(human_for_preview) From 6f14ca3b59d66fea169ff4419c584ca93765fe63 Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Sat, 28 Sep 2024 13:07:22 +0200 Subject: [PATCH 4/8] no regressions --- .../accessories/code/~overrides/code/overrides.dm | 3 +++ .../modular_species/species_types/genemod/genemod.dm | 2 +- .../species_types/primitive_genemod/primitive_genemod.dm | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modular_doppler/modular_customization/accessories/code/~overrides/code/overrides.dm b/modular_doppler/modular_customization/accessories/code/~overrides/code/overrides.dm index 7be7fa5faa096..0928c58dbb97f 100644 --- a/modular_doppler/modular_customization/accessories/code/~overrides/code/overrides.dm +++ b/modular_doppler/modular_customization/accessories/code/~overrides/code/overrides.dm @@ -19,6 +19,9 @@ . = ..() /// Weirdness Check Zone: kill incorrect tails if(randomize_features) + if(species.id != /datum/species/genemod) + var/skin_tone = pick(GLOB.skin_tones) + features["mcolor"] = skintone2hex(skin_tone) if(species.id != /datum/species/human/felinid::id) features["tail_cat"] = /datum/sprite_accessory/tails/human/none::name features["ears"] = /datum/sprite_accessory/ears/none::name diff --git a/modular_doppler/modular_species/species_types/genemod/genemod.dm b/modular_doppler/modular_species/species_types/genemod/genemod.dm index af7025f35b52b..83f0fa3f15931 100644 --- a/modular_doppler/modular_species/species_types/genemod/genemod.dm +++ b/modular_doppler/modular_species/species_types/genemod/genemod.dm @@ -38,7 +38,7 @@ human_for_preview.dna.features["ears_color_2"] = "#F4B1C8" human_for_preview.set_haircolor("#3a2d22", update = FALSE) human_for_preview.set_hairstyle("Short twintails", update = TRUE) - human_for_preview.dna.features["mcolor"] = "#725547" + human_for_preview.dna.features["mcolor"] = skintone2hex("mixed3") human_for_preview.eye_color_left = "#442B12" human_for_preview.eye_color_right = "#442B12" regenerate_organs(human_for_preview) diff --git a/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm b/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm index b3eff4f7d8029..473d7c5336465 100644 --- a/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm +++ b/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm @@ -68,7 +68,7 @@ human_for_preview.dna.features["ears_color_3"] = "#222222" human_for_preview.set_haircolor("#E9EFF5", update = FALSE) human_for_preview.set_hairstyle("Fluffy long", update = TRUE) - human_for_preview.dna.features["mcolor"] = "#FFFFFF" + human_for_preview.dna.features["mcolor"] = skintone2hex("albino") human_for_preview.eye_color_left = "#96dbe7" human_for_preview.eye_color_right = "#96dbe7" regenerate_organs(human_for_preview) From 2729ce33d0b81b0cfe895126d795babd6c76db64 Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Sat, 28 Sep 2024 13:27:04 +0200 Subject: [PATCH 5/8] hemophages want this too --- code/__DEFINES/~doppler_defines/is_helpers.dm | 2 +- .../hemophage/hemophage_species.dm | 33 +++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/code/__DEFINES/~doppler_defines/is_helpers.dm b/code/__DEFINES/~doppler_defines/is_helpers.dm index a86914850fafa..33e34567e514e 100644 --- a/code/__DEFINES/~doppler_defines/is_helpers.dm +++ b/code/__DEFINES/~doppler_defines/is_helpers.dm @@ -3,6 +3,6 @@ //Customization bases #define isinsectoid(A) (is_species(A, /datum/species/insectoid)) #define issnail(A) (is_species(A, /datum/species/snail)) -#define ishemophage(A) (is_species(A, /datum/species/hemophage)) +#define ishemophage(A) (is_species(A, /datum/species/genemod/hemophage)) //Species with green blood #define hasgreenblood(A) (isinsectoid(A) || HAS_TRAIT(A, TRAIT_GREEN_BLOOD)) diff --git a/modular_doppler/modular_species/species_types/hemophage/hemophage_species.dm b/modular_doppler/modular_species/species_types/hemophage/hemophage_species.dm index abd3d59bd5e15..110c9ea2ac6bd 100644 --- a/modular_doppler/modular_species/species_types/hemophage/hemophage_species.dm +++ b/modular_doppler/modular_species/species_types/hemophage/hemophage_species.dm @@ -2,9 +2,10 @@ #define HEMOPHAGE_SPAWN_TEXT "You are an [span_danger("Hemophage")]. You will slowly but constantly lose blood if outside of a closet-like object. If inside a closet-like object, or in pure darkness, you will slowly heal, at the cost of blood. You may gain more blood by grabbing a live victim and using your drain ability." -/datum/species/hemophage +/datum/species/genemod/hemophage name = "Hemophage" id = SPECIES_HEMOPHAGE + preview_outfit = /datum/outfit/hemophage_preview inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, @@ -14,7 +15,7 @@ TRAIT_VIRUSIMMUNE, TRAIT_LITERATE, TRAIT_DRINKS_BLOOD, - TRAIT_USES_SKINTONES, + TRAIT_MUTANT_COLORS, ) inherent_biotypes = MOB_HUMANOID | MOB_ORGANIC exotic_bloodtype = "U" @@ -27,24 +28,24 @@ examine_limb_id = SPECIES_HUMAN skinned_type = /obj/item/stack/sheet/animalhide/human -/datum/species/hemophage/check_roundstart_eligible() +/datum/species/genemod/hemophage/check_roundstart_eligible() if(check_holidays(HALLOWEEN)) return TRUE return ..() -/datum/species/hemophage/on_species_gain(mob/living/carbon/human/new_hemophage, datum/species/old_species, pref_load) +/datum/species/genemod/hemophage/on_species_gain(mob/living/carbon/human/new_hemophage, datum/species/old_species, pref_load) . = ..() to_chat(new_hemophage, HEMOPHAGE_SPAWN_TEXT) new_hemophage.update_body() -/datum/species/hemophage/get_species_description() +/datum/species/genemod/hemophage/get_species_description() return "Oftentimes feared or pushed out of society for the predatory nature of their condition, \ Hemophages are typically mixed around various Frontier populations, keeping their true nature hidden while \ reaping both the benefits and easy access to prey, enjoying unpursued existences on the Frontier." -/datum/species/hemophage/get_species_lore() +/datum/species/genemod/hemophage/get_species_lore() return list( "Though known by many other names, 'Hemophages' are those that have found themselves the host of a bloodthirsty infection. 'Natural' hemophages have their infection first overtake their body through the bloodstream, though methods vary; \ Hemophages thought to be a dense cluster of tightly related but distinct strains and variants. It will first take root in the chest, making alterations to the cells making up the host's organs to rapidly expand and take them over. \ @@ -95,14 +96,18 @@ ) -/datum/species/hemophage/prepare_human_for_preview(mob/living/carbon/human/human) - human.skin_tone = "albino" - human.hair_color = "#1d1d1d" - human.hairstyle = "Pompadour (Big)" +/datum/outfit/hemophage_preview + name = "Hemophage (Species Preview)" + uniform = /obj/item/clothing/under/dress/doppler/pentagram + +/datum/species/genemod/hemophage/prepare_human_for_preview(mob/living/carbon/human/human) + human.dna.features["mcolor"] = skintone2hex("albino") + human.hair_color = "#3D292D" + human.hairstyle = "Long Gloomy Bangs" regenerate_organs(human, src, visual_only = TRUE) human.update_body(TRUE) -/datum/species/hemophage/create_pref_unique_perks() +/datum/species/genemod/hemophage/create_pref_unique_perks() var/list/to_add = list() to_add += list( @@ -145,7 +150,7 @@ return to_add -/datum/species/hemophage/create_pref_blood_perks() +/datum/species/genemod/hemophage/create_pref_blood_perks() var/list/to_add = list() to_add += list(list( @@ -161,12 +166,12 @@ return to_add -/datum/species/hemophage/get_cry_sound(mob/living/carbon/human/hemophage) +/datum/species/genemod/hemophage/get_cry_sound(mob/living/carbon/human/hemophage) var/datum/species/human/human_species = GLOB.species_prototypes[/datum/species/human] return human_species.get_cry_sound(hemophage) // We don't need to mention that they're undead, as the perks that come from it are otherwise already explicited, and they might no longer be actually undead from a gameplay perspective, eventually. -/datum/species/hemophage/create_pref_biotypes_perks() +/datum/species/genemod/hemophage/create_pref_biotypes_perks() return From 1eccd2aad254bc06de68bc3fcbff42b9a63a8007 Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Sat, 28 Sep 2024 13:40:47 +0200 Subject: [PATCH 6/8] oops --- .../accessories/code/~overrides/code/overrides.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_doppler/modular_customization/accessories/code/~overrides/code/overrides.dm b/modular_doppler/modular_customization/accessories/code/~overrides/code/overrides.dm index 0928c58dbb97f..2576ff1ecc555 100644 --- a/modular_doppler/modular_customization/accessories/code/~overrides/code/overrides.dm +++ b/modular_doppler/modular_customization/accessories/code/~overrides/code/overrides.dm @@ -17,11 +17,11 @@ /datum/dna/initialize_dna(newblood_type, create_mutation_blocks = TRUE, randomize_features = TRUE) . = ..() - /// Weirdness Check Zone: kill incorrect tails + /// Weirdness Check Zone if(randomize_features) - if(species.id != /datum/species/genemod) + if(istype(species, /datum/species/genemod)) var/skin_tone = pick(GLOB.skin_tones) - features["mcolor"] = skintone2hex(skin_tone) + features["mcolor"] = skintone2hex(skin_tone) //spoof if(species.id != /datum/species/human/felinid::id) features["tail_cat"] = /datum/sprite_accessory/tails/human/none::name features["ears"] = /datum/sprite_accessory/ears/none::name From 55008873b0f3f4c2b07c15c809755b756c53aa1a Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Sat, 28 Sep 2024 13:42:04 +0200 Subject: [PATCH 7/8] ci --- ...anoids__datum_species_genemod_hemophage.png} | Bin 985 -> 985 bytes 1 file changed, 0 insertions(+), 0 deletions(-) rename code/modules/unit_tests/screenshots/{screenshot_humanoids__datum_species_hemophage.png => screenshot_humanoids__datum_species_genemod_hemophage.png} (80%) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_genemod_hemophage.png similarity index 80% rename from code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png rename to code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_genemod_hemophage.png index 475c07f50deedc69ee8dd9ecfb22392e9592886f..1fbfa6cf0d41ea2c728bc3092995e6031d024f4b 100644 GIT binary patch delta 49 zcmV-10M7r}2iXUZEFJ)~008a)0RI30*#MNkwg3PCiHV5-#{jUfumFqzkxD-VO)!n6 Hv5iavt}YRF delta 49 zcmV-10M7r}2iXUZEFRjPlKIib|KQQ;zqFLUwg3PCiHV8fucolDu)KS5kxD-Vd--jt Hv5iav!k!xm From 3c4d3fe342ffa24992cf0f483d5486bcf516745c Mon Sep 17 00:00:00 2001 From: "Lila S." Date: Sat, 28 Sep 2024 14:35:27 +0200 Subject: [PATCH 8/8] mess with the preview bcuz i can --- .../species_types/hemophage/hemophage_species.dm | 13 +++++++++---- .../primitive_genemod/primitive_genemod.dm | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modular_doppler/modular_species/species_types/hemophage/hemophage_species.dm b/modular_doppler/modular_species/species_types/hemophage/hemophage_species.dm index 110c9ea2ac6bd..8a1fcc8c4dca7 100644 --- a/modular_doppler/modular_species/species_types/hemophage/hemophage_species.dm +++ b/modular_doppler/modular_species/species_types/hemophage/hemophage_species.dm @@ -7,8 +7,6 @@ id = SPECIES_HEMOPHAGE preview_outfit = /datum/outfit/hemophage_preview inherent_traits = list( - TRAIT_ADVANCEDTOOLUSER, - TRAIT_CAN_STRIP, TRAIT_NOHUNGER, TRAIT_NOBREATH, TRAIT_OXYIMMUNE, @@ -98,11 +96,18 @@ /datum/outfit/hemophage_preview name = "Hemophage (Species Preview)" - uniform = /obj/item/clothing/under/dress/doppler/pentagram + uniform = /obj/item/clothing/under/suit/black_really/skirt /datum/species/genemod/hemophage/prepare_human_for_preview(mob/living/carbon/human/human) human.dna.features["mcolor"] = skintone2hex("albino") - human.hair_color = "#3D292D" + human.dna.features["horns"] = "Lifted" + human.dna.features["horns_color_1"] = "#52435e" + human.dna.ear_type = HUMANOID + human.dna.features["ears"] = "Elf (wide)" + human.dna.features["ears_color_1"] = "#F7D1C3" + human.hair_color = "#f1cc9c" + human.lip_style = "lipstick" + human.lip_color = COLOR_BLACK human.hairstyle = "Long Gloomy Bangs" regenerate_organs(human, src, visual_only = TRUE) human.update_body(TRUE) diff --git a/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm b/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm index 473d7c5336465..37fd8fb84a48d 100644 --- a/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm +++ b/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm @@ -13,7 +13,7 @@ selected_language = /datum/language/primitive_genemod /datum/species/genemod/primitive - name = "Primitive Gene-Mod" + name = "Hearthkin" id = SPECIES_GENEMOD_PRIMITIVE preview_outfit = /datum/outfit/genemod_primitive_preview