mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +01:00
Fixes infiltrator suit overslotting (#91933)
the infiltrator suit can now overslot chest and head again. bugfix. 🆑 fix: the infiltrator suit can overslot once more /🆑
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user