Magboot and glove fix (#19415)

* Magboot and glove fix

* Update armblade.dm

* Update leash.dm
This commit is contained in:
Cameron Lennox
2026-04-16 10:40:31 -04:00
committed by GitHub
parent bdffa69343
commit 51b00a200c
86 changed files with 278 additions and 360 deletions
@@ -224,7 +224,7 @@ This saves us from having to call add_fingerprint() any time something is put in
//This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() or advanced_equip_to_slot_if_possible()
/mob/living/carbon/human/equip_to_slot(obj/item/W as obj, slot)
/mob/living/carbon/human/equip_to_slot(obj/item/W, slot)
if(!slot)
return
@@ -236,7 +236,7 @@ This saves us from having to call add_fingerprint() any time something is put in
return
W.loc = src
has_unequipped(W) //TG calls attempt_insert -> transferItemToLoc -> doUnEquip -> has_unequipped. This is where we do it instead since we don't have storage datums.
has_unequipped(W, TRUE, slot) //TG calls attempt_insert -> transferItemToLoc -> doUnEquip -> has_unequipped. This is where we do it instead since we don't have storage datums.
switch(slot)
if(slot_back)
src.back = W
@@ -118,7 +118,7 @@
color = chosen_item.color
selected_item = chosen_item
/obj/item/robotic_multibelt/dropped(mob/user)
/obj/item/robotic_multibelt/dropped(mob/user, equipping, slot)
..()
//We go back to our initial values.
original_state()
@@ -562,7 +562,7 @@
loot_list = list(/obj/item/material/knife/tacknife/combatknife = 100)
/mob/living/simple_mob/humanoid/merc/melee/sword/poi
loot_list = list(/obj/item/melee/energy/sword/color = 20,
loot_list = list(/obj/item/melee/energy/sword = 20,
/obj/item/shield/energy = 40
)
@@ -335,7 +335,7 @@
icon = 'icons/mob/vacpack_swoop.dmi'
item_state = null
/obj/item/vac_attachment/swoopie/dropped(mob/user) //This should fix it sitting on the ground until the next life() tick
/obj/item/vac_attachment/swoopie/dropped(mob/user, equipping, slot) //This should fix it sitting on the ground until the next life() tick
. = ..()
if(!vac_owner)
return