mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +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:
@@ -579,9 +579,8 @@
|
||||
if(C.maxcharge < 100)
|
||||
to_chat(user, "<span class='notice'>[src] requires a higher capacity cell.</span>")
|
||||
return
|
||||
if(!user.unEquip(W))
|
||||
if(!user.transfer_item_to(W, src))
|
||||
return
|
||||
W.loc = src
|
||||
cell = W
|
||||
to_chat(user, "<span class='notice'>You install a cell in [src].</span>")
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
|
||||
@@ -395,7 +395,7 @@
|
||||
H.update_fhair()
|
||||
if(!H.wear_mask || H.wear_mask && !istype(H.wear_mask, /obj/item/clothing/mask/fakemoustache))
|
||||
if(H.wear_mask)
|
||||
H.unEquip(H.wear_mask)
|
||||
H.drop_item_to_ground(H.wear_mask)
|
||||
var/obj/item/clothing/mask/fakemoustache = new /obj/item/clothing/mask/fakemoustache
|
||||
H.equip_to_slot(fakemoustache, ITEM_SLOT_MASK)
|
||||
to_chat(H, "<span class='notice'>Hair bursts forth from your every follicle!")
|
||||
|
||||
@@ -341,7 +341,7 @@
|
||||
to_chat(user, "You add [D] to [src].")
|
||||
qdel(D)
|
||||
user.put_in_hands(new /obj/item/bucket_sensor)
|
||||
user.unEquip(src)
|
||||
user.unequip(src)
|
||||
qdel(src)
|
||||
else
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user