From 6020c9a794fd8d193dde3a8a2b5e8f8925072fb8 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sun, 14 Oct 2018 20:46:31 -0400 Subject: [PATCH 1/4] borer fixes --- code/game/gamemodes/miniantags/borer/borer.dm | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 5543a54caa6..cc9a6593df3 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -91,6 +91,7 @@ ) var/talk_inside_host = FALSE // So that borers don't accidentally give themselves away on a botched message var/used_dominate + var/input_open = FALSE // To prevent people from spam opening the Dominate Victim input var/chemicals = 10 // Chemicals used for reproduction and chemical injection. var/max_chems = 250 var/mob/living/carbon/human/host // Human host for the brain worm. @@ -471,7 +472,7 @@ set category = "Borer" set name = "Dominate Victim" set desc = "Freeze the limbs of a potential host with supernatural fear." - + if(world.time - used_dominate < 150) to_chat(src, "You cannot use that ability again so soon.") return @@ -483,23 +484,43 @@ if(stat) to_chat(src, "You cannot do that in your current state.") return - + + if(input_open) + to_chat(src, "You're already targetting someone!") + return + var/list/choices = list() for(var/mob/living/carbon/C in view(3,src)) if(C.stat != DEAD) choices += C - + if(world.time - used_dominate < 300) to_chat(src, "You cannot use that ability again so soon.") return - + + input_open = TRUE + var/mob/living/carbon/M = input(src,"Who do you wish to dominate?") in null|choices - if(!M || !src) + if(!M) + input_open = FALSE + return + + if(!src) //different statement to avoid a runtime since if the source is deleted then input_open would also be deleted return if(M.has_brain_worms()) to_chat(src, "You cannot dominate someone who is already infested!") + input_open = FALSE + return + + if(stat == DEAD) + input_open = FALSE + return + + if(get_dist(src, M) > 7) //to avoid people remotely doing from across the map etc, 7 is the default view range + to_chat(src, "You're too far away!") + input_open = FALSE return to_chat(src, "You focus your psychic lance on [M] and freeze [M.p_their()] limbs with a wave of terrible dread.") @@ -507,6 +528,7 @@ M.Weaken(3) used_dominate = world.time + input_open = FALSE /mob/living/simple_animal/borer/verb/release_host() set category = "Borer" From 8669cad4d02d2b046d38a092aa3db31c07af37b3 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sun, 14 Oct 2018 21:07:48 -0400 Subject: [PATCH 2/4] borer fixes 2 --- code/game/gamemodes/miniantags/borer/borer.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index cc9a6593df3..47ce49414b2 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -326,6 +326,9 @@ to_chat(src, "You cannot infest someone who is already infested!") return + if(stat == DEAD) + return + to_chat(src, "You slither up [M] and begin probing at [M.p_their()] ear canal...") if(!do_after(src, 50, target = M)) From 265da844dfd7e50d2b11e52ecd65f1f339233b4d Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sun, 14 Oct 2018 21:25:46 -0400 Subject: [PATCH 3/4] borer fixes 3 (spelling) --- code/game/gamemodes/miniantags/borer/borer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 47ce49414b2..a87008c590b 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -489,7 +489,7 @@ return if(input_open) - to_chat(src, "You're already targetting someone!") + to_chat(src, "You're already targeting someone!") return var/list/choices = list() From cb3f3c88a61dca95205f667f73fe263f5c9da405 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Mon, 15 Oct 2018 17:58:20 -0400 Subject: [PATCH 4/4] borer fixes 4 --- code/game/gamemodes/miniantags/borer/borer.dm | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index a87008c590b..6cdfdc736d9 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -91,7 +91,7 @@ ) var/talk_inside_host = FALSE // So that borers don't accidentally give themselves away on a botched message var/used_dominate - var/input_open = FALSE // To prevent people from spam opening the Dominate Victim input + var/attempting_to_dominate = FALSE // To prevent people from spam opening the Dominate Victim input var/chemicals = 10 // Chemicals used for reproduction and chemical injection. var/max_chems = 250 var/mob/living/carbon/human/host // Human host for the brain worm. @@ -326,7 +326,7 @@ to_chat(src, "You cannot infest someone who is already infested!") return - if(stat == DEAD) + if(incapacitated()) return to_chat(src, "You slither up [M] and begin probing at [M.p_their()] ear canal...") @@ -488,7 +488,7 @@ to_chat(src, "You cannot do that in your current state.") return - if(input_open) + if(attempting_to_dominate) to_chat(src, "You're already targeting someone!") return @@ -501,29 +501,29 @@ to_chat(src, "You cannot use that ability again so soon.") return - input_open = TRUE + attempting_to_dominate = TRUE var/mob/living/carbon/M = input(src,"Who do you wish to dominate?") in null|choices if(!M) - input_open = FALSE + attempting_to_dominate = FALSE return - if(!src) //different statement to avoid a runtime since if the source is deleted then input_open would also be deleted + if(!src) //different statement to avoid a runtime since if the source is deleted then attempting_to_dominate would also be deleted return if(M.has_brain_worms()) to_chat(src, "You cannot dominate someone who is already infested!") - input_open = FALSE + attempting_to_dominate = FALSE return - if(stat == DEAD) - input_open = FALSE + if(incapacitated()) + attempting_to_dominate = FALSE return if(get_dist(src, M) > 7) //to avoid people remotely doing from across the map etc, 7 is the default view range to_chat(src, "You're too far away!") - input_open = FALSE + attempting_to_dominate = FALSE return to_chat(src, "You focus your psychic lance on [M] and freeze [M.p_their()] limbs with a wave of terrible dread.") @@ -531,7 +531,7 @@ M.Weaken(3) used_dominate = world.time - input_open = FALSE + attempting_to_dominate = FALSE /mob/living/simple_animal/borer/verb/release_host() set category = "Borer"