Skip to content

Fixes old DNA data disks not rolling species-specific mutations #6743

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

Merged
merged 2 commits into from
May 21, 2025
Merged

Fixes old DNA data disks not rolling species-specific mutations #6743

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37c59f2
Fixes old DNA data disks not rolling species-specific mutations
Absolucy May 19, 2025
d6601a1
whoops
Absolucy May 19, 2025
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
28 changes: 17 additions & 11 deletions monkestation/code/game/machinery/dna_scanner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,23 @@
/obj/item/disk/data/random/proc/initialize_mutation_weights() as /list
RETURN_TYPE(/list)
. = list()
.[get_non_random_locked_mutations(GLOB.good_mutations)] = POSITIVE_WEIGHT
.[get_non_random_locked_mutations(GLOB.not_good_mutations)] = NEUTRAL_WEIGHT
.[get_non_random_locked_mutations(GLOB.bad_mutations)] = NEGATIVE_WEIGHT

/// Returns a list of the typepaths of mutations in the given list without the random_locked var enabled.
/obj/item/disk/data/random/proc/get_non_random_locked_mutations(list/mutations) as /list
RETURN_TYPE(/list)
. = list()
for(var/datum/mutation/human/mutation as anything in mutations)
if(!mutation.random_locked)
.[mutation.type] = isnull(mutation.species_allowed) ? 2 : 3
var/list/good = list()
var/list/neutral = list()
var/list/bad = list()
for(var/datum/mutation/human/mutation as anything in GLOB.all_mutations)
if(mutation::random_locked)
continue
var/weight = isnull(mutation::species_allowed) ? 2 : 3
switch(mutation::quality)
if(POSITIVE)
good[mutation] = weight
if(MINOR_NEGATIVE)
neutral[mutation] = weight
if(NEGATIVE)
bad[mutation] = weight
.[good] = POSITIVE_WEIGHT
.[neutral] = NEUTRAL_WEIGHT
.[bad] = NEGATIVE_WEIGHT

#undef STABILIZER_PROB
#undef CHROMOSOME_PROB
Expand Down