From af3e632a09b9ffdea82d7c6ab136142c77d6d155 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 27 Mar 2018 15:16:19 -0700 Subject: [PATCH 1/3] stops poolcontroller drowning sending messages to admins --- code/game/machinery/poolcontroller.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index c169f3c0a59..f7658cd6aba 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -100,7 +100,7 @@ if(drownee.losebreath > 20) //You've probably got bigger problems than drowning at this point, so we won't add to it until you get that under control. return - add_logs(src, drownee, "drowned", null, null, 0) //log it to their VV, but don't spam the admins' chats with the logs + add_logs(src, drownee, "drowned", null, null, 0, 0) //log it to their VV, but don't spam the admins' chats with the logs if(drownee.stat) //Mob is in critical. drownee.AdjustLoseBreath(3, bound_lower = 0, bound_upper = 20) drownee.visible_message("\The [drownee] appears to be drowning!","You're quickly drowning!") //inform them that they are fucked. From 9aca23aaba34358bcbbbcd2ed3ba49d644b34115 Mon Sep 17 00:00:00 2001 From: Kyep Date: Tue, 27 Mar 2018 16:36:26 -0700 Subject: [PATCH 2/3] Only notify if mob is SSD --- code/game/machinery/poolcontroller.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index f7658cd6aba..39a231acc01 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -100,7 +100,10 @@ if(drownee.losebreath > 20) //You've probably got bigger problems than drowning at this point, so we won't add to it until you get that under control. return - add_logs(src, drownee, "drowned", null, null, 0, 0) //log it to their VV, but don't spam the admins' chats with the logs + if (isLivingSSD(drownee)) + add_logs(src, drownee, "drowned", null, null, 0, 1) // Notify admins, since the person is SSD + else + add_logs(src, drownee, "drowned", null, null, 0, 0) // Do not notify admins. if(drownee.stat) //Mob is in critical. drownee.AdjustLoseBreath(3, bound_lower = 0, bound_upper = 20) drownee.visible_message("\The [drownee] appears to be drowning!","You're quickly drowning!") //inform them that they are fucked. From ffe578808fdeaad0fb209bc251f95350c23b5d01 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 28 Mar 2018 21:12:26 -0700 Subject: [PATCH 3/3] spaces --- code/game/machinery/poolcontroller.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index 39a231acc01..9a1ee503f0b 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -100,7 +100,7 @@ if(drownee.losebreath > 20) //You've probably got bigger problems than drowning at this point, so we won't add to it until you get that under control. return - if (isLivingSSD(drownee)) + if(isLivingSSD(drownee)) add_logs(src, drownee, "drowned", null, null, 0, 1) // Notify admins, since the person is SSD else add_logs(src, drownee, "drowned", null, null, 0, 0) // Do not notify admins.