cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-18 18:42:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7801 from Mloc/bs12-glowypipes

Browse Source 
refactor buckling + glowy HE pipes
This commit is contained in:
Chinsky
2015-02-03 18:12:09 +03:00
parent cda262bbe4 70f67409d5
commit aa7fde250c
29 changed files with 250 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+4 -8
View File
@@ -853,21 +853,17 @@ note dizziness decrements automatically in the mob's Life() proc.
canmove = 0
pixel_y = V.mob_offset_y - 5
else
lying = 0
if(buckled.buckle_lying != -1) lying = buckled.buckle_lying
canmove = 1
pixel_y = V.mob_offset_y
else if(buckled)
if (!buckled.movable)
if(buckled.buckle_lying != -1) lying = buckled.buckle_lying
if (!buckled.buckle_movable)
anchored = 1
canmove = 0
if(istype(buckled,/obj/structure/stool/bed/chair) )
lying = 0
else
lying = 1
else
anchored = 0
canmove = 1
lying = 0
else if( stat || weakened || paralysis || resting || sleeping || (status_flags & FAKEDEATH))
lying = 1
canmove = 0
@@ -904,7 +900,7 @@ note dizziness decrements automatically in the mob's Life() proc.
if(!canface() || client.moving || world.time < client.move_delay)
return 0
set_dir(ndir)
if(buckled && buckled.movable)
if(buckled && buckled.buckle_movable)
buckled.set_dir(ndir)
client.move_delay += movement_delay()
return 1