From ea1a6fa00b09dc84948b8af49cd694f05b5dda34 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 13 Jun 2018 23:33:08 -0700 Subject: [PATCH 1/3] SQL version 3->4 --- code/__DEFINES/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 6e489098c29..f2e72125a1b 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -346,7 +346,7 @@ #define INVESTIGATE_BOMB "bombs" // The SQL version required by this version of the code -#define SQL_VERSION 3 +#define SQL_VERSION 4 // Vending machine stuff #define CAT_NORMAL 1 From dba908af5ab7ff4635be65efa4e6afe1d3b0d665 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 14 Jun 2018 02:54:30 -0700 Subject: [PATCH 2/3] runtime fix --- code/__HELPERS/mobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 95afa6244d3..cf31f63e4e1 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -271,7 +271,7 @@ This is always put in the attack log. else if(istype(target)) if(isLivingSSD(target)) // Attacks on SSDs are shown to admins with any log level except ATKLOG_NONE loglevel = ATKLOG_FEW - else if(!user.ckey && !target.ckey) // Attacks between NPCs are only shown to admins with ATKLOG_ALL + else if(istype(user) && !user.ckey && !target.ckey) // Attacks between NPCs are only shown to admins with ATKLOG_ALL loglevel = ATKLOG_ALL else if(!target.ckey) // Attacks by players on NPCs are only shown to admins with ATKLOG_ALL or ATKLOG_ALMOSTALL loglevel = ATKLOG_ALMOSTALL From 5d49b7ed03096e0ce56e8fe9670edb524b1d2709 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 15 Jun 2018 19:18:31 -0700 Subject: [PATCH 3/3] fixes custom_level not working with ATKLOG_ALL --- code/__HELPERS/mobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index cf31f63e4e1..8628e6957cf 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -266,7 +266,7 @@ This is always put in the attack log. var/loglevel = ATKLOG_MOST - if(custom_level) + if(!isnull(custom_level)) loglevel = custom_level else if(istype(target)) if(isLivingSSD(target)) // Attacks on SSDs are shown to admins with any log level except ATKLOG_NONE