[MIRROR] [NO GBP] Correctly fixes the quick carry module [MDB IGNORE] (…

…#870) * [NO GBP] Correctly fixes the quick carry module (#79928) --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: Nick <[email protected]>
Fluffy-Frontier · Nov 29, 2023 · b5fd7c2 · b5fd7c2
1 parent ca5b7a0
commit b5fd7c2
Showing 1 changed file with 8 additions and 16 deletions.
diff --git 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