mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 02:24:11 +01:00
Refactor /mob/unEquip. (#27720)
* Refactor /mob/unEquip. * fix things found in testing * more fixes from testing * fix removal of hooded suits * fix flayers inability to deploy swarmprod * fix changeling blade activation * unnecessary parens * pass default unequip args to proc overrides * fix belts being able to forceMove into full hands
This commit is contained in:
committed by
GitHub
parent
17602326bc
commit
0eafad8475
@@ -66,7 +66,7 @@
|
||||
if(HAS_TRAIT(F, TRAIT_WIELDED))
|
||||
to_chat(user, "<span class='warning'>Unwield \the [F] first.</span>")
|
||||
return
|
||||
if(!user.unEquip(F, FALSE))
|
||||
if(!user.unequip(F, FALSE))
|
||||
to_chat(user, "<span class='warning'>\The [F] stays stuck to your hands!</span>")
|
||||
return
|
||||
fireaxe = F
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
return ..()
|
||||
|
||||
/obj/structure/janitorialcart/proc/put_in_cart(mob/user, obj/item/I)
|
||||
if(!user.unEquip(I)) // We can do this here because everything below wants to
|
||||
if(!user.unequip(I)) // We can do this here because everything below wants to
|
||||
to_chat(user, "<span class='warning'>[I] is stuck to your hand!</span>")
|
||||
return
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
attacking_mop.wet_mop(src, user)
|
||||
return
|
||||
|
||||
if(!user.unEquip(attacking_mop))
|
||||
if(!user.drop_item_to_ground(attacking_mop))
|
||||
to_chat(user, "<span class='notice'>[attacking_mop] is stuck to your hand!</span>")
|
||||
return
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
if(istype(H.shoes, /obj/item/clothing/shoes/slippers))
|
||||
sleep_ratio *= 2
|
||||
// take your shoes off first, you filthy animal
|
||||
H.unEquip(H.shoes)
|
||||
H.drop_item_to_ground(H.shoes)
|
||||
|
||||
var/extinguished_candle = FALSE
|
||||
for(var/obj/item/candle/C in range(2, src))
|
||||
|
||||
@@ -587,7 +587,7 @@
|
||||
/obj/item/chair/stool/attack__legacy__attackchain(mob/M as mob, mob/user as mob)
|
||||
if(prob(5) && isliving(M))
|
||||
user.visible_message("<span class='danger'>[user] breaks [src] over [M]'s back!.</span>")
|
||||
user.unEquip(src)
|
||||
user.unequip(src)
|
||||
var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
|
||||
m.loc = get_turf(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -733,7 +733,7 @@
|
||||
S.anchored = FALSE
|
||||
S.dir = user.dir
|
||||
S.update_icon()
|
||||
user.unEquip(src, 1)
|
||||
user.unequip(src, force = TRUE)
|
||||
qdel(src)
|
||||
if(prob(50))
|
||||
new /obj/item/stack/sheet/cardboard(T)
|
||||
|
||||
Reference in New Issue
Block a user