From a455a5650b976d35524a9e7ea7393f9a541542b0 Mon Sep 17 00:00:00 2001 From: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com> Date: Thu, 28 Nov 2024 13:48:03 -0500 Subject: [PATCH] Move permanent limp to modular (#2576) ## About The Pull Request Forgot to check if I could make it modular before making pull request, it can be. Updating a previous PR to be modular where it makes sense. Some files are left as commented edits where it makes more sense to do so. ## Why It's Good For The Game Better follows contribution guidelines. ## Proof Of Testing Functions the same way/no changes in how it runs, just how code is structured. --- code/_globalvars/lists/quirks.dm | 10 ---------- code/controllers/subsystem/processing/quirks.dm | 2 +- modular_zubbers/code/_globalvars/lists/quirks.dm | 9 +++++++++ .../datums/quirks/negative_quirks/permanent_limp.dm | 0 .../code}/datums/wounds/permanent_limp.dm | 0 .../code}/modules/client/preferences/permanent_limp.dm | 0 tgstation.dme | 6 +++--- 7 files changed, 13 insertions(+), 14 deletions(-) rename {code => modular_zubbers/code}/datums/quirks/negative_quirks/permanent_limp.dm (100%) rename {code => modular_zubbers/code}/datums/wounds/permanent_limp.dm (100%) rename {code => modular_zubbers/code}/modules/client/preferences/permanent_limp.dm (100%) diff --git a/code/_globalvars/lists/quirks.dm b/code/_globalvars/lists/quirks.dm index 6d2205f82ef..4b77618dfe5 100644 --- a/code/_globalvars/lists/quirks.dm +++ b/code/_globalvars/lists/quirks.dm @@ -101,16 +101,6 @@ GLOBAL_LIST_INIT(paraplegic_choice, list( "Amputee" = TRUE, )) -//Permanent Limp Quirk -GLOBAL_LIST_INIT(permanent_limp_choice, list( - "Left, minor" = /datum/wound/perm_limp/left, - "Left, moderate" = /datum/wound/perm_limp/left/moderate, - "Left, major" = /datum/wound/perm_limp/left/major, - "Right, minor" = /datum/wound/perm_limp/right, - "Right, moderate" = /datum/wound/perm_limp/right/moderate, - "Right, major" = /datum/wound/perm_limp/right/major, -)) - ///chipped Quirk GLOBAL_LIST_INIT(quirk_chipped_choice, list( "Basketsoft 3000" = /obj/item/skillchip/basketweaving, diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index a228794095a..efd76ad395f 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/prosthetic_limb, /datum/quirk/quadruple_amputee, /datum/quirk/body_purist), list(/datum/quirk/transhumanist, /datum/quirk/body_purist), list(/datum/quirk/prosthetic_organ, /datum/quirk/tin_man, /datum/quirk/body_purist), - list(/datum/quirk/quadruple_amputee, /datum/quirk/paraplegic, /datum/quirk/hemiplegic, /datum/quirk/permanent_limp), + list(/datum/quirk/quadruple_amputee, /datum/quirk/paraplegic, /datum/quirk/hemiplegic, /datum/quirk/permanent_limp), //BUBBER EDIT - Add Permanent Limp to this list. //list(/datum/quirk/quadruple_amputee, /datum/quirk/frail), // SKYRAT EDIT REMOVAL- Since we have synth wounds now, frail has a large downside for prosthetics and such list(/datum/quirk/social_anxiety, /datum/quirk/mute), list(/datum/quirk/mute, /datum/quirk/softspoken), diff --git a/modular_zubbers/code/_globalvars/lists/quirks.dm b/modular_zubbers/code/_globalvars/lists/quirks.dm index a5303180fa0..d8a43a2bb8e 100644 --- a/modular_zubbers/code/_globalvars/lists/quirks.dm +++ b/modular_zubbers/code/_globalvars/lists/quirks.dm @@ -15,3 +15,12 @@ GLOBAL_LIST_INIT(quirk_species_whitelist, generate_quirk_species_whitelist()) qdel(quirk) return quirk_species_whitelist +//Permanent Limp Quirk +GLOBAL_LIST_INIT(permanent_limp_choice, list( + "Left, minor" = /datum/wound/perm_limp/left, + "Left, moderate" = /datum/wound/perm_limp/left/moderate, + "Left, major" = /datum/wound/perm_limp/left/major, + "Right, minor" = /datum/wound/perm_limp/right, + "Right, moderate" = /datum/wound/perm_limp/right/moderate, + "Right, major" = /datum/wound/perm_limp/right/major, +)) diff --git a/code/datums/quirks/negative_quirks/permanent_limp.dm b/modular_zubbers/code/datums/quirks/negative_quirks/permanent_limp.dm similarity index 100% rename from code/datums/quirks/negative_quirks/permanent_limp.dm rename to modular_zubbers/code/datums/quirks/negative_quirks/permanent_limp.dm diff --git a/code/datums/wounds/permanent_limp.dm b/modular_zubbers/code/datums/wounds/permanent_limp.dm similarity index 100% rename from code/datums/wounds/permanent_limp.dm rename to modular_zubbers/code/datums/wounds/permanent_limp.dm diff --git a/code/modules/client/preferences/permanent_limp.dm b/modular_zubbers/code/modules/client/preferences/permanent_limp.dm similarity index 100% rename from code/modules/client/preferences/permanent_limp.dm rename to modular_zubbers/code/modules/client/preferences/permanent_limp.dm diff --git a/tgstation.dme b/tgstation.dme index 1a0c618a26d..8bb4a2fb8cf 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1884,7 +1884,6 @@ #include "code\datums\quirks\negative_quirks\numb.dm" #include "code\datums\quirks\negative_quirks\nyctophobia.dm" #include "code\datums\quirks\negative_quirks\paraplegic.dm" -#include "code\datums\quirks\negative_quirks\permanent_limp.dm" #include "code\datums\quirks\negative_quirks\photophobia.dm" #include "code\datums\quirks\negative_quirks\poor_aim.dm" #include "code\datums\quirks\negative_quirks\prosopagnosia.dm" @@ -2100,7 +2099,6 @@ #include "code\datums\wounds\burns.dm" #include "code\datums\wounds\cranial_fissure.dm" #include "code\datums\wounds\loss.dm" -#include "code\datums\wounds\permanent_limp.dm" #include "code\datums\wounds\pierce.dm" #include "code\datums\wounds\slash.dm" #include "code\datums\wounds\scars\_scars.dm" @@ -3928,7 +3926,6 @@ #include "code\modules\client\preferences\parallax.dm" #include "code\modules\client\preferences\paraplegic.dm" #include "code\modules\client\preferences\pda.dm" -#include "code\modules\client\preferences\permanent_limp.dm" #include "code\modules\client\preferences\persistent_scars.dm" #include "code\modules\client\preferences\phobia.dm" #include "code\modules\client\preferences\pixel_size.dm" @@ -8720,11 +8717,13 @@ #include "modular_zubbers\code\datums\mood_events\miasma_events.dm" #include "modular_zubbers\code\datums\mutations\visuals_override.dm" #include "modular_zubbers\code\datums\quirks\negative_quirks\bloodloss_dusting.dm" +#include "modular_zubbers\code\datums\quirks\negative_quirks\permanent_limp.dm" #include "modular_zubbers\code\datums\shuttle\arena.dm" #include "modular_zubbers\code\datums\shuttles\emergency.dm" #include "modular_zubbers\code\datums\station_traits\disabled_traits.dm" #include "modular_zubbers\code\datums\weather\weather_types\radiation_storm.dm" #include "modular_zubbers\code\datums\weather\weather_types\sand_storm.dm" +#include "modular_zubbers\code\datums\wounds\permanent_limp.dm" #include "modular_zubbers\code\game\area\areas.dm" #include "modular_zubbers\code\game\area\areas\centcom.dm" #include "modular_zubbers\code\game\area\areas\moonstation.dm" @@ -8942,6 +8941,7 @@ #include "modular_zubbers\code\modules\client\ssd.dm" #include "modular_zubbers\code\modules\client\autopunctuation\preferences.dm" #include "modular_zubbers\code\modules\client\flavor_text\flavor_text.dm" +#include "modular_zubbers\code\modules\client\preferences\permanent_limp.dm" #include "modular_zubbers\code\modules\client\preferences\middleware\species.dm" #include "modular_zubbers\code\modules\client\verbs\character_directory.dm" #include "modular_zubbers\code\modules\clothing\_job.dm"