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

Husked mobs now keep some of their bodypart overlays (#95155)

Browse Source 
## About The Pull Request

(Some) tails, snouts, horns and other "solid" bodypart overlays are now
preserved on husked mobs, meaning that lizards or fishpeople will no
longer suddenly lose a chunk of their body when husked. Cybernetic
implants, being inorganic, are not colored and preserver their visuals
in full.

<img width="70" height="97" alt="dreamseeker_8CYayvB8ck"
src="https://github.com/user-attachments/assets/32df4ef4-4d20-4d46-8bf8-ccf043cab3ec"
/>

<img width="95" height="104" alt="image"
src="https://github.com/user-attachments/assets/47171a11-2228-4ef8-9d60-e169794fa6fd"
/>

## Why It's Good For The Game

Husking hasn't been an effective method of anonymizing corpses for a
very long while, and I think that visual consistency here doesn't hurt
it much more while making the game feel more immersive and cohesive.

## Changelog
🆑
balance: Husked mobs now keep some of their bodypart overlays, such as
snouts, tails and horns
/🆑
This commit is contained in:
SmArtKar
2026-02-23 17:50:53 -05:00
committed by GitHub
parent ab4a64651c
commit 2b24732b9d
18 changed files with 84 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/bodyparts.dm
+7
View File
@@ -183,6 +183,13 @@ DEFINE_BITFIELD(surgery_state, list(
/// How much blood is lost from clamped vessels or cut organs?
#define CLAMPED_VESSELS_BLEEDING 0.2
/// Do not draw this bodypart overlay on husks
#define HUSK_OVERLAY_NONE 0
/// Draw this overlay on husks but grayscale it
#define HUSK_OVERLAY_GRAYSCALE 1
/// Draw this overlay on husks as normal
#define HUSK_OVERLAY_NORMAL 2
// Limb item categories
/// Gauze slot, asserted to be wrap items
#define LIMB_ITEM_GAUZE "gauze"
code/datums/bodypart_overlays/bodypart_overlay.dm
+22 -9
View File
@@ -1,22 +1,28 @@
///Bodypart ovarlay datum. These can be added to any limb to give them a proper overlay, that'll even stay if the limb gets removed
///This is the abstract parent, don't use it!!
/datum/bodypart_overlay
///Sometimes we need multiple layers, for like the back, middle and front of the person (EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND)
/// Sometimes we need multiple layers, for like the back, middle and front of the person (EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND)
var/layers
///List of all possible layers. Used for looping through in drawing
/// List of all possible layers. Used for looping through in drawing
var/static/list/all_layers = list(EXTERNAL_FRONT, EXTERNAL_ADJACENT, EXTERNAL_BEHIND)
///Key of the icon states of all the sprite_datums for easy caching
/// Key of the icon states of all the sprite_datums for easy caching
var/cache_key = ""
/// Whether the overlay blocks emissive light
var/blocks_emissive = EMISSIVE_BLOCK_UNIQUE
/// Can this overlay be drawn on husked mobs?
var/draw_on_husks = HUSK_OVERLAY_NONE
///Wrapper for getting the proper image, colored and everything
/datum/bodypart_overlay/proc/get_overlay(layer, obj/item/bodypart/limb)
/datum/bodypart_overlay/proc/get_overlay(layer, obj/item/bodypart/limb, is_husked = FALSE)
layer = bitflag_to_layer(layer)
var/image/main_image = get_image(layer, limb)
color_image(main_image, layer, limb)
if (is_husked && draw_on_husks != HUSK_OVERLAY_NORMAL)
main_image = huskify_image(main_image)
main_image.color = limb.husk_color
else
color_image(main_image, layer, limb)
if(blocks_emissive == EMISSIVE_BLOCK_NONE || !limb)
return main_image
@@ -26,6 +32,12 @@
)
return all_images
/datum/bodypart_overlay/proc/huskify_image(image/main_image)
var/icon/husk_icon = new(main_image.icon)
husk_icon.ColorTone(HUSK_COLOR_TONE)
main_image.icon = husk_icon
return main_image
///Generate the image. Needs to be overridden
/datum/bodypart_overlay/proc/get_image(layer, obj/item/bodypart/limb)
CRASH("Get image needs to be overridden")
@@ -69,8 +81,9 @@
return -BODY_FRONT_LAYER
///Check whether we can draw the overlays. You generally don't want lizard snouts to draw over an EVA suit
/datum/bodypart_overlay/proc/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return TRUE
/datum/bodypart_overlay/proc/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
SHOULD_CALL_PARENT(TRUE)
return !is_husked || draw_on_husks
///Colorizes the limb it's inserted to, if required.
/datum/bodypart_overlay/proc/override_color(obj/item/bodypart/bodypart_owner)
code/datums/bodypart_overlays/markings_bodypart_overlay.dm
+2 -2
View File
@@ -35,8 +35,8 @@
. += use_gender
. += draw_color
/datum/bodypart_overlay/simple/body_marking/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return icon_state != SPRITE_ACCESSORY_NONE
/datum/bodypart_overlay/simple/body_marking/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && icon_state != SPRITE_ACCESSORY_NONE
/datum/bodypart_overlay/simple/body_marking/get_image(layer, obj/item/bodypart/limb)
var/gender_string = (use_gender && limb.is_dimorphic) ? (limb.gender == MALE ? MALE : FEMALE + "_") : "" //we only got male and female sprites
code/datums/bodypart_overlays/simple_bodypart_overlay.dm
+1
View File
@@ -24,6 +24,7 @@
/datum/bodypart_overlay/simple/sixpack
icon_state = "sixpack"
layers = EXTERNAL_ADJACENT
draw_on_husks = HUSK_OVERLAY_GRAYSCALE
///bags drawn beneath the eyes
/datum/bodypart_overlay/simple/bags
code/datums/bodypart_overlays/texture_bodypart_overlay.dm
+3 -1
View File
@@ -19,7 +19,9 @@
/datum/bodypart_overlay/texture/generate_icon_cache()
return "[type]"
/datum/bodypart_overlay/texture/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
/datum/bodypart_overlay/texture/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
if (!..())
return FALSE
for (var/datum/bodypart_overlay/texture/other_texture in bodypart_owner.bodypart_overlays)
if (other_texture.overlay_priority > overlay_priority)
return FALSE
code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
+3 -1
View File
@@ -284,6 +284,7 @@
/datum/bodypart_overlay/mutant/tail/fish
feature_key = FEATURE_TAIL_FISH
color_source = ORGAN_COLOR_OVERRIDE
draw_on_husks = HUSK_OVERLAY_GRAYSCALE
/datum/bodypart_overlay/mutant/tail/fish/on_mob_insert(obj/item/organ/parent, mob/living/carbon/receiver)
//Initialize the related dna feature block if we don't have any so it doesn't error out.
@@ -306,7 +307,7 @@
// We add all appearances the parent bodypart has to the tail to inherit scales and fancy effects
// but most other organs don't want to inherit those so we do it here and not on parent
for (var/datum/bodypart_overlay/texture/texture in limb.bodypart_overlays)
if(texture.can_draw_on_bodypart(limb, limb.owner))
if(texture.can_draw_on_bodypart(limb, limb.owner, limb.is_husked))
texture.modify_bodypart_appearance(appearance)
return appearance
@@ -388,6 +389,7 @@
icon = 'icons/mob/human/fish_features.dmi'
icon_state = "gills"
layers = EXTERNAL_ADJACENT
draw_on_husks = HUSK_OVERLAY_GRAYSCALE
/datum/bodypart_overlay/simple/gills/get_image(image_layer, obj/item/bodypart/limb)
return image(
code/game/machinery/dna_infuser/organ_sets/roach_organs.dm
+1
View File
@@ -143,6 +143,7 @@
/datum/bodypart_overlay/simple/roach_shell
icon_state = "roach_shell"
layers = EXTERNAL_FRONT|EXTERNAL_BEHIND
draw_on_husks = HUSK_OVERLAY_GRAYSCALE
/datum/bodypart_overlay/simple/roach_shell/get_image(image_layer, obj/item/bodypart/limb)
return image(
code/modules/fishing/fish/types/rift.dm
+3 -2
View File
@@ -721,9 +721,10 @@
*/
/datum/bodypart_overlay/simple/babbearfish
icon_state = "babbearfish"
draw_on_husks = HUSK_OVERLAY_NORMAL
/datum/bodypart_overlay/simple/babbearfish/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEEARS)
/datum/bodypart_overlay/simple/babbearfish/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDEEARS)
/obj/item/organ/ears/babbelfish/Initialize(mapload)
. = ..()
code/modules/mob/living/carbon/carbon_update_icons.dm
+7 -1
View File
@@ -530,7 +530,7 @@
if(is_invisible)
. += "-invisible"
for(var/datum/bodypart_overlay/overlay as anything in bodypart_overlays)
if(!overlay.can_draw_on_bodypart(src, owner))
if(!overlay.can_draw_on_bodypart(src, owner, is_husked))
continue
. += "-[jointext(overlay.generate_icon_cache(), "-")]"
if(ishuman(owner))
@@ -547,11 +547,17 @@
. += "[husk_type]"
. += "-husk"
. += "-[body_zone]"
if(is_invisible)
. += "-invisible"
var/list/blood_dna = blood_dna_info || owner?.get_blood_dna_list()
if (LAZYLEN(blood_dna))
. += "-[get_color_from_blood_list(blood_dna)]"
else
. += "-[BLOOD_COLOR_RED]"
for(var/datum/bodypart_overlay/overlay as anything in bodypart_overlays)
if(!overlay.can_draw_on_bodypart(src, owner, TRUE))
continue
. += "-[jointext(overlay.generate_icon_cache(), "-")]"
if(ishuman(owner))
var/mob/living/carbon/human/human_owner = owner
. += "-[human_owner.mob_height]"
code/modules/mob/living/carbon/human/species_types/mushpeople.dm
+2 -2
View File
@@ -72,8 +72,8 @@
feature_key = FEATURE_MUSH_CAP
dyable = TRUE
/datum/bodypart_overlay/mutant/mushroom_cap/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
/datum/bodypart_overlay/mutant/mushroom_cap/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
/datum/bodypart_overlay/mutant/mushroom_cap/override_color(obj/item/bodypart/bodypart_owner)
//The mushroom cap is red by default (can still be dyed)
code/modules/surgery/bodyparts/_bodyparts.dm
+2 -7
View File
@@ -1359,14 +1359,9 @@
// Add two masked images based on the old one
. += leg_source.generate_masked_leg(limb_image)
// And finally put bodypart_overlays on if not husked
if(is_husked)
SEND_SIGNAL(src, COMSIG_BODYPART_GET_LIMB_ICON, ., dropped, update_on)
return .
// Draw external organs like horns and frills
for(var/datum/bodypart_overlay/overlay as anything in bodypart_overlays)
if(!overlay.can_draw_on_bodypart(src, owner))
if(!overlay.can_draw_on_bodypart(src, owner, is_husked))
continue
// Some externals have multiple layers for background, foreground and between
@@ -1374,7 +1369,7 @@
if(!(overlay.layers & external_layer))
continue
var/external_overlay = overlay.get_overlay(external_layer, src)
var/external_overlay = overlay.get_overlay(external_layer, src, is_husked)
if (!dropped)
. += external_overlay
continue
code/modules/surgery/organs/external/_visual_organs.dm
Vendored
+13 -11
View File
@@ -96,7 +96,7 @@ Unlike normal organs, we're actually inside a persons limbs at all times
//Build the mob sprite and use it as our overlay
for(var/external_layer in bodypart_overlay.all_layers)
if(bodypart_overlay.layers & external_layer)
. += bodypart_overlay.get_overlay(external_layer, bodypart_owner)
. += bodypart_overlay.get_overlay(external_layer, bodypart_owner, bodypart_owner?.is_husked)
///The horns of a lizard!
/obj/item/organ/horns
@@ -118,9 +118,10 @@ Unlike normal organs, we're actually inside a persons limbs at all times
layers = EXTERNAL_ADJACENT
feature_key = FEATURE_HORNS
dyable = TRUE
draw_on_husks = HUSK_OVERLAY_NORMAL
/datum/bodypart_overlay/mutant/horns/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
/datum/bodypart_overlay/mutant/horns/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
///The frills of a lizard (like weird fin ears)
/obj/item/organ/frills
@@ -142,8 +143,8 @@ Unlike normal organs, we're actually inside a persons limbs at all times
layers = EXTERNAL_ADJACENT
feature_key = FEATURE_FRILLS
/datum/bodypart_overlay/mutant/frills/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEEARS)
/datum/bodypart_overlay/mutant/frills/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDEEARS)
///Guess what part of the lizard this is?
/obj/item/organ/snout
@@ -184,9 +185,10 @@ Unlike normal organs, we're actually inside a persons limbs at all times
/datum/bodypart_overlay/mutant/snout
layers = EXTERNAL_ADJACENT
feature_key = FEATURE_SNOUT
draw_on_husks = HUSK_OVERLAY_GRAYSCALE
/datum/bodypart_overlay/mutant/snout/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDESNOUT)
/datum/bodypart_overlay/mutant/snout/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDESNOUT)
///A moth's antennae
/obj/item/organ/antennae
@@ -266,8 +268,8 @@ Unlike normal organs, we're actually inside a persons limbs at all times
/datum/bodypart_overlay/mutant/antennae/get_base_icon_state()
return burnt ? burn_datum.icon_state : sprite_datum.icon_state
/datum/bodypart_overlay/mutant/antennae/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEANTENNAE)
/datum/bodypart_overlay/mutant/antennae/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDEANTENNAE)
///The leafy hair of a podperson
/obj/item/organ/pod_hair
@@ -308,5 +310,5 @@ Unlike normal organs, we're actually inside a persons limbs at all times
else
overlay.color = null
/datum/bodypart_overlay/mutant/pod_hair/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
/datum/bodypart_overlay/mutant/pod_hair/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
code/modules/surgery/organs/external/spines.dm
Vendored
+3 -2
View File
@@ -31,9 +31,10 @@
layers = EXTERNAL_ADJACENT|EXTERNAL_BEHIND
feature_key = FEATURE_SPINES
dyable = TRUE
draw_on_husks = HUSK_OVERLAY_GRAYSCALE
/datum/bodypart_overlay/mutant/spines/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
/datum/bodypart_overlay/mutant/spines/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
/datum/bodypart_overlay/mutant/spines/set_dye_color(new_color, obj/item/organ/tail/organ)
var/obj/item/organ/tail/tail = organ?.owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
code/modules/surgery/organs/external/tails.dm
Vendored
+7 -4
View File
@@ -147,8 +147,8 @@
/datum/bodypart_overlay/mutant/tail/get_base_icon_state()
return "[wagging ? "wagging_" : ""][sprite_datum.icon_state]" //add the wagging tag if we be wagging
/datum/bodypart_overlay/mutant/tail/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
/datum/bodypart_overlay/mutant/tail/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
/obj/item/organ/tail/cat
name = "tail"
@@ -216,6 +216,7 @@
/datum/bodypart_overlay/mutant/tail/xeno
color_source = NONE
feature_key = FEATURE_TAIL_XENO
draw_on_husks = HUSK_OVERLAY_GRAYSCALE
imprint_on_next_insertion = FALSE
/// We don't want to bother writing this in DNA, just use this appearance
var/default_appearance = "Xeno"
@@ -242,6 +243,7 @@
///Lizard tail bodypart overlay datum
/datum/bodypart_overlay/mutant/tail/lizard
feature_key = FEATURE_TAIL_LIZARD
draw_on_husks = HUSK_OVERLAY_GRAYSCALE
/obj/item/organ/tail/lizard/fake
name = "fabricated lizard tail"
@@ -251,6 +253,7 @@
/datum/bodypart_overlay/mutant/tail_spines
layers = EXTERNAL_ADJACENT|EXTERNAL_BEHIND
feature_key = FEATURE_TAILSPINES
draw_on_husks = HUSK_OVERLAY_GRAYSCALE
///Spines wag when the tail does
var/wagging = FALSE
/// Key for tail spine states, depends on the shape of the tail. Defined in the tail sprite datum.
@@ -259,8 +262,8 @@
/datum/bodypart_overlay/mutant/tail_spines/get_base_icon_state()
return (!isnull(tail_spine_key) ? "[tail_spine_key]_" : "") + (wagging ? "wagging_" : "") + sprite_datum.icon_state // Select the wagging state if appropriate
/datum/bodypart_overlay/mutant/tail_spines/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
/datum/bodypart_overlay/mutant/tail_spines/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
/datum/bodypart_overlay/mutant/tail_spines/set_dye_color(new_color, obj/item/organ/organ)
dye_color = new_color //no update_body_parts() call, tail/set_dye_color will do it.
code/modules/surgery/organs/external/wings/moth_wings.dm
Vendored
+1 -4
View File
@@ -97,6 +97,7 @@
/datum/bodypart_overlay/mutant/wings/moth
feature_key = FEATURE_MOTH_WINGS
layers = EXTERNAL_BEHIND | EXTERNAL_FRONT
slot_blocker = HIDEMUTWINGS
///Accessory datum of the burn sprite
var/datum/sprite_accessory/burn_datum = /datum/sprite_accessory/moth_wings/burnt_off
///Are we burned? If so we draw differently
@@ -104,12 +105,8 @@
/datum/bodypart_overlay/mutant/wings/moth/New()
. = ..()
burn_datum = fetch_sprite_datum(burn_datum)
/datum/bodypart_overlay/mutant/wings/moth/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEMUTWINGS)
/datum/bodypart_overlay/mutant/wings/moth/get_base_icon_state()
return burnt ? burn_datum.icon_state : sprite_datum.icon_state
code/modules/surgery/organs/external/wings/wings.dm
Vendored
+4 -2
View File
@@ -23,6 +23,8 @@
/datum/bodypart_overlay/mutant/wings
layers = ALL_EXTERNAL_OVERLAYS
feature_key = FEATURE_WINGS
/// Slot we check against
var/slot_blocker = HIDEJUMPSUIT
/datum/bodypart_overlay/mutant/wings/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
/datum/bodypart_overlay/mutant/wings/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & slot_blocker)
code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
+1
View File
@@ -44,6 +44,7 @@
/datum/bodypart_overlay/augment
layers = EXTERNAL_ADJACENT
draw_on_husks = HUSK_OVERLAY_NORMAL
/// Implant that owns this overlay
var/obj/item/organ/cyberimp/implant
code/modules/surgery/organs/internal/ears/_ears.dm
+2 -2
View File
@@ -166,8 +166,8 @@
/// Layer upon which we add the inner ears overlay
var/inner_layer = EXTERNAL_FRONT
/datum/bodypart_overlay/mutant/cat_ears/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
return !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
/datum/bodypart_overlay/mutant/cat_ears/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner, mob/living/carbon/owner, is_husked = FALSE)
return ..() && !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
/datum/bodypart_overlay/mutant/cat_ears/get_image(image_layer, obj/item/bodypart/limb)
var/mutable_appearance/base_ears = ..()