diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 87a6808e4e..51072a0b64 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -141,7 +141,7 @@ #define FIRE_PRIORITY_AIR_TURFS 40 #define FIRE_PRIORITY_DEFAULT 50 #define FIRE_PRIORITY_PARALLAX 65 -#define FIRE_PRIORITY_NPC 99 +#define FIRE_PRIORITY_NPC 80 #define FIRE_PRIORITY_MOBS 100 #define FIRE_PRIORITY_TGUI 110 #define FIRE_PRIORITY_PROJECTILES 200 diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm index 164a7fae9f..64836f7c99 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -3,8 +3,6 @@ SUBSYSTEM_DEF(npcpool) flags = SS_KEEP_TIMING | SS_NO_INIT priority = FIRE_PRIORITY_NPC runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME - wait = 1 SECONDS // currently defines how often mobs attack and flip out - // wait = 1 DECISECOND makes retreat/approach mobs just wiggle around in place and cheesegrate people var/list/currentrun = list()