From 6c01df29a30247b4b2eb5a6a3294d5115ebc764f Mon Sep 17 00:00:00 2001 From: Mitryll <155419219+Mitryll@users.noreply.github.com> Date: Fri, 31 Jan 2025 01:04:31 -0400 Subject: [PATCH] Nerfs Entombed (#3026) ## About The Pull Request Sets the fused MODsuit's defence values to be the same as the civilian suit, removes its free insulated gloves and makes it unable to be taken with Bad Back for the free +8 points. Additionally bumps the Mod Complexity of the Entombed suit to 13, it will functionally be 10 since the default storage module the entombed suits has consumes 3, and 10 complexity sets it in line with other suits. ## Why It's Good For The Game The entombed quirk provides a comical amount of benefits for a so called neutral quirk, including an abusable interaction with the Bad Back Quirk that allows the player to ignore all the downsides of Bad Back and get a free +8 points as a result. ## Proof Of Testing Works on literally everyone else's machine. Glory to Dream-Maker. Tested and maintainer approved.
Screenshots/Videos
## Changelog :cl: balance: Made entombed not insulated, lowered its defences and is unable to be taken with Bad Back. /:cl: --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> --- code/controllers/subsystem/processing/quirks.dm | 3 ++- .../modules/entombed_quirk/code/entombed_mod.dm | 15 ++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index f40d1efba81..ee1cc3737c4 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -43,7 +43,8 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( //BUBBER EDIT ADDITION BEGIN list(/datum/quirk/featherweight, /datum/quirk/oversized), list(/datum/quirk/overweight, /datum/quirk/obese), - list(/datum/quirk/dominant_aura, /datum/quirk/well_trained) + list(/datum/quirk/dominant_aura, /datum/quirk/well_trained), + list(/datum/quirk/equipping/entombed, /datum/quirk/badback), //BUBBER EDIT ADDITION END )) diff --git a/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm b/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm index 75c801ffe7e..de3c6ca05f3 100644 --- a/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm +++ b/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm @@ -4,11 +4,10 @@ extended_desc = "Some great aspect of someone's past has permanently bound them to this device, for better or worse." default_skin = "standard" - armor_type = /datum/armor/mod_entombed + armor_type = /datum/armor/mod_theme_civilian resistance_flags = FIRE_PROOF | ACID_PROOF // It is better to die for the Emperor than live for yourself. max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT - siemens_coefficient = 0 - complexity_max = DEFAULT_MAX_COMPLEXITY - 5 + complexity_max = DEFAULT_MAX_COMPLEXITY - 2 // Sets the modsuit complexity to a total of 13 (functionally 10 as the default storage module consumes 3. ) to keep it in line with the civilian modsuit. charge_drain = DEFAULT_CHARGE_DRAIN slowdown_inactive = 2.5 // very slow because the quirk infers you rely on this to move/exist slowdown_active = 0.95 @@ -20,16 +19,6 @@ /obj/item/flashlight, ) -/datum/armor/mod_entombed - melee = 30 - bullet = 30 - laser = 30 - energy = 30 - bio = 100 - fire = 30 - acid = 30 - wound = 30 - /obj/item/mod/module/joint_torsion/entombed name = "internal joint torsion adaptation" desc = "Your adaptation to life in this MODsuit shell allows you to ambulate in such a way that your movements recharge the suit's internal batteries slightly, but only while under the effect of gravity."