Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

https://github.com/tgstation/tgstation/pull/86815 #1228

Merged
merged 1 commit into from
Mar 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions code/modules/mob/living/carbon/human/human_update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,26 @@ There are several things that need to be remembered:

if(!gloves_overlay)
return

if(!handled_by_bodytype && (OFFSET_GLOVES in dna.species.offset_features))
gloves_overlay.pixel_x += dna.species.offset_features[OFFSET_GLOVES][1]
gloves_overlay.pixel_y += dna.species.offset_features[OFFSET_GLOVES][2]

// We dont have any >2 hands human species (and likely wont ever), so theres no point in splitting this because:
// It will only run if the left hand OR the right hand is missing, and it wont run if both are missing because you cant wear gloves with no arms
// (unless admins mess with this then its their fault)
if(num_hands < default_num_hands)
var/static/atom/movable/alpha_filter_target
if(isnull(alpha_filter_target))
alpha_filter_target = new(null)
alpha_filter_target.icon = 'icons/masks/handless.dmi'
alpha_filter_target.icon_state = "missing[!has_left_hand(check_disabled = FALSE) ? "l" : "r"]"
alpha_filter_target.render_target = "*MissGlove [REF(src)] [!has_left_hand(check_disabled = FALSE) ? "L" : "R"]"
gloves_overlay.add_overlay(alpha_filter_target)
gloves_overlay.filters += filter(type="alpha", render_source=alpha_filter_target.render_target, flags=MASK_INVERSE)

overlays_standing[GLOVES_LAYER] = gloves_overlay

apply_overlay(GLOVES_LAYER)


Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
return H.equip_delay_self_check(I, bypass_equip_delay_self)

if(ITEM_SLOT_GLOVES)
if(H.num_hands < 2)
if(H.num_hands == 0)
return FALSE
return H.equip_delay_self_check(I, bypass_equip_delay_self)

Expand Down
8 changes: 4 additions & 4 deletions code/modules/surgery/bodyparts/dismemberment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,10 @@
var/atom/movable/screen/inventory/hand/associated_hand = arm_owner.hud_used.hand_slots["[held_index]"]
if(associated_hand)
associated_hand.update_appearance()
if(arm_owner.gloves)
arm_owner.dropItemToGround(arm_owner.gloves, TRUE)
arm_owner.update_worn_gloves() //to remove the bloody hands overlay
return ..()
. = ..()
if(arm_owner.num_hands == 0)
arm_owner.dropItemToGround(arm_owner.gloves, TRUE)
arm_owner.update_worn_gloves() //to remove the bloody hands overlay

/obj/item/bodypart/leg/drop_limb(special)
if(owner && !special)
Expand Down
Binary file added icons/masks/handless.dmi
Binary file not shown.
Loading