Skip to content

Commit f55d619

Browse files
authored
Fixes PDAs not dropping when being stripped (ParadiseSS13#23245)
* Truly amazing what uncommenting can do * Belts aren't dropped now aswell * Nullchecks
1 parent 060149c commit f55d619

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

code/modules/mob/living/carbon/human/human_update_icons.dm

+5-3
Original file line numberDiff line numberDiff line change
@@ -614,8 +614,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
614614
standing.alpha = w_uniform.alpha
615615
standing.color = w_uniform.color
616616
overlays_standing[UNIFORM_LAYER] = standing
617-
//If anyone asks, /mob/living/carbon/human/unEquip in human_inventory.dm already handles unequip code
618-
/* else if(!dna.species.nojumpsuit)
617+
618+
else if(!dna.species.nojumpsuit)
619619
var/list/uniform_slots = list()
620620
var/obj/item/organ/external/L = get_organ(BODY_ZONE_L_LEG)
621621
if(!(L?.status & ORGAN_ROBOT))
@@ -628,6 +628,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
628628
uniform_slots += wear_id
629629
uniform_slots += wear_pda
630630
uniform_slots += belt
631+
if(belt && (belt.flags_2 & ALLOW_BELT_NO_JUMPSUIT_2))
632+
uniform_slots -= belt
631633

632634
// Automatically drop anything in store / id / belt if you're not wearing a uniform. //CHECK IF NECESARRY
633635
for(var/obj/item/thing in uniform_slots) // whoever made this
@@ -640,7 +642,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
640642
thing.forceMove(drop_location()) //
641643
thing.dropped(src) //
642644
thing.layer = initial(thing.layer)
643-
thing.plane = initial(thing.plane) */
645+
thing.plane = initial(thing.plane)
644646
apply_overlay(UNIFORM_LAYER)
645647
update_hands_layer()
646648

0 commit comments

Comments
 (0)