From 2fa4c6f04b72aa7f430cd5c7635c5eddfda57fee Mon Sep 17 00:00:00 2001 From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Wed, 22 May 2024 20:00:41 -0700 Subject: [PATCH] Rebalances being a lardass (#1417) ## About The Pull Request The overweight quirk no longer makes you fat all the time, and works like it did before the upstream merge, with applying just a 50% movespeed penalty. Being overweight is now a negative trait, worth -4. Adds a new quirk: Obese. It works like the current overweight quirk where it makes you fat AND applies a 50% movespeed penalty. ## Why It's Good For The Game Upstream made the overweight quirk make you fat and apply a custom 50% movespeed penalty. This means that on top of the existing fat movespeed penalty, it also gave you a 50% movespeed penalty which made you movie at Snellie speed. This PR fixes that while also adding a new trait in case people want that for some reason. ## Proof Of Testing Untested. Uncompiled. Unhinged. ## Changelog :cl: BurgerBB balance: Rebalances the overweight quirk, and adds a new obese quirk. /:cl: --------- Co-authored-by: Swift Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> --- .../subsystem/processing/quirks.dm | 1 + .../master_files/code/datums/traits/slow.dm | 19 +++++++++++++++++++ tgstation.dme | 1 + 3 files changed, 21 insertions(+) create mode 100644 modular_zubbers/master_files/code/datums/traits/slow.dm diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 09af55a748a..10f59bc583a 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -39,6 +39,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( //SKYRAT EDIT ADDITION END //BUBBER EDIT ADDITION BEGIN list(/datum/quirk/featherweight, /datum/quirk/oversized), + list(/datum/quirk/overweight, /datum/quirk/obese), //BUBBER EDIT ADDITION END )) diff --git a/modular_zubbers/master_files/code/datums/traits/slow.dm b/modular_zubbers/master_files/code/datums/traits/slow.dm new file mode 100644 index 00000000000..9ceac6ee09f --- /dev/null +++ b/modular_zubbers/master_files/code/datums/traits/slow.dm @@ -0,0 +1,19 @@ +/datum/quirk/overweight + name = "Overweight" + desc = "You weigh more than an average person of your size. Being fat from food still bothers you." + gain_text = span_notice("Your body feels heavy.") + lose_text = span_notice("Your suddenly feel lighter!") + value = -4 + icon = FA_ICON_BOWL_RICE + medical_record_text = "Patient weighs higher than average." + mob_trait = null + +/datum/quirk/obese + name = "Obese" + desc = "You weigh much much more than the average person of your size, and are always fat no matter what. Being fat from food no longer bothers you." + gain_text = span_notice("Your body feels very heavy.") + lose_text = span_notice("Your suddenly feel much lighter!") + value = -6 + icon = FA_ICON_HAMBURGER + medical_record_text = "Patient is considered obese by 101% of medical textbooks, with a 1% margin of error." + mob_trait = TRAIT_FAT diff --git a/tgstation.dme b/tgstation.dme index 2746b65e990..a75f78c38a3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8777,6 +8777,7 @@ #include "modular_zubbers\master_files\code\controllers\subsystem\id_access.dm" #include "modular_zubbers\master_files\code\controllers\subsystem\tts.dm" #include "modular_zubbers\master_files\code\datums\diseases\chronic_ilness.dm" +#include "modular_zubbers\master_files\code\datums\traits\slow.dm" #include "modular_zubbers\master_files\code\modules\client\preferences\hypnopref.dm" #include "modular_zubbers\master_files\code\modules\client\preferences\obscurity_examine.dm" #include "modular_zubbers\master_files\code\modules\client\preferences\scaling_method.dm"