From 355fe5d7517c43a791e7a7d5eb02a6d40902ea60 Mon Sep 17 00:00:00 2001 From: Uristthedorf <40842973+Uristthedorf@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:20:23 -0800 Subject: [PATCH 1/2] More EVIL clones --- .../modules/antagonists/evil_clone/evil_clone_objective.dm | 6 +++--- .../code/modules/antagonists/evil_clone/evil_event.dm | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/monkestation/code/modules/antagonists/evil_clone/evil_clone_objective.dm b/monkestation/code/modules/antagonists/evil_clone/evil_clone_objective.dm index 88aa241e4453..1ce177042ce4 100644 --- a/monkestation/code/modules/antagonists/evil_clone/evil_clone_objective.dm +++ b/monkestation/code/modules/antagonists/evil_clone/evil_clone_objective.dm @@ -14,9 +14,9 @@ name = "minion" explanation_text = "Find the most evil being you can, and become their minion." -/datum/objective/evil_clone/dud // Relies on more destructive objectives, to create conflict from crew hating evil clones because they MIGHT have a more evil objective. - name = "peaceful clone" - explanation_text = "You find it really mean that some people don't like you because of your red eyes." +///datum/objective/evil_clone/dud // Relies on more destructive objectives, to create conflict from crew hating evil clones because they MIGHT have a more evil objective. // +// name = "peaceful clone" +// explanation_text = "You find it really mean that some people don't like you because of your red eyes." //Disabled because it doesn't cause any conflict in my experience. Security is not allowed to validhunt them. /datum/objective/evil_clone/tide name = "tider" diff --git a/monkestation/code/modules/antagonists/evil_clone/evil_event.dm b/monkestation/code/modules/antagonists/evil_clone/evil_event.dm index 10d5b481d9cc..c7dd6b07634f 100644 --- a/monkestation/code/modules/antagonists/evil_clone/evil_event.dm +++ b/monkestation/code/modules/antagonists/evil_clone/evil_event.dm @@ -2,17 +2,18 @@ name = "Experimental Cloner Corruption" typepath = /datum/round_event/cloner_corruption max_occurrences = 1 - weight = 3 + weight = 5 category = EVENT_CATEGORY_ENTITIES //Kinda, evil clones ARE entities. track = EVENT_TRACK_MODERATE tags = list(TAG_COMBAT) // Clones will likely start a fight, but will usually not cause wanton destruction. - earliest_start = 35 MINUTES //This requires an experimental cloner to be made, so should wait until later to fire when there's better chance one has been set up. + earliest_start = 30 MINUTES //This requires an experimental cloner to be made, so should wait until later to fire when there's better chance one has been set up. /datum/round_event/cloner_corruption/start() var/found = FALSE + var/objective = pick(subtypesof(/datum/objective/evil_clone)) for(var/obj/machinery/clonepod/experimental/cloner in GLOB.machines) if(!cloner.locked) - cloner.evil_objective = pick(subtypesof(/datum/objective/evil_clone)) + cloner.evil_objective = objective cloner.RefreshParts() found = TRUE if(!found) // Refund if no experimental cloners are found. From 71a6f95c612a5548a9304f65e11650b1507c2b07 Mon Sep 17 00:00:00 2001 From: Uristthedorf <40842973+Uristthedorf@users.noreply.github.com> Date: Sat, 7 Dec 2024 22:26:45 -0800 Subject: [PATCH 2/2] Update evil_event.dm --- monkestation/code/modules/antagonists/evil_clone/evil_event.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monkestation/code/modules/antagonists/evil_clone/evil_event.dm b/monkestation/code/modules/antagonists/evil_clone/evil_event.dm index c7dd6b07634f..ac7f59d151f8 100644 --- a/monkestation/code/modules/antagonists/evil_clone/evil_event.dm +++ b/monkestation/code/modules/antagonists/evil_clone/evil_event.dm @@ -6,7 +6,7 @@ category = EVENT_CATEGORY_ENTITIES //Kinda, evil clones ARE entities. track = EVENT_TRACK_MODERATE tags = list(TAG_COMBAT) // Clones will likely start a fight, but will usually not cause wanton destruction. - earliest_start = 30 MINUTES //This requires an experimental cloner to be made, so should wait until later to fire when there's better chance one has been set up. + earliest_start = 35 MINUTES //This requires an experimental cloner to be made, so should wait until later to fire when there's better chance one has been set up. /datum/round_event/cloner_corruption/start() var/found = FALSE