mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 05:57:24 +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:
@@ -40,8 +40,7 @@
|
||||
if(screen == 2)
|
||||
screen = 1
|
||||
to_chat(user, "<span class='notice'>You add [(P.name == "paper") ? "the paper" : P.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>")
|
||||
user.unEquip(P)
|
||||
P.loc = src
|
||||
user.transfer_item_to(P, src)
|
||||
if(ishuman(user))
|
||||
var/mob/living/carbon/human/H = user
|
||||
H.update_inv_l_hand()
|
||||
@@ -53,14 +52,12 @@
|
||||
if(screen == 2)
|
||||
screen = 1
|
||||
to_chat(user, "<span class='notice'>You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>")
|
||||
user.unEquip(W)
|
||||
W.loc = src
|
||||
user.transfer_item_to(W, src)
|
||||
|
||||
else if(W.get_heat())
|
||||
burnpaper(W, user)
|
||||
|
||||
else if(istype(W, /obj/item/paper_bundle))
|
||||
user.unEquip(W)
|
||||
for(var/obj/O in W)
|
||||
O.loc = src
|
||||
O.add_fingerprint(usr)
|
||||
@@ -91,8 +88,6 @@
|
||||
user.visible_message("<span class='[class]'>[user] burns right through [src], turning it to ash. It flutters through the air before settling on the floor in a heap.</span>", \
|
||||
"<span class='[class]'>You burn right through [src], turning it to ash. It flutters through the air before settling on the floor in a heap.</span>")
|
||||
|
||||
user.unEquip(src)
|
||||
|
||||
new /obj/effect/decal/cleanable/ash(get_turf(src))
|
||||
qdel(src)
|
||||
|
||||
@@ -168,7 +163,7 @@
|
||||
to_chat(usr, "<span class='notice'>You remove [W] from the bundle.</span>")
|
||||
if(amount == 1)
|
||||
var/obj/item/paper/P = get_page(1)
|
||||
usr.unEquip(src)
|
||||
usr.unequip(src)
|
||||
usr.put_in_hands(P)
|
||||
usr.unset_machine() // Ensure the bundle GCs
|
||||
for(var/obj/O in src) // just in case we somehow lose something (it's happened, especially with photos)
|
||||
@@ -219,7 +214,6 @@
|
||||
O.plane = initial(O.plane)
|
||||
O.add_fingerprint(user)
|
||||
|
||||
user.unEquip(src)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/paper_bundle/update_desc()
|
||||
|
||||
Reference in New Issue
Block a user