From 38e371e99ef4ddeb934c7acccd353e63fafb6346 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 28 Nov 2023 18:33:08 +0100 Subject: [PATCH] [MIRROR] [NO GBP] Correctly fixes the quick carry module [MDB IGNORE] (#25312) * [NO GBP] Correctly fixes the quick carry module (#79928) ## About The Pull Request Messed something up in #79909, now the `FAST_MED` trait should be correctly applied, as well as the appropriate quick or quicker carry trait. Cleans up the procs a bit too so that things don't have to be redefined. ## Why It's Good For The Game Makes a fix actually fix stuff ## Changelog :cl: fix: The quick carry module should now correctly apply the appropriate traits /:cl: * [NO GBP] Correctly fixes the quick carry module --------- Co-authored-by: Nick <42454181+Momo8289@users.noreply.github.com> --- code/modules/mod/modules/modules_medical.dm | 24 +++++++-------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm index 3af9ae710a2..2346d8f9305 100644 --- a/code/modules/mod/modules/modules_medical.dm +++ b/code/modules/mod/modules/modules_medical.dm @@ -74,31 +74,23 @@ complexity = 1 idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.3 incompatible_modules = list(/obj/item/mod/module/quick_carry, /obj/item/mod/module/constructor) + var/quick_carry_trait = TRAIT_QUICK_CARRY /obj/item/mod/module/quick_carry/on_suit_activation() - ADD_TRAIT(mod.wearer, TRAIT_QUICK_CARRY, MOD_TRAIT) + . = ..() + ADD_TRAIT(mod.wearer, TRAIT_FASTMED, MOD_TRAIT) + ADD_TRAIT(mod.wearer, quick_carry_trait, MOD_TRAIT) /obj/item/mod/module/quick_carry/on_suit_deactivation(deleting = FALSE) - REMOVE_TRAIT(mod.wearer, TRAIT_QUICK_CARRY, MOD_TRAIT) + . = ..() + REMOVE_TRAIT(mod.wearer, TRAIT_FASTMED, MOD_TRAIT) + REMOVE_TRAIT(mod.wearer, quick_carry_trait, MOD_TRAIT) /obj/item/mod/module/quick_carry/advanced name = "MOD advanced quick carry module" removable = FALSE complexity = 0 - -/obj/item/mod/module/quick_carry/advanced/on_suit_activation() - ADD_TRAIT(mod.wearer, TRAIT_QUICKER_CARRY, MOD_TRAIT) - -/obj/item/mod/module/quick_carry/advanced/on_suit_deactivation(deleting = FALSE) - REMOVE_TRAIT(mod.wearer, TRAIT_QUICKER_CARRY, MOD_TRAIT) - -/obj/item/mod/module/quick_carry/on_suit_activation() - . = ..() - ADD_TRAIT(mod.wearer, TRAIT_FASTMED, MOD_TRAIT) - -/obj/item/mod/module/quick_carry/on_suit_deactivation(deleting = FALSE) - . = ..() - REMOVE_TRAIT(mod.wearer, TRAIT_FASTMED, MOD_TRAIT) + quick_carry_trait = TRAIT_QUICKER_CARRY ///Injector - Gives the suit an extendable large-capacity piercing syringe. /obj/item/mod/module/injector