From edb3b6aa8b28e298b8de03d422473d827af6cd58 Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Fri, 23 Mar 2018 15:22:38 +0400 Subject: [PATCH] makes drones mob_size = MOB_SIZE_SMALL check for mob_size on doors Bumped() is now MOB_SIZE_TINY --- code/game/machinery/doors/door.dm | 6 +----- code/game/machinery/doors/windowdoor.dm | 2 +- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index bfb758bae75..6b1ea72e609 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -94,12 +94,8 @@ M.last_bumped = world.time if(M.restrained() && !check_access(null)) return - if(M.mob_size > MOB_SIZE_SMALL) + if(M.mob_size > MOB_SIZE_TINY) bumpopen(M) - else if(ispet(M)) - var/mob/living/simple_animal/A = AM - if(A.collar) - bumpopen(M) return if(ismecha(AM)) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 5490b529564..e5211f48407 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -77,7 +77,7 @@ if(!ticker) return var/mob/living/M = AM - if(!M.restrained() && M.mob_size > MOB_SIZE_SMALL && (!(isrobot(M) && M.stat))) + if(!M.restrained() && M.mob_size > MOB_SIZE_TINY && (!(isrobot(M) && M.stat))) bumpopen(M) /obj/machinery/door/window/bumpopen(mob/user) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 81a1958d22c..9b9c756eef9 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -16,7 +16,7 @@ req_access = list(access_engine, access_robotics) ventcrawler = 2 magpulse = 1 - + mob_size = MOB_SIZE_SMALL default_language = "Drone" // We need to keep track of a few module items so we don't need to do list operations