diff --git a/code/__DEFINES/clothing.dm b/code/__DEFINES/clothing.dm index 65c028ad02f..a6370218fd4 100644 --- a/code/__DEFINES/clothing.dm +++ b/code/__DEFINES/clothing.dm @@ -42,6 +42,3 @@ /// How much integrity does a shirt lose every time we bite it? #define MOTH_EATING_CLOTHING_DAMAGE 15 - -/// Allows this clothing item to overslot other items when equipped -#define CLOTHING_MOD_OVERSLOTTING (1<<15) diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index 13152f2a25c..a0d62978529 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -1,7 +1,6 @@ /obj/item/clothing/gloves name = "gloves" gender = PLURAL //Carn: for grammarically correct text-parsing - clothing_flags = CLOTHING_MOD_OVERSLOTTING w_class = WEIGHT_CLASS_SMALL icon = 'icons/obj/clothing/gloves.dmi' inhand_icon_state = "greyscale_gloves" diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index a85e3544556..91fd7df3afb 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -9,7 +9,6 @@ equip_sound = 'sound/items/equip/sneakers_equip1.ogg' sound_vary = TRUE gender = PLURAL //Carn: for grammarically correct text-parsing - clothing_flags = CLOTHING_MOD_OVERSLOTTING body_parts_covered = FEET slot_flags = ITEM_SLOT_FEET armor_type = /datum/armor/clothing_shoes diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm index 30c06051a7f..0961e86af49 100644 --- a/code/modules/mod/mod_activation.dm +++ b/code/modules/mod/mod_activation.dm @@ -85,14 +85,10 @@ playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) if(part_datum.can_overslot) var/obj/item/overslot = wearer.get_item_by_slot(part.slot_flags) - if(overslot && istype(overslot, /obj/item)) - // Bubber Edit Start - Don't require any equipment to be flagged for overslotting - // var/obj/item/ = overslot - // if(clothing.clothing_flags & CLOTHING_MOD_OVERSLOTTING) + if(istype(overslot)) // BUBBER EDIT - check for /obj/item, not /obj/item/clothing - ORIGINAL: if(istype(overslot, /obj/item/clothing)) part_datum.overslotting = overslot wearer.transferItemToLoc(overslot, part, force = TRUE) RegisterSignal(part, COMSIG_ATOM_EXITED, PROC_REF(on_overslot_exit)) - // Bubber Edit End - Don't require clothing to be flagged for overslotting if(wearer.equip_to_slot_if_possible(part, part.slot_flags, qdel_on_fail = FALSE, disable_warning = TRUE)) ADD_TRAIT(part, TRAIT_NODROP, MOD_TRAIT) wearer.update_clothing(slot_flags|part.slot_flags)