cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make lockers use forceMove()

Browse Source
This commit is contained in:
Markolie
2015-09-01 18:49:19 +02:00
parent b683cfa0c5
commit 8d7bd64a00
11 changed files with 31 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/game/objects/structures/crates_lockers/crates.dm
View File

@@ -45,7 +45,7 @@
playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
for(var/obj/O in src)
O.loc = get_turf(src)
O.forceMove(loc)
icon_state = icon_opened
src.opened = 1
@@ -71,7 +71,7 @@
var/obj/structure/stool/bed/B = O
if(B.buckled_mob)
continue
O.loc = src
O.forceMove(src)
itemcount++
icon_state = icon_closed
@@ -151,7 +151,7 @@
user << "<span class='notice'>\The [W] is stuck to your hand, you cannot put it in \the [src]!</span>"
return
if(W)
W.loc = src.loc
W.forceMove(loc)
else if(istype(W, /obj/item/stack/packageWrap))
return
else if(istype(W, /obj/item/stack/cable_coil))
@@ -167,7 +167,7 @@
if(rigged)
user << "<span class='notice'>You attach [W] to [src].</span>"
user.drop_item()
W.loc = src
W.forceMove(src)
return
else if(istype(W, /obj/item/weapon/wirecutters))
if(rigged)
@@ -201,7 +201,7 @@
if(manifest)
user << "<span class='notice'>You tear the manifest off of the crate.</span>"
playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1)
manifest.loc = loc
manifest.forceMove(loc)
if(ishuman(user))
user.put_in_hands(manifest)
manifest = null
@@ -282,7 +282,7 @@
if(manifest)
user << "<span class='notice'>You tear the manifest off of the crate.</span>"
playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1)
manifest.loc = loc
manifest.forceMove(loc)
if(ishuman(user))
user.put_in_hands(manifest)
manifest = null
@@ -503,12 +503,12 @@
continue
if(!S.anchored)
found = 1
S.loc = src
S.forceMove(src)
break
if(!found)
for(var/obj/machinery/M in src.loc)
if(!M.anchored)
M.loc = src
M.forceMove(src)
break
return
@@ -531,12 +531,12 @@
continue
if(!S.anchored)
found = 1
S.loc = src
S.forceMove(src)
break
if(!found)
for(var/obj/machinery/M in src.loc)
if(!M.anchored)
M.loc = src
M.forceMove(src)
break
return