cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 09:08:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Hemophage and Humanoid skintone issues (#1305)

Browse Source 
## About The Pull Request

Adds greyscale versions of human sprites so that it doesn't try to add
skin tone on top of mutant color selections. It'll make playing
porcealine white (or any light color) characters possible.

Specifically, some mutant human bodypart varients have been added that
use these new greyscale human sprites I've cooked up.

Before


![image](https://github.com/Bubberstation/Bubberstation/assets/95130227/d120deff-1656-49aa-b136-afb4ecefed18)

After


![image](https://github.com/Bubberstation/Bubberstation/assets/95130227/4558095f-fe48-48c9-a35f-9ec2ca177a50)

## Why It's Good For The Game

This annoyed the shit out of me when trying to color my hemophage. More
flexibility in making characters. (You don't have to pick anthromorph
just to avoid this)

## Proof Of Testing


![image](https://github.com/Bubberstation/Bubberstation/assets/95130227/50184558-d973-4252-8930-40f6ed257890)


![image](https://github.com/Bubberstation/Bubberstation/assets/95130227/8becb3f9-999a-43dd-a855-36f8615c9c4d)


## Changelog

🆑
fix: Humanoid and Hemophage sprites no longer have base skin tone
issues. Added human greyscale sprites.
/🆑

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
This commit is contained in:
The Sharkening
2024-03-30 09:38:59 -06:00
committed by GitHub
co-authored by Waterpig
parent 33c75b4626
commit bc7a4f67d6
9 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/~~bubber_defines/species.dm
+2 -1
View File
@@ -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'
code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_humanoid.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage/hemophage_species.dm
+17
View File
@@ -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.
modular_zubbers/code/modules/mob/living/carbon/human/species_types/humanoid_overrides.dm
+9
View File
@@ -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,
)
modular_zubbers/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
+34 -6
View File
@@ -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
modular_zubbers/icons/mob/species/human_parts_greyscale.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

modular_zubbers/modules/hemophages/code/species.dm
-5
View File
@@ -1,5 +0,0 @@
/datum/species/hemophage/New()
inherent_traits |= list(
TRAIT_MUTANT_COLORS,
)
. = ..()
tgstation.dme
+1 -1
View File
@@ -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"