mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 22:17:32 +01:00
refactors some item transfers to use transfer_item_to() (#28405)
This commit is contained in:
@@ -219,11 +219,10 @@ GLOBAL_VAR(bomb_set)
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
if(istype(used, /obj/item/nuke_core/plutonium) && removal_stage == NUKE_CORE_FULLY_EXPOSED)
|
||||
if(do_after(user, 2 SECONDS, target = src))
|
||||
if(!user.drop_item_to_ground(used))
|
||||
if(!user.transfer_item_to(used, src))
|
||||
to_chat(user, "<span class='notice'>The [used] is stuck to your hand!</span>")
|
||||
return
|
||||
user.visible_message("<span class='notice'>[user] puts [used] back in [src].</span>", "<span class='notice'>You put [used] back in [src].</span>")
|
||||
used.forceMove(src)
|
||||
core = used
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
|
||||
|
||||
@@ -409,11 +409,10 @@
|
||||
to_chat(user, "The headset can't hold another key!")
|
||||
return
|
||||
|
||||
if(!user.drop_item_to_ground(key))
|
||||
if(!user.transfer_item_to(key, src, FALSE, FALSE))
|
||||
to_chat(user, "<span class='warning'>[key] is stuck to your hand, you can't insert it in [src].</span>")
|
||||
return
|
||||
|
||||
key.forceMove(src)
|
||||
if(!keyslot1)
|
||||
keyslot1 = key
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user