cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes grab-buckling overwriting pixelshift

Browse Source
This commit is contained in:
Hubblenaut
2015-09-25 21:49:39 +02:00
parent c987fedc24
commit f0481b551e
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/game/objects/structures/stool_bed_chair_nest/bed.dm
View File

@@ -132,14 +132,18 @@
remove_padding() remove_padding()
else if(istype(W, /obj/item/weapon/grab)) else if(istype(W, /obj/item/weapon/grab))
user.visible_message("<span class='notice'>[user] attempts to buckle [W:affecting] into \the [src]!</span>") var/obj/item/weapon/grab/G = W
var/mob/living/affecting = G.affecting
user.visible_message("<span class='notice'>[user] attempts to buckle [affecting] into \the [src]!</span>")
if(do_after(user, 20)) if(do_after(user, 20))
W:affecting.loc = loc affecting.loc = loc
if(buckle_mob(W:affecting)) spawn(0)
W:affecting.visible_message(\ if(buckle_mob(affecting))
"<span class='danger'>[W:affecting.name] is buckled to [src] by [user.name]!</span>",\ affecting.visible_message(\
"<span class='danger'>You are buckled to [src] by [user.name]!</span>",\ "<span class='danger'>[affecting.name] is buckled to [src] by [user.name]!</span>",\
"<span class='notice'>You hear metal clanking.</span>") "<span class='danger'>You are buckled to [src] by [user.name]!</span>",\
"<span class='notice'>You hear metal clanking.</span>")
qdel(W)
else else
..() ..()