From f4b365c610673b36dad8495b83eee39636391796 Mon Sep 17 00:00:00 2001 From: Tupinambis Date: Fri, 1 Oct 2021 20:46:46 -0500 Subject: [PATCH 1/5] Stopsforcing people into undesired roles when they get antag --- code/controllers/subsystem/job.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 7e7efe398f..5c690e244b 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -365,9 +365,14 @@ SUBSYSTEM_DEF(job) JobDebug("DO, Handling unrejectable unassigned") //Mop up people who can't leave. for(var/mob/dead/new_player/player in unassigned) //Players that wanted to back out but couldn't because they're antags (can you feel the edge case?) - if(!GiveRandomJob(player)) - if(!AssignRole(player, SSjob.overflow_role)) //If everything is already filled, make them an assistant - return FALSE //Living on the edge, the forced antagonist couldn't be assigned to overflow role (bans, client age) - just reroll + if(player.client.prefs.joblessrole == BERANDOMJOB) //Gives the player a random role if their preferences are set to it + if(!GiveRandomJob(player)) + if(!AssignRole(player, SSjob.overflow_role)) //If everything is already filled, make them the overflow role + return FALSE //Living on the edge, the forced antagonist couldn't be assigned to overflow role (bans, client age) - just reroll + else //If the player prefers to return to lobby or be an assistant, give them assistant + if(!AssignRole(player, SSjob.overflow_role)) + if(!GiveRandomJob(player)) //The forced antagonist couldn't be assigned to overflow role (bans, client age) - give a random role + return FALSE //Somehow the forced antagonist couldn't be assigned to the overflow role or the a random role - reroll return validate_required_jobs(required_jobs) From 578415d3fc8921de1976a026053bc280f8ece402 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sun, 22 May 2022 04:42:40 -0700 Subject: [PATCH 2/5] adds milk to pool blacklist --- code/__DEFINES/pool.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/pool.dm b/code/__DEFINES/pool.dm index 1bf39dcb1d..86088fbb79 100644 --- a/code/__DEFINES/pool.dm +++ b/code/__DEFINES/pool.dm @@ -8,5 +8,6 @@ GLOBAL_LIST_INIT(blacklisted_pool_reagents, list( /datum/reagent/toxin/plasma, /datum/reagent/oxygen, /datum/reagent/nitrous_oxide, /datum/reagent/nitrogen, //gases /datum/reagent/fermi, //blanket fermichem ban sorry. this also covers mkultra, genital enlargers, etc etc. - /datum/reagent/consumable/semen //NO. + /datum/reagent/consumable/semen, //NO. + /datum/reagent/consumable/milk )) From 411d7eb7d2241751072b7398b1f57eb2846786a5 Mon Sep 17 00:00:00 2001 From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> Date: Thu, 26 May 2022 20:22:54 -0700 Subject: [PATCH 3/5] Makes extreme and harmful prefs save (#256) --- modular_citadel/code/modules/client/preferences_savefile.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm index 0c404fc4d8..7d5b42853f 100644 --- a/modular_citadel/code/modules/client/preferences_savefile.dm +++ b/modular_citadel/code/modules/client/preferences_savefile.dm @@ -66,8 +66,8 @@ WRITE_FILE(S["erp_pref"], erppref) WRITE_FILE(S["noncon_pref"], nonconpref) WRITE_FILE(S["vore_pref"], vorepref) - WRITE_FILE(S["extremepref"], extremepref) - WRITE_FILE(S["extremeharm"], extremeharm) + WRITE_FILE(S["extreme_pref"], extremepref) + WRITE_FILE(S["extreme_harm"], extremeharm) WRITE_FILE(S["enable_personal_chat_color"], enable_personal_chat_color) WRITE_FILE(S["personal_chat_color"], personal_chat_color) WRITE_FILE(S["alt_titles_preferences"], alt_titles_preferences) From 5f59be68fcb67107e8a1a5ca8a79c427e1f52cc8 Mon Sep 17 00:00:00 2001 From: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com> Date: Fri, 27 May 2022 03:23:56 +0000 Subject: [PATCH 4/5] Automatic changelog generation for PR #256 [ci skip] --- html/changelogs/AutoChangeLog-pr-256.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-256.yml diff --git a/html/changelogs/AutoChangeLog-pr-256.yml b/html/changelogs/AutoChangeLog-pr-256.yml new file mode 100644 index 0000000000..eead1dcfd3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-256.yml @@ -0,0 +1,4 @@ +author: BongaTheProto +delete-after: true +changes: + - bugfix: fixes extreme and harmful prefs so they're ABLE TO BE SAVED!! FINALLY!!! From 3b4f3f5353da60b2b68c32a5f8a9ac93f8ca2a97 Mon Sep 17 00:00:00 2001 From: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com> Date: Fri, 27 May 2022 03:25:02 +0000 Subject: [PATCH 5/5] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-256.yml | 4 ---- html/changelogs/archive/2022-05.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-256.yml diff --git a/html/changelogs/AutoChangeLog-pr-256.yml b/html/changelogs/AutoChangeLog-pr-256.yml deleted file mode 100644 index eead1dcfd3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-256.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: BongaTheProto -delete-after: true -changes: - - bugfix: fixes extreme and harmful prefs so they're ABLE TO BE SAVED!! FINALLY!!! diff --git a/html/changelogs/archive/2022-05.yml b/html/changelogs/archive/2022-05.yml index 70e4ec56b4..407672d78c 100644 --- a/html/changelogs/archive/2022-05.yml +++ b/html/changelogs/archive/2022-05.yml @@ -72,3 +72,6 @@ 2022-05-24: SandPoot: - rscadd: You can now make shuttle seats with titanium. +2022-05-27: + BongaTheProto: + - bugfix: fixes extreme and harmful prefs so they're ABLE TO BE SAVED!! FINALLY!!!