From b4736febcfe8643f7f1a279b1994c79838a4ea7b Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 4 Jan 2020 13:02:23 -0800 Subject: [PATCH] uhh --- code/__DEFINES/flags.dm | 21 +++++++++++++++++++++ code/modules/mob/living/living_defines.dm | 2 ++ code/modules/mob/mob_defines.dm | 1 - 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 55962bf78c..e6cf3fa25d 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -91,3 +91,24 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 // radiation #define RAD_PROTECT_CONTENTS (1<<0) #define RAD_NO_CONTAMINATE (1<<1) + +//Mob mobility var flags +/// can move +#define MOBILITY_MOVE (1<<0) +/// can, and is, standing up. +#define MOBILITY_STAND (1<<1) +/// can pickup items +#define MOBILITY_PICKUP (1<<2) +/// can hold and use items +#define MOBILITY_USE (1<<3) +/// can use interfaces like consoles +#define MOBILITY_UI (1<<4) +/// can use storage item +#define MOBILITY_STORAGE (1<<5) +/// can pull things +#define MOBILITY_PULL (1<<6) + + +#define MOBILITY_FLAGS_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_PICKUP | MOBILITY_USE | MOBILITY_UI | MOBILITY_STORAGE | MOBILITY_PULL) +#define MOBILITY_FLAGS_ANY_INTERACTION (MOBILITY_USE | MOBILITY_PICKUP | MOBILITY_UI | MOBILITY_STORAGE) + diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 783e044492..214360ec50 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -22,6 +22,8 @@ var/staminaloss = 0 //Stamina damage, or exhaustion. You recover it slowly naturally, and are knocked down if it gets too high. Holodeck and hallucinations deal this. var/crit_threshold = HEALTH_THRESHOLD_CRIT // when the mob goes from "normal" to crit + var/mobility_flags = MOBILITY_FLAGS_DEFAULT + var/confused = 0 //Makes the mob move in random directions. var/hallucination = 0 //Directly affects how long a mob will hallucinate for diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index c7365210ab..9aea4ebf09 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -37,7 +37,6 @@ var/resting = 0 //Carbon var/lying = 0 var/lying_prev = 0 - var/canmove = 1 //MOVEMENT SPEED var/list/movespeed_modification //Lazy list, see mob_movespeed.dm