cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17188 from phil235/FixClosetStuffing

Browse Source 
Fixes weird shit happening when clickdragging things from your
This commit is contained in:
Cheridan
2016-04-28 23:49:34 -05:00
parent 167d743bcd fb93f88fca
commit 034500f622
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+12 -5
View File
@@ -266,13 +266,19 @@
return
if(user == O) //try to climb onto it
return ..()
if(!opened || istype(O, /obj/structure/closet))
if(!opened)
return
if(!isturf(O.loc))
return
var/actuallyismob = 0
if(isliving(O))
actuallyismob = 1
else if(!istype(O, /obj/item))
return
var/turf/T = get_turf(src)
var/list/targets = list(O, src)
add_fingerprint(user)
var/mob/living/L = O
var/actuallyismob = istype(L)
user.visible_message("<span class='warning'>[user] [actuallyismob ? "tries to ":""]stuff [O] into [src].</span>", \
"<span class='warning'>You [actuallyismob ? "try to ":""]stuff [O] into [src].</span>", \
"<span class='italics'>You hear clanging.</span>")
@@ -281,12 +287,13 @@
user.visible_message("<span class='notice'>[user] stuffs [O] into [src].</span>", \
"<span class='notice'>You stuff [O] into [src].</span>", \
"<span class='italics'>You hear a loud metal bang.</span>")
var/mob/living/L = O
if(!issilicon(L))
L.Weaken(2)
O.forceMove(get_turf(src))
O.forceMove(T)
close()
else
O.forceMove(get_turf(src))
O.forceMove(T)
return 1
/obj/structure/closet/relaymove(mob/user)