Merge pull request #7589 from Vivalas/master

Fixes weird offset with beds when buckled.
This commit is contained in:
Crazy Lemon
2017-06-23 09:26:39 -07:00
committed by GitHub
4 changed files with 8 additions and 3 deletions
+4 -2
View File
@@ -881,8 +881,10 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
/mob/living/carbon/get_standard_pixel_y_offset(lying = 0)
if(lying)
if(buckled) return initial(pixel_y)
return -6
if(buckled)
return buckled.buckle_offset //tg just has this whole block removed, always returning -6. Paradise is special.
else
return -6
else
return initial(pixel_y)