cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +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/library/lib_items.dm
+8 -10
View File
@@ -23,13 +23,12 @@
. = ..()
for(var/obj/item/I in loc)
if(istype(I, /obj/item/weapon/book))
I.loc = src
I.forceMove(src)
update_icon()
/obj/structure/bookcase/attackby(obj/O as obj, mob/user as mob)
if(istype(O, /obj/item/weapon/book))
user.drop_item()
O.loc = src
user.drop_from_inventory(O,src)
update_icon()
else if(istype(O, /obj/item/weapon/pen))
var/newname = sanitizeSafe(input("What would you like to title this bookshelf?"), MAX_NAME_LEN)
@@ -48,7 +47,7 @@
user << "<span class='notice'>You dismantle \the [src].</span>"
new /obj/item/stack/material/wood(get_turf(src), 3)
for(var/obj/item/weapon/book/b in contents)
b.loc = (get_turf(src))
b.forceMove((get_turf(src)))
qdel(src)
else
@@ -64,7 +63,7 @@
if(!user.get_active_hand())
user.put_in_hands(choice)
else
choice.loc = get_turf(src)
choice.forceMove(get_turf(src))
update_icon()
/obj/structure/bookcase/ex_act(severity)
@@ -76,14 +75,14 @@
return
if(2.0)
for(var/obj/item/weapon/book/b in contents)
if (prob(50)) b.loc = (get_turf(src))
if (prob(50)) b.forceMove(get_turf(src))
else qdel(b)
qdel(src)
return
if(3.0)
if (prob(50))
for(var/obj/item/weapon/book/b in contents)
b.loc = (get_turf(src))
b.forceMove(get_turf(src))
qdel(src)
return
else
@@ -207,7 +206,7 @@
if(carved)
if(store)
user << "<span class='notice'>[store] falls out of [title]!</span>"
store.loc = get_turf(src.loc)
store.forceMove(get_turf(src.loc))
store = null
return
else
@@ -224,8 +223,7 @@
if(carved)
if(!store)
if(W.w_class < 3)
user.drop_item()
W.loc = src
user.drop_from_inventory(W,src)
store = W
user << "<span class='notice'>You put [W] in [title].</span>"
return
code/modules/library/lib_machines.dm
+3 -5
View File
@@ -410,8 +410,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
/obj/machinery/libraryscanner/attackby(var/obj/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/weapon/book))
user.drop_item()
O.loc = src
user.drop_from_inventory(O,src)
/obj/machinery/libraryscanner/attack_hand(var/mob/user as mob)
usr.set_machine(src)
@@ -442,7 +441,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
cache = null
if(href_list["eject"])
for(var/obj/item/weapon/book/B in contents)
B.loc = src.loc
B.forceMove(src.loc)
src.add_fingerprint(usr)
src.updateUsrDialog()
return
@@ -460,8 +459,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
/obj/machinery/bookbinder/attackby(var/obj/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/weapon/paper))
user.drop_item()
O.loc = src
user.drop_from_inventory(O,src)
user.visible_message("[user] loads some paper into [src].", "You load some paper into [src].")
src.visible_message("[src] begins to hum as it warms up its printing drums.")
sleep(rand(200,400))