From 52bd80b998cdeff537e7dc51e5b69252f75cbccc Mon Sep 17 00:00:00 2001 From: Meiler Date: Sun, 5 Mar 2023 01:59:24 +0100 Subject: [PATCH 01/10] initial --- code/__DEFINES/quirks.dm | 4 ++++ code/__DEFINES/~~bubber_defines/traits.dm | 1 + code/datums/quirks/_quirk.dm | 5 +++++ .../reagents/chemistry/reagents/other_reagents.dm | 5 +++++ .../code/datums/bubber_quirks/hydrophilic.dm | 11 +++++++++++ tgstation.dme | 2 ++ 6 files changed, 28 insertions(+) create mode 100644 code/__DEFINES/~~bubber_defines/traits.dm create mode 100644 modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm diff --git a/code/__DEFINES/quirks.dm b/code/__DEFINES/quirks.dm index 290fed93c95..17b39898969 100644 --- a/code/__DEFINES/quirks.dm +++ b/code/__DEFINES/quirks.dm @@ -12,3 +12,7 @@ #define QUIRK_CHANGES_APPEARANCE (1<<2) /// The only thing this quirk effects is mood so it should be disabled if mood is #define QUIRK_MOODLET_BASED (1<<3) + +//BUBBER EDIT ADDITION - Slime specific traits +/// This quirk can only be applied to roundstartslimes +#define QUIRK_SLIMEPERSON_ONLY (1<<4) diff --git a/code/__DEFINES/~~bubber_defines/traits.dm b/code/__DEFINES/~~bubber_defines/traits.dm new file mode 100644 index 00000000000..ec675566419 --- /dev/null +++ b/code/__DEFINES/~~bubber_defines/traits.dm @@ -0,0 +1 @@ +#define TRAIT_HYDROPHILIC "hydrophilic" diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm index 85885e62127..21ad4d51501 100644 --- a/code/datums/quirks/_quirk.dm +++ b/code/datums/quirks/_quirk.dm @@ -61,6 +61,11 @@ if((quirk_flags & QUIRK_HUMAN_ONLY) && !ishuman(new_holder)) CRASH("Human only quirk attempted to be added to non-human mob.") + //BUBBER EDIT ADDITION - Slime-specific quirk check + if(quirk_flags & QUIRK_SLIMEPERSON_ONLY && !isroundstartslime(new_holder)) //I don't think we want this quirk on non-slimes. + CRASH("Slime-only quirk attempted to be added to a non-slimeperson.") + //BUBBER EDIT END + if(new_holder.has_quirk(type)) CRASH("Quirk attempted to be added to mob which already had this quirk.") diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index c4cff0d1b1a..e10086da4bf 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -253,6 +253,11 @@ /datum/reagent/water/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)//Splashing people with water can help put them out! . = ..() if(methods & TOUCH) + if(HAS_TRAIT(exposed_mob, TRAIT_HYDROPHILIC)) //BUBBER EDIT - Hydrophilic trait + exposed_mob.blood_volume = max(exposed_mob.blood_volume - 30, 0) //So we don't end up with slimes going to -2535% blood. + to_chat(exposed_mob, span_warning("The water causes you to melt away!")) + return + exposed_mob.extinguish_mob() // extinguish removes all fire stacks if(methods & VAPOR) if(!isfeline(exposed_mob)) // SKYRAT EDIT - Feline trait :) diff --git a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm new file mode 100644 index 00000000000..31c6443f7db --- /dev/null +++ b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm @@ -0,0 +1,11 @@ +/datum/quirk/hydrophilic + name = "Hydrophilic" + desc = "Your molecules are highly hydrophilic - or, in layman's terms, dissolve very well in water." + icon = "bug" // I can't be asked to make an icon for this, my spritework sucks. + value = 0 //Neutral quirk for RP stuff. I don't know TGUI so I can't make it whitelisted. + quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_MOODLET_BASED|QUIRK_SLIMEPERSON_ONLY + gain_text = "You have a feeling you should stay away from water..." + lose_text = "Somehow, you feel as if water is no longer dangerous." + medical_record_text = "Patient scans indicate extreme hydrophilicity." + hardcore_value = 0 + mob_trait = TRAIT_HYDROPHILIC diff --git a/tgstation.dme b/tgstation.dme index 81fb1099a00..0642ff381dd 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -384,6 +384,7 @@ #include "code\__DEFINES\~skyrat_defines\_HELPERS\atmos_mapping_helpers.dm" #include "code\__DEFINES\~skyrat_defines\_HELPERS\lighting.dm" #include "code\__DEFINES\~~bubber_defines\access.dm" +#include "code\__DEFINES\~~bubber_defines\traits.dm" #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_lists.dm" #include "code\__HELPERS\_planes.dm" @@ -6539,6 +6540,7 @@ #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\spitter.dm" #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\warrior.dm" #include "modular_zubbers\code\datums\ert.dm" +#include "modular_zubbers\code\datums\bubber_quirks\hydrophilic.dm" #include "modular_zubbers\code\datums\id_trim\jobs.dm" #include "modular_zubbers\code\game\area\areas\station.dm" #include "modular_zubbers\code\game\objects\effects\landmarks.dm" From 93fb7a1e88ff88f43927d631ae29a78b245b0dfc Mon Sep 17 00:00:00 2001 From: Meiler Date: Sun, 5 Mar 2023 02:07:41 +0100 Subject: [PATCH 02/10] should be more specific here --- modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm index 31c6443f7db..054f46a5c92 100644 --- a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm +++ b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm @@ -1,6 +1,6 @@ /datum/quirk/hydrophilic name = "Hydrophilic" - desc = "Your molecules are highly hydrophilic - or, in layman's terms, dissolve very well in water." + desc = "(Slimeperson only) Your molecules are highly hydrophilic - or, in layman's terms, dissolve very well in water." icon = "bug" // I can't be asked to make an icon for this, my spritework sucks. value = 0 //Neutral quirk for RP stuff. I don't know TGUI so I can't make it whitelisted. quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_MOODLET_BASED|QUIRK_SLIMEPERSON_ONLY From b6fe7d83c187cde3b27c280169eb82475df14f13 Mon Sep 17 00:00:00 2001 From: Meiler Date: Sun, 5 Mar 2023 14:14:53 +0100 Subject: [PATCH 03/10] Delete unnecessary define, functional whitelists --- code/__DEFINES/quirks.dm | 4 ---- .../subsystem/processing/quirks.dm | 7 ++++++ code/datums/quirks/_quirk.dm | 5 ---- .../client/preferences/middleware/quirks.dm | 1 + .../code/datums/bubber_quirks/hydrophilic.dm | 4 ++-- .../interfaces/PreferencesMenu/QuirksPage.tsx | 24 +++++++++++++++++++ .../tgui/interfaces/PreferencesMenu/data.ts | 1 + 7 files changed, 35 insertions(+), 11 deletions(-) diff --git a/code/__DEFINES/quirks.dm b/code/__DEFINES/quirks.dm index 17b39898969..290fed93c95 100644 --- a/code/__DEFINES/quirks.dm +++ b/code/__DEFINES/quirks.dm @@ -12,7 +12,3 @@ #define QUIRK_CHANGES_APPEARANCE (1<<2) /// The only thing this quirk effects is mood so it should be disabled if mood is #define QUIRK_MOODLET_BASED (1<<3) - -//BUBBER EDIT ADDITION - Slime specific traits -/// This quirk can only be applied to roundstartslimes -#define QUIRK_SLIMEPERSON_ONLY (1<<4) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index d5bb0effa59..4f669ed3084 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -37,6 +37,13 @@ PROCESSING_SUBSYSTEM_DEF(quirks) //SKYRAT EDIT ADDITION END ) + //BUBBER EDIT ADDITION START - Species quirks + /// A list of quirks that can only be used by a certain species. Format: list(quirk, species define) + var/static/list/quirk_species_whitelist = list( + list("Hydrophilic", "[SPECIES_SLIMESTART]") + ) + //BUBBER EDIT ADDITION END + /datum/controller/subsystem/processing/quirks/Initialize() get_quirks() return SS_INIT_SUCCESS diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm index 21ad4d51501..85885e62127 100644 --- a/code/datums/quirks/_quirk.dm +++ b/code/datums/quirks/_quirk.dm @@ -61,11 +61,6 @@ if((quirk_flags & QUIRK_HUMAN_ONLY) && !ishuman(new_holder)) CRASH("Human only quirk attempted to be added to non-human mob.") - //BUBBER EDIT ADDITION - Slime-specific quirk check - if(quirk_flags & QUIRK_SLIMEPERSON_ONLY && !isroundstartslime(new_holder)) //I don't think we want this quirk on non-slimes. - CRASH("Slime-only quirk attempted to be added to a non-slimeperson.") - //BUBBER EDIT END - if(new_holder.has_quirk(type)) CRASH("Quirk attempted to be added to mob which already had this quirk.") diff --git a/code/modules/client/preferences/middleware/quirks.dm b/code/modules/client/preferences/middleware/quirks.dm index 343aff49144..2b4ded6ce49 100644 --- a/code/modules/client/preferences/middleware/quirks.dm +++ b/code/modules/client/preferences/middleware/quirks.dm @@ -45,6 +45,7 @@ "max_positive_quirks" = MAX_QUIRKS, "quirk_info" = quirk_info, "quirk_blacklist" = SSquirks.quirk_blacklist, + "quirk_species_whitelist" = SSquirks.quirk_species_whitelist, ) /datum/preference_middleware/quirks/on_new_character(mob/user) diff --git a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm index 054f46a5c92..fa5cf8459c9 100644 --- a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm +++ b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm @@ -2,8 +2,8 @@ name = "Hydrophilic" desc = "(Slimeperson only) Your molecules are highly hydrophilic - or, in layman's terms, dissolve very well in water." icon = "bug" // I can't be asked to make an icon for this, my spritework sucks. - value = 0 //Neutral quirk for RP stuff. I don't know TGUI so I can't make it whitelisted. - quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_MOODLET_BASED|QUIRK_SLIMEPERSON_ONLY + value = 0 + quirk_flags = QUIRK_HUMAN_ONLY gain_text = "You have a feeling you should stay away from water..." lose_text = "Somehow, you feel as if water is no longer dangerous." medical_record_text = "Patient scans indicate extreme hydrophilicity." diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx index 16b5f20bf61..6e90c8fa89f 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx @@ -148,6 +148,7 @@ export const QuirksPage = (props, context) => { const { max_positive_quirks: maxPositiveQuirks, quirk_blacklist: quirkBlacklist, + quirk_species_whitelist: quirkSpeciesWhitelist, quirk_info: quirkInfo, } = quirks_data.quirks; // SKYRAT EDIT - Quirks balance refactor @@ -201,6 +202,29 @@ export const QuirksPage = (props, context) => { } } + // BUBBER EDIT ADDITION START - Species quirks + + // Iterate through all whitelists + + for (const whitelist of quirkSpeciesWhitelist) { + const currentSpeciesName = data.character_preferences.misc.species; + + // Format: Quirk ([0]), Species define ([1]) + const whitelistSpeciesName = whitelist[1]; + // Quirk is not in the whitelisted ones, continue to next list + if (whitelist.indexOf(quirk.name) === -1) { + continue; + } + + // If the selected species is NOT in the list, do not give the quirk + // Otherwise, give the quirk + if (whitelist.indexOf(currentSpeciesName) === -1) { + return `This quirk is whitelisted to ${whitelistSpeciesName}!`; + } + } + + // BUBBER EDIT ADDITION END + return undefined; }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts index f428c6612bb..4a08734e063 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts @@ -132,6 +132,7 @@ export type QuirkInfo = { max_positive_quirks: number; quirk_info: Record; quirk_blacklist: string[][]; + quirk_species_whitelist: string[][]; }; export enum RandomSetting { From d25898713c10da44ac5a27d22683a2a83b95fb20 Mon Sep 17 00:00:00 2001 From: Meiler Date: Sun, 5 Mar 2023 20:59:54 +0100 Subject: [PATCH 04/10] re-adds define, code checks just in case --- code/__DEFINES/~~bubber_defines/quirk_whitelist.dm | 4 ++++ code/datums/quirks/_quirk.dm | 8 ++++++++ code/modules/client/preferences/middleware/quirks.dm | 2 +- modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm | 1 + tgstation.dme | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 code/__DEFINES/~~bubber_defines/quirk_whitelist.dm diff --git a/code/__DEFINES/~~bubber_defines/quirk_whitelist.dm b/code/__DEFINES/~~bubber_defines/quirk_whitelist.dm new file mode 100644 index 00000000000..20f4643339f --- /dev/null +++ b/code/__DEFINES/~~bubber_defines/quirk_whitelist.dm @@ -0,0 +1,4 @@ +// Modular file for whitelist bitflag defines + +/// Quirk only applicable to a roundstartslime +#define QUIRK_SLIMEPERSON_ONLY (0<<1) diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm index 85885e62127..bf59a143cbd 100644 --- a/code/datums/quirks/_quirk.dm +++ b/code/datums/quirks/_quirk.dm @@ -9,6 +9,8 @@ var/value = 0 /// Flags related to this quirk. var/quirk_flags = QUIRK_HUMAN_ONLY + /// Flags related to species whitelists. + var/quirk_whitelist_flags = 0 //BUBBER EDIT - Species whitelists /// Reference to the mob currently tied to this quirk datum. Quirks are not singletons. var/mob/living/quirk_holder /// Text displayed when this quirk is assigned to a mob (and not transferred) @@ -67,6 +69,12 @@ if(quirk_holder) CRASH("Attempted to add quirk to a holder when it already has a holder.") + //BUBBER EDIT ADDITION START - Species quirks + //We silently fail if a whitelisted quirk *somehow* got into someone's preferences. + if(quirk_whitelist_flags & QUIRK_SLIMEPERSON_ONLY && !isroundstartslime(new_holder)) + return + //BUBBER EDIT ADDITION END + quirk_holder = new_holder quirk_holder.quirks += src // If we weren't passed a client source try to use a present one diff --git a/code/modules/client/preferences/middleware/quirks.dm b/code/modules/client/preferences/middleware/quirks.dm index 2b4ded6ce49..78a00fdb5b4 100644 --- a/code/modules/client/preferences/middleware/quirks.dm +++ b/code/modules/client/preferences/middleware/quirks.dm @@ -45,7 +45,7 @@ "max_positive_quirks" = MAX_QUIRKS, "quirk_info" = quirk_info, "quirk_blacklist" = SSquirks.quirk_blacklist, - "quirk_species_whitelist" = SSquirks.quirk_species_whitelist, + "quirk_species_whitelist" = SSquirks.quirk_species_whitelist, //BUBBER EDIT - Species quirks ) /datum/preference_middleware/quirks/on_new_character(mob/user) diff --git a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm index fa5cf8459c9..c4e55d0a35d 100644 --- a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm +++ b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm @@ -4,6 +4,7 @@ icon = "bug" // I can't be asked to make an icon for this, my spritework sucks. value = 0 quirk_flags = QUIRK_HUMAN_ONLY + quirk_whitelist_flags = QUIRK_SLIMEPERSON_ONLY gain_text = "You have a feeling you should stay away from water..." lose_text = "Somehow, you feel as if water is no longer dangerous." medical_record_text = "Patient scans indicate extreme hydrophilicity." diff --git a/tgstation.dme b/tgstation.dme index 0642ff381dd..4d98b200886 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -384,6 +384,7 @@ #include "code\__DEFINES\~skyrat_defines\_HELPERS\atmos_mapping_helpers.dm" #include "code\__DEFINES\~skyrat_defines\_HELPERS\lighting.dm" #include "code\__DEFINES\~~bubber_defines\access.dm" +#include "code\__DEFINES\~~bubber_defines\quirk_whitelist.dm" #include "code\__DEFINES\~~bubber_defines\traits.dm" #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_lists.dm" From 62914d3d1d1ec62cc1e5ddb93f1b70f9ea518229 Mon Sep 17 00:00:00 2001 From: Meiler Date: Mon, 6 Mar 2023 02:49:25 +0100 Subject: [PATCH 05/10] non-modular code comments --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 4 +++- tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx | 1 + tgui/packages/tgui/interfaces/PreferencesMenu/data.ts | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index e10086da4bf..04cfea2295a 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -253,10 +253,12 @@ /datum/reagent/water/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)//Splashing people with water can help put them out! . = ..() if(methods & TOUCH) - if(HAS_TRAIT(exposed_mob, TRAIT_HYDROPHILIC)) //BUBBER EDIT - Hydrophilic trait + //BUBBER EDIT ADDITION START - Species quirks; Hydrophilic trait + if(HAS_TRAIT(exposed_mob, TRAIT_HYDROPHILIC)) exposed_mob.blood_volume = max(exposed_mob.blood_volume - 30, 0) //So we don't end up with slimes going to -2535% blood. to_chat(exposed_mob, span_warning("The water causes you to melt away!")) return + //BUBBER EDIT ADDITION END exposed_mob.extinguish_mob() // extinguish removes all fire stacks if(methods & VAPOR) diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx index 6e90c8fa89f..7039affc9c0 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx @@ -148,6 +148,7 @@ export const QuirksPage = (props, context) => { const { max_positive_quirks: maxPositiveQuirks, quirk_blacklist: quirkBlacklist, + // BUBBER EDIT ADDITION - Species quirks quirk_species_whitelist: quirkSpeciesWhitelist, quirk_info: quirkInfo, } = quirks_data.quirks; // SKYRAT EDIT - Quirks balance refactor diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts index 4a08734e063..1a588be7f3a 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts @@ -132,7 +132,7 @@ export type QuirkInfo = { max_positive_quirks: number; quirk_info: Record; quirk_blacklist: string[][]; - quirk_species_whitelist: string[][]; + quirk_species_whitelist: string[][]; // BUBBER EDIT ADDITION - Species quirks }; export enum RandomSetting { From 986e948bd44f8d32e2d2d31ccca1da03556175a3 Mon Sep 17 00:00:00 2001 From: Meiler Date: Mon, 6 Mar 2023 03:15:24 +0100 Subject: [PATCH 06/10] fuck --- code/__DEFINES/~~bubber_defines/quirk_whitelist.dm | 2 +- code/datums/quirks/_quirk.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/~~bubber_defines/quirk_whitelist.dm b/code/__DEFINES/~~bubber_defines/quirk_whitelist.dm index 20f4643339f..c699b9d07cc 100644 --- a/code/__DEFINES/~~bubber_defines/quirk_whitelist.dm +++ b/code/__DEFINES/~~bubber_defines/quirk_whitelist.dm @@ -1,4 +1,4 @@ // Modular file for whitelist bitflag defines /// Quirk only applicable to a roundstartslime -#define QUIRK_SLIMEPERSON_ONLY (0<<1) +#define QUIRK_SLIMEPERSON_ONLY (1<<0) diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm index bf59a143cbd..d518d390d72 100644 --- a/code/datums/quirks/_quirk.dm +++ b/code/datums/quirks/_quirk.dm @@ -10,7 +10,7 @@ /// Flags related to this quirk. var/quirk_flags = QUIRK_HUMAN_ONLY /// Flags related to species whitelists. - var/quirk_whitelist_flags = 0 //BUBBER EDIT - Species whitelists + var/quirk_whitelist_flags //BUBBER EDIT - Species whitelists // Whitelist bitflags in code/__DEFINES/~~bubber_defines/quirk_whitelist.dm /// Reference to the mob currently tied to this quirk datum. Quirks are not singletons. var/mob/living/quirk_holder /// Text displayed when this quirk is assigned to a mob (and not transferred) From da316c80123aea3b320daf7002e88abc977e7164 Mon Sep 17 00:00:00 2001 From: Cyprex <35031555+Cyprex@users.noreply.github.com> Date: Sat, 11 Mar 2023 21:48:24 +0100 Subject: [PATCH 07/10] Update tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx --- tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx index 7039affc9c0..c5ec6198f62 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx @@ -220,7 +220,7 @@ export const QuirksPage = (props, context) => { // If the selected species is NOT in the list, do not give the quirk // Otherwise, give the quirk if (whitelist.indexOf(currentSpeciesName) === -1) { - return `This quirk is whitelisted to ${whitelistSpeciesName}!`; + return `This quirk can only be taken by ${whitelistSpeciesName}!`; } } From f0b8626110659f971f34b8e27298b30090416258 Mon Sep 17 00:00:00 2001 From: Cyprex <35031555+Cyprex@users.noreply.github.com> Date: Sat, 11 Mar 2023 21:48:35 +0100 Subject: [PATCH 08/10] Update code/datums/quirks/_quirk.dm --- code/datums/quirks/_quirk.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm index d518d390d72..8655b4f0dbc 100644 --- a/code/datums/quirks/_quirk.dm +++ b/code/datums/quirks/_quirk.dm @@ -72,7 +72,7 @@ //BUBBER EDIT ADDITION START - Species quirks //We silently fail if a whitelisted quirk *somehow* got into someone's preferences. if(quirk_whitelist_flags & QUIRK_SLIMEPERSON_ONLY && !isroundstartslime(new_holder)) - return + CRASH("Attempted to add quirk [name] to [quirk_holder], but the species is ineligible for it!") //BUBBER EDIT ADDITION END quirk_holder = new_holder From a4e779ffe04e8a58699499458a67f4e8cc092869 Mon Sep 17 00:00:00 2001 From: Cyprex <35031555+Cyprex@users.noreply.github.com> Date: Sat, 11 Mar 2023 21:48:46 +0100 Subject: [PATCH 09/10] Update modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm --- modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm index c4e55d0a35d..fc2768ae1b3 100644 --- a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm +++ b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm @@ -1,6 +1,6 @@ /datum/quirk/hydrophilic name = "Hydrophilic" - desc = "(Slimeperson only) Your molecules are highly hydrophilic - or, in layman's terms, dissolve very well in water." + desc = "(Slimeperson only) Your molecules are highly hydrophilic - or, in layman's terms, dissolve very well in water. You should probably stay away from it..." icon = "bug" // I can't be asked to make an icon for this, my spritework sucks. value = 0 quirk_flags = QUIRK_HUMAN_ONLY From 7c84efbd47f13c810bb4856f2a6cebf1416d08c6 Mon Sep 17 00:00:00 2001 From: Cyprex <35031555+Cyprex@users.noreply.github.com> Date: Sat, 11 Mar 2023 21:48:55 +0100 Subject: [PATCH 10/10] Update modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm --- modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm index fc2768ae1b3..08742a9ec67 100644 --- a/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm +++ b/modular_zubbers/code/datums/bubber_quirks/hydrophilic.dm @@ -5,7 +5,7 @@ value = 0 quirk_flags = QUIRK_HUMAN_ONLY quirk_whitelist_flags = QUIRK_SLIMEPERSON_ONLY - gain_text = "You have a feeling you should stay away from water..." + gain_text = "You get the feeling you should stay away from water..." lose_text = "Somehow, you feel as if water is no longer dangerous." medical_record_text = "Patient scans indicate extreme hydrophilicity." hardcore_value = 0