From fa0259e36ac5889bb54448b5bf11b6dc046ee6f9 Mon Sep 17 00:00:00 2001 From: "Ronald T. Mullins III" Date: Tue, 17 Jul 2018 16:35:50 -0500 Subject: [PATCH 1/3] Reopen of #9162 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Redid the swarmers eating active clone pods things that was stale. Partly because I think it makes sense but MAINLY because I wanted to use the web editor. :^) Fite me 🆑alexkar598 and taukausanake tweak: Swarmers can no longer destroy active clone pods. /🆑 --- code/game/gamemodes/miniantags/bot_swarm/swarmer.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 03b7d2e1b56..c3813021ffd 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -123,7 +123,7 @@ to_chat(src, "Prime Directives:") to_chat(src, "1. Consume resources and replicate until there are no more resources left.") to_chat(src, "2. Ensure that the station is fit for invasion at a later date, do not perform actions that would render it dangerous or inhospitable.") - to_chat(src, "3. Biological and Sentient resources will be harvested at a later date, do not harm them.") + to_chat(src, "3. Biological and sentient resources will be harvested at a later date, do not harm them.") /mob/living/simple_animal/hostile/swarmer/New() ..() @@ -306,6 +306,11 @@ /obj/spacepod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Destroying this vehicle would destroy us. Aborting.") +/obj/machinery/clonepod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) + if(occupant) + to_chat(S, "Destroying this machine while it is occupied would result in biological and sentient resources to be harmed. Aborting.") + return + /mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.DisperseTarget(src) From 9a303e1ed3c739108018e204ec59b8347740bb28 Mon Sep 17 00:00:00 2001 From: "Ronald T. Mullins III" Date: Wed, 18 Jul 2018 19:38:34 -0500 Subject: [PATCH 2/3] ..() Neh --- code/game/gamemodes/miniantags/bot_swarm/swarmer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index c3813021ffd..8da4117280c 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -309,7 +309,7 @@ /obj/machinery/clonepod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) if(occupant) to_chat(S, "Destroying this machine while it is occupied would result in biological and sentient resources to be harmed. Aborting.") - return + return ..() /mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.DisperseTarget(src) From cb115c5b61ef90cad0f9b218450dd9c9c7cce0c2 Mon Sep 17 00:00:00 2001 From: "Ronald T. Mullins III" Date: Wed, 18 Jul 2018 21:55:53 -0500 Subject: [PATCH 3/3] Fixed it --- code/game/gamemodes/miniantags/bot_swarm/swarmer.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 8da4117280c..6b976ad7f05 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -309,7 +309,8 @@ /obj/machinery/clonepod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) if(occupant) to_chat(S, "Destroying this machine while it is occupied would result in biological and sentient resources to be harmed. Aborting.") - return ..() + return + ..() /mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.DisperseTarget(src)