From e55e933a85afa43aae39e4725e5363fc2cb5f036 Mon Sep 17 00:00:00 2001 From: MrJWhit <48370570+MrJWhit@users.noreply.github.com> Date: Mon, 12 Aug 2019 14:56:27 -0400 Subject: [PATCH 1/3] Makes the balls message only work if you have arousal --- modular_citadel/code/modules/arousal/organs/testicles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm index 1e6b4d62d4..2f186f93c5 100644 --- a/modular_citadel/code/modules/arousal/organs/testicles.dm +++ b/modular_citadel/code/modules/arousal/organs/testicles.dm @@ -53,7 +53,7 @@ linked_organ = null /obj/item/organ/genital/testicles/proc/send_full_message(msg = "Your balls finally feel full, again.") - if(owner && istext(msg)) + if(owner && istext(msg) && M.canbearoused) to_chat(owner, msg) return TRUE From a27f3996ce695aec1e274234dea486d78203ae75 Mon Sep 17 00:00:00 2001 From: MrJWhit <48370570+MrJWhit@users.noreply.github.com> Date: Mon, 12 Aug 2019 15:02:34 -0400 Subject: [PATCH 2/3] Revert "Makes the balls message only work if you have arousal" This reverts commit e55e933a85afa43aae39e4725e5363fc2cb5f036. --- modular_citadel/code/modules/arousal/organs/testicles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm index 2f186f93c5..1e6b4d62d4 100644 --- a/modular_citadel/code/modules/arousal/organs/testicles.dm +++ b/modular_citadel/code/modules/arousal/organs/testicles.dm @@ -53,7 +53,7 @@ linked_organ = null /obj/item/organ/genital/testicles/proc/send_full_message(msg = "Your balls finally feel full, again.") - if(owner && istext(msg) && M.canbearoused) + if(owner && istext(msg)) to_chat(owner, msg) return TRUE From 97072c63c825f8bb0ad1a62e838fd683048ca839 Mon Sep 17 00:00:00 2001 From: MrJWhit <48370570+MrJWhit@users.noreply.github.com> Date: Sat, 7 Sep 2019 13:52:08 -0400 Subject: [PATCH 3/3] Adds text to not disturb the habatat to abductor spawntext Adds "Try not to disturb the habitat, it could lead to dead specimens." to the spawntext. --- code/modules/antagonists/abductor/abductor.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index 8e29b38fe1..0fca957ffe 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -56,6 +56,7 @@ /datum/antagonist/abductor/greet() to_chat(owner.current, "You are the [owner.special_role]!") to_chat(owner.current, "With the help of your teammate, kidnap and experiment on station crew members!") + to_chat(owner.current, "Try not to disturb the habitat, it could lead to dead specimens.") to_chat(owner.current, "[greet_text]") owner.announce_objectives()