diff --git a/code/__DEFINES/~~bubber_defines/species.dm b/code/__DEFINES/~~bubber_defines/species.dm index 507a232760f..f5f035de26d 100644 --- a/code/__DEFINES/~~bubber_defines/species.dm +++ b/code/__DEFINES/~~bubber_defines/species.dm @@ -1,3 +1,4 @@ #define SPECIES_SHADEKIN "shadekin" +#define SPECIES_MUTANT_HUMAN "mhuman" // Hemophages and Demihuman sprite overrides #define SPECIES_ABDUCTOR_STATION "lesser_abductor" -#define BODYPART_ICON_SHADEKIN 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi' +#define BODYPART_ICON_BUBBER 'modular_zubbers/icons/mob/species/human_parts_greyscale.dmi' diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png index da1219f9949..a10ac2d72ef 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_humanoid.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_humanoid.png index daf59febb03..30838bfd388 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_humanoid.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_humanoid.png differ diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage/hemophage_species.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage/hemophage_species.dm index e884d2f6276..4b8a6cb3d90 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage/hemophage_species.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage/hemophage_species.dm @@ -1,6 +1,23 @@ /datum/species/hemophage inherent_biotypes = MOB_HUMANOID | MOB_ORGANIC | MOB_VAMPIRIC + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/mhuman, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/mhuman, + BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/mhuman, + BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/mhuman, + BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/mhuman, + BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mhuman, + ) +// MUTANT COLOR OVERRIDE + +/datum/species/hemophage/New() + inherent_traits |= list( + TRAIT_MUTANT_COLORS, + ) + . = ..() + +// BLOODSUCKER SPECIFIC FIXES /datum/species/hemophage/on_bloodsucker_gain(mob/living/carbon/human/target) to_chat(target, span_warning("Your hemophage features have been removed, your nature as a bloodsucker abates the hemophage virus.")) // Without this any new organs would get corrupted again. diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/humanoid_overrides.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/humanoid_overrides.dm new file mode 100644 index 00000000000..91d93ab9b3c --- /dev/null +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/humanoid_overrides.dm @@ -0,0 +1,9 @@ +/datum/species/humanoid + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/mhuman, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/mhuman, + BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/mhuman, + BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/mhuman, + BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/mhuman, + BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mhuman, + ) diff --git a/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm index 04074c257ae..b839737d715 100644 --- a/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm +++ b/modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm @@ -1,25 +1,53 @@ +// SHADEKIN // + /obj/item/bodypart/head/shadekin - icon_greyscale = BODYPART_ICON_SHADEKIN + icon_greyscale = BODYPART_ICON_BUBBER limb_id = SPECIES_SHADEKIN is_dimorphic = TRUE /obj/item/bodypart/chest/shadekin - icon_greyscale = BODYPART_ICON_SHADEKIN + icon_greyscale = BODYPART_ICON_BUBBER limb_id = SPECIES_SHADEKIN is_dimorphic = TRUE /obj/item/bodypart/arm/left/shadekin - icon_greyscale = BODYPART_ICON_SHADEKIN + icon_greyscale = BODYPART_ICON_BUBBER limb_id = SPECIES_SHADEKIN /obj/item/bodypart/arm/right/shadekin - icon_greyscale = BODYPART_ICON_SHADEKIN + icon_greyscale = BODYPART_ICON_BUBBER limb_id = SPECIES_SHADEKIN /obj/item/bodypart/leg/left/shadekin - icon_greyscale = BODYPART_ICON_SHADEKIN + icon_greyscale = BODYPART_ICON_BUBBER limb_id = SPECIES_SHADEKIN /obj/item/bodypart/leg/right/shadekin - icon_greyscale = BODYPART_ICON_SHADEKIN + icon_greyscale = BODYPART_ICON_BUBBER limb_id = SPECIES_SHADEKIN + +// MUTANT HUMAN PART OVERRIDES - HEMOPHAGE AND HUMANOID SPRITE OVERRIDES// + +/obj/item/bodypart/head/mhuman + icon_greyscale = BODYPART_ICON_BUBBER + limb_id = SPECIES_MUTANT_HUMAN + +/obj/item/bodypart/chest/mhuman + icon_greyscale = BODYPART_ICON_BUBBER + limb_id = SPECIES_MUTANT_HUMAN + +/obj/item/bodypart/arm/left/mhuman + icon_greyscale = BODYPART_ICON_MAMMAL + limb_id = SPECIES_MAMMAL + +/obj/item/bodypart/arm/right/mhuman + icon_greyscale = BODYPART_ICON_MAMMAL + limb_id = SPECIES_MAMMAL + +/obj/item/bodypart/leg/left/mhuman + icon_greyscale = BODYPART_ICON_BUBBER + limb_id = SPECIES_MUTANT_HUMAN + +/obj/item/bodypart/leg/right/mhuman + icon_greyscale = BODYPART_ICON_BUBBER + limb_id = SPECIES_MUTANT_HUMAN diff --git a/modular_zubbers/icons/mob/species/human_parts_greyscale.dmi b/modular_zubbers/icons/mob/species/human_parts_greyscale.dmi index 16629622c64..269eb63e014 100644 Binary files a/modular_zubbers/icons/mob/species/human_parts_greyscale.dmi and b/modular_zubbers/icons/mob/species/human_parts_greyscale.dmi differ diff --git a/modular_zubbers/modules/hemophages/code/species.dm b/modular_zubbers/modules/hemophages/code/species.dm deleted file mode 100644 index 014c3e5ee18..00000000000 --- a/modular_zubbers/modules/hemophages/code/species.dm +++ /dev/null @@ -1,5 +0,0 @@ -/datum/species/hemophage/New() - inherent_traits |= list( - TRAIT_MUTANT_COLORS, - ) - . = ..() diff --git a/tgstation.dme b/tgstation.dme index bbb2f7e0716..67b487ecac1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8477,6 +8477,7 @@ #include "modular_zubbers\code\modules\mob\living\carbon\human\_species.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\human.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\abductor.dm" +#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\humanoid_overrides.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\jellypeople.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\lizardpeople.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\monkeys.dm" @@ -8623,7 +8624,6 @@ #include "modular_zubbers\modules\gladiator\code\game\objects\items\gladiator_items.dm" #include "modular_zubbers\modules\hacks\atmos\force_atmos.dm" #include "modular_zubbers\modules\hemophages\code\limbgrower.dm" -#include "modular_zubbers\modules\hemophages\code\species.dm" #include "modular_zubbers\modules\hydroponics\code\grown\rocks.dm" #include "modular_zubbers\modules\hydroponics\code\plantgenes\hydroponics.dm" #include "modular_zubbers\modules\hydroponics\code\vending\megaseed.dm"