mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 05:51:56 +01:00
.loc = to forceMove() (#4937)
As requested, this PR is changed to only include all .loc = to forceMove() changes.
This commit is contained in:
@@ -46,8 +46,7 @@ obj/item/weapon/board/attackby(obj/item/I as obj, mob/user as mob)
|
||||
if(!user.Adjacent(src))
|
||||
return 0
|
||||
|
||||
user.drop_from_inventory(I)
|
||||
I.forceMove(src)
|
||||
user.drop_from_inventory(I,src)
|
||||
num++
|
||||
|
||||
|
||||
|
||||
@@ -145,7 +145,6 @@
|
||||
for(var/datum/playingcard/P in cards)
|
||||
H.cards += P
|
||||
H.concealed = src.concealed
|
||||
user.drop_from_inventory(src,user.loc)
|
||||
qdel(src)
|
||||
H.update_icon()
|
||||
return
|
||||
@@ -190,11 +189,10 @@
|
||||
|
||||
H.cards += cards
|
||||
cards.Cut();
|
||||
user.drop_item()
|
||||
qdel(src)
|
||||
|
||||
user.drop_from_inventory(src,get_turf(src))
|
||||
H.update_icon()
|
||||
user.put_in_active_hand(H)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/hand
|
||||
name = "hand of cards"
|
||||
@@ -229,7 +227,7 @@
|
||||
H.update_icon()
|
||||
src.update_icon()
|
||||
usr.visible_message("\The [usr] plays \the [discarding].")
|
||||
H.loc = get_step(usr,usr.dir)
|
||||
H.forceMove(get_step(usr,usr.dir))
|
||||
|
||||
if(!cards.len)
|
||||
qdel(src)
|
||||
|
||||
Reference in New Issue
Block a user