Skip to content

Commit

Permalink
[MIRROR] Hardcore random will not assign incompatible quirks. [MDB IG…
Browse files Browse the repository at this point in the history
…NORE] (#711)

* Hardcore random will not assign incompatible quirks. (#79825)

---------

Co-authored-by: SkyratBot <[email protected]>
Co-authored-by: lizardqueenlexi <[email protected]>
  • Loading branch information
3 people authored Nov 19, 2023
1 parent 5e8ca7e commit 8857654
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions code/modules/mob/dead/new_player/preferences_setup.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@
var/list/blacklist = bl
if(!(picked_quirk in blacklist))
continue
for(var/iterator_quirk in all_quirks) //Go through all the quirks we've already selected to see if theres a blacklist match
if((iterator_quirk in blacklist) && !(iterator_quirk == picked_quirk)) //two quirks have lined up in the list of the list of quirks that conflict with each other, so return (see quirks.dm for more details)
for(var/quirk_name in all_quirks) //Go through all the quirks we've already selected to see if theres a blacklist match
var/selected_quirk = SSquirks.quirks[quirk_name]
if((selected_quirk in blacklist) && !(selected_quirk == picked_quirk)) //two quirks have lined up in the list of the list of quirks that conflict with each other, so return (see quirks.dm for more details)
picked_quirk_blacklisted = TRUE
break
if(picked_quirk_blacklisted)
Expand Down

0 comments on commit 8857654

Please sign in to comment.