mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +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:
@@ -486,7 +486,7 @@
|
||||
|
||||
if(is_screen_atom(over))
|
||||
if(!remove_item_from_storage(get_turf(M)))
|
||||
M.unEquip(src)
|
||||
M.drop_item_to_ground(src)
|
||||
switch(over.name)
|
||||
if("r_hand")
|
||||
if(M.put_in_r_hand(src))
|
||||
@@ -527,7 +527,7 @@
|
||||
|
||||
H.cards += cards
|
||||
cards.Cut()
|
||||
user.unEquip(src, force = 1)
|
||||
user.unequip(src, force = TRUE)
|
||||
qdel(src)
|
||||
|
||||
H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS)
|
||||
@@ -1031,7 +1031,7 @@
|
||||
"<span class='notice'>You play \the [selected].</span>",
|
||||
"<span class='notice'>You hear a card being played.</span>"
|
||||
)
|
||||
user.unEquip(new_hand)
|
||||
user.drop_item_to_ground(new_hand)
|
||||
var/atom/drop_location = get_step(user, user.dir)
|
||||
var/obj/item/cardhand/hand_on_the_table = locate(/obj/item/cardhand) in drop_location
|
||||
if(istype(hand_on_the_table) && parent_deck_id == hand_on_the_table.parent_deck_id)
|
||||
|
||||
Reference in New Issue
Block a user