cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing compile issues, adjusted buckle code after a weird merge.

Browse Source
This commit is contained in:
Zuhayr
2015-03-07 11:46:29 +10:30
parent 9f1e04aa50
commit ac860b976a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/mob/mob.dm
View File

@@ -858,15 +858,15 @@ note dizziness decrements automatically in the mob's Life() proc.
canmove = 1
pixel_y = V.mob_offset_y
else if(buckled)
if(buckled.buckle_lying != -1)
lying = buckled.buckle_lying
// var/movable is defined at /obj/structure/stool/bed level
// If we're buckled to something else, such as vines, assume it's stationary.
if (!istype(buckled) || !buckled.movable) anchored = 1
canmove = 0
else
anchored = 0
canmove = 1
anchored = 1
canmove = 0
if(istype(buckled))
if(buckled.buckle_lying != -1)
lying = buckled.buckle_lying
if(buckled.buckle_movable)
anchored = 0
canmove = 1
else if( stat || weakened || paralysis || resting || sleeping || (status_flags & FAKEDEATH))
lying = 1
canmove = 0

2
code/modules/mob/mob_defines.dm
View File

@@ -121,7 +121,7 @@
var/m_int = null//Living
var/m_intent = "run"//Living
var/lastKnownIP = null
var/obj/structure/bed/buckled = null//Living
var/obj/buckled = null//Living
var/obj/item/l_hand = null//Living
var/obj/item/r_hand = null//Living
var/obj/item/weapon/back = null//Human/Monkey