diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 355a521ce50..6055b180971 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -108,6 +108,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define LETPASSTHROW (1<<6) #define PASSMACHINE (1<<7) #define PASSSTRUCTURE (1<<8) +#define PASSFLAPS (1<<9) //Movement Types #define GROUND (1<<0) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 4cd918f5b49..76c0e12f5c9 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -71,7 +71,8 @@ /obj/structure/plasticflaps/CanAllowThrough(atom/movable/A, turf/T) . = ..() - + if(A.pass_flags & PASSFLAPS) //For anything specifically engineered to cross plastic flaps. + return TRUE if(istype(A) && (A.pass_flags & PASSGLASS)) return prob(60) @@ -89,8 +90,6 @@ else if(isliving(A)) // You Shall Not Pass! var/mob/living/M = A - if(isbot(A)) //Bots understand the secrets - return TRUE if(M.buckled && istype(M.buckled, /mob/living/simple_animal/bot/mulebot)) // mulebot passenger gets a free pass. return TRUE if(M.body_position == STANDING_UP && !M.ventcrawler && M.mob_size != MOB_SIZE_TINY) //If your not laying down, or a ventcrawler or a small creature, no pass. diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index f9e6ee9e576..cf7477b7e1b 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -14,6 +14,7 @@ has_unlimited_silicon_privilege = 1 sentience_type = SENTIENCE_ARTIFICIAL status_flags = NONE //no default canpush + pass_flags = PASSFLAPS verb_say = "states" verb_ask = "queries" verb_exclaim = "declares" diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index a976a6c38d5..d1a155226c2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -14,6 +14,7 @@ health = 250 gender = NEUTER mob_biotypes = NONE + pass_flags = PASSFLAPS harm_intent_damage = 5 melee_damage_lower = 8