Fixes in wheelchair and different handling of movement

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob.dm
This commit is contained in:
Hubblenaut
2014-07-13 06:52:38 -04:00
committed by ZomgPonies
parent b9be3e6ed7
commit 6c0122e7d6
6 changed files with 54 additions and 22 deletions
@@ -137,7 +137,7 @@
return
//BubbleWrap: people in handcuffs are always switched around as if they were on 'help' intent to prevent a person being pulled from being seperated from their puller
if((tmob.a_intent == "help" || tmob.restrained()) && (a_intent == "help" || src.restrained()) && tmob.canmove && canmove) // mutual brohugs all around!
if((tmob.a_intent == "help" || tmob.restrained()) && (a_intent == "help" || src.restrained()) && tmob.canmove && !tmob.buckled && canmove) // mutual brohugs all around!
var/turf/oldloc = loc
loc = tmob.loc
tmob.loc = oldloc
+3 -3
View File
@@ -909,7 +909,7 @@ var/list/slot_equipment_priority = list( \
else
lying = 0
canmove = 1
if(buckled)
if(buckled && (!buckled.movable))
anchored = 1
canmove = 0
if( istype(buckled,/obj/structure/stool/bed/chair) )
@@ -928,9 +928,9 @@ var/list/slot_equipment_priority = list( \
else if( stunned )
// lying = 0
canmove = 0
else
else if (!buckled)
lying = !can_stand
canmove = has_limbs
//canmove = has_limbs
if(lying)
density = 0
+1
View File
@@ -19,6 +19,7 @@
var/emagged = 0
var/powered = 0 //set if vehicle is powered and should use fuel when moving
var/move_delay = 1 //set this to limit the speed of the vehicle
var/movable = 1
var/obj/item/weapon/cell/cell
var/power_use = 5 //set this to adjust the amount of power the vehicle uses per move