cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

.loc = to forceMove() (#4937)

Browse Source 
As requested, this PR is changed to only include all .loc = to forceMove() changes.
This commit is contained in:
BurgerLUA
2018-08-04 01:48:58 +03:00
committed by Erki
parent 187613428e
commit 8519dcc393
376 changed files with 968 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_vending.dm
+3 -5
View File
@@ -135,7 +135,7 @@ var/global/list/minevendor_list = list( //keep in order of price
if(href_list["choice"])
if(istype(inserted_id))
if(href_list["choice"] == "eject")
inserted_id.loc = loc
inserted_id.forceMove(loc)
if(ishuman(usr))
if(!usr.get_active_hand())
usr.put_in_hands(inserted_id)
@@ -145,8 +145,7 @@ var/global/list/minevendor_list = list( //keep in order of price
else if(href_list["choice"] == "insert")
var/obj/item/weapon/card/id/I = usr.get_active_hand()
if(istype(I))
usr.drop_item()
I.loc = src
usr.drop_from_inventory(I,src)
inserted_id = I
else usr << "<span class='danger'>No valid ID.</span>"
if(href_list["purchase"])
@@ -210,8 +209,7 @@ var/global/list/minevendor_list = list( //keep in order of price
if(istype(I,/obj/item/weapon/card/id))
var/obj/item/weapon/card/id/C = usr.get_active_hand()
if(istype(C) && !istype(inserted_id))
usr.drop_item()
C.loc = src
usr.drop_from_inventory(C,src)
inserted_id = C
interact(user)
return