From 35d97be97d2edf9c43c6b0f6314ad9d8cf26c24d Mon Sep 17 00:00:00 2001 From: Zattarra Date: Mon, 12 Jun 2023 21:59:46 +0900 Subject: [PATCH 01/14] Adds first implementation of Pushover. --- code/__SPLURTCODE/DEFINES/traits.dm | 1 + code/datums/traits/neutral.dm | 20 +++++++++++++++++++ .../code/modules/resize/resizing.dm | 15 ++++++++++++++ tgstation.dme | 1 + 4 files changed, 37 insertions(+) create mode 100644 modular_splurt/code/modules/resize/resizing.dm diff --git a/code/__SPLURTCODE/DEFINES/traits.dm b/code/__SPLURTCODE/DEFINES/traits.dm index c429752e3d..efef8dfe6a 100644 --- a/code/__SPLURTCODE/DEFINES/traits.dm +++ b/code/__SPLURTCODE/DEFINES/traits.dm @@ -43,3 +43,4 @@ #define TRAIT_DUMB_CUM_CRAVE "dumb_for_cum_need" #define TRAIT_RAD_FIEND "RadFiend" #define TRAIT_BODY_MORPHER "body_morpher" +#define TRAIT_PUSHOVER "pushover" diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 4db3d688ce..1c58dc85eb 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -182,3 +182,23 @@ /datum/quirk/dullahan/post_add() quirk_holder.AddComponent(/datum/component/dullahan) + +/datum/quirk/pushover + name = "Pushover" + desc = "You are a pushover! Those who are larger than you can step over and stomp on you." + value = 0 + mob_trait = TRAIT_PUSHOVER + gain_text = span_notice("You feel more feeble than usual...") + lose_text = span_notice("You feel like standing up for yourself!") + medical_record_text = "Patient can be considered as a pushover." + +/datum/quirk/pushover/add() + // Add examine text. + RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/quirk_examine_Pushover) + +/datum/quirk/pushover/remove() + // Remove examine text. + UnregisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE) + +/datum/quirk/pushover/proc/quirk_examine_Pushover(atom/examine_target, mob/living/carbon/human/examiner, list/examine_list) + examine_list += "[quirk_holder.p_they(TRUE)] seems like a pushover..." diff --git a/modular_splurt/code/modules/resize/resizing.dm b/modular_splurt/code/modules/resize/resizing.dm new file mode 100644 index 0000000000..e489b71b57 --- /dev/null +++ b/modular_splurt/code/modules/resize/resizing.dm @@ -0,0 +1,15 @@ +/mob/living/handle_micro_bump_helping(mob/living/target) + // If the target is not a pushover, stop the interaction. + if(!HAS_TRAIT(target, TRAIT_PUSHOVER)) + return FALSE + + // Do the rest of the function normally. + . = ..() + +/mob/living/handle_micro_bump_other(mob/living/target) // I am not sure why this is a different function. + // If the target is not a pushover, stop the interaction. + if(!HAS_TRAIT(target, TRAIT_PUSHOVER)) + return FALSE + + // Do the rest of the function normally. + . = ..() diff --git a/tgstation.dme b/tgstation.dme index a3772ade3f..19d819f81e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4873,6 +4873,7 @@ #include "modular_splurt\code\modules\research\techweb\nodes\medical_nodes.dm" #include "modular_splurt\code\modules\research\techweb\nodes\nanites_nodes.dm" #include "modular_splurt\code\modules\research\techweb\nodes\robotic_nodes.dm" +#include "modular_splurt\code\modules\resize\resizing.dm" #include "modular_splurt\code\modules\resize\smallsprite_action.dm" #include "modular_splurt\code\modules\ruins\objects_and_mobs\ash_walker_den.dm" #include "modular_splurt\code\modules\ruins\spaceruin_code\hilbertshotel.dm" From 61023778b76cc2eb4c1a2c09afd6eacdd1036f62 Mon Sep 17 00:00:00 2001 From: Zatarra <68243757+Zattarra@users.noreply.github.com> Date: Wed, 14 Jun 2023 10:56:37 +0900 Subject: [PATCH 02/14] Limit the quirk to non - helping interactions (disarm, harm, grab). --- modular_splurt/code/modules/resize/resizing.dm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/modular_splurt/code/modules/resize/resizing.dm b/modular_splurt/code/modules/resize/resizing.dm index e489b71b57..978802beb2 100644 --- a/modular_splurt/code/modules/resize/resizing.dm +++ b/modular_splurt/code/modules/resize/resizing.dm @@ -1,12 +1,4 @@ -/mob/living/handle_micro_bump_helping(mob/living/target) - // If the target is not a pushover, stop the interaction. - if(!HAS_TRAIT(target, TRAIT_PUSHOVER)) - return FALSE - - // Do the rest of the function normally. - . = ..() - -/mob/living/handle_micro_bump_other(mob/living/target) // I am not sure why this is a different function. +/mob/living/handle_micro_bump_other(mob/living/target) // If the target is not a pushover, stop the interaction. if(!HAS_TRAIT(target, TRAIT_PUSHOVER)) return FALSE From 548088fa9abd7da9b8a8f90dbe3f93c0a701d8cc Mon Sep 17 00:00:00 2001 From: Zattarra Date: Sat, 1 Jul 2023 19:49:49 -0700 Subject: [PATCH 03/14] Conflict temporary fix. --- code/__SPLURTCODE/DEFINES/traits.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/__SPLURTCODE/DEFINES/traits.dm b/code/__SPLURTCODE/DEFINES/traits.dm index efef8dfe6a..c429752e3d 100644 --- a/code/__SPLURTCODE/DEFINES/traits.dm +++ b/code/__SPLURTCODE/DEFINES/traits.dm @@ -43,4 +43,3 @@ #define TRAIT_DUMB_CUM_CRAVE "dumb_for_cum_need" #define TRAIT_RAD_FIEND "RadFiend" #define TRAIT_BODY_MORPHER "body_morpher" -#define TRAIT_PUSHOVER "pushover" From 6d7118db89840916f0314c86dec4f2c9cb3c0509 Mon Sep 17 00:00:00 2001 From: Zattarra Date: Sat, 1 Jul 2023 19:56:31 -0700 Subject: [PATCH 04/14] More changes... --- code/__SPLURTCODE/DEFINES/traits.dm | 1 - modular_splurt/code/modules/resize/resizing.dm | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/__SPLURTCODE/DEFINES/traits.dm b/code/__SPLURTCODE/DEFINES/traits.dm index 5162783e83..4316b0a69f 100644 --- a/code/__SPLURTCODE/DEFINES/traits.dm +++ b/code/__SPLURTCODE/DEFINES/traits.dm @@ -44,4 +44,3 @@ #define TRAIT_RAD_FIEND "RadFiend" #define TRAIT_BODY_MORPHER "body_morpher" #define TRAIT_HALLOWED "hallowed" -#define TRAIT_PUSHOVER "pushover" diff --git a/modular_splurt/code/modules/resize/resizing.dm b/modular_splurt/code/modules/resize/resizing.dm index 978802beb2..0d1b1d3f6f 100644 --- a/modular_splurt/code/modules/resize/resizing.dm +++ b/modular_splurt/code/modules/resize/resizing.dm @@ -1,6 +1,6 @@ /mob/living/handle_micro_bump_other(mob/living/target) - // If the target is not a pushover, stop the interaction. - if(!HAS_TRAIT(target, TRAIT_PUSHOVER)) + // If the target has the preference off, stop the interaction. + if(target.client.prefs.unholypref == "No") return FALSE // Do the rest of the function normally. From 80248055d9f0b11fbd476db26aeebec36c187ff3 Mon Sep 17 00:00:00 2001 From: Zatarra <68243757+Zattarra@users.noreply.github.com> Date: Sun, 2 Jul 2023 14:13:51 -0700 Subject: [PATCH 05/14] Update modular_splurt/code/modules/resize/resizing.dm Typo. Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> --- modular_splurt/code/modules/resize/resizing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_splurt/code/modules/resize/resizing.dm b/modular_splurt/code/modules/resize/resizing.dm index 0d1b1d3f6f..1cfa1d617a 100644 --- a/modular_splurt/code/modules/resize/resizing.dm +++ b/modular_splurt/code/modules/resize/resizing.dm @@ -1,6 +1,6 @@ /mob/living/handle_micro_bump_other(mob/living/target) // If the target has the preference off, stop the interaction. - if(target.client.prefs.unholypref == "No") + if(target.client.prefs.stomppref == "No") return FALSE // Do the rest of the function normally. From 14f1434165409be1566cfe2305ba4345ff1169a9 Mon Sep 17 00:00:00 2001 From: Zattarra Date: Sun, 2 Jul 2023 19:48:16 -0700 Subject: [PATCH 06/14] Adds pref toggle to legacy version. --- modular_splurt/code/modules/client/preferences.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modular_splurt/code/modules/client/preferences.dm b/modular_splurt/code/modules/client/preferences.dm index 84051aa50a..0c13ba15c3 100644 --- a/modular_splurt/code/modules/client/preferences.dm +++ b/modular_splurt/code/modules/client/preferences.dm @@ -1057,6 +1057,8 @@ //SPLURT EDIT dat += "? " dat += "Unholy ERP verbs : [unholypref]
" //https://www.youtube.com/watch?v=OHKARc-GObU + dat += "? " + dat += "Stomping Interactions : [stomppref]
" //END OF SPLURT EDIT //SKYRAT EDIT dat += "? " From c186b9daaecd008e66ec37efe973b78f3441dd66 Mon Sep 17 00:00:00 2001 From: Zattarra Date: Sat, 29 Jul 2023 18:39:00 -0700 Subject: [PATCH 07/14] Switches the pref to be a boolean, switches the checks to be booleans, adds stomptext to even display the thing, and also hopefully saves the pref. --- code/datums/elements/flavor_text.dm | 2 +- code/modules/client/preferences.dm | 11 ++++++----- modular_splurt/code/modules/client/preferences.dm | 3 ++- .../code/modules/client/preferences_savefile.dm | 5 +++++ modular_splurt/code/modules/resize/resizing.dm | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/code/datums/elements/flavor_text.dm b/code/datums/elements/flavor_text.dm index 821092c217..af529e6f0a 100644 --- a/code/datums/elements/flavor_text.dm +++ b/code/datums/elements/flavor_text.dm @@ -105,7 +105,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code else content += "\n" - if(L.client.prefs.stomppref == "Yes") + if(L.client.prefs.stomppref == TRUE) content += " | Stomping Interactions: [L.client.prefs.stomppref]\n" else content += "\n" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c45bc90827..2a7bbb16da 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1524,7 +1524,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "? " dat += "Unholy ERP verbs : [unholypref]
" //https://www.youtube.com/watch?v=OHKARc-GObU dat += "? " - dat += "Stomping Interactions : [stomppref]
" + dat += "Stomping Interactions : [stomptext]
" //END OF SPLURT EDIT //SKYRAT EDIT dat += "? " //SPLURT Edit (wow! editception???) @@ -3515,10 +3515,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) unholypref = "Yes" if("stomppref") // What the fuck is this? switch(stomppref) - if("Yes") - stomppref = "No" - if("No") - stomppref = "Yes" + if(TRUE) + stomptext = "No" + if(FALSE) + stomptext = "Yes" + stomppref = !stomppref //Skyrat edit - *someone* offered me actual money for this shit if("extremepref") //i hate myself for doing this switch(extremepref) //why the fuck did this need to use cycling instead of input from a list diff --git a/modular_splurt/code/modules/client/preferences.dm b/modular_splurt/code/modules/client/preferences.dm index 0c13ba15c3..230822467f 100644 --- a/modular_splurt/code/modules/client/preferences.dm +++ b/modular_splurt/code/modules/client/preferences.dm @@ -6,7 +6,8 @@ /datum/preferences max_save_slots = DEFAULT_SAVE_SLOTS var/unholypref = "No" //Goin 2 hell fo dis one - var/stomppref = "No" // Please step on me. + var/stomppref = FALSE // Please step on me. + var/stomptext = "No" // For displaying the pref. var/list/gfluid_blacklist = list() //Stuff you don't want people to cum into you var/new_character_creator = TRUE // old/new character creator var/show_in_directory = 1 //Show in Character Directory diff --git a/modular_splurt/code/modules/client/preferences_savefile.dm b/modular_splurt/code/modules/client/preferences_savefile.dm index deda14d0e1..cb79fb77be 100644 --- a/modular_splurt/code/modules/client/preferences_savefile.dm +++ b/modular_splurt/code/modules/client/preferences_savefile.dm @@ -10,6 +10,8 @@ directory_tag = sanitize_inlist(directory_tag, GLOB.char_directory_tags, initial(directory_tag)) directory_erptag = sanitize_inlist(directory_erptag, GLOB.char_directory_erptags, initial(directory_erptag)) directory_ad = strip_html_simple(directory_ad, MAX_FLAVOR_LEN) + // Get stomping preferences. + stomppref = S["stomp_pref"] /datum/preferences/proc/splurt_character_pref_save(savefile/S) //TODO: modularize our other savefile edits... maybe? //Character directory @@ -18,6 +20,9 @@ WRITE_FILE(S["directory_erptag"], directory_erptag) WRITE_FILE(S["directory_ad"], directory_ad) + // Stomping preferences. + WRITE_FILE(S["stomp_pref"], stomppref) + /datum/preferences/update_preferences(current_version, savefile/S) . = ..() if(current_version < 57.01) //a diff --git a/modular_splurt/code/modules/resize/resizing.dm b/modular_splurt/code/modules/resize/resizing.dm index 1cfa1d617a..f10799ca77 100644 --- a/modular_splurt/code/modules/resize/resizing.dm +++ b/modular_splurt/code/modules/resize/resizing.dm @@ -1,6 +1,6 @@ /mob/living/handle_micro_bump_other(mob/living/target) // If the target has the preference off, stop the interaction. - if(target.client.prefs.stomppref == "No") + if(target.client.prefs.stomppref == FALSE) return FALSE // Do the rest of the function normally. From ec680057b18eac12257ae434d73b4768cbd49406 Mon Sep 17 00:00:00 2001 From: Zattarra Date: Sat, 29 Jul 2023 20:18:05 -0700 Subject: [PATCH 08/14] Reads the savefile correctly. --- modular_splurt/code/modules/client/preferences_savefile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_splurt/code/modules/client/preferences_savefile.dm b/modular_splurt/code/modules/client/preferences_savefile.dm index cb79fb77be..8556dad842 100644 --- a/modular_splurt/code/modules/client/preferences_savefile.dm +++ b/modular_splurt/code/modules/client/preferences_savefile.dm @@ -11,7 +11,7 @@ directory_erptag = sanitize_inlist(directory_erptag, GLOB.char_directory_erptags, initial(directory_erptag)) directory_ad = strip_html_simple(directory_ad, MAX_FLAVOR_LEN) // Get stomping preferences. - stomppref = S["stomp_pref"] + S["stomp_pref"] >> stomppref /datum/preferences/proc/splurt_character_pref_save(savefile/S) //TODO: modularize our other savefile edits... maybe? //Character directory From 831bf2de667d2dadd3caed0efad5c55fa0ffc3ea Mon Sep 17 00:00:00 2001 From: Zatarra <68243757+Zattarra@users.noreply.github.com> Date: Mon, 31 Jul 2023 11:02:26 -0700 Subject: [PATCH 09/14] Remove stomptext var; Replaces with better code. Thank you Mos. Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> --- code/modules/client/preferences.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index d71dc0a840..8e93b2194b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1524,7 +1524,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "? " dat += "Unholy ERP verbs : [unholypref]
" //https://www.youtube.com/watch?v=OHKARc-GObU dat += "? " - dat += "Stomping Interactions : [stomptext]
" + dat += "Stomping Interactions : [stomppref ? "Yes" : "No"]
" //END OF SPLURT EDIT //SKYRAT EDIT dat += "? " //SPLURT Edit (wow! editception???) From 6c59b03ce0635f3c90e4e70aa84dc954501fff87 Mon Sep 17 00:00:00 2001 From: Zattarra Date: Mon, 31 Jul 2023 11:06:20 -0700 Subject: [PATCH 10/14] Changes the rest of the code to not use the extra var 'stomptext' --- code/modules/client/preferences.dm | 5 ----- modular_splurt/code/modules/client/preferences.dm | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 8e93b2194b..2e919d8d92 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -3514,11 +3514,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("No") unholypref = "Yes" if("stomppref") // What the fuck is this? - switch(stomppref) - if(TRUE) - stomptext = "No" - if(FALSE) - stomptext = "Yes" stomppref = !stomppref //Skyrat edit - *someone* offered me actual money for this shit if("extremepref") //i hate myself for doing this diff --git a/modular_splurt/code/modules/client/preferences.dm b/modular_splurt/code/modules/client/preferences.dm index 230822467f..e333032c7f 100644 --- a/modular_splurt/code/modules/client/preferences.dm +++ b/modular_splurt/code/modules/client/preferences.dm @@ -7,7 +7,6 @@ max_save_slots = DEFAULT_SAVE_SLOTS var/unholypref = "No" //Goin 2 hell fo dis one var/stomppref = FALSE // Please step on me. - var/stomptext = "No" // For displaying the pref. var/list/gfluid_blacklist = list() //Stuff you don't want people to cum into you var/new_character_creator = TRUE // old/new character creator var/show_in_directory = 1 //Show in Character Directory @@ -1059,7 +1058,7 @@ dat += "? " dat += "Unholy ERP verbs : [unholypref]
" //https://www.youtube.com/watch?v=OHKARc-GObU dat += "? " - dat += "Stomping Interactions : [stomppref]
" + dat += "Stomping Interactions : [stomppref ? "Yes" : "No"]
" //END OF SPLURT EDIT //SKYRAT EDIT dat += "? " From 60bf3ed43bec3da2649a0664687aab067b5e26f6 Mon Sep 17 00:00:00 2001 From: Zattarra Date: Mon, 31 Jul 2023 13:46:46 -0700 Subject: [PATCH 11/14] Updates savefile version, changes default to TRUE. --- code/modules/client/preferences_savefile.dm | 2 +- modular_splurt/code/modules/client/preferences.dm | 2 +- modular_splurt/code/modules/client/preferences_savefile.dm | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 77e63db5fc..521c5ef368 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -5,7 +5,7 @@ // You do not need to raise this if you are adding new values that have sane defaults. // Only raise this value when changing the meaning/format/name/layout of an existing value // where you would want the updater procs below to run -#define SAVEFILE_VERSION_MAX 58 +#define SAVEFILE_VERSION_MAX 58.01 /* SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn diff --git a/modular_splurt/code/modules/client/preferences.dm b/modular_splurt/code/modules/client/preferences.dm index e333032c7f..a22d166233 100644 --- a/modular_splurt/code/modules/client/preferences.dm +++ b/modular_splurt/code/modules/client/preferences.dm @@ -6,7 +6,7 @@ /datum/preferences max_save_slots = DEFAULT_SAVE_SLOTS var/unholypref = "No" //Goin 2 hell fo dis one - var/stomppref = FALSE // Please step on me. + var/stomppref = TRUE // Please step on me. var/list/gfluid_blacklist = list() //Stuff you don't want people to cum into you var/new_character_creator = TRUE // old/new character creator var/show_in_directory = 1 //Show in Character Directory diff --git a/modular_splurt/code/modules/client/preferences_savefile.dm b/modular_splurt/code/modules/client/preferences_savefile.dm index 8556dad842..1e555d2dff 100644 --- a/modular_splurt/code/modules/client/preferences_savefile.dm +++ b/modular_splurt/code/modules/client/preferences_savefile.dm @@ -28,6 +28,9 @@ if(current_version < 57.01) //a new_character_creator = TRUE + if(current_version < 58.01) // Stomp pref. + stomppref = TRUE + /datum/preferences/update_character(current_version, savefile/S) . = ..() if(current_version < 53.01) From a6b86259336ff3ea4e39196d9c04dbcf9dd20928 Mon Sep 17 00:00:00 2001 From: Zattarra Date: Tue, 22 Aug 2023 17:04:11 -0700 Subject: [PATCH 12/14] BAM, changes it to be based on combat mode and intent too. --- modular_splurt/code/modules/resize/resizing.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modular_splurt/code/modules/resize/resizing.dm b/modular_splurt/code/modules/resize/resizing.dm index f10799ca77..9554d1db85 100644 --- a/modular_splurt/code/modules/resize/resizing.dm +++ b/modular_splurt/code/modules/resize/resizing.dm @@ -1,6 +1,7 @@ /mob/living/handle_micro_bump_other(mob/living/target) - // If the target has the preference off, stop the interaction. - if(target.client.prefs.stomppref == FALSE) + + // If the target is not in combat mode, if the target has the preference off, stop the interaction. + if(target.a_intent != INTENT_HARM && SEND_SIGNAL(target, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE) && target.client.prefs.stomppref == FALSE) return FALSE // Do the rest of the function normally. From 756c166f4f3c629ebad8927c642836477d8824c0 Mon Sep 17 00:00:00 2001 From: Zatarra <68243757+Zattarra@users.noreply.github.com> Date: Mon, 28 Aug 2023 06:55:20 -0700 Subject: [PATCH 13/14] Update to show if pref is on or off. Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> --- code/datums/elements/flavor_text.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/elements/flavor_text.dm b/code/datums/elements/flavor_text.dm index af529e6f0a..c6c0ba99b4 100644 --- a/code/datums/elements/flavor_text.dm +++ b/code/datums/elements/flavor_text.dm @@ -106,7 +106,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code content += "\n" if(L.client.prefs.stomppref == TRUE) - content += " | Stomping Interactions: [L.client.prefs.stomppref]\n" + content += " | Stomping Interactions: [L.client.prefs.stomppref ? "Yes" : "No"]\n" else content += "\n" From f8b2fdc38b7ad3edb33eac5e8cdca4e12dadb679 Mon Sep 17 00:00:00 2001 From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> Date: Sat, 16 Sep 2023 15:25:35 -0500 Subject: [PATCH 14/14] Update flavor_text.dm --- code/datums/elements/flavor_text.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/datums/elements/flavor_text.dm b/code/datums/elements/flavor_text.dm index c6c0ba99b4..2f905e965c 100644 --- a/code/datums/elements/flavor_text.dm +++ b/code/datums/elements/flavor_text.dm @@ -105,10 +105,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code else content += "\n" - if(L.client.prefs.stomppref == TRUE) - content += " | Stomping Interactions: [L.client.prefs.stomppref ? "Yes" : "No"]\n" - else - content += "\n" + content += " | Stomping Interactions: [L.client.prefs.stomppref ? "Yes" : "No"]\n" if(L.client.prefs.extremepref == "Yes") content += "
Extreme content: [L.client.prefs.extremepref] | Extreme content harm: [L.client.prefs.extremeharm]\n"