diff --git a/code/__DEFINES/~~~splurt_defines/inventory.dm b/code/__DEFINES/~~~splurt_defines/inventory.dm index ed111c471709d..7454601183534 100644 --- a/code/__DEFINES/~~~splurt_defines/inventory.dm +++ b/code/__DEFINES/~~~splurt_defines/inventory.dm @@ -1,4 +1,6 @@ //Underwear and extra slots +/// Right ear slot +#define ITEM_SLOT_EARS_RIGHT (1<<20) // It can't use extra because it's linked to ITEM_SLOT_EARS_LEFT /// Slot to indicate it's an extra slot #define ITEM_SLOT_EXTRA (1<<23) //this will work until TG decides to use this value for a slot for some reason /// Underwear slot @@ -9,10 +11,8 @@ #define ITEM_SLOT_SHIRT ITEM_SLOT_EXTRA | (1<<2) /// Bra slot #define ITEM_SLOT_BRA ITEM_SLOT_EXTRA | (1<<3) -/// Right ear slot -#define ITEM_SLOT_EARS_RIGHT ITEM_SLOT_EXTRA | (1<<4) /// Wrist slot -#define ITEM_SLOT_WRISTS ITEM_SLOT_EXTRA | (1<<5) +#define ITEM_SLOT_WRISTS ITEM_SLOT_EXTRA | (1<<4) /datum/bitfield/no_equip_flags/New() var/list/extra_flags = list( diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 7cdecfe41ed6b..3d082fa118d42 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -251,7 +251,7 @@ GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH, if(ITEM_SLOT_GLOVES, ITEM_SLOT_HANDS, ITEM_SLOT_HANDCUFFED) return pick(BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND) - if(ITEM_SLOT_HEAD, ITEM_SLOT_NECK, ITEM_SLOT_NECK, ITEM_SLOT_EARS) + if(ITEM_SLOT_HEAD, ITEM_SLOT_NECK, ITEM_SLOT_NECK, ITEM_SLOT_EARS_LEFT, ITEM_SLOT_EARS_RIGHT) //SPLURT EDIT - Extra Inventory return BODY_ZONE_HEAD if(ITEM_SLOT_MASK) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index f001808a9c357..4d8d9e179a40b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -1700,7 +1700,7 @@ return (zone == BODY_ZONE_PRECISE_GROIN) if(ITEM_SLOT_GLOVES) return (zone == BODY_ZONE_R_ARM || zone == BODY_ZONE_L_ARM) - if(ITEM_SLOT_HEAD, ITEM_SLOT_EARS, ITEM_SLOT_NECK) + if(ITEM_SLOT_HEAD, ITEM_SLOT_EARS_LEFT, ITEM_SLOT_EARS_RIGHT, ITEM_SLOT_NECK) // SPLURT EDIT - Extra Inventory return (zone == BODY_ZONE_HEAD) if(ITEM_SLOT_MASK) return (zone == BODY_ZONE_PRECISE_MOUTH) diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/captaincy.dm b/code/modules/antagonists/wizard/grand_ritual/finales/captaincy.dm index d1a3c1afaf758..f3df3e68b922c 100644 --- a/code/modules/antagonists/wizard/grand_ritual/finales/captaincy.dm +++ b/code/modules/antagonists/wizard/grand_ritual/finales/captaincy.dm @@ -76,7 +76,7 @@ // Won't be needing these var/obj/id = invoker.get_item_by_slot(ITEM_SLOT_ID) QDEL_NULL(id) - var/obj/headset = invoker.get_item_by_slot(ITEM_SLOT_EARS) + var/obj/headset = invoker.get_item_by_slot(ITEM_SLOT_EARS_LEFT) || invoker.get_item_by_slot(ITEM_SLOT_EARS_RIGHT) //SPLURT EDIT - Extra Inventory QDEL_NULL(headset) // We're about to take off your pants so those are going to fall out var/obj/item/pocket_L = invoker.get_item_by_slot(ITEM_SLOT_LPOCKET) diff --git a/code/modules/basketball/basketball_teams.dm b/code/modules/basketball/basketball_teams.dm index 4f5d2b22f1839..19f7162542625 100644 --- a/code/modules/basketball/basketball_teams.dm +++ b/code/modules/basketball/basketball_teams.dm @@ -6,13 +6,15 @@ id = /obj/item/card/id/away ///Do they get an ID? var/has_card = FALSE + // SPLURT EDIT CHANGE START - Extra Inventory ///Which slots to apply TRAIT_NODROP to the items in var/list/nodrop_slots = list( ITEM_SLOT_OCLOTHING, ITEM_SLOT_GLOVES, ITEM_SLOT_FEET, - ITEM_SLOT_ICLOTHING, ITEM_SLOT_EARS, ITEM_SLOT_BELT, + ITEM_SLOT_ICLOTHING, ITEM_SLOT_EARS_LEFT, ITEM_SLOT_EARS_RIGHT, ITEM_SLOT_BELT, ITEM_SLOT_MASK, ITEM_SLOT_EYES, ITEM_SLOT_ID, ITEM_SLOT_HEAD, ITEM_SLOT_BACK, ITEM_SLOT_NECK, ) + // SPLURT EDIT CHANGE END //Chance for the wearer to have their height increased. This is repeated three times for maximum height. var/taller_chance = 50 diff --git a/code/modules/capture_the_flag/ctf_classes.dm b/code/modules/capture_the_flag/ctf_classes.dm index 0482bd1ec88eb..9255b2c281f62 100644 --- a/code/modules/capture_the_flag/ctf_classes.dm +++ b/code/modules/capture_the_flag/ctf_classes.dm @@ -26,7 +26,7 @@ ///Do they get an ID? var/has_card = TRUE ///Which slots to apply TRAIT_NODROP to the items in - var/list/nodrop_slots = list(ITEM_SLOT_OCLOTHING, ITEM_SLOT_GLOVES, ITEM_SLOT_FEET, ITEM_SLOT_ICLOTHING, ITEM_SLOT_EARS) + var/list/nodrop_slots = list(ITEM_SLOT_OCLOTHING, ITEM_SLOT_GLOVES, ITEM_SLOT_FEET, ITEM_SLOT_ICLOTHING, ITEM_SLOT_EARS_LEFT, ITEM_SLOT_EARS_RIGHT) // SPLURT EDIT - Extra Inventory /datum/outfit/ctf/post_equip(mob/living/carbon/human/human_to_equip, visualsOnly=FALSE) if(visualsOnly) diff --git a/modular_zzplurt/code/game/objects/items.dm b/modular_zzplurt/code/game/objects/items.dm index 090c01b0e9728..8bc92ae0019db 100644 --- a/modular_zzplurt/code/game/objects/items.dm +++ b/modular_zzplurt/code/game/objects/items.dm @@ -2,12 +2,14 @@ // Extra inventory var/hide_underwear_examine = FALSE + var/extra_slot_flags = NONE + /obj/item/update_slot_icon() . = ..() if(!ismob(loc)) return var/mob/owner = loc - var/flags = slot_flags + var/flags = extra_slot_flags // Extra inventory if((flags & ITEM_SLOT_UNDERWEAR) && (flags & ITEM_SLOT_EXTRA)) owner.update_worn_underwear() @@ -17,7 +19,7 @@ owner.update_worn_shirt() if((flags & ITEM_SLOT_BRA) && (flags & ITEM_SLOT_EXTRA)) owner.update_worn_bra() - if((flags & ITEM_SLOT_EARS) && (flags & ITEM_SLOT_EXTRA)) + if((flags & ITEM_SLOT_EARS_RIGHT) && (flags & ITEM_SLOT_EXTRA)) owner.update_worn_ears_extra() if((flags & ITEM_SLOT_WRISTS) && (flags & ITEM_SLOT_EXTRA)) owner.update_worn_wrists()