From a236357ebe0a653a3569683821d930f077703ca5 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 8 Jun 2021 00:21:19 -0700 Subject: [PATCH 1/3] makes medihound sleeper toggle do something --- code/game/objects/items/devices/dogborg_sleeper.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/devices/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm index 4d57d05be4..54e0e540e5 100644 --- a/code/game/objects/items/devices/dogborg_sleeper.dm +++ b/code/game/objects/items/devices/dogborg_sleeper.dm @@ -77,6 +77,8 @@ return if(!iscarbon(target)) return + if(!(target?.client?.prefs?.cit_toggles & MEDIHOUND_SLEEPER)) + return var/voracious = TRUE if(!target.client || !(target.client.prefs.cit_toggles & MEDIHOUND_SLEEPER) || !hound.client || !(hound.client.prefs.cit_toggles & MEDIHOUND_SLEEPER)) voracious = FALSE From f6e08a8d2a6036283713eddc8300c60c3eb04ee9 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 8 Jun 2021 00:24:54 -0700 Subject: [PATCH 2/3] include a message too --- code/game/objects/items/devices/dogborg_sleeper.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm index 54e0e540e5..ad1b5232cd 100644 --- a/code/game/objects/items/devices/dogborg_sleeper.dm +++ b/code/game/objects/items/devices/dogborg_sleeper.dm @@ -78,6 +78,7 @@ if(!iscarbon(target)) return if(!(target?.client?.prefs?.cit_toggles & MEDIHOUND_SLEEPER)) + to_chat(user, "The user has opted out of the use of your [src].") return var/voracious = TRUE if(!target.client || !(target.client.prefs.cit_toggles & MEDIHOUND_SLEEPER) || !hound.client || !(hound.client.prefs.cit_toggles & MEDIHOUND_SLEEPER)) From fcd1ec83cc9ddde1d2bc000d213e79ba29e0643a Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 8 Jun 2021 00:25:31 -0700 Subject: [PATCH 3/3] removed redundant check --- code/game/objects/items/devices/dogborg_sleeper.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm index ad1b5232cd..01970ccdbd 100644 --- a/code/game/objects/items/devices/dogborg_sleeper.dm +++ b/code/game/objects/items/devices/dogborg_sleeper.dm @@ -81,7 +81,7 @@ to_chat(user, "The user has opted out of the use of your [src].") return var/voracious = TRUE - if(!target.client || !(target.client.prefs.cit_toggles & MEDIHOUND_SLEEPER) || !hound.client || !(hound.client.prefs.cit_toggles & MEDIHOUND_SLEEPER)) + if(!hound.client || !(hound.client.prefs.cit_toggles & MEDIHOUND_SLEEPER)) voracious = FALSE if(target.buckled) to_chat(user, "The user is buckled and can not be put into your [src].")