TGS Test Merge (#16600)

tgstation · Oct 19, 2024 · f544fee · f544fee
2 parents 025c261 + ae12f47
commit f544fee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
@@ -249,6 +249,9 @@
 //set redraw_mob to 0 if you don't wish the hud to be updated - if you're doing it manually in your own proc.
 /mob/living/carbon/human/equip_to_slot(obj/item/item_to_equip, slot, bitslot = FALSE)
 	. = ..()
+	if(bitslot)
+		var/oldslot = slot
+		slot = slotbit2slotdefine(oldslot)
 	if(!has_limb_for_slot(slot))
 		return
 

diff --git a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm
@@ -516,6 +516,9 @@ Returns TRUE when loc_weeds_type changes. Returns FALSE when it doesn’t change
 
 /mob/living/carbon/xenomorph/equip_to_slot(obj/item/item_to_equip, slot, bitslot)
 	. = ..()
+	if(bitslot)
+		var/oldslot = slot
+		slot = slotbit2slotdefine(oldslot)
 	switch(slot)
 		if(SLOT_BACK)
 			back = item_to_equip