Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Evil Clone event changes, and removes "peaceful" evil clone objective #4502

Merged
merged 3 commits into from
Jan 1, 2025
Merged

Evil Clone event changes, and removes "peaceful" evil clone objective #4502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
355fe5d
More EVIL clones
Uristthedorf Dec 6, 2024
71a6f95
Update evil_event.dm
Uristthedorf Dec 8, 2024
24c4365
Merge remote-tracking branch 'upstream/master' into democracyClone
Uristthedorf Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions monkestation/code/modules/antagonists/evil_clone/evil_clone_objective.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions monkestation/code/modules/antagonists/evil_clone/evil_event.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

/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.
Expand Down
Loading