diff --git a/code/__DEFINES/clothing_defines.dm b/code/__DEFINES/clothing_defines.dm index d0380ede710..c9e26b2d78f 100644 --- a/code/__DEFINES/clothing_defines.dm +++ b/code/__DEFINES/clothing_defines.dm @@ -1,3 +1,36 @@ +//Item inventory slots bitmasks +#define ITEM_SLOT_BACK (1<<0) // back +#define ITEM_SLOT_MASK (1<<1) // mask +#define ITEM_SLOT_HANDCUFFED (1<<2) // handcuffs +#define ITEM_SLOT_LEFT_HAND (1<<3) // l_hand +#define ITEM_SLOT_RIGHT_HAND (1<<4) // r_hand +#define ITEM_SLOT_BOTH_HANDS (ITEM_SLOT_LEFT_HAND | ITEM_SLOT_RIGHT_HAND) +#define ITEM_SLOT_BELT (1<<5) // belt +#define ITEM_SLOT_ID (1<<6) // id +#define ITEM_SLOT_LEFT_EAR (1<<7) // l_ear +#define ITEM_SLOT_RIGHT_EAR (1<<8) // r_ear +#define ITEM_SLOT_BOTH_EARS (ITEM_SLOT_LEFT_EAR | ITEM_SLOT_RIGHT_EAR) +#define ITEM_SLOT_EYES (1<<9) // eyes +#define ITEM_SLOT_GLOVES (1<<10) // gloves +#define ITEM_SLOT_HEAD (1<<11) // head +#define ITEM_SLOT_SHOES (1<<12) // shoes +#define ITEM_SLOT_OUTER_SUIT (1<<13) // wear_suit +#define ITEM_SLOT_JUMPSUIT (1<<14) // w_uniform +#define ITEM_SLOT_LEFT_POCKET (1<<15) // l_store +#define ITEM_SLOT_RIGHT_POCKET (1<<16) // r_store +#define ITEM_SLOT_BOTH_POCKETS (ITEM_SLOT_LEFT_POCKET | ITEM_SLOT_RIGHT_POCKET) +#define ITEM_SLOT_SUIT_STORE (1<<17) // suit_storage +#define ITEM_SLOT_IN_BACKPACK (1<<18) // this just puts stuff a backpack if you have one +#define ITEM_SLOT_LEGCUFFED (1<<19) // legcuffs +#define ITEM_SLOT_PDA (1<<20) // pda +#define ITEM_SLOT_ACCESSORY (1<<21) // accessories +#define ITEM_SLOT_COLLAR (1<<22) // pet collar +#define ITEM_SLOT_AMOUNT_FLAG (1< item path + /// A mapping of `num2text(ITEM_SLOT_XYZ)` -> item path var/list/magic_fashion = list() @@ -18,11 +18,11 @@ . = ..() var/list/magic_fashion_slot_IDs = list( - SLOT_HUD_RIGHT_HAND, - SLOT_HUD_LEFT_HAND, - SLOT_HUD_HEAD, - SLOT_HUD_OUTER_SUIT, - SLOT_HUD_SHOES + ITEM_SLOT_LEFT_HAND, + ITEM_SLOT_RIGHT_HAND, + ITEM_SLOT_HEAD, + ITEM_SLOT_OUTER_SUIT, + ITEM_SLOT_SHOES ) var/list/magic_fashion_items = list( /obj/item/staff, @@ -70,7 +70,7 @@ continue switch(slot_ID) // Extra filtering for specific slots - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) if(isplasmaman(H)) continue // We want them to spread the magical joy, not burn to death in agony diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm index 80104ece9d4..bfd96c8ee89 100644 --- a/code/datums/elements/earhealing.dm +++ b/code/datums/elements/earhealing.dm @@ -20,7 +20,7 @@ /datum/element/earhealing/proc/equippedChanged(datum/source, mob/living/carbon/user, slot) SIGNAL_HANDLER - if(((slot == SLOT_HUD_LEFT_EAR) || (slot == SLOT_HUD_RIGHT_EAR)) && istype(user)) + if((slot & ITEM_SLOT_BOTH_EARS) && istype(user)) user_by_item[source] = user else user_by_item -= source diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index 5ad2ad814cf..ce26ce82eb3 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -181,7 +181,7 @@ /// A preset for equipping items onto mob slots /datum/strippable_item/mob_item_slot - /// The SLOT_FLAG_* to equip to. + /// The ITEM_SLOT_* to equip to. var/item_slot /datum/strippable_item/mob_item_slot/get_item(atom/source) @@ -230,7 +230,7 @@ /datum/strippable_item/mob_item_slot/get_obscuring(atom/source) if(ishuman(source)) var/mob/living/carbon/human/human_source = source - if(item_slot in human_source.check_obscured_slots()) + if(item_slot & human_source.check_obscured_slots()) return STRIPPABLE_OBSCURING_COMPLETELY return STRIPPABLE_OBSCURING_NONE diff --git a/code/datums/keybindings/human_keybinds.dm b/code/datums/keybindings/human_keybinds.dm index 0005d17efb9..956a408c57e 100644 --- a/code/datums/keybindings/human_keybinds.dm +++ b/code/datums/keybindings/human_keybinds.dm @@ -11,7 +11,7 @@ /datum/keybinding/human/bag_equip/down(client/C) . = ..() var/mob/living/carbon/human/M = C.mob - M.quick_equip_item(SLOT_HUD_BACK) + M.quick_equip_item(ITEM_SLOT_BACK) /datum/keybinding/human/belt_equip name = "Equip Held Object To Belt" @@ -20,7 +20,7 @@ /datum/keybinding/human/belt_equip/down(client/C) . = ..() var/mob/living/carbon/human/M = C.mob - M.quick_equip_item(SLOT_HUD_BELT) + M.quick_equip_item(ITEM_SLOT_BELT) /datum/keybinding/human/suit_equip name = "Equip Held Object To Suit Storage" @@ -29,7 +29,7 @@ /datum/keybinding/human/suit_equip/down(client/C) . = ..() var/mob/living/carbon/human/M = C.mob - M.quick_equip_item(SLOT_HUD_SUIT_STORE) + M.quick_equip_item(ITEM_SLOT_SUIT_STORE) /datum/keybinding/human/toggle_holster name = "Toggle Holster" diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 6b481b09daa..56f4d6e30e9 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -70,29 +70,29 @@ //Start with uniform,suit,backpack for additional slots if(uniform) - equip_item(H, uniform, SLOT_HUD_JUMPSUIT) + equip_item(H, uniform, ITEM_SLOT_JUMPSUIT) if(suit) - equip_item(H, suit, SLOT_HUD_OUTER_SUIT) + equip_item(H, suit, ITEM_SLOT_OUTER_SUIT) if(back) - equip_item(H, back, SLOT_HUD_BACK) + equip_item(H, back, ITEM_SLOT_BACK) if(belt) - equip_item(H, belt, SLOT_HUD_BELT) + equip_item(H, belt, ITEM_SLOT_BELT) if(gloves) - equip_item(H, gloves, SLOT_HUD_GLOVES) + equip_item(H, gloves, ITEM_SLOT_GLOVES) if(shoes) - equip_item(H, shoes, SLOT_HUD_SHOES) + equip_item(H, shoes, ITEM_SLOT_SHOES) if(head) - equip_item(H, head, SLOT_HUD_HEAD) + equip_item(H, head, ITEM_SLOT_HEAD) if(mask) - equip_item(H, mask, SLOT_HUD_WEAR_MASK) + equip_item(H, mask, ITEM_SLOT_MASK) if(l_ear) - equip_item(H, l_ear, SLOT_HUD_LEFT_EAR) + equip_item(H, l_ear, ITEM_SLOT_LEFT_EAR) if(r_ear) - equip_item(H, r_ear, SLOT_HUD_RIGHT_EAR) + equip_item(H, r_ear, ITEM_SLOT_RIGHT_EAR) if(glasses) - equip_item(H, glasses, SLOT_HUD_GLASSES) + equip_item(H, glasses, ITEM_SLOT_EYES) if(id) - equip_item(H, id, SLOT_HUD_WEAR_ID) + equip_item(H, id, ITEM_SLOT_ID) if(!H.head && toggle_helmet && istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit)) var/obj/item/clothing/suit/space/hardsuit/HS = H.wear_suit @@ -102,7 +102,7 @@ C.quick_activation() if(suit_store) - equip_item(H, suit_store, SLOT_HUD_SUIT_STORE) + equip_item(H, suit_store, ITEM_SLOT_SUIT_STORE) if(l_hand) H.put_in_l_hand(new l_hand(H)) @@ -110,7 +110,7 @@ H.put_in_r_hand(new r_hand(H)) if(pda) - equip_item(H, pda, SLOT_HUD_WEAR_PDA) + equip_item(H, pda, ITEM_SLOT_PDA) if(uniform) for(var/path in accessories) @@ -120,9 +120,9 @@ if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon. if(l_pocket) - equip_item(H, l_pocket, SLOT_HUD_LEFT_STORE) + equip_item(H, l_pocket, ITEM_SLOT_LEFT_POCKET) if(r_pocket) - equip_item(H, r_pocket, SLOT_HUD_RIGHT_STORE) + equip_item(H, r_pocket, ITEM_SLOT_RIGHT_POCKET) if(box) if(!backpack_contents) @@ -135,7 +135,7 @@ if(!number) number = 1 for(var/i in 1 to number) - H.equip_or_collect(new path(H), SLOT_HUD_IN_BACKPACK) + H.equip_or_collect(new path(H), ITEM_SLOT_IN_BACKPACK) for(var/path in cybernetic_implants) var/obj/item/organ/internal/O = new path diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 8eb5cdd3ead..aa753d0052d 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -1247,7 +1247,7 @@ if(istype(C)) C.name = "ancient robes" C.hood.name = "ancient hood" - H.equip_to_slot_or_del(C, SLOT_HUD_IN_BACKPACK) + H.equip_to_slot_or_del(C, ITEM_SLOT_IN_BACKPACK) var/obj/item/card/id/I = H.wear_id if(istype(I)) @@ -1289,7 +1289,7 @@ if(istype(C)) C.name = "ancient robes" C.hood.name = "ancient hood" - H.equip_to_slot_or_del(C, SLOT_HUD_IN_BACKPACK) + H.equip_to_slot_or_del(C, ITEM_SLOT_IN_BACKPACK) var/obj/item/card/id/I = H.wear_id if(istype(I)) @@ -1602,7 +1602,7 @@ H.update_dna() H.wear_mask.adjustmask(H) // push it back on the head - equip_item(H, /obj/item/clothing/mask/cigarette/cigar, SLOT_HUD_WEAR_MASK) // get them their cigar + equip_item(H, /obj/item/clothing/mask/cigarette/cigar, ITEM_SLOT_MASK) // get them their cigar if(istype(H.glasses, /obj/item/clothing/glasses)) // this is gonna be always true var/obj/item/clothing/glasses/glassass = H.glasses glassass.over_mask = TRUE diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm index 40ad60665c7..32aaff8de2f 100644 --- a/code/datums/outfits/outfit_debug.dm +++ b/code/datums/outfits/outfit_debug.dm @@ -22,7 +22,7 @@ id = /obj/item/card/id/admin pda = /obj/item/pda/centcom - internals_slot = SLOT_HUD_SUIT_STORE + internals_slot = ITEM_SLOT_SUIT_STORE toggle_helmet = TRUE cybernetic_implants = list( diff --git a/code/datums/outfits/vv_outfit.dm b/code/datums/outfits/vv_outfit.dm index 36401cb41fd..81809812616 100644 --- a/code/datums/outfits/vv_outfit.dm +++ b/code/datums/outfits/vv_outfit.dm @@ -11,37 +11,37 @@ /datum/outfit/varedit/proc/set_equipment_by_slot(slot, item_path) switch(slot) - if(SLOT_HUD_JUMPSUIT) + if(ITEM_SLOT_JUMPSUIT) uniform = item_path - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) back = item_path - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) suit = item_path - if(SLOT_HUD_BELT) + if(ITEM_SLOT_BELT) belt = item_path - if(SLOT_HUD_GLOVES) + if(ITEM_SLOT_GLOVES) gloves = item_path - if(SLOT_HUD_SHOES) + if(ITEM_SLOT_SHOES) shoes = item_path - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) head = item_path - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) mask = item_path - if(SLOT_HUD_LEFT_EAR) + if(ITEM_SLOT_LEFT_EAR) l_ear = item_path - if(SLOT_HUD_RIGHT_EAR) + if(ITEM_SLOT_RIGHT_EAR) r_ear = item_path - if(SLOT_HUD_GLASSES) + if(ITEM_SLOT_EYES) glasses = item_path - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_ID) id = item_path - if(SLOT_HUD_WEAR_PDA) + if(ITEM_SLOT_PDA) pda = item_path - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) suit_store = item_path - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) l_pocket = item_path - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) r_pocket = item_path @@ -70,7 +70,7 @@ // Copy equipment var/list/result = list() - var/list/slots_to_check = list(SLOT_HUD_JUMPSUIT, SLOT_HUD_BACK, SLOT_HUD_OUTER_SUIT, SLOT_HUD_BELT, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_HEAD, SLOT_HUD_WEAR_MASK, SLOT_HUD_LEFT_EAR, SLOT_HUD_RIGHT_EAR, SLOT_HUD_GLASSES, SLOT_HUD_WEAR_ID, SLOT_HUD_WEAR_PDA, SLOT_HUD_SUIT_STORE, SLOT_HUD_LEFT_STORE, SLOT_HUD_RIGHT_STORE) + var/list/slots_to_check = list(ITEM_SLOT_JUMPSUIT, ITEM_SLOT_BACK, ITEM_SLOT_OUTER_SUIT, ITEM_SLOT_BELT, ITEM_SLOT_GLOVES, ITEM_SLOT_SHOES, ITEM_SLOT_HEAD, ITEM_SLOT_MASK, ITEM_SLOT_LEFT_EAR, ITEM_SLOT_RIGHT_EAR, ITEM_SLOT_EYES, ITEM_SLOT_ID, ITEM_SLOT_PDA, ITEM_SLOT_SUIT_STORE, ITEM_SLOT_LEFT_POCKET, ITEM_SLOT_RIGHT_POCKET) for(var/s in slots_to_check) var/obj/item/I = get_item_by_slot(s) var/vedits = collect_vv(I) @@ -81,7 +81,7 @@ // Copy access O.stored_access = list() - var/obj/item/id_slot = get_item_by_slot(SLOT_HUD_WEAR_ID) + var/obj/item/id_slot = get_item_by_slot(ITEM_SLOT_ID) if(id_slot) O.stored_access |= id_slot.GetAccess() var/obj/item/card/id/ID = id_slot.GetID() @@ -105,7 +105,7 @@ O.vv_values = result // Copy backpack contents if exist. - var/obj/item/backpack = get_item_by_slot(SLOT_HUD_BACK) + var/obj/item/backpack = get_item_by_slot(ITEM_SLOT_BACK) if(istype(backpack) && LAZYLEN(backpack.contents) > 0) var/list/typecounts = list() for(var/obj/item/I in backpack) @@ -129,7 +129,7 @@ O.cybernetic_implants |= aug.type // Copy accessories - var/obj/item/clothing/under/uniform_slot = get_item_by_slot(SLOT_HUD_JUMPSUIT) + var/obj/item/clothing/under/uniform_slot = get_item_by_slot(ITEM_SLOT_JUMPSUIT) if(uniform_slot) O.accessories = list() for(var/obj/item/clothing/accessory/A in uniform_slot.accessories) @@ -160,7 +160,7 @@ I.vv_edit_var(vname,edits[vname]) // Apply access - var/obj/item/id_slot = H.get_item_by_slot(SLOT_HUD_WEAR_ID) + var/obj/item/id_slot = H.get_item_by_slot(ITEM_SLOT_ID) if(!id_slot) return diff --git a/code/datums/spells/banana_touch.dm b/code/datums/spells/banana_touch.dm index 6fc3a835313..2c289884a91 100644 --- a/code/datums/spells/banana_touch.dm +++ b/code/datums/spells/banana_touch.dm @@ -54,17 +54,17 @@ unEquip(wear_mask, TRUE) unEquip(head, TRUE) unEquip(wear_suit, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/head/wizard/clown, SLOT_HUD_HEAD, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/suit/wizrobe/clown, SLOT_HUD_OUTER_SUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/magical, SLOT_HUD_SHOES, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clownwiz, SLOT_HUD_WEAR_MASK, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/head/wizard/clown, ITEM_SLOT_HEAD, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/suit/wizrobe/clown, ITEM_SLOT_OUTER_SUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/magical, ITEM_SLOT_SHOES, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clownwiz, ITEM_SLOT_MASK, TRUE, TRUE) else qdel(shoes) qdel(wear_mask) qdel(w_uniform) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/nodrop, SLOT_HUD_JUMPSUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, SLOT_HUD_SHOES, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, SLOT_HUD_WEAR_MASK, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/nodrop, ITEM_SLOT_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, ITEM_SLOT_SHOES, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, ITEM_SLOT_MASK, TRUE, TRUE) dna.SetSEState(GLOB.clumsyblock, TRUE, TRUE) dna.SetSEState(GLOB.comicblock, TRUE, TRUE) singlemutcheck(src, GLOB.clumsyblock, MUTCHK_FORCED) diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm index 14996e6a5bd..58279b573f4 100644 --- a/code/datums/spells/cluwne.dm +++ b/code/datums/spells/cluwne.dm @@ -41,10 +41,10 @@ tumor.insert(src) if(!istype(wear_mask, /obj/item/clothing/mask/cursedclown)) //Infinite loops otherwise unEquip(wear_mask, 1) - equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, SLOT_HUD_JUMPSUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, SLOT_HUD_GLOVES, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, SLOT_HUD_WEAR_MASK, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, SLOT_HUD_SHOES, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/cursedclown, ITEM_SLOT_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, ITEM_SLOT_GLOVES, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, ITEM_SLOT_MASK, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, ITEM_SLOT_SHOES, TRUE, TRUE) /mob/living/carbon/human/proc/makeAntiCluwne() to_chat(src, "You don't feel very funny.") @@ -85,5 +85,5 @@ unEquip(gloves, 1) qdel(G) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/iaa/formal/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, SLOT_HUD_SHOES, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/iaa/formal/black, ITEM_SLOT_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, ITEM_SLOT_SHOES, TRUE, TRUE) diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index 86781aa426c..fa6cd24a8a8 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -36,6 +36,6 @@ "Your face burns up, and shortly after the fire you realise you have the face of a horse!") if(!target.unEquip(target.wear_mask)) qdel(target.wear_mask) - target.equip_to_slot_if_possible(magichead, SLOT_HUD_WEAR_MASK, TRUE, TRUE) + target.equip_to_slot_if_possible(magichead, ITEM_SLOT_MASK, TRUE, TRUE) target.flash_eyes() diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index 68af16b3a79..b40c1a19d49 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -138,7 +138,7 @@ return TRUE /datum/spell/lichdom/proc/equip_lich(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), ITEM_SLOT_JUMPSUIT) diff --git a/code/datums/spells/mime_malaise.dm b/code/datums/spells/mime_malaise.dm index 6c448b91bd6..209863ada38 100644 --- a/code/datums/spells/mime_malaise.dm +++ b/code/datums/spells/mime_malaise.dm @@ -37,17 +37,17 @@ unEquip(wear_mask, TRUE) unEquip(w_uniform, TRUE) unEquip(wear_suit, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime, SLOT_HUD_WEAR_MASK, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime, SLOT_HUD_JUMPSUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders, SLOT_HUD_OUTER_SUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime, ITEM_SLOT_MASK, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime, ITEM_SLOT_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders, ITEM_SLOT_OUTER_SUIT, TRUE, TRUE) Silence(14 SECONDS) else qdel(wear_mask) qdel(w_uniform) qdel(wear_suit) - equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime/nodrop, SLOT_HUD_WEAR_MASK, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime/nodrop, SLOT_HUD_JUMPSUIT, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, SLOT_HUD_OUTER_SUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/mime/nodrop, ITEM_SLOT_MASK, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime/nodrop, ITEM_SLOT_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, ITEM_SLOT_OUTER_SUIT, TRUE, TRUE) dna.SetSEState(GLOB.muteblock , TRUE, TRUE) singlemutcheck(src, GLOB.muteblock, MUTCHK_FORCED) dna.default_blocks.Add(GLOB.muteblock) diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index d7b0cf278fa..7d2d7f7251c 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -130,12 +130,12 @@ N.visible_message("As [item_to_retrieve] vanishes, [N] remains behind!") break //If you have 2 nads, well, congrats? Keeps message from doubling up if(target.hand) //left active hand - if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_LEFT_HAND, FALSE, TRUE)) - if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_RIGHT_HAND, FALSE, TRUE)) + if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_LEFT_HAND, FALSE, TRUE)) + if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE)) butterfingers = TRUE else //right active hand - if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_RIGHT_HAND, FALSE, TRUE)) - if(!target.equip_to_slot_if_possible(item_to_retrieve, SLOT_HUD_LEFT_HAND, FALSE, TRUE)) + if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE)) + if(!target.equip_to_slot_if_possible(item_to_retrieve, ITEM_SLOT_LEFT_HAND, FALSE, TRUE)) butterfingers = TRUE if(butterfingers) item_to_retrieve.loc = target.loc diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm index 948cfe80ef8..455bbdf5b0b 100644 --- a/code/datums/spells/touch_attacks.dm +++ b/code/datums/spells/touch_attacks.dm @@ -21,12 +21,12 @@ user.put_in_hands(attached_hand) return if(user.hand) //left active hand - if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_LEFT_HAND, FALSE, TRUE)) - if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_RIGHT_HAND, FALSE, TRUE)) + if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_LEFT_HAND, FALSE, TRUE)) + if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE)) hand_handled = 0 else //right active hand - if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_RIGHT_HAND, FALSE, TRUE)) - if(!user.equip_to_slot_if_possible(attached_hand, SLOT_HUD_LEFT_HAND, FALSE, TRUE)) + if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_RIGHT_HAND, FALSE, TRUE)) + if(!user.equip_to_slot_if_possible(attached_hand, ITEM_SLOT_LEFT_HAND, FALSE, TRUE)) hand_handled = 0 if(!hand_handled) qdel(attached_hand) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 662b9ed349a..c71e9683859 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -106,7 +106,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes) - var/obj/item/clothing/glasses/glasses = H.get_item_by_slot(SLOT_HUD_GLASSES) + var/obj/item/clothing/glasses/glasses = H.get_item_by_slot(ITEM_SLOT_EYES) if(eyes && HAS_TRAIT(H, TRAIT_COLORBLIND) && (!glasses || !glasses.correct_wires)) // Check if the human has colorblindness. replace_colors = eyes.replace_colours // Get the colorblind replacement colors list. diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm index cc0b0f22c20..348345a6aee 100644 --- a/code/game/gamemodes/cult/blood_magic.dm +++ b/code/game/gamemodes/cult/blood_magic.dm @@ -688,10 +688,10 @@ if(iscarbon(target) && proximity) uses-- var/mob/living/carbon/C = target - var/armour = C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), SLOT_HUD_OUTER_SUIT) - C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(user), SLOT_HUD_JUMPSUIT) - C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), SLOT_HUD_BACK) - C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), SLOT_HUD_SHOES) + var/armour = C.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), ITEM_SLOT_OUTER_SUIT) + C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(user), ITEM_SLOT_JUMPSUIT) + C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), ITEM_SLOT_BACK) + C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), ITEM_SLOT_SHOES) if(C == user) qdel(src) //Clears the hands diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 0f0427d29b1..f05682e9d1b 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -206,7 +206,7 @@ user.unEquip(src, 1) user.Confused(20 SECONDS) user.Weaken(10 SECONDS) - else if(slot == SLOT_HUD_OUTER_SUIT) + else if(slot == ITEM_SLOT_OUTER_SUIT) ADD_TRAIT(user, TRAIT_GOTTAGOFAST, "cultrobes[UID()]") /obj/item/clothing/suit/hooded/cultrobes/flagellant_robe/dropped(mob/user) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index bb89b65ebbd..e8858b87956 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -358,7 +358,7 @@ structure_check() searches for nearby cultist structures required for the invoca H.reagents.del_reagent("holywater") // Also prevent fill stomach with holy water and "forgot" about it after converting var/obj/item/melee/cultblade/dagger/D = new(get_turf(src)) - if(H.equip_to_slot_if_possible(D, SLOT_HUD_IN_BACKPACK, FALSE, TRUE)) + if(H.equip_to_slot_if_possible(D, ITEM_SLOT_IN_BACKPACK, FALSE, TRUE)) to_chat(H, "You have a dagger in your backpack. Use it to do [GET_CULT_DATA(entity_title1, "your god")]'s bidding.") else to_chat(H, "There is a dagger on the floor. Use it to do [GET_CULT_DATA(entity_title1, "your god")]'s bidding.") diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index cd037209648..79ff304e4a8 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -107,7 +107,7 @@ CONTENTS: A.UpdateButtons() /obj/item/clothing/suit/armor/abductor/vest/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_OUTER_SUIT) //we only give the mob the ability to activate the vest if he's actually wearing it. + if(slot == ITEM_SLOT_OUTER_SUIT) //we only give the mob the ability to activate the vest if he's actually wearing it. return 1 /obj/item/clothing/suit/armor/abductor/vest/proc/SetDisguise(datum/icon_snapshot/entry) @@ -245,7 +245,7 @@ CONTENTS: righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' icon_state = "wonderprodStun" item_state = "wonderprod" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "materials=4;combat=4;biotech=7;abductor=4" w_class = WEIGHT_CLASS_NORMAL actions_types = list(/datum/action/item_action/toggle_mode) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm index 82a903afa37..5b2f73c5245 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm @@ -25,7 +25,7 @@ console.vest = V V.flags |= NODROP - var/obj/item/abductor/gizmo/G = locate() in H.get_item_by_slot(SLOT_HUD_BACK) + var/obj/item/abductor/gizmo/G = locate() in H.get_item_by_slot(ITEM_SLOT_BACK) if(G) console.gizmo = G G.console = console diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 67470854f0d..323943bd78d 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -202,7 +202,7 @@ to_chat(synd_mind.current, "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.") var/obj/item/nuclear_challenge/challenge = new /obj/item/nuclear_challenge - synd_mind.current.equip_to_slot_or_del(challenge, SLOT_HUD_RIGHT_HAND) + synd_mind.current.equip_to_slot_or_del(challenge, ITEM_SLOT_RIGHT_HAND) update_syndicate_id(synd_mind, leader_title, TRUE) @@ -219,7 +219,7 @@ else var/mob/living/carbon/human/H = synd_mind.current P.loc = H.loc - H.equip_to_slot_or_del(P, SLOT_HUD_RIGHT_STORE, 0) + H.equip_to_slot_or_del(P, ITEM_SLOT_RIGHT_POCKET, 0) H.update_icons() @@ -259,7 +259,7 @@ var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt(synd_mob) R.set_frequency(radio_freq) - synd_mob.equip_to_slot_or_del(R, SLOT_HUD_LEFT_EAR) + synd_mob.equip_to_slot_or_del(R, ITEM_SLOT_LEFT_EAR) var/back @@ -275,18 +275,18 @@ else back = /obj/item/storage/backpack - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), SLOT_HUD_JUMPSUIT) - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), SLOT_HUD_SHOES) - synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), SLOT_HUD_GLOVES) - synd_mob.equip_to_slot_or_del(new /obj/item/card/id/syndicate(synd_mob), SLOT_HUD_WEAR_ID) - synd_mob.equip_to_slot_or_del(new back(synd_mob), SLOT_HUD_BACK) - synd_mob.equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/pistol(synd_mob), SLOT_HUD_BELT) - synd_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(synd_mob.back), SLOT_HUD_IN_BACKPACK) - synd_mob.equip_to_slot_or_del(new /obj/item/pinpointer/nukeop(synd_mob), SLOT_HUD_WEAR_PDA) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), ITEM_SLOT_JUMPSUIT) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), ITEM_SLOT_SHOES) + synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), ITEM_SLOT_GLOVES) + synd_mob.equip_to_slot_or_del(new /obj/item/card/id/syndicate(synd_mob), ITEM_SLOT_ID) + synd_mob.equip_to_slot_or_del(new back(synd_mob), ITEM_SLOT_BACK) + synd_mob.equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/pistol(synd_mob), ITEM_SLOT_BELT) + synd_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(synd_mob.back), ITEM_SLOT_IN_BACKPACK) + synd_mob.equip_to_slot_or_del(new /obj/item/pinpointer/nukeop(synd_mob), ITEM_SLOT_PDA) var/obj/item/radio/uplink/nuclear/U = new /obj/item/radio/uplink/nuclear(synd_mob) U.hidden_uplink.uplink_owner="[synd_mob.key]" U.hidden_uplink.uses = uplink_uses - synd_mob.equip_to_slot_or_del(U, SLOT_HUD_IN_BACKPACK) + synd_mob.equip_to_slot_or_del(U, ITEM_SLOT_IN_BACKPACK) synd_mob.mind.offstation_role = TRUE if(synd_mob.dna.species) @@ -294,17 +294,17 @@ switch(race) if("Vox") - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), SLOT_HUD_WEAR_MASK) - synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), SLOT_HUD_LEFT_HAND) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), ITEM_SLOT_MASK) + synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), ITEM_SLOT_LEFT_HAND) synd_mob.internal = synd_mob.l_hand synd_mob.update_action_buttons_icon() if("Plasmaman") - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), SLOT_HUD_WEAR_MASK) - synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), SLOT_HUD_SUIT_STORE) - synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), SLOT_HUD_IN_BACKPACK) - synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), SLOT_HUD_IN_BACKPACK) - synd_mob.internal = synd_mob.get_item_by_slot(SLOT_HUD_SUIT_STORE) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), ITEM_SLOT_MASK) + synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), ITEM_SLOT_SUIT_STORE) + synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), ITEM_SLOT_IN_BACKPACK) + synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), ITEM_SLOT_IN_BACKPACK) + synd_mob.internal = synd_mob.get_item_by_slot(ITEM_SLOT_SUIT_STORE) synd_mob.update_action_buttons_icon() synd_mob.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index f5f8487e1b2..a8106a2d210 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -16,7 +16,7 @@ icon = 'icons/obj/device.dmi' icon_state = "pinoff" flags = CONDUCT - slot_flags = SLOT_FLAG_PDA | SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_PDA | ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL item_state = "electronic" throw_speed = 4 @@ -275,7 +275,7 @@ /////////////////////// /obj/item/pinpointer/nukeop var/obj/docking_port/mobile/home = null - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_PDA + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_PDA syndicate = TRUE modes = list(MODE_DISK, MODE_NUKE) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 18bced35c23..865d2a47cb1 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -674,11 +674,11 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) var/obj/item/item_to_give = new item_path var/static/list/slots = list( - "backpack" = SLOT_HUD_IN_BACKPACK, - "left pocket" = SLOT_HUD_LEFT_STORE, - "right pocket" = SLOT_HUD_RIGHT_STORE, - "left hand" = SLOT_HUD_LEFT_HAND, - "right hand" = SLOT_HUD_RIGHT_HAND, + "backpack" = ITEM_SLOT_IN_BACKPACK, + "left pocket" = ITEM_SLOT_LEFT_POCKET, + "right pocket" = ITEM_SLOT_RIGHT_POCKET, + "left hand" = ITEM_SLOT_LEFT_HAND, + "right hand" = ITEM_SLOT_RIGHT_HAND, ) for(var/datum/mind/kit_receiver_mind as anything in shuffle(objective_owners)) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 1546afc8c11..cd7d2b48e91 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -262,7 +262,7 @@ GLOBAL_LIST_EMPTY(multiverse) item_state = "energy_katana" hitsound = 'sound/weapons/bladeslice.ogg' flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 20 throwforce = 10 sharp = TRUE @@ -411,199 +411,199 @@ GLOBAL_LIST_EMPTY(multiverse) //Duplicates the user's current equipent var/mob/living/carbon/human/H = usr - var/obj/head = H.get_item_by_slot(SLOT_HUD_HEAD) + var/obj/head = H.get_item_by_slot(ITEM_SLOT_HEAD) if(head) - M.equip_to_slot_or_del(new head.type(M), SLOT_HUD_HEAD) + M.equip_to_slot_or_del(new head.type(M), ITEM_SLOT_HEAD) - var/obj/mask = H.get_item_by_slot(SLOT_HUD_WEAR_MASK) + var/obj/mask = H.get_item_by_slot(ITEM_SLOT_MASK) if(mask) - M.equip_to_slot_or_del(new mask.type(M), SLOT_HUD_WEAR_MASK) + M.equip_to_slot_or_del(new mask.type(M), ITEM_SLOT_MASK) - var/obj/glasses = H.get_item_by_slot(SLOT_HUD_GLASSES) + var/obj/glasses = H.get_item_by_slot(ITEM_SLOT_EYES) if(glasses) - M.equip_to_slot_or_del(new glasses.type(M), SLOT_HUD_GLASSES) + M.equip_to_slot_or_del(new glasses.type(M), ITEM_SLOT_EYES) - var/obj/left_ear = H.get_item_by_slot(SLOT_HUD_LEFT_EAR) + var/obj/left_ear = H.get_item_by_slot(ITEM_SLOT_LEFT_EAR) if(left_ear) - M.equip_to_slot_or_del(new left_ear.type(M), SLOT_HUD_LEFT_EAR) + M.equip_to_slot_or_del(new left_ear.type(M), ITEM_SLOT_LEFT_EAR) - var/obj/right_ear = H.get_item_by_slot(SLOT_HUD_RIGHT_EAR) + var/obj/right_ear = H.get_item_by_slot(ITEM_SLOT_RIGHT_EAR) if(right_ear) - M.equip_to_slot_or_del(new right_ear.type(M), SLOT_HUD_RIGHT_EAR) + M.equip_to_slot_or_del(new right_ear.type(M), ITEM_SLOT_RIGHT_EAR) - var/obj/uniform = H.get_item_by_slot(SLOT_HUD_JUMPSUIT) + var/obj/uniform = H.get_item_by_slot(ITEM_SLOT_JUMPSUIT) if(uniform) - M.equip_to_slot_or_del(new uniform.type(M), SLOT_HUD_JUMPSUIT) + M.equip_to_slot_or_del(new uniform.type(M), ITEM_SLOT_JUMPSUIT) - var/obj/suit = H.get_item_by_slot(SLOT_HUD_OUTER_SUIT) + var/obj/suit = H.get_item_by_slot(ITEM_SLOT_OUTER_SUIT) if(suit) - M.equip_to_slot_or_del(new suit.type(M), SLOT_HUD_OUTER_SUIT) + M.equip_to_slot_or_del(new suit.type(M), ITEM_SLOT_OUTER_SUIT) - var/obj/gloves = H.get_item_by_slot(SLOT_HUD_GLOVES) + var/obj/gloves = H.get_item_by_slot(ITEM_SLOT_GLOVES) if(gloves) - M.equip_to_slot_or_del(new gloves.type(M), SLOT_HUD_GLOVES) + M.equip_to_slot_or_del(new gloves.type(M), ITEM_SLOT_GLOVES) - var/obj/shoes = H.get_item_by_slot(SLOT_HUD_SHOES) + var/obj/shoes = H.get_item_by_slot(ITEM_SLOT_SHOES) if(shoes) - M.equip_to_slot_or_del(new shoes.type(M), SLOT_HUD_SHOES) + M.equip_to_slot_or_del(new shoes.type(M), ITEM_SLOT_SHOES) - var/obj/belt = H.get_item_by_slot(SLOT_HUD_BELT) + var/obj/belt = H.get_item_by_slot(ITEM_SLOT_BELT) if(belt) - M.equip_to_slot_or_del(new belt.type(M), SLOT_HUD_BELT) + M.equip_to_slot_or_del(new belt.type(M), ITEM_SLOT_BELT) - var/obj/pda = H.get_item_by_slot(SLOT_HUD_WEAR_PDA) + var/obj/pda = H.get_item_by_slot(ITEM_SLOT_PDA) if(pda) - M.equip_to_slot_or_del(new pda.type(M), SLOT_HUD_WEAR_PDA) + M.equip_to_slot_or_del(new pda.type(M), ITEM_SLOT_PDA) - var/obj/back = H.get_item_by_slot(SLOT_HUD_BACK) + var/obj/back = H.get_item_by_slot(ITEM_SLOT_BACK) if(back) - M.equip_to_slot_or_del(new back.type(M), SLOT_HUD_BACK) + M.equip_to_slot_or_del(new back.type(M), ITEM_SLOT_BACK) - var/obj/suit_storage = H.get_item_by_slot(SLOT_HUD_SUIT_STORE) + var/obj/suit_storage = H.get_item_by_slot(ITEM_SLOT_SUIT_STORE) if(suit_storage) - M.equip_to_slot_or_del(new suit_storage.type(M), SLOT_HUD_SUIT_STORE) + M.equip_to_slot_or_del(new suit_storage.type(M), ITEM_SLOT_SUIT_STORE) - var/obj/left_pocket = H.get_item_by_slot(SLOT_HUD_LEFT_STORE) + var/obj/left_pocket = H.get_item_by_slot(ITEM_SLOT_LEFT_POCKET) if(left_pocket) - M.equip_to_slot_or_del(new left_pocket.type(M), SLOT_HUD_LEFT_STORE) + M.equip_to_slot_or_del(new left_pocket.type(M), ITEM_SLOT_LEFT_POCKET) - var/obj/right_pocket = H.get_item_by_slot(SLOT_HUD_RIGHT_STORE) + var/obj/right_pocket = H.get_item_by_slot(ITEM_SLOT_RIGHT_POCKET) if(right_pocket) - M.equip_to_slot_or_del(new right_pocket.type(M), SLOT_HUD_RIGHT_STORE) + M.equip_to_slot_or_del(new right_pocket.type(M), ITEM_SLOT_RIGHT_POCKET) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) //Don't duplicate what's equipped to hands, or else duplicate swords could be generated...or weird cases of factionless swords. + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) //Don't duplicate what's equipped to hands, or else duplicate swords could be generated...or weird cases of factionless swords. else if(istajaran(M) || isunathi(M)) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES) //If they can't wear shoes, give them a pair of sandals. + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES) //If they can't wear shoes, give them a pair of sandals. var/randomize = pick("mobster","roman","wizard","cyborg","syndicate","assistant", "animu", "cultist", "highlander", "clown", "killer", "pirate", "soviet", "officer", "gladiator") switch(randomize) if("mobster") - M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), SLOT_HUD_GLOVES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), SLOT_HUD_GLASSES) - M.equip_to_slot_or_del(new /obj/item/clothing/under/suit/really_black(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), ITEM_SLOT_GLOVES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), ITEM_SLOT_EYES) + M.equip_to_slot_or_del(new /obj/item/clothing/under/suit/really_black(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("roman") var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - M.equip_to_slot_or_del(new hat(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/shield/riot/roman(M), SLOT_HUD_LEFT_HAND) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new hat(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/shield/riot/roman(M), ITEM_SLOT_LEFT_HAND) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("wizard") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("cyborg") if(!ismachineperson(M)) for(var/obj/item/organ/O in M.bodyparts) O.robotize(make_tough = 1) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), SLOT_HUD_GLASSES) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), ITEM_SLOT_EYES) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("syndicate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), SLOT_HUD_GLOVES) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),SLOT_HUD_WEAR_MASK) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), ITEM_SLOT_GLOVES) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),ITEM_SLOT_MASK) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("assistant") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("animu") - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("cultist") - M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("highlander") - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("clown") - M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), SLOT_HUD_WEAR_MASK) - M.equip_to_slot_or_del(new /obj/item/bikehorn(M), SLOT_HUD_LEFT_STORE) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), ITEM_SLOT_MASK) + M.equip_to_slot_or_del(new /obj/item/bikehorn(M), ITEM_SLOT_LEFT_POCKET) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("killer") - M.equip_to_slot_or_del(new /obj/item/clothing/under/misc/overalls(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), SLOT_HUD_GLOVES) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), SLOT_HUD_WEAR_MASK) - M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), SLOT_HUD_LEFT_STORE) - M.equip_to_slot_or_del(new /obj/item/scalpel(M), SLOT_HUD_RIGHT_STORE) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/misc/overalls(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), ITEM_SLOT_GLOVES) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), ITEM_SLOT_MASK) + M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), ITEM_SLOT_LEFT_POCKET) + M.equip_to_slot_or_del(new /obj/item/scalpel(M), ITEM_SLOT_RIGHT_POCKET) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) for(var/obj/item/carried_item in M.contents) if(!istype(carried_item, /obj/item/bio_chip)) carried_item.add_mob_blood(M) if("pirate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), SLOT_HUD_GLASSES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), ITEM_SLOT_EYES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("soviet") - M.equip_to_slot_or_del(new /obj/item/clothing/head/sovietofficerhat(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), SLOT_HUD_GLOVES) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/sovietcoat(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/under/new_soviet/sovietofficer(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/head/sovietofficerhat(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), ITEM_SLOT_GLOVES) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/sovietcoat(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/under/new_soviet/sovietofficer(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("officer") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), SLOT_HUD_GLOVES) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), SLOT_HUD_WEAR_MASK) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), SLOT_HUD_OUTER_SUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), SLOT_HUD_GLASSES) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), ITEM_SLOT_GLOVES) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), ITEM_SLOT_MASK) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), ITEM_SLOT_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), ITEM_SLOT_EYES) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) if("gladiator") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), SLOT_HUD_HEAD) - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/gladiator(M), SLOT_HUD_JUMPSUIT) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), SLOT_HUD_LEFT_EAR) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), SLOT_HUD_SHOES) - M.equip_to_slot_or_del(sword, SLOT_HUD_RIGHT_HAND) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), ITEM_SLOT_HEAD) + M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/gladiator(M), ITEM_SLOT_JUMPSUIT) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), ITEM_SLOT_LEFT_EAR) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), ITEM_SLOT_SHOES) + M.equip_to_slot_or_del(sword, ITEM_SLOT_RIGHT_HAND) else @@ -611,7 +611,7 @@ GLOBAL_LIST_EMPTY(multiverse) var/obj/item/card/id/W = new /obj/item/card/id if(duplicate_self) - var/duplicated_access = usr.get_item_by_slot(SLOT_HUD_WEAR_ID) + var/duplicated_access = usr.get_item_by_slot(ITEM_SLOT_ID) if(duplicated_access && istype(duplicated_access, /obj/item/card/id)) var/obj/item/card/id/duplicated_id = duplicated_access W.access = duplicated_id.access @@ -626,7 +626,7 @@ GLOBAL_LIST_EMPTY(multiverse) W.registered_name = M.real_name W.update_label(M.real_name) W.SetOwnerInfo(M) - M.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + M.equip_to_slot_or_del(W, ITEM_SLOT_ID) if(isvox(M)) M.dna.species.after_equip_job(null, M) //Nitrogen tanks @@ -759,38 +759,38 @@ GLOBAL_LIST_EMPTY(multiverse) switch(skeleton_type) if("roman") var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - victim.equip_to_slot_or_del(new hat(victim), SLOT_HUD_HEAD) - victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(victim), SLOT_HUD_JUMPSUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(victim), SLOT_HUD_SHOES) - victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND) - victim.equip_to_slot_or_del(new /obj/item/claymore(victim), SLOT_HUD_RIGHT_HAND) - victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK) + victim.equip_to_slot_or_del(new hat(victim), ITEM_SLOT_HEAD) + victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(victim), ITEM_SLOT_JUMPSUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(victim), ITEM_SLOT_SHOES) + victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND) + victim.equip_to_slot_or_del(new /obj/item/claymore(victim), ITEM_SLOT_RIGHT_HAND) + victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK) if("pirate") - victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(victim), SLOT_HUD_JUMPSUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(victim), SLOT_HUD_OUTER_SUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(victim), SLOT_HUD_HEAD) - victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), SLOT_HUD_SHOES) - victim.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(victim), SLOT_HUD_GLASSES) - victim.equip_to_slot_or_del(new /obj/item/claymore(victim), SLOT_HUD_RIGHT_HAND) - victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK) - victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND) + victim.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(victim), ITEM_SLOT_JUMPSUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(victim), ITEM_SLOT_OUTER_SUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(victim), ITEM_SLOT_HEAD) + victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), ITEM_SLOT_SHOES) + victim.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(victim), ITEM_SLOT_EYES) + victim.equip_to_slot_or_del(new /obj/item/claymore(victim), ITEM_SLOT_RIGHT_HAND) + victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK) + victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND) if("yand")//mine is an evil laugh - victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), SLOT_HUD_SHOES) - victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), SLOT_HUD_HEAD) - victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), SLOT_HUD_JUMPSUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), SLOT_HUD_OUTER_SUIT) - victim.equip_to_slot_or_del(new /obj/item/katana(victim), SLOT_HUD_RIGHT_HAND) - victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND) - victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK) + victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), ITEM_SLOT_SHOES) + victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), ITEM_SLOT_HEAD) + victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), ITEM_SLOT_JUMPSUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), ITEM_SLOT_OUTER_SUIT) + victim.equip_to_slot_or_del(new /obj/item/katana(victim), ITEM_SLOT_RIGHT_HAND) + victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND) + victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK) if("clown") - victim.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(victim), SLOT_HUD_JUMPSUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(victim), SLOT_HUD_SHOES) - victim.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(victim), SLOT_HUD_WEAR_MASK) - victim.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(victim), SLOT_HUD_HEAD) - victim.equip_to_slot_or_del(new /obj/item/bikehorn(victim), SLOT_HUD_LEFT_STORE) - victim.equip_to_slot_or_del(new /obj/item/claymore(victim), SLOT_HUD_RIGHT_HAND) - victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND) - victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK) + victim.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(victim), ITEM_SLOT_JUMPSUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(victim), ITEM_SLOT_SHOES) + victim.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(victim), ITEM_SLOT_MASK) + victim.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(victim), ITEM_SLOT_HEAD) + victim.equip_to_slot_or_del(new /obj/item/bikehorn(victim), ITEM_SLOT_LEFT_POCKET) + victim.equip_to_slot_or_del(new /obj/item/claymore(victim), ITEM_SLOT_RIGHT_HAND) + victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND) + victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK) ///Updates the mobs species and gear to anime /obj/item/necromantic_stone/proc/equip_heresy(mob/living/carbon/human/victim) @@ -812,13 +812,13 @@ GLOBAL_LIST_EMPTY(multiverse) victim.grab_ghost() victim.revive() - victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), SLOT_HUD_SHOES) - victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), SLOT_HUD_HEAD) - victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), SLOT_HUD_JUMPSUIT) - victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), SLOT_HUD_OUTER_SUIT) - victim.equip_to_slot_or_del(new /obj/item/katana(victim), SLOT_HUD_RIGHT_HAND) - victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), SLOT_HUD_LEFT_HAND) - victim.equip_to_slot_or_del(new /obj/item/spear(victim), SLOT_HUD_BACK) + victim.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(victim), ITEM_SLOT_SHOES) + victim.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(victim), ITEM_SLOT_HEAD) + victim.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(victim), ITEM_SLOT_JUMPSUIT) + victim.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(victim), ITEM_SLOT_OUTER_SUIT) + victim.equip_to_slot_or_del(new /obj/item/katana(victim), ITEM_SLOT_RIGHT_HAND) + victim.equip_to_slot_or_del(new /obj/item/shield/riot/roman(victim), ITEM_SLOT_LEFT_HAND) + victim.equip_to_slot_or_del(new /obj/item/spear(victim), ITEM_SLOT_BACK) if(!victim.real_name || victim.real_name == "unknown") victim.real_name = "Neko-chan" diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index f312d1f4de0..82217d065fd 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -118,7 +118,7 @@ wizard.additional_text = "Make sure the station pays for its actions against our diplomats. We might send more Wizards to the station if the situation is not developing in our favour." new_character.mind.add_antag_datum(wizard) new_character.forceMove(pick(GLOB.wizardstart)) - new_character.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/mugwort(harry), SLOT_HUD_IN_BACKPACK) + new_character.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/mugwort(harry), ITEM_SLOT_IN_BACKPACK) // The first wiznerd can get their mugwort from the wizard's den, new ones will also need mugwort! mages_made++ dust_if_respawnable(harry) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 0cc06bbd8b7..7e3c863c148 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -8,7 +8,7 @@ var/icon_state_full = "soulstone2" desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artifact's power." w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "bluespace=4;materials=5" /// Should we show rays? Triggered by a held body diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 624ac346f7b..671a32e3b46 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -1107,7 +1107,7 @@ magichead.voicechange = TRUE //NEEEEIIGHH if(!user.unEquip(user.wear_mask)) qdel(user.wear_mask) - user.equip_to_slot_if_possible(magichead, SLOT_HUD_WEAR_MASK, TRUE, TRUE) + user.equip_to_slot_if_possible(magichead, ITEM_SLOT_MASK, TRUE, TRUE) qdel(src) else to_chat(user, "I say thee neigh") diff --git a/code/game/gamemodes/wizard/wizloadouts.dm b/code/game/gamemodes/wizard/wizloadouts.dm index 8608d913277..480ee9dfd61 100644 --- a/code/game/gamemodes/wizard/wizloadouts.dm +++ b/code/game/gamemodes/wizard/wizloadouts.dm @@ -61,10 +61,10 @@ is_ragin_restricted = TRUE /datum/spell/lichdom/gunslinger/equip_lich(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), SLOT_HUD_GLOVES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), ITEM_SLOT_GLOVES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(H), ITEM_SLOT_JUMPSUIT) /datum/spellbook_entry/loadout/greytide name = "Tyde the Grey" @@ -87,9 +87,9 @@ new /obj/item/clothing/head/helmet/space/plasmaman/assistant(get_turf(user)) new /obj/item/clothing/under/plasmaman/assistant(get_turf(user)) user.unEquip(user.wear_id) - user.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/glorf, SLOT_HUD_JUMPSUIT) //Just in case they're naked + user.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/glorf, ITEM_SLOT_JUMPSUIT) //Just in case they're naked var/obj/item/card/id/wizid = new /obj/item/card/id(src) - user.equip_to_slot_or_del(wizid, SLOT_HUD_WEAR_ID) + user.equip_to_slot_or_del(wizid, ITEM_SLOT_ID) wizid.registered_name = user.real_name wizid.access = list(ACCESS_MAINT_TUNNELS) wizid.assignment = "Assistant" @@ -144,10 +144,10 @@ ADD_TRAIT(user, TRAIT_RESISTHEAT, MAGIC_TRAIT) ADD_TRAIT(user, TRAIT_RESISTHIGHPRESSURE, MAGIC_TRAIT) - user.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red/fireball(user), SLOT_HUD_OUTER_SUIT) - user.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red/fireball(user), SLOT_HUD_HEAD) + user.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red/fireball(user), ITEM_SLOT_OUTER_SUIT) + user.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red/fireball(user), ITEM_SLOT_HEAD) - user.equip_or_collect(new /obj/item/storage/belt/wands/fireballs(), SLOT_HUD_BELT) + user.equip_or_collect(new /obj/item/storage/belt/wands/fireballs(), ITEM_SLOT_BELT) /obj/item/clothing/suit/wizrobe/red/fireball name = "infernal robe" diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 3a896dcb5c1..e0fc7cde9c2 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -138,7 +138,7 @@ mask = /obj/item/clothing/mask/gas/explorer glasses = /obj/item/clothing/glasses/meson suit_store = /obj/item/tank/internals/emergency_oxygen - internals_slot = SLOT_HUD_SUIT_STORE + internals_slot = ITEM_SLOT_SUIT_STORE backpack_contents = list( /obj/item/flashlight/seclite=1,\ /obj/item/kitchen/knife/combat/survival=1, diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index beac738708e..96d190a3a6f 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -533,9 +533,9 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons A.Grant(user) in_inventory = TRUE if(!initial) - if(equip_sound && slot == slot_bitfield_to_slot(slot_flags)) + if(equip_sound && (slot & slot_flags)) playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE) - else if(slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND) + else if(slot & ITEM_SLOT_BOTH_HANDS) playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE) /obj/item/proc/item_action_slot_check(slot, mob/user) @@ -853,29 +853,29 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons return var/mob/owner = loc var/flags = slot_flags - if(flags & SLOT_FLAG_OCLOTHING) + if(flags & ITEM_SLOT_OUTER_SUIT) owner.update_inv_wear_suit() - if(flags & SLOT_FLAG_ICLOTHING) + if(flags & ITEM_SLOT_JUMPSUIT) owner.update_inv_w_uniform() - if(flags & SLOT_FLAG_GLOVES) + if(flags & ITEM_SLOT_GLOVES) owner.update_inv_gloves() - if(flags & SLOT_FLAG_EYES) + if(flags & ITEM_SLOT_EYES) owner.update_inv_glasses() - if(flags & SLOT_FLAG_EARS) + if(flags & ITEM_SLOT_BOTH_EARS) owner.update_inv_ears() - if(flags & SLOT_FLAG_MASK) + if(flags & ITEM_SLOT_MASK) owner.update_inv_wear_mask() - if(flags & SLOT_FLAG_HEAD) + if(flags & ITEM_SLOT_HEAD) owner.update_inv_head() - if(flags & SLOT_FLAG_FEET) + if(flags & ITEM_SLOT_SHOES) owner.update_inv_shoes() - if(flags & SLOT_FLAG_ID) + if(flags & ITEM_SLOT_ID) owner.update_inv_wear_id() - if(flags & SLOT_FLAG_BELT) + if(flags & ITEM_SLOT_BELT) owner.update_inv_belt() - if(flags & SLOT_FLAG_BACK) + if(flags & ITEM_SLOT_BACK) owner.update_inv_back() - if(flags & SLOT_FLAG_PDA) + if(flags & ITEM_SLOT_PDA) owner.update_inv_wear_pda() /// Called on cyborg items that need special charging behavior. Override as needed for specific items. diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index b398722ace5..5088cb75ba2 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -11,7 +11,7 @@ icon = 'icons/obj/crayons.dmi' icon_state = "crayonred" w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS attack_verb = list("attacked", "coloured") toolspeed = 1 var/colour = COLOR_RED @@ -307,7 +307,7 @@ name = "\improper Nanotrasen-brand Rapid Paint Applicator" desc = "A metallic container containing spray paint." icon_state = "spraycan_cap" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/capped = TRUE instant = TRUE validSurfaces = list(/turf/simulated/floor,/turf/simulated/wall) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 980fb3941bd..78067b05071 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -5,7 +5,7 @@ icon_state = "aicard" // aicard-full item_state = "electronic" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags = NOBLUDGEON var/flush = null origin_tech = "programming=3;materials=3" diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index d9304ac3bd9..3a0036f02f9 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/surgery.dmi' icon_state = "autopsy_scanner" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL origin_tech = "magnets=1;biotech=1" var/list/datum/autopsy_data_scanner/wdata = list() diff --git a/code/game/objects/items/devices/chameleon_counter.dm b/code/game/objects/items/devices/chameleon_counter.dm index bef3d4e5681..8bb7f7b25b5 100644 --- a/code/game/objects/items/devices/chameleon_counter.dm +++ b/code/game/objects/items/devices/chameleon_counter.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/device.dmi' icon_state = "cham_counter" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT item_state = "electronic" w_class = WEIGHT_CLASS_SMALL origin_tech = "syndicate=1;magnets=3" diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index f204e8499d1..660f7720aff 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/device.dmi' icon_state = "shield0" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT item_state = "electronic" throwforce = 5 throw_speed = 3 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index b5fe142722f..4d5166a3ed2 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -228,7 +228,7 @@ icon_state = "camera" item_state = "electropack" //spelling, a coders worst enemy. This part gave me trouble for a while. w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT can_overcharge = FALSE var/flash_max_charges = 5 var/flash_cur_charges = 5 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 1b4348b8deb..81776dc836c 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -6,7 +6,7 @@ item_state = "flashlight" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL = 200, MAT_GLASS = 100) actions_types = list(/datum/action/item_action/toggle_light) var/on = FALSE @@ -93,7 +93,7 @@ icon_state = "penlight" item_state = "" w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS flags = CONDUCT brightness_on = 2 var/colour = "blue" // Ink color diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index cab15b14213..2db44252dc3 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -12,7 +12,7 @@ icon_state = "geiger_off" item_state = "multitool" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags = NOBLUDGEON materials = list(MAT_METAL = 210, MAT_GLASS = 150) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index b7a45a27a06..3658d32a687 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -6,7 +6,7 @@ item_state = "pen" var/pointer_icon_state flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL=500, MAT_GLASS=500) w_class = WEIGHT_CLASS_SMALL //Increased to 2, because diodes are w_class 2. Conservation of matter. origin_tech = "combat=1;magnets=2" diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 7dac6e3640e..2cdeb556487 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -40,7 +40,7 @@ belt_icon = "light_replacer" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "magnets=3;engineering=4" force = 8 var/max_uses = 20 diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 683f6462f3d..fe601c9f7d7 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -5,7 +5,7 @@ icon_state = "pai" item_state = "electronic" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "programming=2" var/request_cooldown = 5 // five seconds var/last_request diff --git a/code/game/objects/items/devices/painter/painter.dm b/code/game/objects/items/devices/painter/painter.dm index fd1b2c86f80..5d3ad7cfcf4 100644 --- a/code/game/objects/items/devices/painter/painter.dm +++ b/code/game/objects/items/devices/painter/painter.dm @@ -5,7 +5,7 @@ usesound = 'sound/effects/spray2.ogg' flags = CONDUCT | NOBLUDGEON w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL = 5000, MAT_GLASS = 2000) /// Associative list of painter types, with the value being the datum. (For use in the radial menu) var/static/list/painter_type_list = list( diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index fd80d2149fc..7affcb8c1ba 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -6,7 +6,7 @@ item_state = "signaler" origin_tech = "bluespace=1" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throw_speed = 2 throw_range = 9 w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 963c81c35ec..309d1ee12ee 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -5,7 +5,7 @@ icon_state = "electropack0" item_state = "electropack" flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_HUGE materials = list(MAT_METAL = 10000, MAT_GLASS = 2500) /// The integrated signaler diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 6c3f728f8ce..cd0946c3411 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -11,7 +11,7 @@ materials = list(MAT_METAL = 200) canhear_range = 0 // can't hear headsets from very far away - slot_flags = SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_BOTH_EARS var/translate_binary = FALSE var/translate_hive = FALSE var/obj/item/encryptionkey/keyslot1 = null diff --git a/code/game/objects/items/devices/radio/radio_objects.dm b/code/game/objects/items/devices/radio/radio_objects.dm index a12c35c1a2d..3b01d9989c7 100644 --- a/code/game/objects/items/devices/radio/radio_objects.dm +++ b/code/game/objects/items/devices/radio/radio_objects.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems) var/static/list/blacklisted_areas = list(/area/adminconstruction, /area/tdome, /area/ruin/space/bubblegum_arena) flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throw_speed = 2 throw_range = 9 w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index a778c418085..ea68cc331d2 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -18,7 +18,7 @@ SLIME SCANNER icon = 'icons/obj/device.dmi' icon_state = "t-ray0" var/on = FALSE - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL item_state = "electronic" materials = list(MAT_METAL = 300) @@ -109,7 +109,7 @@ SLIME SCANNER item_state = "healthanalyzer" belt_icon = "health_analyzer" flags = CONDUCT | NOBLUDGEON - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL throwforce = 3 throw_speed = 3 @@ -373,7 +373,7 @@ SLIME SCANNER icon_state = "robotanalyzer" item_state = "analyzer" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 3 w_class = WEIGHT_CLASS_SMALL throw_speed = 5 @@ -520,7 +520,7 @@ SLIME SCANNER icon = 'icons/obj/device.dmi' icon_state = "atmos" item_state = "analyzer" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL flags = CONDUCT throwforce = 0 @@ -719,7 +719,7 @@ SLIME SCANNER item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 5 throw_speed = 4 throw_range = 20 @@ -797,7 +797,7 @@ SLIME SCANNER icon_state = "adv_spectrometer_s" item_state = "analyzer" origin_tech = "biotech=2" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL flags = CONDUCT throwforce = 0 @@ -854,7 +854,7 @@ SLIME SCANNER icon = 'icons/obj/device.dmi' icon_state = "bodyanalyzer_0" item_state = "healthanalyser" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL throwforce = 3 throw_speed = 5 diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm index cff8ec35179..bd5932287ac 100644 --- a/code/game/objects/items/devices/sensor_device.dm +++ b/code/game/objects/items/devices/sensor_device.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/device.dmi' icon_state = "scanner" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "programming=3;materials=3;magnets=3" var/datum/ui_module/crew_monitor/crew_monitor diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 6feda858d4c..5e20328ce2b 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -5,7 +5,7 @@ icon_state = "taperecorder_empty" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL = 180, MAT_GLASS = 90) force = 2 throwforce = 0 diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 1938d86a1cd..593b5289af6 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -4,7 +4,7 @@ item_state = "buildpipe" icon_state = "blank" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/list/part = null var/sabotaged = FALSE //Emagging limbs can have repercussions when installed as prosthetics. var/model_info = "Unbranded" diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 8becf16684d..70795a2d89a 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -7,7 +7,7 @@ belt_icon = "crowbar" usesound = 'sound/items/crowbar.ogg' flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 5 throwforce = 7 w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index b9a79fbcfdd..9cedc192c75 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -6,7 +6,7 @@ icon_state = "screwdriver_map" belt_icon = "screwdriver" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 5 w_class = WEIGHT_CLASS_TINY throwforce = 5 diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index 40edd403aaf..4226798d735 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -8,7 +8,7 @@ item_state = "welder" belt_icon = "welder" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 3 throwforce = 5 throw_speed = 3 @@ -27,7 +27,7 @@ pickup_sound = 'sound/items/handling/weldingtool_pickup.ogg' var/maximum_fuel = 20 /// Set to FALSE if it doesn't need fuel, but serves equally well as a cost modifier. - var/requires_fuel = TRUE + var/requires_fuel = TRUE /// If TRUE, fuel will regenerate over time. var/refills_over_time = FALSE /// Sound played when turned on. diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index cd68290806c..ff1ee43e3ff 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -5,7 +5,7 @@ icon_state = "cutters" belt_icon = "wirecutters_red" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 6 throw_speed = 3 throw_range = 7 diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index fc90779a97a..c63fb0bb230 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -5,7 +5,7 @@ icon_state = "wrench" belt_icon = "wrench" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 5 throwforce = 7 usesound = 'sound/items/ratchet.ogg' diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 1d23ae613ad..db100b340c2 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -325,7 +325,7 @@ icon_state = "katana" item_state = "katana" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too. force = 5 throwforce = 5 @@ -503,7 +503,7 @@ icon_state = "inflatable" item_state = "inflatable" icon = 'icons/obj/clothing/belts.dmi' - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 /* @@ -1171,7 +1171,7 @@ righthand_file = 'icons/mob/inhands/guns_righthand.dmi' hitsound = "swing_hit" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL=2000) w_class = WEIGHT_CLASS_NORMAL throwforce = 5 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 73bbf852c76..42635506edb 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -74,7 +74,7 @@ name = "Kentucky Fried Vox" icon_state = "fried_vox_empty" item_state = "fried_vox_empty" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD dog_fashion = /datum/dog_fashion/head/fried_vox_empty sprite_sheets = list( "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi', diff --git a/code/game/objects/items/weapons/batons.dm b/code/game/objects/items/weapons/batons.dm index f5e5ecb8ae3..003d2d2b4a5 100644 --- a/code/game/objects/items/weapons/batons.dm +++ b/code/game/objects/items/weapons/batons.dm @@ -11,7 +11,7 @@ icon = 'icons/obj/weapons/baton.dmi' icon_state = "baton" item_state = "classic_baton" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 12 //9 hit crit w_class = WEIGHT_CLASS_NORMAL // Settings @@ -155,7 +155,7 @@ desc = "A compact yet robust personal defense weapon. Can be concealed when folded." icon_state = "telebaton_0" // For telling what it is when mapping item_state = null - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL on = FALSE /// Force when concealed @@ -196,7 +196,7 @@ else to_chat(user, "You collapse [src].") item_state = null //no sprite for concealment even when in hand - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL force = force_off //not so robust now attack_verb = attack_verb_off diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 1769bd7ff6a..6cde633e308 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -94,7 +94,7 @@ var/total_mining_points = 0 var/list/access = list() var/registered_name = "Unknown" // The name registered_name on the card - slot_flags = SLOT_FLAG_ID + slot_flags = ITEM_SLOT_ID armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 100) resistance_flags = FIRE_PROOF | ACID_PROOF var/untrackable // Can not be tracked by AI's diff --git a/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm b/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm index ae130040936..32ef36bb8a6 100644 --- a/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm +++ b/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm @@ -11,7 +11,7 @@ throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK materials = list(MAT_METAL = 5000) resistance_flags = FIRE_PROOF origin_tech = "combat=1;plasmatech=2;engineering=2" diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index fbd824c38fe..25334872198 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -7,7 +7,7 @@ icon_state = "chronobackpack" item_state = "backpack" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK slowdown = 1 actions_types = list(/datum/action/item_action/equip_unequip_TED_Gun) var/obj/item/gun/energy/chrono_gun/PA = null @@ -36,7 +36,7 @@ user.put_in_hands(PA) /obj/item/chrono_eraser/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_BACK) + if(slot == ITEM_SLOT_BACK) return 1 diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index c6e7465bf7c..35efab9e071 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -22,7 +22,7 @@ LIGHTERS ARE IN LIGHTERS.DM icon_state = "cigoff" item_state = "cigoff" throw_speed = 0.5 - slot_flags = SLOT_FLAG_MASK + slot_flags = ITEM_SLOT_MASK w_class = WEIGHT_CLASS_TINY body_parts_covered = null attack_verb = null @@ -99,7 +99,7 @@ LIGHTERS ARE IN LIGHTERS.DM var/mob/living/carbon/M = target if(istype(M) && user.zone_selected == "mouth" && !M.wear_mask && user.a_intent == INTENT_HELP) user.unEquip(src, TRUE) - M.equip_to_slot_if_possible(src, SLOT_HUD_WEAR_MASK) + M.equip_to_slot_if_possible(src, ITEM_SLOT_MASK) if(target != user) user.visible_message( "[user] slips \a [name] into the mouth of [M].", @@ -488,7 +488,7 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/holo_cigar/equipped(mob/user, slot, initial) . = ..() - if(enabled && slot == SLOT_HUD_WEAR_MASK) + if(enabled && slot == ITEM_SLOT_MASK) if(!HAS_TRAIT_FROM(user, TRAIT_BADASS, HOLO_CIGAR)) ADD_TRAIT(user, TRAIT_BADASS, HOLO_CIGAR) to_chat(user, "You feel more badass while smoking [src].") diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 392ff0f398a..7a818cc6f47 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -72,7 +72,7 @@ icon_state = "clown_recorder" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL = 180, MAT_GLASS = 90) force = 2 throwforce = 0 diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index feb1237b612..77bc144bd8e 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/defib.dmi' icon_state = "defibunit" item_state = "defibunit" - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK force = 5 throwforce = 6 w_class = WEIGHT_CLASS_BULKY @@ -163,12 +163,12 @@ /obj/item/defibrillator/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_BACK) + if(slot != ITEM_SLOT_BACK) remove_paddles(user) update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_BACK) + if(slot == ITEM_SLOT_BACK) return TRUE /obj/item/defibrillator/proc/remove_paddles(mob/user) // from your hands @@ -206,7 +206,7 @@ item_state = "defibcompact" sprite_sheets = null //Because Vox had the belt defibrillator sprites in back.dm w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 origin_tech = "biotech=5" @@ -216,7 +216,7 @@ update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_BELT) + if(slot == ITEM_SLOT_BELT) return TRUE /obj/item/defibrillator/compact/combat diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index 475a9e02aee..462a9b72235 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -10,7 +10,7 @@ throw_speed = 3 throw_range = 7 flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT active = FALSE det_time = 5 SECONDS display_timer = FALSE diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 212088822e7..0d2c6535098 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -8,7 +8,7 @@ throw_speed = 3 throw_range = 20 flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT resistance_flags = FLAMMABLE max_integrity = 40 /// Has the pin been pulled? diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 49908095d14..b6943f10282 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -6,7 +6,7 @@ det_time = 2 SECONDS modifiable_timer = FALSE item_state = "smoke" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/datum/effect_system/smoke_spread/bad/smoke /obj/item/grenade/smokebomb/Initialize(mapload) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 4d3826f3f3e..cc6288bb74c 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -42,7 +42,7 @@ icon_state = "handcuff" belt_icon = "handcuffs" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 5 w_class = WEIGHT_CLASS_SMALL throw_speed = 2 diff --git a/code/game/objects/items/weapons/highlander_swords.dm b/code/game/objects/items/weapons/highlander_swords.dm index b0e6e5b91e0..b9dcdfabbc6 100644 --- a/code/game/objects/items/weapons/highlander_swords.dm +++ b/code/game/objects/items/weapons/highlander_swords.dm @@ -28,7 +28,7 @@ if(!ishuman(user) || !user.mind) return var/mob/living/carbon/human/H = user - if(slot == SLOT_HUD_RIGHT_HAND || slot == SLOT_HUD_LEFT_HAND) + if(slot & ITEM_SLOT_BOTH_HANDS) if(H.mind.martial_art != style) style.teach(H, TRUE) to_chat(H, "THERE CAN ONLY BE ONE!") diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index f51d1493347..12333965c90 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -134,7 +134,7 @@ item_state = "godstaff-red" w_class = WEIGHT_CLASS_HUGE force = 5 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK /obj/item/nullrod/staff/Initialize(mapload) . = ..() @@ -154,7 +154,7 @@ item_state = "claymore" desc = "A weapon fit for a crusade!" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK|SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT sharp = TRUE hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -174,7 +174,7 @@ icon_state = "cultblade" item_state = "darkbalde" desc = "Spread the glory of the dark gods!" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT hitsound = 'sound/hallucinations/growl1.ogg' /obj/item/nullrod/claymore/chainsaw_sword @@ -183,7 +183,7 @@ icon_state = "chainswordon" item_state = "chainswordon" desc = "Suffer not a heretic to live." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT attack_verb = list("sawed", "torn", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsaw.ogg' @@ -193,14 +193,14 @@ icon_state = "swordon" item_state = "swordon" desc = "The blade glows with the power of faith. Or possibly a battery." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /obj/item/nullrod/claymore/katana name = "hanzo steel" desc = "Capable of cutting clean through a holy claymore." icon_state = "katana" item_state = "katana" - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK /obj/item/nullrod/claymore/multiverse name = "extradimensional blade" @@ -208,7 +208,7 @@ icon = 'icons/obj/weapons/magical_weapons.dmi' icon_state = "multiverse" item_state = "multiverse" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /obj/item/nullrod/claymore/saber name = "light energy blade" @@ -217,7 +217,7 @@ icon_state = "swordblue" item_state = "swordblue" desc = "If you strike me down, I shall become more robust than you can possibly imagine." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /obj/item/nullrod/claymore/saber/red name = "dark energy blade" @@ -238,7 +238,7 @@ righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' icon_state = "sord" item_state = "sord" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 4.13 throwforce = 1 hitsound = 'sound/weapons/bladeslice.ogg' @@ -252,7 +252,7 @@ desc = "Ask not for whom the bell tolls..." w_class = WEIGHT_CLASS_BULKY armour_penetration_flat = 30 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK sharp = TRUE attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/rapierhit.ogg' @@ -390,7 +390,7 @@ icon_state = "hammeron" item_state = "hammeron" desc = "This war hammer cost the chaplain fourty thousand space dollars." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_HUGE attack_verb = list("smashed", "bashed", "hammered", "crunched") @@ -425,7 +425,7 @@ icon = 'icons/obj/clothing/hats.dmi' icon_state = "fedora" item_state = "fedora" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD force = 0 throw_speed = 4 throw_range = 7 @@ -493,7 +493,7 @@ item_state = "bostaff0" w_class = WEIGHT_CLASS_BULKY force = 13 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK sharp = FALSE hitsound = "swing_hit" attack_verb = list("smashed", "slammed", "whacked", "thwacked") @@ -628,7 +628,7 @@ /obj/item/nullrod/rosary/bread/equipped(mob/user, slot, initial = FALSE) . = ..() - if(ishuman(user) && (slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)) + if(ishuman(user) && (slot & ITEM_SLOT_BOTH_HANDS)) START_PROCESSING(SSobj, src) else STOP_PROCESSING(SSobj, src) @@ -672,7 +672,7 @@ item_state = "godstaff-red" w_class = WEIGHT_CLASS_HUGE force = 5 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK var/team_color = "red" var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robes = null //the robes linked with this staff diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index b12c2c8a82e..1c5b403562e 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -10,7 +10,7 @@ w_class = WEIGHT_CLASS_TINY throwforce = 4 flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT attack_verb = null resistance_flags = FIRE_PROOF var/lit = FALSE diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm index 9aeedf0b9d8..8391118d92b 100644 --- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm +++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm @@ -406,7 +406,7 @@ inhand_y_dimension = 64 icon_state = "cleaving_saw" icon_state_on = "cleaving_saw_open" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT is_a_cleaving_saw = TRUE var/attack_verb_off = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut") attack_verb_on = list("cleaved", "swiped", "slashed", "chopped") diff --git a/code/game/objects/items/weapons/melee/melee_misc.dm b/code/game/objects/items/weapons/melee/melee_misc.dm index 99c3652f28e..c3296817ff9 100644 --- a/code/game/objects/items/weapons/melee/melee_misc.dm +++ b/code/game/objects/items/weapons/melee/melee_misc.dm @@ -10,7 +10,7 @@ icon_state = "chain" item_state = "chain" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 10 throwforce = 7 w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 604b90b7c54..f5c0ccbcb1f 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -21,7 +21,7 @@ name = "riot shield" desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." icon_state = "riot" - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK force = 10 throwforce = 5 throw_speed = 2 @@ -163,7 +163,7 @@ throwforce = 5 throw_speed = 2 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK to_chat(user, "You extend \the [src].") icon_state = "teleriot[HAS_TRAIT(src, TRAIT_ITEM_ACTIVE)]" playsound(loc, 'sound/weapons/batonextend.ogg', 50, TRUE) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index e49cb9b6306..72019a5b20c 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -11,7 +11,7 @@ lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK //ERROOOOO + slot_flags = ITEM_SLOT_BACK //ERROOOOO max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 21 storage_slots = 21 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 7cdfc1bef79..132f478a121 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -24,7 +24,7 @@ allow_quick_empty = TRUE display_contents_with_number = 1 // should work fine now use_to_pickup = 1 - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT //////////////////////////////////////// // MARK: Trash bag @@ -117,7 +117,7 @@ icon = 'icons/obj/trash.dmi' icon_state = "plasticbag" item_state = "plasticbag" - slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_BULKY max_w_class = WEIGHT_CLASS_SMALL @@ -127,14 +127,14 @@ cant_hold = list(/obj/item/disk/nuclear) /obj/item/storage/bag/plasticbag/mob_can_equip(mob/M, slot, disable_warning = FALSE) - if(slot == SLOT_HUD_HEAD && length(contents)) + if(slot == ITEM_SLOT_HEAD && length(contents)) to_chat(M, "You need to empty the bag first!") return FALSE return ..() /obj/item/storage/bag/plasticbag/equipped(mob/user, slot) - if(slot==SLOT_HUD_HEAD) + if(slot==ITEM_SLOT_HEAD) storage_slots = 0 START_PROCESSING(SSobj, src) return @@ -143,7 +143,7 @@ if(is_equipped()) if(ishuman(loc)) var/mob/living/carbon/human/H = loc - if(H.get_item_by_slot(SLOT_HUD_HEAD) == src) + if(H.get_item_by_slot(ITEM_SLOT_HEAD) == src) if(H.internal) return H.AdjustLoseBreath(2 SECONDS) @@ -161,7 +161,7 @@ icon = 'icons/obj/mining.dmi' icon_state = "satchel" origin_tech = "engineering=2" - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS w_class = WEIGHT_CLASS_NORMAL storage_slots = 10 max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class @@ -473,7 +473,7 @@ icon = 'icons/obj/mining.dmi' icon_state = "satchel" origin_tech = "engineering=2" - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS w_class = WEIGHT_CLASS_NORMAL storage_slots = 15 max_combined_w_class = 60 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 9f8d789aa13..d60d9d8b650 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -6,7 +6,7 @@ item_state = "utility" lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi' - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 | BLOCKS_LIGHT_2 attack_verb = list("whipped", "lashed", "disciplined") max_integrity = 300 diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 77db50a1f2b..1dad0fb1fb6 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -112,7 +112,7 @@ item_state = "candlebox5" storage_slots = 5 throwforce = 2 - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /obj/item/storage/fancy/candle_box/Initialize(mapload) . = ..() @@ -189,7 +189,7 @@ storage_slots = 10 w_class = WEIGHT_CLASS_TINY max_w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT drop_sound = 'sound/items/handling/matchbox_drop.ogg' pickup_sound = 'sound/items/handling/matchbox_pickup.ogg' can_hold = list(/obj/item/match) @@ -228,7 +228,7 @@ belt_icon = "patch_pack" w_class = WEIGHT_CLASS_SMALL throwforce = 2 - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT storage_slots = 6 max_combined_w_class = 6 can_hold = list(/obj/item/clothing/mask/cigarette, @@ -257,7 +257,7 @@ var/obj/item/I = contents[num] if(istype(I, /obj/item/clothing/mask/cigarette)) var/obj/item/clothing/mask/cigarette/C = I - M.equip_to_slot_if_possible(C, SLOT_HUD_WEAR_MASK) + M.equip_to_slot_if_possible(C, ITEM_SLOT_MASK) if(M != user) user.visible_message( "[user] takes \a [C.name] out of [src] and gives it to [M].", diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 793b4302b6a..ef502b7a349 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -29,7 +29,7 @@ cant_hold = list( /obj/item/screwdriver/power ) - slot_flags = SLOT_FLAG_ID + slot_flags = ITEM_SLOT_ID var/obj/item/card/id/front_id = null diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 2b0976e3af5..304b679137f 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -6,7 +6,7 @@ var/base_icon = "stunbaton" item_state = null belt_icon = "stunbaton" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 10 throwforce = 7 origin_tech = "combat=2" @@ -89,7 +89,7 @@ return cell /obj/item/melee/baton/mob_can_equip(mob/user, slot, disable_warning = TRUE) // disable the warning - if(turned_on && (slot == SLOT_HUD_BELT || slot == SLOT_HUD_SUIT_STORE)) + if(turned_on && (slot == ITEM_SLOT_BELT || slot == ITEM_SLOT_SUIT_STORE)) to_chat(user, "You can't equip [src] while it's active!") return FALSE return ..() @@ -313,7 +313,7 @@ knockdown_duration = 6 SECONDS w_class = WEIGHT_CLASS_BULKY hitcost = 2000 - slot_flags = SLOT_FLAG_BACK | SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too. var/obj/item/assembly/igniter/sparkler = null diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index c635c7816a9..83eb5a4c03b 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -103,7 +103,7 @@ /obj/item/tank/internals/plasmaman/belt icon_state = "plasmaman_tank_belt" item_state = "plasmaman_tank_belt" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 force = 5 volume = 35 @@ -131,7 +131,7 @@ desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it." icon_state = "emergency" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 w_class = WEIGHT_CLASS_SMALL force = 4 diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 0cb398e24c6..4b73b7f3342 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -2,7 +2,7 @@ name = "tank" icon = 'icons/obj/tank.dmi' flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK hitsound = 'sound/weapons/smash.ogg' w_class = WEIGHT_CLASS_NORMAL pressure_resistance = ONE_ATMOSPHERE * 5 diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 2fd912cf450..0c0a8c237d1 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -6,7 +6,7 @@ icon_state = "waterbackpack" item_state = "waterbackpack" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK slowdown = 1 actions_types = list(/datum/action/item_action/toggle_mister) max_integrity = 200 @@ -32,13 +32,13 @@ toggle_mister(user) /obj/item/watertank/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_BACK) + if(slot == ITEM_SLOT_BACK) return TRUE /obj/item/watertank/proc/toggle_mister(mob/user) if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user)) return - if(user.get_item_by_slot(SLOT_HUD_BACK) != src) + if(user.get_item_by_slot(ITEM_SLOT_BACK) != src) to_chat(user, "The watertank needs to be on your back to use.") return on = !on @@ -62,7 +62,7 @@ /obj/item/watertank/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_BACK) + if(slot != ITEM_SLOT_BACK) remove_noz() /obj/item/watertank/proc/remove_noz() diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index ab111432411..6390fe821df 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -38,7 +38,7 @@ user.visible_message("[user] tapes [M]'s mouth shut!", "You cover [M == user ? "your own" : "[M]'s"] mouth with a piece of duct tape.[M == user ? null : " That will shut them up."]") var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag - M.equip_to_slot(G, SLOT_HUD_WEAR_MASK) + M.equip_to_slot(G, ITEM_SLOT_MASK) G.add_fingerprint(user) /obj/item/stack/tape_roll/update_icon_state() diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 23322162e6c..3131a6acf88 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -14,7 +14,7 @@ throwforce = 15 sharp = TRUE w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK toolspeed = 0.25 attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") hitsound = 'sound/weapons/bladeslice.ogg' @@ -267,7 +267,7 @@ righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' force = 10 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK var/force_unwielded = 10 var/force_wielded = 18 throwforce = 20 @@ -579,7 +579,7 @@ icon_state = "singulohammer0" base_icon_state = "singulohammer" flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK force = 5 throwforce = 15 throw_range = 1 @@ -650,7 +650,7 @@ icon_state = "mjollnir0" base_icon_state = "mjollnir" flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK force = 5 throwforce = 30 throw_range = 7 @@ -699,7 +699,7 @@ icon_state = "knighthammer0" base_icon_state = "knighthammer" flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK force = 5 throwforce = 15 throw_range = 1 @@ -854,7 +854,7 @@ . += "It is missing a pyroclastic anomaly core." /obj/item/clothing/gloves/color/black/pyro_claws/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLOVES) + if(slot == ITEM_SLOT_GLOVES) return TRUE /obj/item/clothing/gloves/color/black/pyro_claws/ui_action_click(mob/user) @@ -1058,7 +1058,7 @@ sharp = TRUE damtype = BURN w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK throwforce = 15 toolspeed = 0.25 attack_verb = list("enlightened", "enforced", "cleaved", "stabbed", "whacked") diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index b47ad6db64b..994d92e8c71 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -6,7 +6,7 @@ desc = "A banhammer." icon = 'icons/obj/toy.dmi' icon_state = "toyhammer" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 7 @@ -32,7 +32,7 @@ icon_state = "sord" lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 2 throwforce = 1 w_class = WEIGHT_CLASS_NORMAL @@ -54,7 +54,7 @@ item_state = "claymore" flags = CONDUCT hitsound = 'sound/weapons/bladeslice.ogg' - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 40 throwforce = 10 sharp = TRUE @@ -86,7 +86,7 @@ icon_state = "katana" item_state = "katana" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too. force = 40 throwforce = 10 diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm index 680b69a7371..27ed8bbb4a9 100644 --- a/code/game/objects/mail.dm +++ b/code/game/objects/mail.dm @@ -239,7 +239,7 @@ lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL origin_tech = "magnets=1" /// The reference to the envelope that is currently stored in the mail scanner. It will be cleared upon confirming a correct delivery diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 522fc7261de..c0191a2bbe6 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -19,7 +19,7 @@ LINEN BINS w_class = WEIGHT_CLASS_TINY item_color = "white" resistance_flags = FLAMMABLE - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK dog_fashion = /datum/dog_fashion/head/ghost dyeing_key = DYE_REGISTRY_BEDSHEET diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b50e77354b0..54387ebc385 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1178,8 +1178,8 @@ M.loc = prison_cell if(ishuman(M)) var/mob/living/carbon/human/prisoner = M - prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), SLOT_HUD_JUMPSUIT) - prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), SLOT_HUD_SHOES) + prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), ITEM_SLOT_JUMPSUIT) + prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), ITEM_SLOT_SHOES) to_chat(M, "You have been sent to the prison station!") log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") @@ -1399,8 +1399,8 @@ if(ishuman(M)) var/mob/living/carbon/human/observer = M - observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit(observer), SLOT_HUD_JUMPSUIT) - observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), SLOT_HUD_SHOES) + observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit(observer), ITEM_SLOT_JUMPSUIT) + observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), ITEM_SLOT_SHOES) if(isliving(M)) var/mob/living/L = M L.Paralyse(10 SECONDS) @@ -1812,9 +1812,9 @@ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - H.equip_to_slot_or_del( new /obj/item/food/cookie(H), SLOT_HUD_LEFT_HAND ) + H.equip_to_slot_or_del( new /obj/item/food/cookie(H), ITEM_SLOT_LEFT_HAND ) if(!(istype(H.l_hand,/obj/item/food/cookie))) - H.equip_to_slot_or_del( new /obj/item/food/cookie(H), SLOT_HUD_RIGHT_HAND ) + H.equip_to_slot_or_del( new /obj/item/food/cookie(H), ITEM_SLOT_RIGHT_HAND ) if(!(istype(H.r_hand,/obj/item/food/cookie))) log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") message_admins("[key_name_admin(H)] has [H.p_their()] hands full, so [H.p_they()] did not receive [H.p_their()] cookie, spawned by [key_name_admin(src.owner)].") @@ -2153,7 +2153,7 @@ evilcookie.bitesize = 100 evilcookie.flags = NODROP | DROPDEL H.drop_l_hand() - H.equip_to_slot_or_del(evilcookie, SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(evilcookie, ITEM_SLOT_LEFT_HAND) logmsg = "a mutagen cookie." if("Hellwater Cookie") var/obj/item/food/cookie/evilcookie = new /obj/item/food/cookie @@ -2162,7 +2162,7 @@ evilcookie.bitesize = 100 evilcookie.flags = NODROP | DROPDEL H.drop_l_hand() - H.equip_to_slot_or_del(evilcookie, SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(evilcookie, ITEM_SLOT_LEFT_HAND) logmsg = "a hellwater cookie." if("Hunter") ADD_TRAIT(H, TRAIT_BADDNA, "smiting") @@ -2211,7 +2211,7 @@ if(H.head) H.unEquip(H.head, TRUE) var/obj/item/clothing/head/sombrero/shamebrero/S = new(H.loc) - H.equip_to_slot_or_del(S, SLOT_HUD_HEAD) + H.equip_to_slot_or_del(S, ITEM_SLOT_HEAD) logmsg = "shamebrero" if("Nugget") H.Weaken(12 SECONDS, TRUE) @@ -2969,8 +2969,8 @@ W.plane = initial(W.plane) //teleport person to cell H.loc = pick(GLOB.prisonwarp) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), SLOT_HUD_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), ITEM_SLOT_SHOES) else //teleport security person H.loc = pick(GLOB.prisonsecuritywarp) @@ -3572,7 +3572,7 @@ dust_if_respawnable(C) hunter_mob.equipOutfit(O, FALSE) var/obj/item/pinpointer/advpinpointer/N = new /obj/item/pinpointer/advpinpointer(hunter_mob) - hunter_mob.equip_to_slot_or_del(N, SLOT_HUD_IN_BACKPACK) + hunter_mob.equip_to_slot_or_del(N, ITEM_SLOT_IN_BACKPACK) N.mode = 3 //MODE_ADV, not defined here N.setting = 2 //SETTING_OBJECT, not defined here N.target = H diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 08944435cec..c64f7dc8357 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -477,7 +477,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) id.registered_name = H.real_name id.assignment = "Captain" id.name = "[id.registered_name]'s ID Card ([id.assignment])" - H.equip_to_slot_or_del(id, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(id, ITEM_SLOT_ID) H.update_inv_wear_id() else alert("Invalid mob") diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm index e0d12efd6d2..7abd5b1b20b 100644 --- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm +++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm @@ -141,16 +141,16 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0) /mob/living/carbon/human/proc/equip_syndicate_infiltrator(syndicate_leader_selected = 0, num_tc, flag_mgmt) // Storage items - equip_to_slot_or_del(new /obj/item/storage/backpack(src), SLOT_HUD_BACK) - equip_to_slot_or_del(new /obj/item/storage/box/survival(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(src), SLOT_HUD_JUMPSUIT) + equip_to_slot_or_del(new /obj/item/storage/backpack(src), ITEM_SLOT_BACK) + equip_to_slot_or_del(new /obj/item/storage/box/survival(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(src), ITEM_SLOT_JUMPSUIT) if(!flag_mgmt) - equip_to_slot_or_del(new /obj/item/flashlight(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/storage/belt/utility/full/multitool(src), SLOT_HUD_BELT) + equip_to_slot_or_del(new /obj/item/flashlight(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/storage/belt/utility/full/multitool(src), ITEM_SLOT_BELT) var/obj/item/clothing/gloves/combat/G = new /obj/item/clothing/gloves/combat(src) G.name = "black gloves" - equip_to_slot_or_del(G, SLOT_HUD_GLOVES) + equip_to_slot_or_del(G, ITEM_SLOT_GLOVES) // Implants: // Uplink @@ -167,11 +167,11 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0) // Radio & PDA var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/syndteam(src) R.set_frequency(SYNDTEAM_FREQ) - equip_to_slot_or_del(R, SLOT_HUD_LEFT_EAR) - equip_or_collect(new /obj/item/pda(src), SLOT_HUD_IN_BACKPACK) + equip_to_slot_or_del(R, ITEM_SLOT_LEFT_EAR) + equip_or_collect(new /obj/item/pda(src), ITEM_SLOT_IN_BACKPACK) // Other gear - equip_to_slot_or_del(new /obj/item/clothing/shoes/chameleon/noslip(src), SLOT_HUD_SHOES) + equip_to_slot_or_del(new /obj/item/clothing/shoes/chameleon/noslip(src), ITEM_SLOT_SHOES) var/obj/item/card/id/syndicate/W = new(src) if(flag_mgmt) @@ -191,6 +191,6 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0) W.access += get_syndicate_access("Syndicate Operative") W.name = "[real_name]'s ID Card ([W.assignment])" W.registered_name = real_name - equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + equip_to_slot_or_del(W, ITEM_SLOT_ID) return 1 diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 3c921066da3..ce39aea36f8 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -30,12 +30,12 @@ continue qdel(I) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), SLOT_HUD_LEFT_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/claymore/highlander(H), SLOT_HUD_RIGHT_HAND) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/pinpointer(H.loc), SLOT_HUD_LEFT_STORE) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), ITEM_SLOT_LEFT_EAR) + H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/claymore/highlander(H), ITEM_SLOT_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/pinpointer(H.loc), ITEM_SLOT_LEFT_POCKET) var/obj/item/card/id/W = new(H) W.name = "[H.real_name]'s ID Card" @@ -44,7 +44,7 @@ W.access += get_all_centcom_access() W.assignment = "Highlander" W.registered_name = H.real_name - H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) H.dna.species.after_equip_job(null, H) H.regenerate_icons() @@ -79,13 +79,13 @@ messages.Add(H.mind.prepare_announce_objectives(FALSE)) to_chat(H, chat_box_red(messages.Join("
"))) - var/obj/item/slot_item_ID = H.get_item_by_slot(SLOT_HUD_WEAR_ID) + var/obj/item/slot_item_ID = H.get_item_by_slot(ITEM_SLOT_ID) qdel(slot_item_ID) - var/obj/item/slot_item_hand = H.get_item_by_slot(SLOT_HUD_RIGHT_HAND) + var/obj/item/slot_item_hand = H.get_item_by_slot(ITEM_SLOT_RIGHT_HAND) H.unEquip(slot_item_hand) var/obj/item/multisword/pure_evil/multi = new(H) - H.equip_to_slot_or_del(multi, SLOT_HUD_RIGHT_HAND) + H.equip_to_slot_or_del(multi, ITEM_SLOT_RIGHT_HAND) var/obj/item/card/id/W = new(H) W.icon_state = "centcom" @@ -94,7 +94,7 @@ W.assignment = "Multiverse Summoner" W.registered_name = H.real_name W.update_label(H.real_name) - H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) H.update_icons() diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm index 80ca1f922ad..6301cfb1477 100644 --- a/code/modules/admin/verbs/onlyoneteam.dm +++ b/code/modules/admin/verbs/onlyoneteam.dm @@ -23,14 +23,14 @@ to_chat(H, "You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs.") - H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), SLOT_HUD_LEFT_EAR) - H.equip_to_slot_or_del(new /obj/item/beach_ball/dodgeball_team(H), SLOT_HUD_RIGHT_HAND) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), SLOT_HUD_SHOES) + H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), ITEM_SLOT_LEFT_EAR) + H.equip_to_slot_or_del(new /obj/item/beach_ball/dodgeball_team(H), ITEM_SLOT_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), ITEM_SLOT_SHOES) if(!team_toggle) GLOB.team_alpha += H - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/red/dodgeball(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/red/dodgeball(H), ITEM_SLOT_JUMPSUIT) var/obj/item/card/id/W = new(H) W.name = "[H.real_name]'s ID Card" W.icon_state = "centcom" @@ -38,12 +38,12 @@ W.access += get_all_centcom_access() W.assignment = "Professional Pee-Wee League Dodgeball Player" W.registered_name = H.real_name - H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) else GLOB.team_bravo += H - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/blue/dodgeball(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/blue/dodgeball(H), ITEM_SLOT_JUMPSUIT) var/obj/item/card/id/W = new(H) W.name = "[H.real_name]'s ID Card" W.icon_state = "centcom" @@ -51,7 +51,7 @@ W.access += get_all_centcom_access() W.assignment = "Professional Pee-Wee League Dodgeball Player" W.registered_name = H.real_name - H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) team_toggle = !team_toggle H.dna.species.after_equip_job(null, H) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 0fb7db499b5..6fe5399fd74 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -37,8 +37,8 @@ M.loc = pick(GLOB.prisonwarp) if(ishuman(M)) var/mob/living/carbon/human/prisoner = M - prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), SLOT_HUD_JUMPSUIT) - prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), SLOT_HUD_SHOES) + prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), ITEM_SLOT_JUMPSUIT) + prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), ITEM_SLOT_SHOES) spawn(50) to_chat(M, "You have been sent to the prison station!") log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index da8390b76bc..5ea81e30b0f 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -124,36 +124,36 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0) /mob/living/carbon/human/proc/equip_syndicate_commando(is_leader = FALSE, full_gear = FALSE) var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt/syndteam(src) R.set_frequency(SYNDTEAM_FREQ) - equip_to_slot_or_del(R, SLOT_HUD_LEFT_EAR) - equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), SLOT_HUD_JUMPSUIT) + equip_to_slot_or_del(R, ITEM_SLOT_LEFT_EAR) + equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), ITEM_SLOT_JUMPSUIT) if(!full_gear) - equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(src), SLOT_HUD_SHOES) - equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), SLOT_HUD_GLOVES) + equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(src), ITEM_SLOT_SHOES) + equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), ITEM_SLOT_GLOVES) - equip_to_slot_or_del(new /obj/item/storage/backpack/security(src), SLOT_HUD_BACK) - equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(src), SLOT_HUD_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/storage/backpack/security(src), ITEM_SLOT_BACK) + equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(src), ITEM_SLOT_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/gun/projectile/revolver(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/ammo_box/a357(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), SLOT_HUD_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/gun/projectile/revolver(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/ammo_box/a357(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), ITEM_SLOT_IN_BACKPACK) if(is_leader) - equip_to_slot_or_del(new /obj/item/pinpointer(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/disk/nuclear/unrestricted(src), SLOT_HUD_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/pinpointer(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/disk/nuclear/unrestricted(src), ITEM_SLOT_IN_BACKPACK) else - equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), SLOT_HUD_IN_BACKPACK) - equip_to_slot_or_del(new /obj/item/card/emag(src), SLOT_HUD_RIGHT_STORE) - equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber/red(src), SLOT_HUD_LEFT_STORE) + equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), ITEM_SLOT_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/card/emag(src), ITEM_SLOT_RIGHT_POCKET) + equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber/red(src), ITEM_SLOT_LEFT_POCKET) if(full_gear) - equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(src), SLOT_HUD_WEAR_MASK) - equip_to_slot_or_del(new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src), SLOT_HUD_OUTER_SUIT) - equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), SLOT_HUD_GLASSES) - equip_to_slot_or_del(new /obj/item/storage/belt/military/sst(src), SLOT_HUD_BELT) - equip_to_slot_or_del(new /obj/item/tank/internals/oxygen/red(src), SLOT_HUD_SUIT_STORE) - equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/elite(src), SLOT_HUD_SHOES) - equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/l6_saw(src), SLOT_HUD_RIGHT_HAND) - equip_to_slot_or_del(new /obj/item/ammo_box/magazine/mm556x45(src), SLOT_HUD_IN_BACKPACK) + equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(src), ITEM_SLOT_MASK) + equip_to_slot_or_del(new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src), ITEM_SLOT_OUTER_SUIT) + equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), ITEM_SLOT_EYES) + equip_to_slot_or_del(new /obj/item/storage/belt/military/sst(src), ITEM_SLOT_BELT) + equip_to_slot_or_del(new /obj/item/tank/internals/oxygen/red(src), ITEM_SLOT_SUIT_STORE) + equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/elite(src), ITEM_SLOT_SHOES) + equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/l6_saw(src), ITEM_SLOT_RIGHT_HAND) + equip_to_slot_or_del(new /obj/item/ammo_box/magazine/mm556x45(src), ITEM_SLOT_IN_BACKPACK) var/obj/item/bio_chip/dust/D = new /obj/item/bio_chip/dust(src) D.implant(src) @@ -163,7 +163,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0) W.assignment = "Syndicate Commando" W.access += get_syndicate_access(W.assignment) W.registered_name = real_name - equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + equip_to_slot_or_del(W, ITEM_SLOT_ID) return 1 diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm index 9d037689bbe..7a94fbf46e4 100644 --- a/code/modules/antagonists/changeling/powers/biodegrade.dm +++ b/code/modules/antagonists/changeling/powers/biodegrade.dm @@ -17,7 +17,7 @@ var/used = FALSE // only one form of shackles removed per use if(user.handcuffed) - var/obj/O = user.get_item_by_slot(SLOT_HUD_HANDCUFFED) + var/obj/O = user.get_item_by_slot(ITEM_SLOT_HANDCUFFED) if(!istype(O)) return FALSE user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O.name]!", \ @@ -26,7 +26,7 @@ used = TRUE if(user.legcuffed) - var/obj/O = user.get_item_by_slot(SLOT_HUD_LEGCUFFED) + var/obj/O = user.get_item_by_slot(ITEM_SLOT_LEGCUFFED) if(!istype(O)) return FALSE user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O.name]!", \ @@ -35,7 +35,7 @@ used = TRUE if(user.wear_suit && user.wear_suit.breakouttime && !used) - var/obj/item/clothing/suit/S = user.get_item_by_slot(SLOT_HUD_OUTER_SUIT) + var/obj/item/clothing/suit/S = user.get_item_by_slot(ITEM_SLOT_OUTER_SUIT) if(!istype(S)) return FALSE user.visible_message("[user] vomits a glob of acid across the front of [user.p_their()] [S.name]!", \ diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index dc1719ef157..3083769d879 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -107,8 +107,8 @@ user.unEquip(user.head) user.unEquip(user.wear_suit) - user.equip_to_slot_if_possible(new suit_type(user), SLOT_HUD_OUTER_SUIT, TRUE, TRUE) - user.equip_to_slot_if_possible(new helmet_type(user), SLOT_HUD_HEAD, TRUE, TRUE) + user.equip_to_slot_if_possible(new suit_type(user), ITEM_SLOT_OUTER_SUIT, TRUE, TRUE) + user.equip_to_slot_if_possible(new helmet_type(user), ITEM_SLOT_HEAD, TRUE, TRUE) cling.chem_recharge_slowdown += recharge_slowdown return TRUE diff --git a/code/modules/antagonists/cult/datum_cultist.dm b/code/modules/antagonists/cult/datum_cultist.dm index 105b66256be..457abc6fea7 100644 --- a/code/modules/antagonists/cult/datum_cultist.dm +++ b/code/modules/antagonists/cult/datum_cultist.dm @@ -128,9 +128,9 @@ RESTRICT_TYPE(/datum/antagonist/cultist) return var/mob/living/carbon/human/H = owner.current var/list/slots = list( - "backpack" = SLOT_HUD_IN_BACKPACK, - "left pocket" = SLOT_HUD_LEFT_STORE, - "right pocket" = SLOT_HUD_RIGHT_STORE + "backpack" = ITEM_SLOT_IN_BACKPACK, + "left pocket" = ITEM_SLOT_LEFT_POCKET, + "right pocket" = ITEM_SLOT_RIGHT_POCKET ) var/where = H.equip_in_one_of_slots(new item_path(H), slots) diff --git a/code/modules/antagonists/revolutionary/datum_headrev.dm b/code/modules/antagonists/revolutionary/datum_headrev.dm index 1f229266bad..3097fbc0229 100644 --- a/code/modules/antagonists/revolutionary/datum_headrev.dm +++ b/code/modules/antagonists/revolutionary/datum_headrev.dm @@ -32,11 +32,11 @@ RESTRICT_TYPE(/datum/antagonist/rev/head) return var/list/slots = list( - "backpack" = SLOT_HUD_IN_BACKPACK, - "left pocket" = SLOT_HUD_LEFT_STORE, - "right pocket" = SLOT_HUD_RIGHT_STORE, - "left hand" = SLOT_HUD_LEFT_HAND, - "right hand" = SLOT_HUD_RIGHT_HAND, + "backpack" = ITEM_SLOT_IN_BACKPACK, + "left pocket" = ITEM_SLOT_LEFT_POCKET, + "right pocket" = ITEM_SLOT_RIGHT_POCKET, + "left hand" = ITEM_SLOT_LEFT_HAND, + "right hand" = ITEM_SLOT_RIGHT_HAND, ) var/flashloc_name diff --git a/code/modules/antagonists/traitor/contractor/items/contractor_uplink.dm b/code/modules/antagonists/traitor/contractor/items/contractor_uplink.dm index 5da2b31ad58..2edeadfd98a 100644 --- a/code/modules/antagonists/traitor/contractor/items/contractor_uplink.dm +++ b/code/modules/antagonists/traitor/contractor/items/contractor_uplink.dm @@ -9,7 +9,7 @@ icon = 'icons/obj/device.dmi' icon_state = "contractor_uplink" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "programming=5;syndicate=4" // Hackerman encryption /// The Contractor Hub associated with this uplink. var/datum/contractor_hub/hub = null diff --git a/code/modules/antagonists/wizard/datum_apprentice.dm b/code/modules/antagonists/wizard/datum_apprentice.dm index 3935e7d9e82..a929a07dbfb 100644 --- a/code/modules/antagonists/wizard/datum_apprentice.dm +++ b/code/modules/antagonists/wizard/datum_apprentice.dm @@ -33,14 +33,14 @@ if(!class_type) CRASH("/datum/antagonist/wizard/apprentice was never assigned a class_type") var/mob/living/carbon/human/new_wiz = owner.current - new_wiz.equip_to_slot_or_del(new /obj/item/radio/headset(new_wiz), SLOT_HUD_LEFT_EAR) + new_wiz.equip_to_slot_or_del(new /obj/item/radio/headset(new_wiz), ITEM_SLOT_LEFT_EAR) if(class_type == "stealth") - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(new_wiz), SLOT_HUD_JUMPSUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(new_wiz), ITEM_SLOT_JUMPSUIT) else - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(new_wiz), SLOT_HUD_JUMPSUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/storage/backpack(new_wiz), SLOT_HUD_BACK) - new_wiz.equip_to_slot_or_del(new /obj/item/storage/box(new_wiz), SLOT_HUD_IN_BACKPACK) - new_wiz.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(new_wiz), SLOT_HUD_RIGHT_STORE) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(new_wiz), ITEM_SLOT_JUMPSUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/storage/backpack(new_wiz), ITEM_SLOT_BACK) + new_wiz.equip_to_slot_or_del(new /obj/item/storage/box(new_wiz), ITEM_SLOT_IN_BACKPACK) + new_wiz.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(new_wiz), ITEM_SLOT_RIGHT_POCKET) var/list/messages = list() switch(class_type) @@ -50,18 +50,18 @@ ADD_TRAIT(new_wiz, TRAIT_RESISTHEAT, MAGIC_TRAIT) ADD_TRAIT(new_wiz, TRAIT_RESISTHIGHPRESSURE, MAGIC_TRAIT) new_wiz.mind.AddSpell(new /datum/spell/ethereal_jaunt(null)) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(new_wiz), SLOT_HUD_OUTER_SUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(new_wiz), SLOT_HUD_HEAD) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(new_wiz), ITEM_SLOT_OUTER_SUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(new_wiz), ITEM_SLOT_HEAD) messages += "Your service has not gone unrewarded. Under the tutelage of [my_teacher.real_name], you've acquired proficiency in the fundamentals of Firebending, enabling you to cast spells like Fireball, Sacred Flame, and Ethereal Jaunt." messages += "You are immune to fire, but you are NOT immune to the explosions caused by your fireballs. Neither is your teacher, for that matter. Be careful!" if("translocation") new_wiz.mind.AddSpell(new /datum/spell/area_teleport/teleport(null)) new_wiz.mind.AddSpell(new /datum/spell/turf_teleport/blink(null)) new_wiz.mind.AddSpell(new /datum/spell/ethereal_jaunt(null)) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(new_wiz), SLOT_HUD_OUTER_SUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(new_wiz), SLOT_HUD_HEAD) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(new_wiz), ITEM_SLOT_OUTER_SUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(new_wiz), ITEM_SLOT_HEAD) messages += "Your service has not gone unrewarded. While studying under [my_teacher.real_name], you mastered reality-bending mobility spells, allowing you to cast Teleport, Blink, and Ethereal Jaunt." if("restoration") new_wiz.mind.AddSpell(new /datum/spell/charge(null)) @@ -69,10 +69,10 @@ var/datum/spell/return_to_teacher/S = new /datum/spell/return_to_teacher(null) S.teacher = my_teacher.mind new_wiz.mind.AddSpell(S) - new_wiz.equip_to_slot_or_del(new /obj/item/gun/magic/staff/healing(new_wiz), SLOT_HUD_RIGHT_HAND) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/marisa(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/marisa(new_wiz), SLOT_HUD_OUTER_SUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/marisa(new_wiz), SLOT_HUD_HEAD) + new_wiz.equip_to_slot_or_del(new /obj/item/gun/magic/staff/healing(new_wiz), ITEM_SLOT_RIGHT_HAND) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/marisa(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/marisa(new_wiz), ITEM_SLOT_OUTER_SUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/marisa(new_wiz), ITEM_SLOT_HEAD) messages += "Your service has not gone unrewarded. Under the guidance of [my_teacher.real_name], you've acquired life-saving survival spells. You can now cast Charge and Knock, and possess the ability to teleport back to your mentor." messages += "Your Charge spell can be used to recharge your Staff of Healing or reduce the cooldowns of your teacher, if you are grabbing them with empty hands." if("stealth") @@ -80,20 +80,20 @@ new_wiz.mind.AddSpell(new /datum/spell/aoe/knock(null)) new_wiz.mind.AddSpell(new /datum/spell/fireball/toolbox(null)) new_wiz.mind.AddSpell(new /datum/spell/disguise_self(null)) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(new_wiz), SLOT_HUD_WEAR_MASK) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(new_wiz), SLOT_HUD_GLOVES) - new_wiz.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_wiz), SLOT_HUD_BELT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(new_wiz), ITEM_SLOT_MASK) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(new_wiz), ITEM_SLOT_GLOVES) + new_wiz.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_wiz), ITEM_SLOT_BELT) messages += "Your service has not gone unrewarded. Under the mentorship of [my_teacher.real_name], you've mastered stealthy, robeless spells. You can now cast Mindswap, Knock, Homing Toolbox, and Disguise Self without the need for wizard robes." if("honk") new_wiz.mind.AddSpell(new /datum/spell/touch/banana/apprentice(null)) new_wiz.mind.AddSpell(new /datum/spell/ethereal_jaunt(null)) new_wiz.mind.AddSpell(new /datum/spell/summonitem(null)) - new_wiz.equip_to_slot_or_del(new /obj/item/gun/magic/staff/slipping(new_wiz), SLOT_HUD_RIGHT_HAND) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes/magical/nodrop(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/clown(new_wiz), SLOT_HUD_OUTER_SUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/clown(new_wiz), SLOT_HUD_HEAD) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clownwiz(new_wiz), SLOT_HUD_WEAR_MASK) + new_wiz.equip_to_slot_or_del(new /obj/item/gun/magic/staff/slipping(new_wiz), ITEM_SLOT_RIGHT_HAND) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes/magical/nodrop(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/clown(new_wiz), ITEM_SLOT_OUTER_SUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/clown(new_wiz), ITEM_SLOT_HEAD) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clownwiz(new_wiz), ITEM_SLOT_MASK) messages += "Your dedication pays off! Under [my_teacher.real_name]'s guidance, you've mastered magical honkings, seamlessly casting spells like Banana Touch, Ethereal Jaunt, and Instant Summons, while skillfully wielding a Staff of Slipping. Honk!" return messages diff --git a/code/modules/antagonists/wizard/datum_wizard.dm b/code/modules/antagonists/wizard/datum_wizard.dm index f3e1f622eb1..252a6f75678 100644 --- a/code/modules/antagonists/wizard/datum_wizard.dm +++ b/code/modules/antagonists/wizard/datum_wizard.dm @@ -88,22 +88,22 @@ new_wiz.internal = new_wiz.r_hand new_wiz.update_action_buttons_icon() else - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(new_wiz), SLOT_HUD_JUMPSUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(new_wiz), SLOT_HUD_HEAD) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(new_wiz), ITEM_SLOT_JUMPSUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(new_wiz), ITEM_SLOT_HEAD) new_wiz.dna.species.after_equip_job(null, new_wiz) new_wiz.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups - new_wiz.equip_to_slot_or_del(new /obj/item/radio/headset(new_wiz), SLOT_HUD_LEFT_EAR) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), SLOT_HUD_SHOES) - new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(new_wiz), SLOT_HUD_OUTER_SUIT) - new_wiz.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_wiz), SLOT_HUD_BACK) + new_wiz.equip_to_slot_or_del(new /obj/item/radio/headset(new_wiz), ITEM_SLOT_LEFT_EAR) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_wiz), ITEM_SLOT_SHOES) + new_wiz.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(new_wiz), ITEM_SLOT_OUTER_SUIT) + new_wiz.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_wiz), ITEM_SLOT_BACK) if(new_wiz.dna.species.speciesbox) - new_wiz.equip_to_slot_or_del(new new_wiz.dna.species.speciesbox(new_wiz), SLOT_HUD_IN_BACKPACK) + new_wiz.equip_to_slot_or_del(new new_wiz.dna.species.speciesbox(new_wiz), ITEM_SLOT_IN_BACKPACK) else - new_wiz.equip_to_slot_or_del(new /obj/item/storage/box/survival(new_wiz), SLOT_HUD_IN_BACKPACK) - new_wiz.equip_to_slot_or_del(new /obj/item/teleportation_scroll(new_wiz), SLOT_HUD_RIGHT_STORE) + new_wiz.equip_to_slot_or_del(new /obj/item/storage/box/survival(new_wiz), ITEM_SLOT_IN_BACKPACK) + new_wiz.equip_to_slot_or_del(new /obj/item/teleportation_scroll(new_wiz), ITEM_SLOT_RIGHT_POCKET) var/obj/item/spellbook/spellbook = new /obj/item/spellbook(new_wiz) spellbook.owner = new_wiz - new_wiz.equip_to_slot_or_del(spellbook, SLOT_HUD_LEFT_HAND) + new_wiz.equip_to_slot_or_del(spellbook, ITEM_SLOT_LEFT_HAND) var/list/reading = list() reading += "You will find a list of available spells in your spell book. Choose your magic arsenal carefully." diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm index 10cb910c97a..a4a8f50368c 100644 --- a/code/modules/client/preference/loadout/loadout_accessories.dm +++ b/code/modules/client/preference/loadout/loadout_accessories.dm @@ -13,7 +13,7 @@ /datum/gear/accessory main_typepath = /datum/gear/accessory - slot = SLOT_HUD_TIE + slot = ITEM_SLOT_ACCESSORY sort_category = "Accessories" /datum/gear/accessory/scarf diff --git a/code/modules/client/preference/loadout/loadout_glasses.dm b/code/modules/client/preference/loadout/loadout_glasses.dm index c6188f31464..af40da04e6e 100644 --- a/code/modules/client/preference/loadout/loadout_glasses.dm +++ b/code/modules/client/preference/loadout/loadout_glasses.dm @@ -13,7 +13,7 @@ /datum/gear/glasses main_typepath = /datum/gear/glasses - slot = SLOT_HUD_GLASSES + slot = ITEM_SLOT_EYES sort_category = "Glasses" /datum/gear/glasses/sunglasses diff --git a/code/modules/client/preference/loadout/loadout_gloves.dm b/code/modules/client/preference/loadout/loadout_gloves.dm index ccf4de8c44e..180c75296fc 100644 --- a/code/modules/client/preference/loadout/loadout_gloves.dm +++ b/code/modules/client/preference/loadout/loadout_gloves.dm @@ -13,7 +13,7 @@ /datum/gear/gloves main_typepath = /datum/gear/gloves - slot = SLOT_HUD_GLOVES + slot = ITEM_SLOT_GLOVES sort_category = "Gloves" /datum/gear/gloves/fingerless diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 325e37e5995..6d3b7e84575 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -13,7 +13,7 @@ /datum/gear/hat main_typepath = /datum/gear/hat - slot = SLOT_HUD_HEAD + slot = ITEM_SLOT_HEAD sort_category = "Headwear" /datum/gear/hat/hhat_yellow diff --git a/code/modules/client/preference/loadout/loadout_racial.dm b/code/modules/client/preference/loadout/loadout_racial.dm index 55359fb4fbc..aaf337ece8c 100644 --- a/code/modules/client/preference/loadout/loadout_racial.dm +++ b/code/modules/client/preference/loadout/loadout_racial.dm @@ -20,29 +20,29 @@ display_name = "Tajaran veil" description = "A common traditional nano-fiber veil worn by many Tajaran. It is rare and offensive to see it on other races. Can be combined with various other eyewear." path = /obj/item/clothing/glasses/hud/tajblind - slot = SLOT_HUD_GLASSES + slot = ITEM_SLOT_EYES /datum/gear/racial/footwraps display_name = "Cloth footwraps" path = /obj/item/clothing/shoes/footwraps - slot = SLOT_HUD_SHOES + slot = ITEM_SLOT_SHOES /datum/gear/racial/handwraps display_name = "Cloth handwraps" path = /obj/item/clothing/gloves/handwraps - slot = SLOT_HUD_GLOVES + slot = ITEM_SLOT_GLOVES /datum/gear/racial/vox_casual display_name = "Vox jumpsuit" description = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement." path = /obj/item/clothing/under/vox/vox_casual - slot = SLOT_HUD_JUMPSUIT + slot = ITEM_SLOT_JUMPSUIT /datum/gear/racial/vox_robes display_name = "Vox robes" description = "Large, comfortable robes worn by those who need a bit more covering. The thick fabric contains a pocket suitable for those that need their hands free during their work, while the cloth serves to cover scars or other injuries to the wearer's body." path = /obj/item/clothing/suit/hooded/vox_robes - slot = SLOT_HUD_OUTER_SUIT + slot = ITEM_SLOT_OUTER_SUIT /datum/gear/racial/plasmamansuit_coke display_name = "Coke Suit" diff --git a/code/modules/client/preference/loadout/loadout_shoes.dm b/code/modules/client/preference/loadout/loadout_shoes.dm index 6181e2120a7..26fafc2c580 100644 --- a/code/modules/client/preference/loadout/loadout_shoes.dm +++ b/code/modules/client/preference/loadout/loadout_shoes.dm @@ -13,7 +13,7 @@ /datum/gear/shoes main_typepath = /datum/gear/shoes - slot = SLOT_HUD_SHOES + slot = ITEM_SLOT_SHOES sort_category = "Shoes" /datum/gear/shoes/sandals diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index b4f36409d1c..4023a2a82e2 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -13,7 +13,7 @@ /datum/gear/suit main_typepath = /datum/gear/suit - slot = SLOT_HUD_OUTER_SUIT + slot = ITEM_SLOT_OUTER_SUIT sort_category = "External Wear" //WINTER COATS diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 97fdfaad69d..a8c472998af 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -14,7 +14,7 @@ // Uniform slot /datum/gear/uniform main_typepath = /datum/gear/uniform - slot = SLOT_HUD_JUMPSUIT + slot = ITEM_SLOT_JUMPSUIT sort_category = "Uniforms and Casual Dress" /datum/gear/uniform/suit diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 50f1ef7d08a..86bcb1f3b78 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -28,7 +28,6 @@ var/visor_flags_inv = NONE //same as visor_flags, but for flags_inv var/visor_flags_cover = NONE //for cover flags var/visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_VISIONFLAGS | VISOR_DARKNESSVIEW | VISOR_INVISVIEW //what to toggle when toggled with weldingvisortoggle() - var/can_toggle = FALSE var/toggle_message = null var/alt_toggle_message = null @@ -93,7 +92,7 @@ return FALSE // Skip species restriction checks on non-equipment slots - if(slot in list(SLOT_HUD_RIGHT_HAND, SLOT_HUD_LEFT_HAND, SLOT_HUD_IN_BACKPACK, SLOT_HUD_LEFT_STORE, SLOT_HUD_RIGHT_STORE)) + if(slot & (ITEM_SLOT_RIGHT_HAND | ITEM_SLOT_LEFT_HAND | ITEM_SLOT_IN_BACKPACK | ITEM_SLOT_LEFT_POCKET | ITEM_SLOT_RIGHT_POCKET)) return TRUE if(species_restricted && ishuman(M)) @@ -145,7 +144,7 @@ name = "ears" w_class = WEIGHT_CLASS_TINY throwforce = 2 - slot_flags = SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_BOTH_EARS resistance_flags = NONE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/ears.dmi', //We read you loud and skree-er. @@ -179,7 +178,7 @@ w_class = WEIGHT_CLASS_HUGE icon = 'icons/mob/screen_gen.dmi' icon_state = "block" - slot_flags = SLOT_FLAG_EARS | SLOT_FLAG_TWOEARS + slot_flags = ITEM_SLOT_BOTH_EARS /obj/item/clothing/ears/offear/New(obj/O) . = ..() @@ -197,7 +196,7 @@ icon = 'icons/obj/clothing/glasses.dmi' w_class = WEIGHT_CLASS_SMALL flags_cover = GLASSESCOVERSEYES - slot_flags = SLOT_FLAG_EYES + slot_flags = ITEM_SLOT_EYES materials = list(MAT_GLASS = 250) var/vision_flags = 0 var/see_in_dark = 0 //Base human is 2 @@ -249,7 +248,7 @@ icon = 'icons/obj/clothing/gloves.dmi' siemens_coefficient = 0.50 body_parts_covered = HANDS - slot_flags = SLOT_FLAG_GLOVES + slot_flags = ITEM_SLOT_GLOVES attack_verb = list("challenged") strip_delay = 2 SECONDS put_on_delay = 4 SECONDS @@ -379,7 +378,7 @@ icon = 'icons/obj/clothing/hats.dmi' icon_override = 'icons/mob/clothing/head.dmi' body_parts_covered = HEAD - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD var/HUDType = null var/vision_flags = 0 @@ -429,7 +428,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_HEAD) == src) + if(H.get_item_by_slot(ITEM_SLOT_HEAD) == src) for(var/obj/item/clothing/head/hat as anything in attached_hats) hat.attached_unequip() @@ -539,7 +538,7 @@ name = "mask" icon = 'icons/obj/clothing/masks.dmi' body_parts_covered = HEAD - slot_flags = SLOT_FLAG_MASK + slot_flags = ITEM_SLOT_MASK strip_delay = 4 SECONDS put_on_delay = 4 SECONDS dyeable = FALSE @@ -570,9 +569,9 @@ if(initial(flags_cover) & MASKCOVERSMOUTH) //If the mask covers the mouth when it's down and can be adjusted yet lost that trait when it was adjusted, make it cover the mouth again. flags_cover |= MASKCOVERSMOUTH if(H.head == src) - if(isnull(user.get_item_by_slot(slot_bitfield_to_slot(slot_flags)))) + if(isnull(user.get_item_by_slot(slot_flags))) user.unEquip(src) - user.equip_to_slot(src, slot_bitfield_to_slot(slot_flags)) + user.equip_to_slot(src, slot_flags) else if(flags_inv == HIDEFACE) //Means that only things like bandanas and balaclavas will be affected since they obscure the identity of the wearer. if(H.l_hand && H.r_hand) //If both hands are occupied, drop the object on the ground. user.unEquip(src) @@ -597,9 +596,9 @@ if(flags & AIRTIGHT) //If the mask was airtight, it won't be anymore since you just pushed it off your face. flags &= ~AIRTIGHT if(user.wear_mask == src) - if(isnull(user.get_item_by_slot(slot_bitfield_to_slot(slot_flags)))) + if(isnull(user.get_item_by_slot(slot_flags))) user.unEquip(src) - user.equip_to_slot(src, slot_bitfield_to_slot(slot_flags)) + user.equip_to_slot(src, slot_flags) else if(initial(flags_inv) == HIDEFACE) //Means that you won't have to take off and put back on simple things like breath masks which, realistically, can just be pulled down off your face. if(H.l_hand && H.r_hand) //If both hands are occupied, drop the object on the ground. user.unEquip(src) @@ -627,7 +626,7 @@ gender = PLURAL //Carn: for grammatically correct text-parsing body_parts_covered = FEET - slot_flags = SLOT_FLAG_FEET + slot_flags = ITEM_SLOT_SHOES dyeable = TRUE dyeing_key = DYE_REGISTRY_SHOES @@ -650,11 +649,9 @@ var/blood_state = BLOOD_STATE_NOT_BLOODY var/list/bloody_shoes = list(BLOOD_STATE_HUMAN = 0, BLOOD_STATE_XENO = 0, BLOOD_STATE_NOT_BLOODY = 0, BLOOD_BASE_ALPHA = BLOODY_FOOTPRINT_BASE_ALPHA) - - /obj/item/clothing/shoes/equipped(mob/user, slot) . = ..() - if(!no_slip || slot != SLOT_HUD_SHOES) + if(!no_slip || slot != ITEM_SLOT_SHOES) return ADD_TRAIT(user, TRAIT_NOSLIP, UID()) @@ -665,7 +662,7 @@ var/mob/living/carbon/human/H = user if(!user) return - if(H.get_item_by_slot(SLOT_HUD_SHOES) == src) + if(H.get_item_by_slot(ITEM_SLOT_SHOES) == src) REMOVE_TRAIT(H, TRAIT_NOSLIP, UID()) /obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params) @@ -761,7 +758,7 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) drop_sound = 'sound/items/handling/cloth_drop.ogg' pickup_sound = 'sound/items/handling/cloth_pickup.ogg' - slot_flags = SLOT_FLAG_OCLOTHING + slot_flags = ITEM_SLOT_OUTER_SUIT dyeable = FALSE var/fire_resist = T0C + 100 @@ -861,7 +858,7 @@ /obj/item/clothing/suit/equipped(mob/living/carbon/human/user, slot) //Handle tail-hiding on a by-species basis. ..() - if(ishuman(user) && hide_tail_by_species && slot == SLOT_HUD_OUTER_SUIT) + if(ishuman(user) && hide_tail_by_species && slot == ITEM_SLOT_OUTER_SUIT) if("modsuit" in hide_tail_by_species) return if(user.dna.species.sprite_sheet_name in hide_tail_by_species) @@ -965,7 +962,7 @@ name = "under" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS permeability_coefficient = 0.90 - slot_flags = SLOT_FLAG_ICLOTHING + slot_flags = ITEM_SLOT_JUMPSUIT armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) equip_sound = 'sound/items/equip/jumpsuit_equip.ogg' drop_sound = 'sound/items/handling/cloth_drop.ogg' @@ -1007,7 +1004,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_JUMPSUIT) == src) + if(H.get_item_by_slot(ITEM_SLOT_JUMPSUIT) == src) for(var/obj/item/clothing/accessory/A in accessories) A.attached_unequip() @@ -1015,7 +1012,7 @@ ..() if(!ishuman(user)) return - if(slot == SLOT_HUD_JUMPSUIT) + if(slot == ITEM_SLOT_JUMPSUIT) for(var/obj/item/clothing/accessory/A in accessories) A.attached_equip() @@ -1029,7 +1026,7 @@ if(length(accessories) >= MAX_EQUIPABLE_ACCESSORIES) //this is neccesary to prevent chat spam when examining clothing return FALSE for(var/obj/item/clothing/accessory/AC in accessories) - if((A.slot in list(ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_ARMBAND)) && AC.slot == A.slot) + if((A.slot & (ACCESSORY_SLOT_UTILITY | ACCESSORY_SLOT_ARMBAND)) && (AC.slot & A.slot)) return FALSE if(!A.allow_duplicates && AC.type == A.type) return FALSE @@ -1124,7 +1121,7 @@ if(copytext(item_color,-2) != "_d") basecolor = item_color - if(user.get_item_by_slot(SLOT_HUD_JUMPSUIT) != src) + if(user.get_item_by_slot(ITEM_SLOT_JUMPSUIT) != src) to_chat(user, "You must wear the uniform to adjust it!") else diff --git a/code/modules/clothing/ears/earmuffs.dm b/code/modules/clothing/ears/earmuffs.dm index bf47c4bebe1..55df72c904c 100644 --- a/code/modules/clothing/ears/earmuffs.dm +++ b/code/modules/clothing/ears/earmuffs.dm @@ -14,7 +14,7 @@ /obj/item/clothing/ears/earmuffs/equipped(mob/user, slot) . = ..() - if(ishuman(user) && ((slot == SLOT_HUD_LEFT_EAR) || (slot == SLOT_HUD_RIGHT_EAR))) + if(ishuman(user) && (slot & ITEM_SLOT_BOTH_EARS)) ADD_TRAIT(user, TRAIT_DEAF, "[CLOTHING_TRAIT][UID()]") /obj/item/clothing/ears/earmuffs/dropped(mob/user) diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index e593c0eb03d..d6189f76158 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -31,10 +31,10 @@ /obj/item/clothing/glasses/meson/engine/equipped(mob/user, slot, initial) . = ..() - if(active_on_equip && mode == MODE_MESON && slot == SLOT_HUD_GLASSES) + if(active_on_equip && mode == MODE_MESON && slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_glasses[UID()]") - if(active_on_equip_rad && mode == MODE_RAD && slot == SLOT_HUD_GLASSES) + if(active_on_equip_rad && mode == MODE_RAD && slot == ITEM_SLOT_EYES) ADD_TRAIT(user, SM_HALLUCINATION_IMMUNE, "meson_glasses[UID()]") /obj/item/clothing/glasses/meson/engine/proc/toggle_mode(mob/user, voluntary) @@ -95,7 +95,7 @@ item_state = icon_state if(isliving(loc)) var/mob/living/user = loc - if(user.get_item_by_slot(SLOT_HUD_GLASSES) == src) + if(user.get_item_by_slot(ITEM_SLOT_EYES) == src) user.update_inv_glasses() else user.update_inv_l_hand() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index e06ef37583f..2004447294b 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -103,7 +103,7 @@ /obj/item/clothing/glasses/meson/equipped(mob/user, slot, initial) . = ..() - if(active_on_equip && slot == SLOT_HUD_GLASSES) + if(active_on_equip && slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_glasses[UID()]") /obj/item/clothing/glasses/meson/dropped(mob/user) @@ -169,7 +169,7 @@ actions_types = list(/datum/action/item_action/toggle_research_scanner) /obj/item/clothing/glasses/science/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) return TRUE /obj/item/clothing/glasses/science/night @@ -370,7 +370,7 @@ toggle_noir(user) /obj/item/clothing/glasses/sunglasses/noir/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) return TRUE /obj/item/clothing/glasses/sunglasses/noir/proc/toggle_noir(mob/user) @@ -404,7 +404,7 @@ actions_types = list(/datum/action/item_action/toggle_research_scanner) /obj/item/clothing/glasses/sunglasses/reagent/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) return TRUE /obj/item/clothing/glasses/virussunglasses @@ -429,7 +429,7 @@ flags = NODROP /obj/item/clothing/glasses/sunglasses/lasers/equipped(mob/user, slot) //grant them laser eyes upon equipping it. - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_LASEREYES, "admin_zapglasses") user.regenerate_icons() ..(user, slot) diff --git a/code/modules/clothing/glasses/hudglasses.dm b/code/modules/clothing/glasses/hudglasses.dm index b45c9d9c447..1c4a60cd8f1 100644 --- a/code/modules/clothing/glasses/hudglasses.dm +++ b/code/modules/clothing/glasses/hudglasses.dm @@ -16,7 +16,7 @@ /obj/item/clothing/glasses/hud/equipped(mob/living/carbon/human/user, slot) ..() - if(slot != SLOT_HUD_GLASSES) + if(slot != ITEM_SLOT_EYES) return for(var/new_hud in hud_types) var/datum/atom_hud/H = GLOB.huds[new_hud] diff --git a/code/modules/clothing/glasses/tajblind.dm b/code/modules/clothing/glasses/tajblind.dm index cf793288406..00ec29e5296 100644 --- a/code/modules/clothing/glasses/tajblind.dm +++ b/code/modules/clothing/glasses/tajblind.dm @@ -66,7 +66,7 @@ /obj/item/clothing/glasses/hud/tajblind/meson/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_glasses[UID()]") /obj/item/clothing/glasses/hud/tajblind/meson/dropped(mob/user) @@ -91,7 +91,7 @@ desc += "
It has science goggles integrated into it." /obj/item/clothing/glasses/hud/tajblind/sci/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) return TRUE /obj/item/clothing/glasses/hud/tajblind/med @@ -136,7 +136,7 @@ /obj/item/clothing/glasses/hud/tajblind/shaded/meson/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_glasses[UID()]") /obj/item/clothing/glasses/hud/tajblind/shaded/meson/dropped(mob/user) @@ -162,7 +162,7 @@ desc += "
It has science goggles integrated into it." /obj/item/clothing/glasses/hud/tajblind/shaded/sci/item_action_slot_check(slot) - if(slot == SLOT_HUD_GLASSES) + if(slot == ITEM_SLOT_EYES) return TRUE /obj/item/clothing/glasses/hud/tajblind/shaded/med diff --git a/code/modules/clothing/gloves/boxing_gloves.dm b/code/modules/clothing/gloves/boxing_gloves.dm index 72adfaf38eb..2c2ab0f724b 100644 --- a/code/modules/clothing/gloves/boxing_gloves.dm +++ b/code/modules/clothing/gloves/boxing_gloves.dm @@ -14,7 +14,7 @@ /obj/item/clothing/gloves/boxing/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_HUD_GLOVES) + if(slot == ITEM_SLOT_GLOVES) var/mob/living/carbon/human/H = user style.teach(H, TRUE) @@ -23,7 +23,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_GLOVES) == src) + if(H.get_item_by_slot(ITEM_SLOT_GLOVES) == src) style.remove(H) /obj/item/clothing/gloves/boxing/green diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index b24eff63868..848651f2b1b 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -58,7 +58,7 @@ /obj/item/clothing/head/helmet/meson/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_HEAD) + if(slot == ITEM_SLOT_HEAD) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_helmet[UID()]") /obj/item/clothing/head/helmet/meson/dropped(mob/user) diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index b2c69a6e443..82a20aa3607 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -281,7 +281,7 @@ tip_fedora(user) /obj/item/clothing/head/fedora/item_action_slot_check(slot) - if(slot == SLOT_HUD_HEAD) + if(slot == ITEM_SLOT_HEAD) return TRUE /obj/item/clothing/head/fedora/proc/tip_fedora(mob/user) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 524358e00dd..41b8cd5ea05 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -201,7 +201,7 @@ /obj/item/clothing/head/kitty/equipped(mob/M, slot) . = ..() - if(ishuman(M) && slot == SLOT_HUD_HEAD) + if(ishuman(M) && slot == ITEM_SLOT_HEAD) update_icon(NONE, M) /obj/item/clothing/head/kitty/mouse diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 98ba676b12b..cab34dd939f 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -8,7 +8,7 @@ w_class = WEIGHT_CLASS_SMALL can_toggle = TRUE actions_types = list(/datum/action/item_action/adjust) - adjusted_flags = SLOT_FLAG_HEAD + adjusted_flags = ITEM_SLOT_HEAD sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm index 8f94631e346..df4684a5e5e 100644 --- a/code/modules/clothing/masks/misc_masks.dm +++ b/code/modules/clothing/masks/misc_masks.dm @@ -223,7 +223,7 @@ pontificate(user) /obj/item/clothing/mask/fakemoustache/item_action_slot_check(slot) - if(slot == SLOT_HUD_WEAR_MASK) + if(slot == ITEM_SLOT_MASK) return 1 /obj/item/clothing/mask/fakemoustache/proc/pontificate(mob/user) @@ -361,8 +361,8 @@ flags_inv = HIDEFACE flags_cover = MASKCOVERSMOUTH w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_MASK - adjusted_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_MASK + adjusted_flags = ITEM_SLOT_HEAD icon_state = "bandbotany" dyeable = TRUE dyeing_key = DYE_REGISTRY_BANDANA @@ -466,7 +466,7 @@ /obj/item/clothing/mask/cursedclown/equipped(mob/user, slot) ..() var/mob/living/carbon/human/H = user - if(istype(H) && slot == SLOT_HUD_WEAR_MASK) + if(istype(H) && slot == ITEM_SLOT_MASK) to_chat(H, "[src] grips your face!") if(H.mind && H.mind.assigned_role != "Cluwne") H.makeCluwne() diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 3fdcf020870..6e36ba0d104 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -8,7 +8,7 @@ strip_delay = 7 SECONDS put_on_delay = 7 SECONDS resistance_flags = FIRE_PROOF - + no_slip = FALSE var/magboot_state = "magboots" var/magpulse = FALSE var/slowdown_active = 2 @@ -24,7 +24,7 @@ /obj/item/clothing/shoes/magboots/equipped(mob/user, slot, initial) . = ..() - if(slot != SLOT_HUD_SHOES || !ishuman(user)) + if(slot != ITEM_SLOT_SHOES || !ishuman(user)) return check_mag_pulse(user) @@ -42,7 +42,7 @@ REMOVE_TRAIT(user, TRAIT_NOSLIP, UID()) slowdown = slowdown_passive else - if(user.get_item_by_slot(SLOT_HUD_SHOES) == src) + if(user.get_item_by_slot(ITEM_SLOT_SHOES) == src) ADD_TRAIT(user, TRAIT_NOSLIP, UID()) slowdown = slowdown_active magpulse = !magpulse @@ -56,7 +56,7 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtons() - check_mag_pulse(user, removing = (user.get_item_by_slot(SLOT_HUD_SHOES) != src)) + check_mag_pulse(user, removing = (user.get_item_by_slot(ITEM_SLOT_SHOES) != src)) /obj/item/clothing/shoes/magboots/proc/check_mag_pulse(mob/user, removing = FALSE) if(!user) @@ -144,7 +144,7 @@ /obj/item/clothing/shoes/magboots/clown/equipped(mob/user, slot) . = ..() - if(slot == SLOT_HUD_SHOES && enabled_waddle) + if(slot == ITEM_SLOT_SHOES && enabled_waddle) user.AddElement(/datum/element/waddling) /obj/item/clothing/shoes/magboots/clown/dropped(mob/user) @@ -302,7 +302,7 @@ ..() if(!ishuman(user)) return - if(slot == SLOT_HUD_SHOES && cell && core) + if(slot == ITEM_SLOT_SHOES && cell && core) style.teach(user, TRUE) /obj/item/clothing/shoes/magboots/gravity/dropped(mob/user) @@ -310,14 +310,14 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_SHOES) == src) + if(H.get_item_by_slot(ITEM_SLOT_SHOES) == src) style.remove(H) if(magpulse) to_chat(user, "As [src] are removed, they deactivate.") toggle_magpulse(user, TRUE) /obj/item/clothing/shoes/magboots/gravity/item_action_slot_check(slot) - if(slot == SLOT_HUD_SHOES) + if(slot == ITEM_SLOT_SHOES) return TRUE /obj/item/clothing/shoes/magboots/gravity/proc/dash(mob/user, action) diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm index 068d6671e59..e0a1ac06e51 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -103,7 +103,7 @@ /obj/item/clothing/shoes/clown_shoes/equipped(mob/user, slot) . = ..() - if(slot == SLOT_HUD_SHOES && enabled_waddle) + if(slot == ITEM_SLOT_SHOES && enabled_waddle) user.AddElement(/datum/element/waddling) /obj/item/clothing/shoes/clown_shoes/dropped(mob/user) @@ -154,7 +154,7 @@ var/recharging_time = 0 /obj/item/clothing/shoes/clown_shoes/slippers/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_SHOES) + if(slot == ITEM_SLOT_SHOES) return TRUE /obj/item/clothing/shoes/clown_shoes/slippers/proc/slide_one(mob/living/user, progress, prev_dir , prev_flags) @@ -460,7 +460,7 @@ var/recharging_time = 0 //time until next dash /obj/item/clothing/shoes/bhop/item_action_slot_check(slot) - if(slot == SLOT_HUD_SHOES) + if(slot == ITEM_SLOT_SHOES) return TRUE /obj/item/clothing/shoes/bhop/ui_action_click(mob/user, action) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index c4e7304ed4c..a09a72cd5c5 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -81,12 +81,12 @@ soundloop.stop(user) /obj/item/clothing/head/helmet/space/hardsuit/item_action_slot_check(slot) - if(slot == SLOT_HUD_HEAD) + if(slot == ITEM_SLOT_HEAD) return 1 /obj/item/clothing/head/helmet/space/hardsuit/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_HEAD) + if(slot != ITEM_SLOT_HEAD) if(suit) suit.RemoveHelmet() soundloop.stop(user) @@ -201,7 +201,7 @@ if(jetpack) to_chat(user, "[src] already has a jetpack installed.") return - if(src == user.get_item_by_slot(SLOT_HUD_OUTER_SUIT)) //Make sure the player is not wearing the suit before applying the upgrade. + if(src == user.get_item_by_slot(ITEM_SLOT_OUTER_SUIT)) //Make sure the player is not wearing the suit before applying the upgrade. to_chat(user, "You cannot install the upgrade to [src] while wearing it.") return @@ -219,7 +219,7 @@ if(!jetpack) to_chat(user, "[src] has no jetpack installed.") return - if(src == user.get_item_by_slot(SLOT_HUD_OUTER_SUIT)) + if(src == user.get_item_by_slot(ITEM_SLOT_OUTER_SUIT)) to_chat(user, "You cannot remove the jetpack from [src] while wearing it.") return jetpack.turn_off(user) @@ -229,10 +229,10 @@ /obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot) ..() - if(helmettype && slot != SLOT_HUD_OUTER_SUIT) + if(helmettype && slot != ITEM_SLOT_OUTER_SUIT) RemoveHelmet() if(jetpack) - if(slot == SLOT_HUD_OUTER_SUIT) + if(slot == ITEM_SLOT_OUTER_SUIT) for(var/X in jetpack.actions) var/datum/action/A = X A.Grant(user) @@ -246,7 +246,7 @@ A.Remove(user) /obj/item/clothing/suit/space/hardsuit/item_action_slot_check(slot) - if(slot == SLOT_HUD_OUTER_SUIT) //we only give the mob the ability to toggle the helmet if he's wearing the hardsuit. + if(slot == ITEM_SLOT_OUTER_SUIT) //we only give the mob the ability to toggle the helmet if he's wearing the hardsuit. return 1 /obj/item/clothing/suit/space/hardsuit/on_mob_move(dir, mob/mob) diff --git a/code/modules/clothing/spacesuits/misc_spacesuits.dm b/code/modules/clothing/spacesuits/misc_spacesuits.dm index 202b89711c9..c07d9b47291 100644 --- a/code/modules/clothing/spacesuits/misc_spacesuits.dm +++ b/code/modules/clothing/spacesuits/misc_spacesuits.dm @@ -14,7 +14,7 @@ ) /obj/item/clothing/head/helmet/space/capspace/equipped(mob/living/carbon/human/user, slot) - if(ishuman(user) && slot == SLOT_HUD_HEAD) + if(ishuman(user) && slot == ITEM_SLOT_HEAD) if(isvox(user)) if(flags & BLOCKHAIR) flags &= ~BLOCKHAIR diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm index 0ef37b03aa2..94c41cd423f 100644 --- a/code/modules/clothing/suits/armor_suits.dm +++ b/code/modules/clothing/suits/armor_suits.dm @@ -532,7 +532,7 @@ /obj/item/clothing/suit/armor/reactive/fire/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_OUTER_SUIT) + if(slot != ITEM_SLOT_OUTER_SUIT) return ADD_TRAIT(user, TRAIT_RESISTHEAT, "[UID()]") @@ -559,7 +559,7 @@ /obj/item/clothing/suit/armor/reactive/cryo/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_OUTER_SUIT) + if(slot != ITEM_SLOT_OUTER_SUIT) return ADD_TRAIT(user, TRAIT_RESISTCOLD, "[UID()]") diff --git a/code/modules/clothing/suits/cardborg_suit.dm b/code/modules/clothing/suits/cardborg_suit.dm index 9a7a214f13b..324c2fb04c8 100644 --- a/code/modules/clothing/suits/cardborg_suit.dm +++ b/code/modules/clothing/suits/cardborg_suit.dm @@ -192,7 +192,7 @@ CONTENTS: */ /obj/item/clothing/head/cardborg/equipped(mob/living/user, slot) ..() - if(ishuman(user) && slot == SLOT_HUD_HEAD) + if(ishuman(user) && slot == ITEM_SLOT_HEAD) var/mob/living/carbon/human/H = user if(!istype(H.wear_suit, /obj/item/clothing/suit/cardborg)) return @@ -205,14 +205,14 @@ CONTENTS: /obj/item/clothing/suit/cardborg/equipped(mob/living/user, slot) ..() - if(ishuman(user) && slot == SLOT_HUD_OUTER_SUIT) + if(ishuman(user) && slot == ITEM_SLOT_OUTER_SUIT) var/mob/living/carbon/human/H = user if(!istype(H.head, /obj/item/clothing/head/cardborg)) return var/obj/item/clothing/head/cardborg/head = H.head apply_borg_disguise(user, head) -/obj/item/clothing/suit/cardborg/dropped(mob/living/user) +/obj/item/clothing/suit/cardborg/dropped(mob/living/user) ..() user.remove_alt_appearance("selected_borg_disguise") diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm index 9deab56b082..660911e7fe0 100644 --- a/code/modules/clothing/suits/hood.dm +++ b/code/modules/clothing/suits/hood.dm @@ -29,11 +29,11 @@ ToggleHood() /obj/item/clothing/suit/hooded/item_action_slot_check(slot, mob/user) - if(slot == SLOT_HUD_OUTER_SUIT) + if(slot == ITEM_SLOT_OUTER_SUIT) return 1 /obj/item/clothing/suit/hooded/equipped(mob/user, slot) - if(slot != SLOT_HUD_OUTER_SUIT) + if(slot != ITEM_SLOT_OUTER_SUIT) RemoveHood() ..() @@ -65,7 +65,7 @@ if(H.head) to_chat(H,"You're already wearing something on your head!") return - else if(H.equip_to_slot_if_possible(hood, SLOT_HUD_HEAD, FALSE, FALSE)) + else if(H.equip_to_slot_if_possible(hood, ITEM_SLOT_HEAD, FALSE, FALSE)) suit_adjusted = 1 icon_state = "[initial(icon_state)]_hood" H.update_inv_wear_suit() @@ -94,7 +94,7 @@ /obj/item/clothing/head/hooded/equipped(mob/user, slot) ..() - if(slot != SLOT_HUD_HEAD) + if(slot != ITEM_SLOT_HEAD) if(suit) suit.RemoveHood() else diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index b884e4dfc42..4fe7d71ff6f 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -298,7 +298,7 @@ /obj/item/clothing/suit/hooded/carp_costume/dragon/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_OUTER_SUIT) + if(slot == ITEM_SLOT_OUTER_SUIT) user.faction += "carp" to_chat(user, "You feel a something gnash in the back of your mind- the carp are your friends, not your foe.") playsound(loc, 'sound/weapons/bite.ogg', 35, TRUE) @@ -697,7 +697,7 @@ /obj/item/clothing/suit/straight_jacket/equipped(mob/living/carbon/human/user, slot) . = ..() - if(slot == SLOT_HUD_OUTER_SUIT) + if(slot == ITEM_SLOT_OUTER_SUIT) ADD_TRAIT(user, TRAIT_RESTRAINED, "straight_jacket") /obj/item/clothing/suit/straight_jacket/dropped(mob/user, silent) @@ -1275,7 +1275,7 @@ return ..() /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/equipped(mob/living/carbon/human/H, slot) - if(!istype(H) || slot != SLOT_HUD_OUTER_SUIT) + if(!istype(H) || slot != ITEM_SLOT_OUTER_SUIT) STOP_PROCESSING(SSobj, src) return else diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index c6b4c1beb53..0e55e6ae647 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -35,7 +35,7 @@ if(H.head) to_chat(H, "You're already wearing something on your head!") return - else if(H.equip_to_slot_if_possible(helmet, SLOT_HUD_HEAD, FALSE, FALSE)) + else if(H.equip_to_slot_if_possible(helmet, ITEM_SLOT_HEAD, FALSE, FALSE)) to_chat(H, "You engage the helmet on the hardsuit.") suit_toggled = TRUE H.update_inv_wear_suit() diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 90671880536..b1a6cf91d04 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -5,7 +5,7 @@ icon_state = "bluetie" item_state = "" //no inhands item_color = "bluetie" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY w_class = WEIGHT_CLASS_SMALL var/slot = ACCESSORY_SLOT_DECOR var/obj/item/clothing/under/has_suit = null //the suit the tie may be attached to @@ -413,7 +413,7 @@ desc = "This glowing blue badge marks the holder as THE LAW." icon_state = "holobadge" item_color = "holobadge" - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_ACCESSORY var/stored_name = null @@ -601,7 +601,7 @@ icon_state = "necklace" item_state = "necklace" item_color = "necklace" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY /obj/item/clothing/accessory/necklace/long name = "large necklace" @@ -642,7 +642,7 @@ icon_state = "locketgold" item_state = "locketgold" item_color = "locketgold" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY var/base_icon var/open var/obj/item/held //Item inside locket. diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index e31e66f186a..90a69de3dea 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -103,7 +103,7 @@ if(!holstered) var/obj/item/gun/gun = user.get_active_hand() if(!istype(gun)) - to_chat(user, "You need your gun equiped to holster it.") + to_chat(user, "You need your gun equipped to holster it.") return holster(gun, user) else diff --git a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm index 15adfb45ab6..2a557d2ea12 100644 --- a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm @@ -42,21 +42,21 @@ /obj/item/clothing/under/rank/engineering/atmospheric_technician/contortionist/equipped(mob/living/carbon/human/user, slot) . = ..() - if(slot != SLOT_HUD_JUMPSUIT) + if(slot != ITEM_SLOT_JUMPSUIT) return if(!user.ventcrawler) user.ventcrawler = VENTCRAWLER_ALWAYS /obj/item/clothing/under/rank/engineering/atmospheric_technician/contortionist/dropped(mob/living/carbon/human/user) . = ..() - if(user.get_item_by_slot(SLOT_HUD_JUMPSUIT) != src) + if(user.get_item_by_slot(ITEM_SLOT_JUMPSUIT) != src) return if(!user.get_int_organ(/obj/item/organ/internal/heart/gland/ventcrawling)) // This is such a snowflaky check user.ventcrawler = VENTCRAWLER_NONE /obj/item/clothing/under/rank/engineering/atmospheric_technician/contortionist/proc/check_clothing(mob/user as mob) //Allowed to wear: glasses, shoes, gloves, pockets, mask, and jumpsuit (obviously) - var/list/slot_must_be_empty = list(SLOT_HUD_BACK,SLOT_HUD_HANDCUFFED,SLOT_HUD_LEGCUFFED,SLOT_HUD_LEFT_HAND,SLOT_HUD_RIGHT_HAND,SLOT_HUD_BELT,SLOT_HUD_HEAD,SLOT_HUD_OUTER_SUIT) + var/list/slot_must_be_empty = list(ITEM_SLOT_BACK,ITEM_SLOT_HANDCUFFED,ITEM_SLOT_LEGCUFFED,ITEM_SLOT_LEFT_HAND,ITEM_SLOT_RIGHT_HAND,ITEM_SLOT_BELT,ITEM_SLOT_HEAD,ITEM_SLOT_OUTER_SUIT) for(var/slot_id in slot_must_be_empty) if(user.get_item_by_slot(slot_id)) to_chat(user,"You can't fit inside while wearing \the [user.get_item_by_slot(slot_id)].") diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 788e59583e8..6d85efc99e7 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -14,7 +14,7 @@ /obj/item/clothing/under/pants/equipped(mob/user, slot) - if(ishuman(user) && slot == SLOT_HUD_JUMPSUIT) + if(ishuman(user) && slot == ITEM_SLOT_JUMPSUIT) var/mob/living/carbon/human/H = user if(H.undershirt != "Nude") var/additional_body_parts = UPPER_TORSO|ARMS diff --git a/code/modules/clothing/under/syndicate_jumpsuits.dm b/code/modules/clothing/under/syndicate_jumpsuits.dm index ceda190cdf3..659bd623328 100644 --- a/code/modules/clothing/under/syndicate_jumpsuits.dm +++ b/code/modules/clothing/under/syndicate_jumpsuits.dm @@ -51,7 +51,7 @@ /obj/item/clothing/under/syndicate/silicon_cham/equipped(mob/user, slot, initial) . = ..() - if(slot == SLOT_HUD_JUMPSUIT) + if(slot == ITEM_SLOT_JUMPSUIT) ADD_TRAIT(user, TRAIT_AI_UNTRACKABLE, "silicon_cham[UID()]") user.set_invisible(SEE_INVISIBLE_LIVING) to_chat(user, "You feel a slight shiver as the cybernetic obfuscators activate.") diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index 3cd99b4a1e1..d56cd287322 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -89,7 +89,7 @@ if(AM.flags_2 & HOLOGRAM_2) continue . += AM - for(var/slot in list(SLOT_HUD_RIGHT_STORE, SLOT_HUD_LEFT_STORE)) + for(var/slot in list(ITEM_SLOT_RIGHT_POCKET, ITEM_SLOT_LEFT_POCKET)) . += user.get_item_by_slot(slot) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 0938dabfc7d..4dddd9485c6 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -150,7 +150,7 @@ force = 5 sharp = FALSE flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 5 w_class = WEIGHT_CLASS_NORMAL attack_verb = list("attacked", "slashed", "stabbed", "sliced") @@ -1555,7 +1555,7 @@ icon_state = "fethasnecklace" item_state = "fethasnecklace" item_color = "fethasnecklace" - slot_flags = SLOT_FLAG_MASK | SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_MASK | ITEM_SLOT_ACCESSORY /// HugoLuman: Dan Martinez /obj/item/bedsheet/fluff/hugosheet @@ -1613,7 +1613,7 @@ var/obj/item/clothing/head/helmet/space/plasmaman/lf53_fluff/F = new(P.loc) if(P == H.head) H.unEquip(P, TRUE, TRUE) - H.equip_to_slot(F, SLOT_HUD_HEAD, TRUE) + H.equip_to_slot(F, ITEM_SLOT_HEAD, TRUE) H.update_inv_head() qdel(P) @@ -1689,7 +1689,7 @@ icon_state = "panzermedal" item_state = "panzermedal" item_color = "panzermedal" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY /// Sagrotter: Xann Zxiax /obj/item/clothing/accessory/medal/fluff/XannZxiax @@ -1699,7 +1699,7 @@ icon_state = "Xann_necklace" item_state = "Xann_necklace" item_color = "Xann_necklace" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY /// Rb303: Isthel Eisenwald /obj/item/clothing/accessory/rbscarf diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm index 94f44bbdbae..6bb25918fee 100644 --- a/code/modules/detective_work/scanner.dm +++ b/code/modules/detective_work/scanner.dm @@ -10,7 +10,7 @@ w_class = WEIGHT_CLASS_NORMAL item_state = "electronic" flags = CONDUCT | NOBLUDGEON - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "engineering=4;biotech=2;programming=5" var/scanning = FALSE var/list/log = list() diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm index 89ca75c8cc3..fe31a78edeb 100644 --- a/code/modules/fish/fish_items.dm +++ b/code/modules/fish/fish_items.dm @@ -8,7 +8,7 @@ desc = "A small scoop to collect fish eggs with." icon = 'icons/obj/fish_items.dmi' icon_state = "egg_scoop" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -19,7 +19,7 @@ desc = "A tiny net to capture fish with. It's a death sentence!" icon = 'icons/obj/fish_items.dmi' icon_state = "net" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -44,7 +44,7 @@ desc = "A brush for cleaning the inside of aquariums. Contains a built-in odor neutralizer." icon = 'icons/obj/fish_items.dmi' icon_state = "brush" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 4d6c1845454..339fee416d9 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -281,18 +281,18 @@ for(var/obj/item/I in H.get_contents()) if(I.resistance_flags & INDESTRUCTIBLE) I.forceMove(get_turf(src)) - if(H.get_item_by_slot(SLOT_HUD_SUIT_STORE)) - var/obj/item/ws = H.get_item_by_slot(SLOT_HUD_SUIT_STORE) + if(H.get_item_by_slot(ITEM_SLOT_SUIT_STORE)) + var/obj/item/ws = H.get_item_by_slot(ITEM_SLOT_SUIT_STORE) if(ws.resistance_flags & INDESTRUCTIBLE) ws.forceMove(get_turf(src)) H.s_store = null - if(H.get_item_by_slot(SLOT_HUD_LEFT_STORE)) - var/obj/item/ls = H.get_item_by_slot(SLOT_HUD_LEFT_STORE) + if(H.get_item_by_slot(ITEM_SLOT_LEFT_POCKET)) + var/obj/item/ls = H.get_item_by_slot(ITEM_SLOT_LEFT_POCKET) if(ls.resistance_flags & INDESTRUCTIBLE) ls.forceMove(get_turf(src)) H.l_store = null - if(H.get_item_by_slot(SLOT_HUD_RIGHT_STORE)) - var/obj/item/rs = H.get_item_by_slot(SLOT_HUD_RIGHT_STORE) + if(H.get_item_by_slot(ITEM_SLOT_RIGHT_POCKET)) + var/obj/item/rs = H.get_item_by_slot(ITEM_SLOT_RIGHT_POCKET) if(rs.resistance_flags & INDESTRUCTIBLE) rs.forceMove(get_turf(src)) H.r_store = null diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 45f9c17e00f..5343876be14 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -398,7 +398,7 @@ if(href_list["pick"] == "Turn") turn_hand(usr) else - if(cardUser.get_item_by_slot(SLOT_HUD_LEFT_HAND) == src || cardUser.get_item_by_slot(SLOT_HUD_RIGHT_HAND) == src) + if(cardUser.get_item_by_slot(ITEM_SLOT_LEFT_HAND) == src || cardUser.get_item_by_slot(ITEM_SLOT_RIGHT_HAND) == src) pickedcard = href_list["pick"] Removecard() cardUser << browse(null, "window=cardhand") diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index b11cfd56251..0f2e1e97f45 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -4,7 +4,7 @@ name = "ambrosia branch" desc = "This is a plant." icon_state = "ambrosiavulgaris" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD filling_color = "#008000" bitesize_mod = 2 tastes = list("ambrosia" = 1) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 505ccd1b123..bf095885d14 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -22,7 +22,7 @@ name = "poppy" desc = "Long-used as a symbol of rest, peace, and death." icon_state = "poppy" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD bitesize_mod = 3 tastes = list("poppy" = 1) filling_color = "#FF6347" @@ -45,7 +45,7 @@ name = "lily" desc = "A beautiful white flower." icon_state = "lily" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD bitesize_mod = 3 tastes = list("lily" = 1) filling_color = "#C7BBAD" @@ -98,7 +98,7 @@ name = "geranium" desc = "A beautiful purple flower." icon_state = "geranium" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD bitesize_mod = 3 tastes = list("geranium" = 1) filling_color = "#A463FB" @@ -128,7 +128,7 @@ name = "harebell" desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten'd not thy breath.\"" icon_state = "harebell" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD filling_color = "#E6E6FA" tastes = list("harebell" = 1) bitesize_mod = 3 @@ -161,7 +161,7 @@ icon_state = "sunflower" damtype = "fire" force = 0 - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 1 @@ -190,7 +190,7 @@ name = "moonflower" desc = "Store in a location at least 50 yards away from werewolves." icon_state = "moonflower" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD filling_color = "#E6E6FA" bitesize_mod = 2 tastes = list("moonflower" = 1) @@ -217,7 +217,7 @@ icon_state = "novaflower" damtype = "fire" force = 0 - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 1 diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 262c623b226..543e1f026a2 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -6,7 +6,7 @@ icon_state = "hydro" item_state = "analyzer" w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "magnets=2;biotech=2" materials = list(MAT_METAL = 210, MAT_GLASS = 40) @@ -42,7 +42,7 @@ belt_icon = null volume = 100 container_type = OPENCONTAINER - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -63,7 +63,7 @@ belt_icon = null volume = 100 container_type = OPENCONTAINER - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -149,7 +149,7 @@ w_class = WEIGHT_CLASS_BULKY flags = CONDUCT armour_penetration_flat = 20 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK origin_tech = "materials=3;combat=2" attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/bladeslice.ogg' @@ -199,7 +199,7 @@ sharp = FALSE w_class = WEIGHT_CLASS_SMALL extend = FALSE - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "materials=3;combat=3" attack_verb = list("hit", "poked") hitsound = "swing_hit" @@ -208,7 +208,7 @@ extend = !extend if(extend) to_chat(user, "With a flick of your wrist, you extend the scythe. It's reaping time!") - slot_flags = SLOT_FLAG_BACK //won't fit on belt, but can be worn on belt when extended + slot_flags = ITEM_SLOT_BACK //won't fit on belt, but can be worn on belt when extended w_class = WEIGHT_CLASS_BULKY //won't fit in backpacks while extended force = 15 //slightly better than normal scythe damage attack_verb = list("chopped", "sliced", "cut", "reaped") @@ -217,7 +217,7 @@ playsound(src.loc, 'sound/weapons/blade_unsheath.ogg', 50, 1) //Sound credit to Qat of Freesound.org else to_chat(user, "You collapse the scythe, folding it away for easy storage.") - slot_flags = SLOT_FLAG_BELT //can be worn on belt again, but no longer makes sense to wear on the back + slot_flags = ITEM_SLOT_BELT //can be worn on belt again, but no longer makes sense to wear on the back w_class = WEIGHT_CLASS_SMALL force = 3 attack_verb = list("hit", "poked") diff --git a/code/modules/instruments/objs/items/headphones.dm b/code/modules/instruments/objs/items/headphones.dm index 32373c5afb4..fe0f4f54e9e 100644 --- a/code/modules/instruments/objs/items/headphones.dm +++ b/code/modules/instruments/objs/items/headphones.dm @@ -56,7 +56,7 @@ icon_state = item_state = "headphones[on]" /obj/item/clothing/ears/headphones/item_action_slot_check(slot) - if(slot == SLOT_HUD_LEFT_EAR || slot == SLOT_HUD_RIGHT_EAR) + if(slot & ITEM_SLOT_BOTH_EARS) return TRUE /** diff --git a/code/modules/martial_arts/bearserk.dm b/code/modules/martial_arts/bearserk.dm index 26fe0e196f6..3c5833484ba 100644 --- a/code/modules/martial_arts/bearserk.dm +++ b/code/modules/martial_arts/bearserk.dm @@ -54,7 +54,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(slot == SLOT_HUD_HEAD) + if(slot == ITEM_SLOT_HEAD) style.teach(H, TRUE) H.faction |= "soviet" H.physiology.stun_mod *= 0.80 @@ -65,7 +65,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_HEAD) == src) + if(H.get_item_by_slot(ITEM_SLOT_HEAD) == src) style.remove(H) H.faction -= "soviet" H.physiology.stun_mod /= 0.80 diff --git a/code/modules/martial_arts/judo.dm b/code/modules/martial_arts/judo.dm index 74cae47d84c..5afe28e2856 100644 --- a/code/modules/martial_arts/judo.dm +++ b/code/modules/martial_arts/judo.dm @@ -45,7 +45,7 @@ /obj/item/storage/belt/judobelt/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_HUD_BELT) + if(slot == ITEM_SLOT_BELT) var/mob/living/carbon/human/H = user if(HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(H, "The arts of Corporate Judo echo uselessly in your head, the thought of violence disgusts you!") @@ -60,7 +60,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_BELT) == src) + if(H.get_item_by_slot(ITEM_SLOT_BELT) == src) style.remove(H) to_chat(user, "You suddenly forget the arts of Corporate Judo...") diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm index 3d9fd8645eb..11badf02162 100644 --- a/code/modules/martial_arts/krav_maga.dm +++ b/code/modules/martial_arts/krav_maga.dm @@ -153,7 +153,7 @@ /obj/item/clothing/gloves/color/black/krav_maga/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_HUD_GLOVES) + if(slot == ITEM_SLOT_GLOVES) var/mob/living/carbon/human/H = user style.teach(H, TRUE) @@ -162,7 +162,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_GLOVES) == src) + if(H.get_item_by_slot(ITEM_SLOT_GLOVES) == src) style.remove(H) // Warden gloves diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 2c5f5945916..9594dc9fdaf 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -268,7 +268,7 @@ /obj/item/storage/belt/champion/wrestling/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == SLOT_HUD_BELT) + if(slot == ITEM_SLOT_BELT) var/mob/living/carbon/human/H = user if(HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(user, "In spite of the grandiosity of the belt, you don't feel like getting into any fights.") @@ -282,7 +282,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(SLOT_HUD_BELT) == src) + if(H.get_item_by_slot(ITEM_SLOT_BELT) == src) style.remove(H) to_chat(user, "You no longer have an urge to flex your muscles.") @@ -369,7 +369,7 @@ righthand_file = 'icons/mob/inhands/staves_righthand.dmi' force = 10 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK throwforce = 20 throw_speed = 2 attack_verb = list("smashed", "slammed", "whacked", "thwacked") diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 3442e7e9853..a0b5c179d4b 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -11,7 +11,7 @@ item_state = "crusher0" force = 0 //You can't hit stuff unless wielded w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK throwforce = 5 throw_speed = 4 armour_penetration_flat = 10 diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index 77b915f9427..ea43d1ae28e 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -7,7 +7,7 @@ item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/cooldown = 35 var/current_cooldown = 0 @@ -37,7 +37,7 @@ item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/cooldown = 35 var/current_cooldown = 0 var/range = 7 diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 8a9bb832b88..4d5a6e63d55 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/mining_tool.dmi' icon_state = "pickaxe" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 15 throwforce = 10 item_state = "pickaxe" @@ -130,7 +130,7 @@ icon = 'icons/obj/mining_tool.dmi' icon_state = "shovel" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT force = 8 throwforce = 4 item_state = "shovel" diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 28e64797fd0..17cf4e80bd8 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_EMPTY(wormhole_effect) throw_speed = 3 throw_range = 5 origin_tech = "bluespace=2" - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /obj/item/wormhole_jaunter/attack_self(mob/user) user.visible_message("[user.name] activates the [name]!") @@ -55,7 +55,7 @@ GLOBAL_LIST_EMPTY(wormhole_effect) qdel(src) /obj/item/wormhole_jaunter/proc/chasm_react(mob/user) - if(user.get_item_by_slot(SLOT_HUD_BELT) == src) + if(user.get_item_by_slot(ITEM_SLOT_BELT) == src) to_chat(user, "Your [name] activates, saving you from the chasm!") activate(user, FALSE) else diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 04825b90b83..f05c780505a 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -66,7 +66,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) to_chat(user, "You start attaching the pack to [A]...") if(do_after(user, 50, target = A)) to_chat(user, "You attach the pack to [A] and activate it.") - user.equip_to_slot_if_possible(src, SLOT_HUD_IN_BACKPACK, FALSE, TRUE) + user.equip_to_slot_if_possible(src, ITEM_SLOT_IN_BACKPACK, FALSE, TRUE) uses_left-- if(uses_left <= 0) user.drop_item(src) diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm index 31f42bc2ef8..94fc152dab4 100644 --- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm +++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm @@ -252,7 +252,7 @@ lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/staves_righthand.dmi' item_state = "lavastaff" - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY force = 25 damtype = BURN diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm index d5e747ed200..eaa7ecc9318 100644 --- a/code/modules/mining/lavaland/loot/hierophant_loot.dm +++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm @@ -10,7 +10,7 @@ righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' inhand_x_dimension = 64 inhand_y_dimension = 64 - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY force = 15 attack_verb = list("clubbed", "beat", "pummeled") diff --git a/code/modules/mining/lavaland/loot/legion_loot.dm b/code/modules/mining/lavaland/loot/legion_loot.dm index 40c1e51167a..4153ea14f90 100644 --- a/code/modules/mining/lavaland/loot/legion_loot.dm +++ b/code/modules/mining/lavaland/loot/legion_loot.dm @@ -6,7 +6,7 @@ righthand_file = 'icons/mob/inhands/staves_righthand.dmi' item_state = "staffofstorms" icon = 'icons/obj/guns/magic.dmi' - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY force = 25 damtype = BURN @@ -96,7 +96,7 @@ // This early return stops the staff from shooting lightning at someone when being used as a lighter. if(iscarbon(target)) var/mob/living/carbon/cig_haver = target - var/mask_item = cig_haver.get_item_by_slot(SLOT_HUD_WEAR_MASK) + var/mask_item = cig_haver.get_item_by_slot(ITEM_SLOT_MASK) if(istype(mask_item, /obj/item/clothing/mask/cigarette) && user.zone_selected == "mouth" && user.a_intent == INTENT_HELP) return diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index 384e4c4cc93..b925bd1a71f 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -18,7 +18,7 @@ desc = "Somehow, it's in two places at once." icon = 'icons/obj/storage.dmi' icon_state = "cultpack" - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK resistance_flags = INDESTRUCTIBLE var/obj/item/storage/backpack/shared/bag diff --git a/code/modules/mob/inventory_procs.dm b/code/modules/mob/inventory_procs.dm index f38dabacd7e..569f493d25a 100644 --- a/code/modules/mob/inventory_procs.dm +++ b/code/modules/mob/inventory_procs.dm @@ -61,9 +61,9 @@ /mob/proc/put_in_hand(obj/item/I, slot) switch(slot) - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return put_in_l_hand(I) - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return put_in_r_hand(I) //Puts the item into your l_hand if possible and calls all necessary triggers/updates. returns 1 on success. @@ -75,7 +75,7 @@ l_hand = W W.layer = ABOVE_HUD_LAYER //TODO: move to equipped? W.plane = ABOVE_HUD_PLANE //TODO: move to equipped? - W.equipped(src, SLOT_HUD_LEFT_HAND) + W.equipped(src, ITEM_SLOT_LEFT_HAND) if(pulling == W) stop_pulling() update_inv_l_hand() @@ -91,7 +91,7 @@ r_hand = W W.layer = ABOVE_HUD_LAYER W.plane = ABOVE_HUD_PLANE - W.equipped(src,SLOT_HUD_RIGHT_HAND) + W.equipped(src,ITEM_SLOT_RIGHT_HAND) if(pulling == W) stop_pulling() update_inv_r_hand() @@ -277,17 +277,17 @@ S.handle_item_insertion(src, M) return TRUE - S = M.get_item_by_slot(SLOT_HUD_WEAR_ID) + S = M.get_item_by_slot(ITEM_SLOT_ID) if(istype(S) && S.can_be_inserted(src, TRUE)) //else we put in a wallet S.handle_item_insertion(src, M) return TRUE - S = M.get_item_by_slot(SLOT_HUD_BELT) + S = M.get_item_by_slot(ITEM_SLOT_BELT) if(istype(S) && S.can_be_inserted(src, TRUE)) //else we put in belt S.handle_item_insertion(src, M) return TRUE - var/obj/item/O = M.get_item_by_slot(SLOT_HUD_BACK) //else we put in backpack + var/obj/item/O = M.get_item_by_slot(ITEM_SLOT_BACK) //else we put in backpack if(istype(O, /obj/item/storage)) S = O if(S.can_be_inserted(src, TRUE)) @@ -315,16 +315,31 @@ /mob/proc/get_item_by_slot(slot_id) switch(slot_id) - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) return wear_mask - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) return back - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return l_hand - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return r_hand return null +/mob/proc/get_slot_by_item(obj/item/looking_for) + if(looking_for == wear_mask) + return ITEM_SLOT_MASK + + if(looking_for == back) + return ITEM_SLOT_BACK + + if(looking_for == l_hand) + return ITEM_SLOT_LEFT_HAND + + if(looking_for == r_hand) + return ITEM_SLOT_RIGHT_HAND + + return null + //search for a path in inventory and storage items in that inventory (backpack, belt, etc) and return it. /mob/proc/find_item(path) var/list/L = get_contents() diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm index 6a929602998..7bef0ed3234 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm @@ -11,7 +11,7 @@ var/obj/item/W = get_active_hand() if(!W) switch(slot_id) - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) if(wear_suit) wear_suit.attack_alien(src) - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) if(head) head.attack_alien(src) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm index ac13fd82732..0f2ee12fcfc 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm @@ -68,7 +68,7 @@ /mob/living/carbon/alien/humanoid/update_inv_wear_suit() if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_OUTER_SUIT)] inv.update_icon() if(wear_suit) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 191ae690666..39920b0cace 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -138,7 +138,7 @@ "[src] tears [W] off of [target]'s face!") src.loc = target - target.equip_to_slot_if_possible(src, SLOT_HUD_WEAR_MASK, FALSE, TRUE) + target.equip_to_slot_if_possible(src, ITEM_SLOT_MASK, FALSE, TRUE) if(!sterile) M.KnockDown(impregnation_time + 2 SECONDS) flags |= NODROP //You can't take it off until it dies... or figures out you're an IPC. diff --git a/code/modules/mob/living/carbon/carbon_procs.dm b/code/modules/mob/living/carbon/carbon_procs.dm index 358f897240a..1cc22fd249d 100644 --- a/code/modules/mob/living/carbon/carbon_procs.dm +++ b/code/modules/mob/living/carbon/carbon_procs.dm @@ -766,22 +766,37 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven /mob/living/carbon/get_item_by_slot(slot_id) switch(slot_id) - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) return back - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) return wear_mask - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) return wear_suit - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return l_hand - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return r_hand - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_HANDCUFFED) return handcuffed - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) return legcuffed return null +/mob/living/carbon/get_slot_by_item(obj/item/looking_for) + if(looking_for == back) + return ITEM_SLOT_BACK + + // if(back && (looking_for in back)) + // return ITEM_SLOT_BACKPACK + + if(looking_for == wear_mask) + return ITEM_SLOT_MASK + + if(looking_for == head) + return ITEM_SLOT_HEAD + + return ..() + //generates realistic-ish pulse output based on preset levels /mob/living/carbon/proc/get_pulse() var/temp = 0 diff --git a/code/modules/mob/living/carbon/carbon_stripping.dm b/code/modules/mob/living/carbon/carbon_stripping.dm index e29abf475da..19125b47082 100644 --- a/code/modules/mob/living/carbon/carbon_stripping.dm +++ b/code/modules/mob/living/carbon/carbon_stripping.dm @@ -1,10 +1,10 @@ /datum/strippable_item/mob_item_slot/head key = STRIPPABLE_ITEM_HEAD - item_slot = SLOT_HUD_HEAD + item_slot = ITEM_SLOT_HEAD /datum/strippable_item/mob_item_slot/back key = STRIPPABLE_ITEM_BACK - item_slot = SLOT_HUD_BACK + item_slot = ITEM_SLOT_BACK /datum/strippable_item/mob_item_slot/back/get_alternate_actions(atom/source, mob/user) return get_strippable_alternate_action_internals(get_item(source), source) @@ -16,7 +16,7 @@ /datum/strippable_item/mob_item_slot/mask key = STRIPPABLE_ITEM_MASK - item_slot = SLOT_HUD_WEAR_MASK + item_slot = ITEM_SLOT_MASK /datum/strippable_item/mob_item_slot/mask/get_body_action(atom/source, mob/user) if(!ishuman(source)) @@ -84,7 +84,7 @@ /datum/strippable_item/mob_item_slot/handcuffs key = STRIPPABLE_ITEM_HANDCUFFS - item_slot = SLOT_HUD_HANDCUFFED + item_slot = ITEM_SLOT_HANDCUFFED /datum/strippable_item/mob_item_slot/handcuffs/should_show(atom/source, mob/user) if(!iscarbon(source)) @@ -99,7 +99,7 @@ /datum/strippable_item/mob_item_slot/legcuffs key = STRIPPABLE_ITEM_LEGCUFFS - item_slot = SLOT_HUD_LEGCUFFED + item_slot = ITEM_SLOT_LEGCUFFED /datum/strippable_item/mob_item_slot/legcuffs/should_show(atom/source, mob/user) if(!iscarbon(source)) @@ -173,8 +173,8 @@ /datum/strippable_item/hand/left key = STRIPPABLE_ITEM_LHAND - which_hand = SLOT_HUD_LEFT_HAND + which_hand = ITEM_SLOT_LEFT_HAND /datum/strippable_item/hand/right key = STRIPPABLE_ITEM_RHAND - which_hand = SLOT_HUD_RIGHT_HAND + which_hand = ITEM_SLOT_RIGHT_HAND diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 7377aeedf28..414130c96d5 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -35,9 +35,9 @@ /mob/living/carbon/proc/update_hands_hud() if(!hud_used) return - var/atom/movable/screen/inventory/R = hud_used.inv_slots[SLOT_HUD_RIGHT_HAND] + var/atom/movable/screen/inventory/R = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_RIGHT_HAND)] R?.update_icon() - var/atom/movable/screen/inventory/L = hud_used.inv_slots[SLOT_HUD_LEFT_HAND] + var/atom/movable/screen/inventory/L = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_LEFT_HAND)] L?.update_icon() /mob/living/carbon/update_inv_r_hand(ignore_cuffs) @@ -66,8 +66,8 @@ update_hud_wear_mask(wear_mask) /mob/living/carbon/update_inv_back() - if(client && hud_used && hud_used.inv_slots[SLOT_HUD_BACK]) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BACK] + if(client && hud_used && hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_BACK)]) + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_BACK)] inv.update_icon() if(back) diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 42511b04c46..bba2f1c9e9f 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -208,7 +208,7 @@ var/just_sleeping = FALSE //We don't appear as dead upon casual examination, just sleeping if(stat == DEAD || HAS_TRAIT(src, TRAIT_FAKEDEATH)) - var/obj/item/clothing/glasses/E = get_item_by_slot(SLOT_HUD_GLASSES) + var/obj/item/clothing/glasses/E = get_item_by_slot(ITEM_SLOT_EYES) var/are_we_in_weekend_at_bernies = E?.tint && istype(buckled, /obj/structure/chair) //Are we in a chair with our eyes obscured? if(isliving(user) && are_we_in_weekend_at_bernies) diff --git a/code/modules/mob/living/carbon/human/human_inventory.dm b/code/modules/mob/living/carbon/human/human_inventory.dm index 206958d2e12..b9ca980f82e 100644 --- a/code/modules/mob/living/carbon/human/human_inventory.dm +++ b/code/modules/mob/living/carbon/human/human_inventory.dm @@ -20,50 +20,50 @@ /mob/living/carbon/human/proc/has_organ_for_slot(slot) switch(slot) - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) return has_organ("chest") - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) return has_organ("head") - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_HANDCUFFED) return has_organ("l_hand") && has_organ("r_hand") - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) return has_organ("l_leg") && has_organ("r_leg") - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return has_organ("l_hand") - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return has_organ("r_hand") - if(SLOT_HUD_BELT) + if(ITEM_SLOT_BELT) return has_organ("chest") - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_ID) // the only relevant check for this is the uniform check return TRUE - if(SLOT_HUD_WEAR_PDA) + if(ITEM_SLOT_PDA) return TRUE - if(SLOT_HUD_LEFT_EAR) + if(ITEM_SLOT_LEFT_EAR) return has_organ("head") - if(SLOT_HUD_RIGHT_EAR) + if(ITEM_SLOT_RIGHT_EAR) return has_organ("head") - if(SLOT_HUD_GLASSES) + if(ITEM_SLOT_EYES) return has_organ("head") - if(SLOT_HUD_GLOVES) + if(ITEM_SLOT_GLOVES) return has_organ("l_hand") && has_organ("r_hand") - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) return has_organ("head") - if(SLOT_HUD_SHOES) + if(ITEM_SLOT_SHOES) return has_organ("r_foot") && has_organ("l_foot") - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) return has_organ("chest") - if(SLOT_HUD_JUMPSUIT) + if(ITEM_SLOT_JUMPSUIT) return has_organ("chest") - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) return has_organ("chest") - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) return has_organ("chest") - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) return has_organ("chest") - if(SLOT_HUD_IN_BACKPACK) + if(ITEM_SLOT_IN_BACKPACK) return TRUE - if(SLOT_HUD_TIE) + if(ITEM_SLOT_ACCESSORY) return TRUE /mob/living/carbon/human/unEquip(obj/item/I, force, silent = FALSE) @@ -187,7 +187,6 @@ src.r_hand = null update_inv_r_hand() - I.screen_loc = null if(client) client.screen -= I if(length(observers)) @@ -201,10 +200,10 @@ I.plane = ABOVE_HUD_PLANE switch(slot) - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) back = I update_inv_back() - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) wear_mask = I if((wear_mask.flags & BLOCKHAIR) || (wear_mask.flags & BLOCKHEADHAIR)) update_hair() //rebuild hair @@ -215,48 +214,48 @@ wear_mask_update(I, toggle_off = TRUE) update_misc_effects() update_inv_wear_mask() - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_HANDCUFFED) handcuffed = I update_inv_handcuffed() - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) legcuffed = I update_inv_legcuffed() - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) l_hand = I update_inv_l_hand() - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) r_hand = I update_inv_r_hand() - if(SLOT_HUD_BELT) + if(ITEM_SLOT_BELT) belt = I update_inv_belt() - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_ID) wear_id = I if(length(hud_list)) sec_hud_set_ID() update_inv_wear_id() - if(SLOT_HUD_WEAR_PDA) + if(ITEM_SLOT_PDA) wear_pda = I update_inv_wear_pda() - if(SLOT_HUD_LEFT_EAR) + if(ITEM_SLOT_LEFT_EAR) l_ear = I - if(l_ear.slot_flags & SLOT_FLAG_TWOEARS) - var/obj/item/clothing/ears/offear/O = new(I) - O.forceMove(src) - r_ear = O - O.layer = ABOVE_HUD_LAYER - O.plane = ABOVE_HUD_PLANE + // if(l_ear.slot_flags & ITEM_SLOT_LEFT_EAR) CHAP-TODO: ACTUALLY FIX OFFEARS OR REMOVE THEM COMPLETELY + // var/obj/item/clothing/ears/offear/O = new(I) + // O.forceMove(src) + // r_ear = O + // O.layer = ABOVE_HUD_LAYER + // O.plane = ABOVE_HUD_PLANE update_inv_ears() - if(SLOT_HUD_RIGHT_EAR) + if(ITEM_SLOT_RIGHT_EAR) r_ear = I - if(r_ear.slot_flags & SLOT_FLAG_TWOEARS) - var/obj/item/clothing/ears/offear/O = new(I) - O.forceMove(src) - l_ear = O - O.layer = ABOVE_HUD_LAYER - O.plane = ABOVE_HUD_PLANE + // if(r_ear.slot_flags & ITEM_SLOT_RIGHT_EAR) + // var/obj/item/clothing/ears/offear/O = new(I) + // O.forceMove(src) + // l_ear = O + // O.layer = ABOVE_HUD_LAYER + // O.plane = ABOVE_HUD_PLANE update_inv_ears() - if(SLOT_HUD_GLASSES) + if(ITEM_SLOT_EYES) glasses = I var/obj/item/clothing/glasses/G = I if(G.tint) @@ -267,10 +266,10 @@ update_sight() update_inv_glasses() update_client_colour() - if(SLOT_HUD_GLOVES) + if(ITEM_SLOT_GLOVES) gloves = I update_inv_gloves() - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) head = I if((head.flags & BLOCKHAIR) || (head.flags & BLOCKHEADHAIR)) update_hair() //rebuild hair @@ -284,27 +283,27 @@ // this calls update_inv_head() on its own update_misc_effects() head_update(I) - if(SLOT_HUD_SHOES) + if(ITEM_SLOT_SHOES) shoes = I update_inv_shoes() - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) wear_suit = I if(wear_suit.flags_inv & HIDESHOES) update_inv_shoes() update_inv_wear_suit() - if(SLOT_HUD_JUMPSUIT) + if(ITEM_SLOT_JUMPSUIT) w_uniform = I update_inv_w_uniform() - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) l_store = I update_inv_pockets() - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) r_store = I update_inv_pockets() - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) s_store = I update_inv_s_store() - if(SLOT_HUD_IN_BACKPACK) + if(ITEM_SLOT_IN_BACKPACK) if(get_active_hand() == I) unEquip(I) if(ismodcontrol(back)) @@ -313,12 +312,14 @@ I.forceMove(C.bag) else I.forceMove(back) - if(SLOT_HUD_TIE) + if(ITEM_SLOT_ACCESSORY) var/obj/item/clothing/under/uniform = src.w_uniform uniform.attackby(I, src) else to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!") + I.screen_loc = null + /mob/living/carbon/human/put_in_hands(obj/item/I) if(!I) return FALSE @@ -337,48 +338,90 @@ // Return the item currently in the slot ID /mob/living/carbon/human/get_item_by_slot(slot_id) switch(slot_id) - if(SLOT_HUD_BACK) + if(ITEM_SLOT_BACK) return back - if(SLOT_HUD_WEAR_MASK) + if(ITEM_SLOT_MASK) return wear_mask - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_HANDCUFFED) return handcuffed - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) return legcuffed - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return l_hand - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return r_hand - if(SLOT_HUD_BELT) + if(ITEM_SLOT_BELT) return belt - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_ID) return wear_id - if(SLOT_HUD_WEAR_PDA) + if(ITEM_SLOT_PDA) return wear_pda - if(SLOT_HUD_LEFT_EAR) + if(ITEM_SLOT_LEFT_EAR) return l_ear - if(SLOT_HUD_RIGHT_EAR) + if(ITEM_SLOT_RIGHT_EAR) return r_ear - if(SLOT_HUD_GLASSES) + if(ITEM_SLOT_EYES) return glasses - if(SLOT_HUD_GLOVES) + if(ITEM_SLOT_GLOVES) return gloves - if(SLOT_HUD_HEAD) + if(ITEM_SLOT_HEAD) return head - if(SLOT_HUD_SHOES) + if(ITEM_SLOT_SHOES) return shoes - if(SLOT_HUD_OUTER_SUIT) + if(ITEM_SLOT_OUTER_SUIT) return wear_suit - if(SLOT_HUD_JUMPSUIT) + if(ITEM_SLOT_JUMPSUIT) return w_uniform - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) return l_store - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) return r_store - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) return s_store return null +/mob/living/carbon/human/get_slot_by_item(obj/item/looking_for) + if(looking_for == belt) + return ITEM_SLOT_BELT + + if(looking_for == wear_id) + return ITEM_SLOT_ID + + if(looking_for == l_ear) + return ITEM_SLOT_LEFT_EAR + + if(looking_for == r_ear) + return ITEM_SLOT_RIGHT_EAR + + if(looking_for == glasses) + return ITEM_SLOT_EYES + + if(looking_for == gloves) + return ITEM_SLOT_GLOVES + + if(looking_for == head) + return ITEM_SLOT_HEAD + + if(looking_for == shoes) + return ITEM_SLOT_SHOES + + if(looking_for == wear_suit) + return ITEM_SLOT_OUTER_SUIT + + if(looking_for == w_uniform) + return ITEM_SLOT_JUMPSUIT + + if(looking_for == r_store) + return ITEM_SLOT_BOTH_POCKETS + + if(looking_for == l_store) + return ITEM_SLOT_BOTH_POCKETS + + // if(looking_for == s_store) + // return ITEM_SLOT_SUIT_STORE + + return ..() + /mob/living/carbon/human/get_all_slots() . = get_body_slots() | get_head_slots() diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm index ebac0940b26..d2040cf6c84 100644 --- a/code/modules/mob/living/carbon/human/human_mob.dm +++ b/code/modules/mob/living/carbon/human/human_mob.dm @@ -844,30 +844,34 @@ fail_msg = "There is no exposed flesh or thin material [target_zone == "head" ? "on [p_their()] head" : "on [p_their()] body"] to inject into." to_chat(user, "[fail_msg]") +/// +/** + * Gets the obscured ITEM_SLOTs on a human + * + * Returns: + * * A bitfield containing the ITEM_SLOTS bitflags that are obscured. + */ /mob/living/carbon/human/proc/check_obscured_slots() - var/list/obscured = list() + var/obscured = NONE if(wear_suit) if(wear_suit.flags_inv & HIDEGLOVES) - obscured |= SLOT_HUD_GLOVES + obscured |= ITEM_SLOT_GLOVES if(wear_suit.flags_inv & HIDEJUMPSUIT) - obscured |= SLOT_HUD_JUMPSUIT + obscured |= ITEM_SLOT_JUMPSUIT if(wear_suit.flags_inv & HIDESHOES) - obscured |= SLOT_HUD_SHOES + obscured |= ITEM_SLOT_SHOES if(head) if(head.flags_inv & HIDEMASK) - obscured |= SLOT_HUD_WEAR_MASK + obscured |= ITEM_SLOT_MASK if(head.flags_inv & HIDEEYES) - obscured |= SLOT_HUD_GLASSES + obscured |= ITEM_SLOT_EYES if(head.flags_inv & HIDEEARS) - obscured |= SLOT_HUD_RIGHT_EAR - obscured |= SLOT_HUD_LEFT_EAR + obscured |= ITEM_SLOT_BOTH_EARS - if(length(obscured) > 0) + if(obscured) return obscured - else - return null /mob/living/carbon/human/proc/check_has_mouth() // Todo, check stomach organ when implemented. @@ -877,9 +881,8 @@ return TRUE /mob/living/carbon/human/proc/get_visible_gender() - var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - if((SLOT_HUD_JUMPSUIT in obscured) && skipface) + if(skipface && (check_obscured_slots() & ITEM_SLOT_JUMPSUIT)) return PLURAL return gender @@ -1107,7 +1110,7 @@ if(!(dna.species.bodyflags & HAS_SKIN_TONE)) s_tone = 0 - var/list/thing_to_check = list(SLOT_HUD_WEAR_MASK, SLOT_HUD_HEAD, SLOT_HUD_SHOES, SLOT_HUD_GLOVES, SLOT_HUD_LEFT_EAR, SLOT_HUD_RIGHT_EAR, SLOT_HUD_GLASSES, SLOT_HUD_LEFT_HAND, SLOT_HUD_RIGHT_HAND) + var/list/thing_to_check = list(ITEM_SLOT_MASK, ITEM_SLOT_HEAD, ITEM_SLOT_SHOES, ITEM_SLOT_GLOVES, ITEM_SLOT_LEFT_EAR, ITEM_SLOT_RIGHT_EAR, ITEM_SLOT_EYES, ITEM_SLOT_LEFT_HAND, ITEM_SLOT_RIGHT_HAND) var/list/kept_items[0] var/list/item_flags[0] for(var/thing in thing_to_check) @@ -1777,8 +1780,8 @@ Eyes need to have significantly high darksight to shine unless the mob has the X organs_list[O.name] = O.serialize() // Equipment - equip_list.len = SLOT_HUD_AMOUNT - for(var/i = 1, i < SLOT_HUD_AMOUNT, i++) + equip_list.len = ITEM_SLOT_AMOUNT + for(var/i = 1, i < ITEM_SLOT_AMOUNT, i++) var/obj/item/thing = get_item_by_slot(i) if(thing != null) equip_list[i] = thing.serialize() @@ -1837,16 +1840,16 @@ Eyes need to have significantly high darksight to shine unless the mob has the X // #1: Jumpsuit // #2: Outer suit // #3+: Everything else - if(islist(equip_list[SLOT_HUD_JUMPSUIT])) - var/obj/item/clothing/C = list_to_object(equip_list[SLOT_HUD_JUMPSUIT], T) - equip_to_slot_if_possible(C, SLOT_HUD_JUMPSUIT) + if(islist(equip_list[ITEM_SLOT_JUMPSUIT])) + var/obj/item/clothing/C = list_to_object(equip_list[ITEM_SLOT_JUMPSUIT], T) + equip_to_slot_if_possible(C, ITEM_SLOT_JUMPSUIT) - if(islist(equip_list[SLOT_HUD_OUTER_SUIT])) - var/obj/item/clothing/C = list_to_object(equip_list[SLOT_HUD_OUTER_SUIT], T) - equip_to_slot_if_possible(C, SLOT_HUD_OUTER_SUIT) + if(islist(equip_list[ITEM_SLOT_OUTER_SUIT])) + var/obj/item/clothing/C = list_to_object(equip_list[ITEM_SLOT_OUTER_SUIT], T) + equip_to_slot_if_possible(C, ITEM_SLOT_OUTER_SUIT) - for(var/i = 1, i < SLOT_HUD_AMOUNT, i++) - if(i == SLOT_HUD_JUMPSUIT || i == SLOT_HUD_OUTER_SUIT) + for(var/i = 1, i < ITEM_SLOT_AMOUNT, i++) + if(i == ITEM_SLOT_JUMPSUIT || i == ITEM_SLOT_OUTER_SUIT) continue if(islist(equip_list[i])) var/obj/item/clothing/C = list_to_object(equip_list[i], T) diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm index 1e159ce42c6..fdb6e8a3d83 100644 --- a/code/modules/mob/living/carbon/human/human_stripping.dm +++ b/code/modules/mob/living/carbon/human/human_stripping.dm @@ -26,11 +26,11 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/eyes key = STRIPPABLE_ITEM_EYES - item_slot = SLOT_HUD_GLASSES + item_slot = ITEM_SLOT_EYES /datum/strippable_item/mob_item_slot/jumpsuit key = STRIPPABLE_ITEM_JUMPSUIT - item_slot = SLOT_HUD_JUMPSUIT + item_slot = ITEM_SLOT_JUMPSUIT /datum/strippable_item/mob_item_slot/jumpsuit/get_alternate_actions(atom/source, mob/user) var/list/multiple_options = list() @@ -74,27 +74,27 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/left_ear key = STRIPPABLE_ITEM_L_EAR - item_slot = SLOT_HUD_LEFT_EAR + item_slot = ITEM_SLOT_LEFT_EAR /datum/strippable_item/mob_item_slot/right_ear key = STRIPPABLE_ITEM_R_EAR - item_slot = SLOT_HUD_RIGHT_EAR + item_slot = ITEM_SLOT_RIGHT_EAR /datum/strippable_item/mob_item_slot/suit key = STRIPPABLE_ITEM_SUIT - item_slot = SLOT_HUD_OUTER_SUIT + item_slot = ITEM_SLOT_OUTER_SUIT /datum/strippable_item/mob_item_slot/gloves key = STRIPPABLE_ITEM_GLOVES - item_slot = SLOT_HUD_GLOVES + item_slot = ITEM_SLOT_GLOVES /datum/strippable_item/mob_item_slot/feet key = STRIPPABLE_ITEM_FEET - item_slot = SLOT_HUD_SHOES + item_slot = ITEM_SLOT_SHOES /datum/strippable_item/mob_item_slot/suit_storage key = STRIPPABLE_ITEM_SUIT_STORAGE - item_slot = SLOT_HUD_SUIT_STORE + item_slot = ITEM_SLOT_SUIT_STORE /datum/strippable_item/mob_item_slot/suit_storage/get_alternate_actions(atom/source, mob/user) return get_strippable_alternate_action_internals(get_item(source), source) @@ -106,11 +106,11 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/id key = STRIPPABLE_ITEM_ID - item_slot = SLOT_HUD_WEAR_ID + item_slot = ITEM_SLOT_ID /datum/strippable_item/mob_item_slot/pda key = STRIPPABLE_ITEM_PDA - item_slot = SLOT_HUD_WEAR_PDA + item_slot = ITEM_SLOT_PDA /datum/strippable_item/mob_item_slot/pda/get_obscuring(atom/source) return isnull(get_item(source)) \ @@ -119,7 +119,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/belt key = STRIPPABLE_ITEM_BELT - item_slot = SLOT_HUD_BELT + item_slot = ITEM_SLOT_BELT /datum/strippable_item/mob_item_slot/belt/get_alternate_actions(atom/source, mob/user) return get_strippable_alternate_action_internals(get_item(source), source) @@ -168,12 +168,12 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( /datum/strippable_item/mob_item_slot/pocket/left key = STRIPPABLE_ITEM_LPOCKET - item_slot = SLOT_HUD_LEFT_STORE + item_slot = ITEM_SLOT_LEFT_POCKET pocket_side = "left" /datum/strippable_item/mob_item_slot/pocket/right key = STRIPPABLE_ITEM_RPOCKET - item_slot = SLOT_HUD_RIGHT_STORE + item_slot = ITEM_SLOT_RIGHT_POCKET pocket_side = "right" /proc/get_strippable_alternate_action_internals(obj/item/item, atom/source) diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 52db0245ce1..a50446542ff 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -574,7 +574,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_w_uniform() remove_overlay(UNIFORM_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_JUMPSUIT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_JUMPSUIT)] if(inv) inv.update_icon() @@ -648,7 +648,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_id() remove_overlay(ID_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_ID] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_ID)] if(inv) inv.update_icon() @@ -664,7 +664,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) remove_overlay(L_HAND_BLOOD_LAYER) remove_overlay(R_HAND_BLOOD_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLOVES] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_GLOVES)] if(inv) inv.update_icon() @@ -708,7 +708,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) remove_overlay(OVER_MASK_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLASSES] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_EYES)] if(inv) inv.update_icon() @@ -745,8 +745,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) remove_overlay(RIGHT_EAR_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/left_ear_inv = hud_used.inv_slots[SLOT_HUD_LEFT_EAR] - var/atom/movable/screen/inventory/right_ear_inv = hud_used.inv_slots[SLOT_HUD_RIGHT_EAR] + var/atom/movable/screen/inventory/left_ear_inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_LEFT_EAR)] + var/atom/movable/screen/inventory/right_ear_inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_RIGHT_EAR)] if(left_ear_inv) left_ear_inv.update_icon() if(right_ear_inv) @@ -786,7 +786,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) remove_overlay(L_FOOT_BLOOD_LAYER) remove_overlay(R_FOOT_BLOOD_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SHOES] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_SHOES)] if(inv) inv.update_icon() @@ -826,7 +826,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_s_store() remove_overlay(SUIT_STORE_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SUIT_STORE] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_SUIT_STORE)] if(inv) inv.update_icon() @@ -846,7 +846,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) ..() remove_overlay(HEAD_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_HEAD] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_HEAD)] if(inv) inv.update_icon() @@ -900,7 +900,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) - /obj/item/claymore/.. */ if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BELT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_BELT)] if(inv) inv.update_icon() @@ -939,7 +939,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_suit() remove_overlay(SUIT_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_OUTER_SUIT)] if(inv) inv.update_icon() @@ -982,11 +982,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(client && hud_used) var/atom/movable/screen/inventory/inv - inv = hud_used.inv_slots[SLOT_HUD_LEFT_STORE] + inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_LEFT_POCKET)] if(inv) inv.update_icon() - inv = hud_used.inv_slots[SLOT_HUD_RIGHT_STORE] + inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_RIGHT_POCKET)] if(inv) inv.update_icon() @@ -1006,7 +1006,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_pda() if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_PDA] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_PDA)] if(inv) inv.update_icon() @@ -1017,12 +1017,12 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) ..() remove_overlay(FACEMASK_LAYER) if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_MASK] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_MASK)] if(inv) inv.update_icon() if(wear_mask && (istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/accessory))) update_hud_wear_mask(wear_mask) - if(!(SLOT_HUD_WEAR_MASK in check_obscured_slots())) + if(!(check_obscured_slots() & ITEM_SLOT_MASK)) var/obj/item/organ/external/head/head_organ = get_organ("head") if(!istype(head_organ)) return // Nothing to update here diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm index 6974075c918..9aab8fc08f5 100644 --- a/code/modules/mob/living/carbon/human/npcs.dm +++ b/code/modules/mob/living/carbon/human/npcs.dm @@ -13,7 +13,7 @@ . = ..() name = "Pun Pun" real_name = name - equip_to_slot(new /obj/item/clothing/under/punpun(src), SLOT_HUD_JUMPSUIT) + equip_to_slot(new /obj/item/clothing/under/punpun(src), ITEM_SLOT_JUMPSUIT) /mob/living/carbon/human/monkey/teeny/Initialize(mapload) . = ..() @@ -40,7 +40,7 @@ update_transform() real_name = name - equip_to_slot_or_del(new headwear(src), SLOT_HUD_HEAD) + equip_to_slot_or_del(new headwear(src), ITEM_SLOT_HEAD) RegisterSignal(src, list(COMSIG_HUMAN_ATTACKED, COMSIG_HOSTILE_ATTACKINGTARGET), PROC_REF(ouch)) for(var/trait in list(TRAIT_RESISTHEAT, TRAIT_NOBREATH, TRAIT_RESISTCOLD, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE)) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 6a9211c7418..c84b5b6d821 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -91,7 +91,7 @@ var/exotic_blood var/own_species_blood = FALSE // Can it only use blood from it's species? var/skinned_type - var/list/no_equip = list() // slots the race can't equip stuff to + var/no_equip // bitflags of slots the race can't equip stuff to var/nojumpsuit = 0 // this is sorta... weird. it basically lets you equip stuff that usually needs jumpsuits without one, like belts and pockets and ids var/can_craft = TRUE // Can this mob using crafting or not? @@ -358,7 +358,11 @@ #undef SLOWDOWN_MULTIPLIER /datum/species/proc/on_species_gain(mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment. - for(var/slot_id in no_equip) + for(var/slot_id in GLOB.bitflags) // Iterate through all bitflags + if(slot_id > ITEM_SLOT_AMOUNT_FLAG) // If the slot_id bitflag is larger than the largest ITEM_SLOT flag we're done + break + if(!(slot_id & no_equip)) // If the slot_id bitflag isn't in the no_equip flag, check the next bitflag + continue var/obj/item/thing = H.get_item_by_slot(slot_id) if(thing && (!thing.species_exception || !is_type_in_list(src, thing.species_exception))) H.unEquip(thing) @@ -747,7 +751,7 @@ return copy /datum/species/proc/can_equip(obj/item/I, slot, disable_warning = FALSE, mob/living/carbon/human/H) - if(slot in no_equip) + if(slot & no_equip) if(!I.species_exception || !is_type_in_list(src, I.species_exception)) return FALSE @@ -755,21 +759,21 @@ return FALSE switch(slot) - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) return !H.l_hand && !H.incapacitated() - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) return !H.r_hand && !H.incapacitated() - if(SLOT_HUD_WEAR_MASK) - return !H.wear_mask && (I.slot_flags & SLOT_FLAG_MASK) - if(SLOT_HUD_BACK) - return !H.back && (I.slot_flags & SLOT_FLAG_BACK) - if(SLOT_HUD_OUTER_SUIT) - return !H.wear_suit && (I.slot_flags & SLOT_FLAG_OCLOTHING) - if(SLOT_HUD_GLOVES) - return !H.gloves && (I.slot_flags & SLOT_FLAG_GLOVES) - if(SLOT_HUD_SHOES) - return !H.shoes && (I.slot_flags & SLOT_FLAG_FEET) - if(SLOT_HUD_BELT) + if(ITEM_SLOT_MASK) + return !H.wear_mask && (I.slot_flags & ITEM_SLOT_MASK) + if(ITEM_SLOT_BACK) + return !H.back && (I.slot_flags & ITEM_SLOT_BACK) + if(ITEM_SLOT_OUTER_SUIT) + return !H.wear_suit && (I.slot_flags & ITEM_SLOT_OUTER_SUIT) + if(ITEM_SLOT_GLOVES) + return !H.gloves && (I.slot_flags & ITEM_SLOT_GLOVES) + if(ITEM_SLOT_SHOES) + return !H.shoes && (I.slot_flags & ITEM_SLOT_SHOES) + if(ITEM_SLOT_BELT) if(H.belt) return FALSE var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST) @@ -778,20 +782,20 @@ if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [I.name].") return FALSE - if(!(I.slot_flags & SLOT_FLAG_BELT)) + if(!(I.slot_flags & ITEM_SLOT_BELT)) return return TRUE - if(SLOT_HUD_GLASSES) - return !H.glasses && (I.slot_flags & SLOT_FLAG_EYES) - if(SLOT_HUD_HEAD) - return !H.head && (I.slot_flags & SLOT_FLAG_HEAD) - if(SLOT_HUD_LEFT_EAR) - return !H.l_ear && (I.slot_flags & SLOT_FLAG_EARS) && !((I.slot_flags & SLOT_FLAG_TWOEARS) && H.r_ear) - if(SLOT_HUD_RIGHT_EAR) - return !H.r_ear && (I.slot_flags & SLOT_FLAG_EARS) && !((I.slot_flags & SLOT_FLAG_TWOEARS) && H.l_ear) - if(SLOT_HUD_JUMPSUIT) - return !H.w_uniform && (I.slot_flags & SLOT_FLAG_ICLOTHING) - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_EYES) + return !H.glasses && (I.slot_flags & ITEM_SLOT_EYES) + if(ITEM_SLOT_HEAD) + return !H.head && (I.slot_flags & ITEM_SLOT_HEAD) + if(ITEM_SLOT_LEFT_EAR) + return !H.l_ear && (I.slot_flags & ITEM_SLOT_LEFT_EAR) + if(ITEM_SLOT_RIGHT_EAR) + return !H.r_ear && (I.slot_flags & ITEM_SLOT_RIGHT_EAR) + if(ITEM_SLOT_JUMPSUIT) + return !H.w_uniform && (I.slot_flags & ITEM_SLOT_JUMPSUIT) + if(ITEM_SLOT_ID) if(H.wear_id) return FALSE var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST) @@ -800,10 +804,10 @@ if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [I.name].") return FALSE - if(!(I.slot_flags & SLOT_FLAG_ID)) + if(!(I.slot_flags & ITEM_SLOT_ID)) return FALSE return TRUE - if(SLOT_HUD_WEAR_PDA) + if(ITEM_SLOT_PDA) if(H.wear_pda) return FALSE var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST) @@ -812,10 +816,10 @@ if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [I.name].") return FALSE - if(!(I.slot_flags & SLOT_FLAG_PDA)) + if(!(I.slot_flags & ITEM_SLOT_PDA)) return FALSE return TRUE - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) if(I.flags & NODROP) //Pockets aren't visible, so you can't move NODROP items into them. return FALSE if(H.l_store) @@ -826,9 +830,9 @@ if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [I.name].") return FALSE - if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_FLAG_POCKET)) + if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & ITEM_SLOT_BOTH_POCKETS)) return TRUE - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) if(I.flags & NODROP) return FALSE if(H.r_store) @@ -839,10 +843,10 @@ if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [I.name].") return FALSE - if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_FLAG_POCKET)) + if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & ITEM_SLOT_BOTH_POCKETS)) return TRUE return FALSE - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) if(I.flags & NODROP) //Suit storage NODROP items drop if you take a suit off, this is to prevent people exploiting this. return FALSE if(H.s_store) @@ -862,11 +866,11 @@ if(istype(I, /obj/item/pda) || is_pen(I) || is_type_in_list(I, H.wear_suit.allowed)) return TRUE return FALSE - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_HANDCUFFED) return !H.handcuffed && istype(I, /obj/item/restraints/handcuffs) - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) return !H.legcuffed && istype(I, /obj/item/restraints/legcuffs) - if(SLOT_HUD_IN_BACKPACK) + if(ITEM_SLOT_IN_BACKPACK) if(H.back && istype(H.back, /obj/item/storage/backpack)) var/obj/item/storage/backpack/B = H.back if(length(B.contents) < B.storage_slots && I.w_class <= B.max_w_class) @@ -878,7 +882,7 @@ if(length(B.contents) < B.storage_slots && I.w_class <= B.max_w_class) return TRUE return FALSE - if(SLOT_HUD_TIE) + if(ITEM_SLOT_ACCESSORY) if(!istype(I, /obj/item/clothing/accessory)) return FALSE var/obj/item/clothing/under/uniform = H.w_uniform @@ -890,7 +894,7 @@ if(!disable_warning) to_chat(H, "You already have an accessory of this type attached to your [uniform].") return FALSE - if(!(I.slot_flags & SLOT_FLAG_TIE)) + if(!(I.slot_flags & ITEM_SLOT_ACCESSORY)) return FALSE return TRUE diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm index 5c04aef2795..abb29f946eb 100644 --- a/code/modules/mob/living/carbon/human/species/golem.dm +++ b/code/modules/mob/living/carbon/human/species/golem.dm @@ -15,7 +15,7 @@ punchdamagelow = 5 punchdamagehigh = 14 punchstunthreshold = 11 //about 40% chance to stun - no_equip = list(SLOT_HUD_WEAR_MASK, SLOT_HUD_OUTER_SUIT, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_JUMPSUIT, SLOT_HUD_SUIT_STORE) + no_equip = ITEM_SLOT_MASK | ITEM_SLOT_OUTER_SUIT | ITEM_SLOT_GLOVES | ITEM_SLOT_SHOES | ITEM_SLOT_JUMPSUIT | ITEM_SLOT_SUIT_STORE nojumpsuit = TRUE dietflags = DIET_OMNI //golems can eat anything because they are magic or something @@ -572,8 +572,8 @@ ..() last_banana = world.time last_honk = world.time - H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(H), SLOT_HUD_RIGHT_STORE) - H.equip_to_slot_or_del(new /obj/item/bikehorn(H), SLOT_HUD_LEFT_STORE) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(H), ITEM_SLOT_RIGHT_POCKET) + H.equip_to_slot_or_del(new /obj/item/bikehorn(H), ITEM_SLOT_LEFT_POCKET) H.AddElement(/datum/element/waddling) /datum/species/golem/bananium/on_species_loss(mob/living/carbon/C) @@ -650,9 +650,9 @@ /datum/species/golem/tranquillite/on_species_gain(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(H), SLOT_HUD_RIGHT_STORE) - H.equip_to_slot_or_del(new /obj/item/cane(H), SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(H), ITEM_SLOT_RIGHT_POCKET) + H.equip_to_slot_or_del(new /obj/item/cane(H), ITEM_SLOT_LEFT_HAND) if(H.mind) H.mind.AddSpell(new /datum/spell/aoe/conjure/build/mime_wall(null)) H.mind.AddSpell(new /datum/spell/mime/speak(null)) diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm index f0eeac4251e..607005f0edb 100644 --- a/code/modules/mob/living/carbon/human/species/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/monkey.dm @@ -13,7 +13,7 @@ species_traits = list(NOT_SELECTABLE) skinned_type = /obj/item/stack/sheet/animalhide/monkey greater_form = /datum/species/human - no_equip = list(SLOT_HUD_BELT, SLOT_HUD_WEAR_ID, SLOT_HUD_LEFT_EAR, SLOT_HUD_RIGHT_EAR, SLOT_HUD_GLASSES, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_OUTER_SUIT, SLOT_HUD_JUMPSUIT, SLOT_HUD_LEFT_STORE, SLOT_HUD_RIGHT_STORE, SLOT_HUD_SUIT_STORE, SLOT_HUD_WEAR_PDA) + no_equip = ITEM_SLOT_BELT | ITEM_SLOT_ID | ITEM_SLOT_LEFT_EAR | ITEM_SLOT_RIGHT_EAR | ITEM_SLOT_EYES | ITEM_SLOT_GLOVES | ITEM_SLOT_SHOES | ITEM_SLOT_OUTER_SUIT | ITEM_SLOT_JUMPSUIT | ITEM_SLOT_LEFT_POCKET | ITEM_SLOT_RIGHT_POCKET | ITEM_SLOT_SUIT_STORE | ITEM_SLOT_PDA inherent_factions = list("jungle", "monkey") can_craft = FALSE is_small = 1 diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index cf0d8070028..74a2e22ff0d 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -189,7 +189,7 @@ if(!H.mind || !H.mind.assigned_role || H.mind.assigned_role != "Clown" && H.mind.assigned_role != "Mime") H.unEquip(H.wear_mask) - H.equip_or_collect(new /obj/item/clothing/mask/breath(H), SLOT_HUD_WEAR_MASK) + H.equip_or_collect(new /obj/item/clothing/mask/breath(H), ITEM_SLOT_MASK) var/tank_pref = H.client && H.client.prefs ? H.client.prefs.active_character.speciesprefs : null var/obj/item/tank/internal_tank if(tank_pref) //Diseasel, here you go @@ -198,7 +198,7 @@ internal_tank = new /obj/item/tank/internals/plasmaman/belt/full(H) if(!H.equip_to_appropriate_slot(internal_tank) && !H.put_in_any_hand_if_possible(internal_tank)) H.unEquip(H.l_hand) - H.equip_or_collect(internal_tank, SLOT_HUD_LEFT_HAND) + H.equip_or_collect(internal_tank, ITEM_SLOT_LEFT_HAND) to_chat(H, "Could not find an empty slot for internals! Please report this as a bug.") stack_trace("Failed to equip plasmaman with a tank, with the job [J.type]") H.internal = internal_tank diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index c300570b0dd..f3dd78b2f71 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -79,7 +79,7 @@ if(!H.mind || !H.mind.assigned_role || H.mind.assigned_role != "Clown" && H.mind.assigned_role != "Mime") H.unEquip(H.wear_mask) - H.equip_or_collect(new /obj/item/clothing/mask/breath/vox/respirator(H), SLOT_HUD_WEAR_MASK) + H.equip_or_collect(new /obj/item/clothing/mask/breath/vox/respirator(H), ITEM_SLOT_MASK) var/tank_pref = H.client && H.client.prefs ? H.client.prefs.active_character.speciesprefs : null var/obj/item/tank/internal_tank if(tank_pref)//Diseasel, here you go @@ -89,7 +89,7 @@ if(!H.equip_to_appropriate_slot(internal_tank)) if(!H.put_in_any_hand_if_possible(internal_tank)) H.unEquip(H.l_hand) - H.equip_or_collect(internal_tank, SLOT_HUD_LEFT_HAND) + H.equip_or_collect(internal_tank, ITEM_SLOT_LEFT_HAND) to_chat(H, "Could not find an empty slot for internals! Please report this as a bug") H.internal = internal_tank to_chat(H, "You are now running on nitrogen internals from [internal_tank]. Your species finds oxygen toxic, so you must breathe nitrogen only.") diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm index 3c317c8688e..8b9218bac33 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/code/modules/mob/living/carbon/superheroes.dm @@ -16,7 +16,7 @@ H.rename_character(H.real_name, name) for(var/obj/item/W in H.get_all_slots()) H.unEquip(W) - H.equip_to_slot_or_del(new /obj/item/radio/headset(H), SLOT_HUD_LEFT_EAR) + H.equip_to_slot_or_del(new /obj/item/radio/headset(H), ITEM_SLOT_LEFT_EAR) /datum/superheroes/proc/fixflags(mob/living/carbon/human/H) for(var/obj/item/W in H.get_all_slots()) @@ -52,7 +52,7 @@ W.SetOwnerInfo(H) W.UpdateName() W.flags |= NODROP - H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + H.equip_to_slot_or_del(W, ITEM_SLOT_ID) H.regenerate_icons() to_chat(H, desc) @@ -67,12 +67,12 @@ /datum/superheroes/owlman/equip(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/owl(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask/super_hero(H), SLOT_HUD_WEAR_MASK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/bluespace/owlman(H), SLOT_HUD_BELT) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), SLOT_HUD_GLASSES) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/owl(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask/super_hero(H), ITEM_SLOT_MASK) + H.equip_to_slot_or_del(new /obj/item/storage/belt/bluespace/owlman(H), ITEM_SLOT_BELT) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), ITEM_SLOT_EYES) /datum/superheroes/griffin @@ -86,10 +86,10 @@ /datum/superheroes/griffin/equip(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/griffin(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/griffin(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin/(H), SLOT_HUD_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/griffin(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/griffin(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin/(H), ITEM_SLOT_HEAD) var/obj/item/bio_chip/freedom/L = new/obj/item/bio_chip/freedom(H) L.implant(H) @@ -106,12 +106,12 @@ /datum/superheroes/lightnian/equip(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/brown(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(H), SLOT_HUD_GLOVES) - H.equip_to_slot_or_del(new /obj/item/bedsheet/orange(H), SLOT_HUD_BACK) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/brown(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(H), ITEM_SLOT_GLOVES) + H.equip_to_slot_or_del(new /obj/item/bedsheet/orange(H), ITEM_SLOT_BACK) /datum/superheroes/electro @@ -125,11 +125,11 @@ /datum/superheroes/electro/equip(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero/en(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero/en(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/bedsheet/cult(H), SLOT_HUD_BACK) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), ITEM_SLOT_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), ITEM_SLOT_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero/en(H), ITEM_SLOT_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero/en(H), ITEM_SLOT_HEAD) + H.equip_to_slot_or_del(new /obj/item/bedsheet/cult(H), ITEM_SLOT_BACK) @@ -223,10 +223,10 @@ for(var/obj/item/W in target.get_all_slots()) target.unEquip(W) target.rename_character(target.real_name, "Generic Henchman ([rand(1, 1000)])") - target.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/greytide(target), SLOT_HUD_JUMPSUIT) - target.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(target), SLOT_HUD_SHOES) - target.equip_to_slot_or_del(new /obj/item/storage/toolbox/mechanical/greytide(target), SLOT_HUD_LEFT_HAND) - target.equip_to_slot_or_del(new /obj/item/radio/headset(target), SLOT_HUD_LEFT_EAR) + target.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/greytide(target), ITEM_SLOT_JUMPSUIT) + target.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(target), ITEM_SLOT_SHOES) + target.equip_to_slot_or_del(new /obj/item/storage/toolbox/mechanical/greytide(target), ITEM_SLOT_LEFT_HAND) + target.equip_to_slot_or_del(new /obj/item/radio/headset(target), ITEM_SLOT_LEFT_EAR) var/obj/item/card/id/syndicate/W = new(target) W.icon_state = "lifetimeid" W.access = list(ACCESS_MAINT_TUNNELS) @@ -235,5 +235,5 @@ W.flags |= NODROP W.SetOwnerInfo(target) W.UpdateName() - target.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) + target.equip_to_slot_or_del(W, ITEM_SLOT_ID) target.regenerate_icons() diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm index fee84e4083b..3217f7cdc2e 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm @@ -264,7 +264,7 @@ icon_state = "herald_cloak" item_state = "herald_cloak" item_color = "herald_cloak" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY allow_duplicates = FALSE actions_types = list(/datum/action/item_action/accessory/herald) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm index d0c6b420a9d..c9450b56f57 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm @@ -206,7 +206,7 @@ icon_state = "hope" item_state = "hope" item_color = "hope" - slot_flags = SLOT_FLAG_TIE + slot_flags = ITEM_SLOT_ACCESSORY allow_duplicates = FALSE resistance_flags = FIRE_PROOF diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 8ce7b533a7d..88ddc6189a2 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -474,14 +474,14 @@ /mob/living/simple_animal/get_item_by_slot(slot_id) switch(slot_id) - if(SLOT_HUD_COLLAR) + if(ITEM_SLOT_COLLAR) return pcollar . = ..() /mob/living/simple_animal/can_equip(obj/item/I, slot, disable_warning = 0) // . = ..() // Do not call parent. We do not want animals using their hand slots. switch(slot) - if(SLOT_HUD_COLLAR) + if(ITEM_SLOT_COLLAR) if(pcollar) return FALSE if(!can_collar) @@ -501,7 +501,7 @@ W.plane = ABOVE_HUD_PLANE switch(slot) - if(SLOT_HUD_COLLAR) + if(ITEM_SLOT_COLLAR) add_collar(W) /mob/living/simple_animal/unEquip(obj/item/I, force, silent = FALSE) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 827f24c121e..e2107763158 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -241,9 +241,9 @@ src:update_fhair() /mob/proc/put_in_any_hand_if_possible(obj/item/W as obj, del_on_fail = 0, disable_warning = 1) - if(equip_to_slot_if_possible(W, SLOT_HUD_LEFT_HAND, del_on_fail, disable_warning)) + if(equip_to_slot_if_possible(W, ITEM_SLOT_LEFT_HAND, del_on_fail, disable_warning)) return 1 - else if(equip_to_slot_if_possible(W, SLOT_HUD_RIGHT_HAND, del_on_fail, disable_warning)) + else if(equip_to_slot_if_possible(W, ITEM_SLOT_RIGHT_HAND, del_on_fail, disable_warning)) return 1 return 0 @@ -303,23 +303,23 @@ //The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot. GLOBAL_LIST_INIT(slot_equipment_priority, list( \ - SLOT_HUD_BACK,\ - SLOT_HUD_WEAR_PDA,\ - SLOT_HUD_WEAR_ID,\ - SLOT_HUD_JUMPSUIT,\ - SLOT_HUD_OUTER_SUIT,\ - SLOT_HUD_WEAR_MASK,\ - SLOT_HUD_HEAD,\ - SLOT_HUD_SHOES,\ - SLOT_HUD_GLOVES,\ - SLOT_HUD_LEFT_EAR,\ - SLOT_HUD_RIGHT_EAR,\ - SLOT_HUD_GLASSES,\ - SLOT_HUD_BELT,\ - SLOT_HUD_SUIT_STORE,\ - SLOT_HUD_TIE,\ - SLOT_HUD_LEFT_STORE,\ - SLOT_HUD_RIGHT_STORE\ + ITEM_SLOT_BACK,\ + ITEM_SLOT_PDA,\ + ITEM_SLOT_ID,\ + ITEM_SLOT_JUMPSUIT,\ + ITEM_SLOT_OUTER_SUIT,\ + ITEM_SLOT_MASK,\ + ITEM_SLOT_HEAD,\ + ITEM_SLOT_SHOES,\ + ITEM_SLOT_GLOVES,\ + ITEM_SLOT_LEFT_EAR,\ + ITEM_SLOT_RIGHT_EAR,\ + ITEM_SLOT_EYES,\ + ITEM_SLOT_BELT,\ + ITEM_SLOT_SUIT_STORE,\ + ITEM_SLOT_ACCESSORY,\ + ITEM_SLOT_LEFT_POCKET,\ + ITEM_SLOT_RIGHT_POCKET\ )) //puts the item "W" into an appropriate slot in a human's inventory @@ -328,7 +328,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ if(!istype(W)) return 0 for(var/slot in GLOB.slot_equipment_priority) - if(isstorage(W) && slot == SLOT_HUD_HEAD) // Storage items should be put on the belt before the head + if(isstorage(W) && slot == ITEM_SLOT_HEAD) // Storage items should be put on the belt before the head continue if(equip_to_slot_if_possible(W, slot, FALSE, TRUE)) //del_on_fail = 0; disable_warning = 0 return 1 @@ -352,22 +352,22 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ var/mob/living/carbon/human/H = M switch(slot) - if(SLOT_HUD_LEFT_HAND) + if(ITEM_SLOT_LEFT_HAND) if(H.l_hand) return 0 return 1 - if(SLOT_HUD_RIGHT_HAND) + if(ITEM_SLOT_RIGHT_HAND) if(H.r_hand) return 0 return 1 - if(SLOT_HUD_WEAR_MASK) - if(!(slot_flags & SLOT_FLAG_MASK)) + if(ITEM_SLOT_MASK) + if(!(slot_flags & ITEM_SLOT_MASK)) return 0 if(H.wear_mask) return 0 return 1 - if(SLOT_HUD_BACK) - if(!(slot_flags & SLOT_FLAG_BACK)) + if(ITEM_SLOT_BACK) + if(!(slot_flags & ITEM_SLOT_BACK)) return 0 if(H.back) if(!(H.back.flags & NODROP)) @@ -375,8 +375,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_OUTER_SUIT) - if(!(slot_flags & SLOT_FLAG_OCLOTHING)) + if(ITEM_SLOT_OUTER_SUIT) + if(!(slot_flags & ITEM_SLOT_OUTER_SUIT)) return 0 if(H.wear_suit) if(!(H.wear_suit.flags & NODROP)) @@ -384,8 +384,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_GLOVES) - if(!(slot_flags & SLOT_FLAG_GLOVES)) + if(ITEM_SLOT_GLOVES) + if(!(slot_flags & ITEM_SLOT_GLOVES)) return 0 if(H.gloves) if(!(H.gloves.flags & NODROP)) @@ -393,8 +393,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_SHOES) - if(!(slot_flags & SLOT_FLAG_FEET)) + if(ITEM_SLOT_SHOES) + if(!(slot_flags & ITEM_SLOT_SHOES)) return 0 if(H.shoes) if(!(H.shoes.flags & NODROP)) @@ -402,12 +402,12 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_BELT) + if(ITEM_SLOT_BELT) if(!H.w_uniform) if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [name].") return 0 - if(!(slot_flags & SLOT_FLAG_BELT)) + if(!(slot_flags & ITEM_SLOT_BELT)) return 0 if(H.belt) if(!(H.belt.flags & NODROP)) @@ -415,8 +415,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_GLASSES) - if(!(slot_flags & SLOT_FLAG_EYES)) + if(ITEM_SLOT_EYES) + if(!(slot_flags & ITEM_SLOT_EYES)) return 0 if(H.glasses) if(!(H.glasses.flags & NODROP)) @@ -424,8 +424,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_HEAD) - if(!(slot_flags & SLOT_FLAG_HEAD)) + if(ITEM_SLOT_HEAD) + if(!(slot_flags & ITEM_SLOT_HEAD)) return 0 if(H.head) if(!(H.head.flags & NODROP)) @@ -433,8 +433,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_LEFT_EAR) - if(!(slot_flags & SLOT_HUD_LEFT_EAR)) + if(ITEM_SLOT_LEFT_EAR) + if(!(slot_flags & ITEM_SLOT_LEFT_EAR)) return 0 if(H.l_ear) if(!(H.l_ear.flags & NODROP)) @@ -442,8 +442,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_RIGHT_EAR) - if(!(slot_flags & SLOT_HUD_RIGHT_EAR)) + if(ITEM_SLOT_RIGHT_EAR) + if(!(slot_flags & ITEM_SLOT_RIGHT_EAR)) return 0 if(H.r_ear) if(!(H.r_ear.flags & NODROP)) @@ -451,8 +451,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_JUMPSUIT) - if(!(slot_flags & SLOT_FLAG_ICLOTHING)) + if(ITEM_SLOT_JUMPSUIT) + if(!(slot_flags & ITEM_SLOT_JUMPSUIT)) return 0 if(H.w_uniform) if(!(H.w_uniform.flags & NODROP)) @@ -460,12 +460,12 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_WEAR_ID) + if(ITEM_SLOT_ID) if(!H.w_uniform) if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [name].") return 0 - if(!(slot_flags & SLOT_FLAG_ID)) + if(!(slot_flags & ITEM_SLOT_ID)) return 0 if(H.wear_id) if(!(H.wear_id.flags & NODROP)) @@ -473,26 +473,26 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(SLOT_HUD_LEFT_STORE) + if(ITEM_SLOT_LEFT_POCKET) if(H.l_store) return 0 if(!H.w_uniform) if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [name].") return 0 - if(w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_FLAG_POCKET)) + if(w_class <= WEIGHT_CLASS_SMALL || (slot_flags & ITEM_SLOT_BOTH_POCKETS)) return 1 - if(SLOT_HUD_RIGHT_STORE) + if(ITEM_SLOT_RIGHT_POCKET) if(H.r_store) return 0 if(!H.w_uniform) if(!disable_warning) to_chat(H, "You need a jumpsuit before you can attach this [name].") return 0 - if(w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_FLAG_POCKET)) + if(w_class <= WEIGHT_CLASS_SMALL || (slot_flags & ITEM_SLOT_BOTH_POCKETS)) return 1 return 0 - if(SLOT_HUD_SUIT_STORE) + if(ITEM_SLOT_SUIT_STORE) if(!H.wear_suit) if(!disable_warning) to_chat(H, "You need a suit before you can attach this [name].") @@ -514,15 +514,15 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 1 return 0 - if(SLOT_HUD_HANDCUFFED) + if(ITEM_SLOT_HANDCUFFED) if(H.handcuffed) return 0 return istype(src, /obj/item/restraints/handcuffs) - if(SLOT_HUD_LEGCUFFED) + if(ITEM_SLOT_LEGCUFFED) if(H.legcuffed) return 0 return istype(src, /obj/item/restraints/legcuffs) - if(SLOT_HUD_IN_BACKPACK) + if(ITEM_SLOT_IN_BACKPACK) if(H.back && istype(H.back, /obj/item/storage/backpack)) var/obj/item/storage/backpack/B = H.back if(length(B.contents) < B.storage_slots && w_class <= B.max_w_class) diff --git a/code/modules/mob/mob_holder.dm b/code/modules/mob/mob_holder.dm index 566296c5af7..571d0d0e2ef 100644 --- a/code/modules/mob/mob_holder.dm +++ b/code/modules/mob/mob_holder.dm @@ -3,7 +3,7 @@ name = "holder" desc = "You shouldn't ever see this." icon = 'icons/obj/objects.dmi' - slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_BOTH_EARS /obj/item/holder/New() ..() @@ -98,7 +98,7 @@ name = "nian caterpillar" desc = "It's a tiny little itty bitty critter." icon_state = "mothroach" - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD /obj/item/holder/drone/emagged name = "maintenance drone" diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm index 5dd2e207e10..915d02d123c 100644 --- a/code/modules/mod/mod_activation.dm +++ b/code/modules/mod/mod_activation.dm @@ -74,13 +74,13 @@ to_chat(user, "[part.name] already deployed!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) if(part in overslotting_parts) - var/obj/item/overslot = wearer.get_item_by_slot(slot_bitfield_to_slot(part.slot_flags)) + var/obj/item/overslot = wearer.get_item_by_slot(part.slot_flags) if(overslot) wearer.unEquip(overslot, TRUE) overslotting_parts[part] = overslot overslot.forceMove(part) RegisterSignal(part, COMSIG_ATOM_EXITED, PROC_REF(on_overslot_exit)) - if(wearer.equip_to_slot_if_possible(part, slot_bitfield_to_slot(part.slot_flags), disable_warning = TRUE)) + if(wearer.equip_to_slot_if_possible(part, part.slot_flags, disable_warning = TRUE)) part.flags |= NODROP if(mass) return TRUE @@ -109,7 +109,7 @@ if(overslotting_parts[part]) UnregisterSignal(part, COMSIG_ATOM_EXITED) var/obj/item/overslot = overslotting_parts[part] - if(!wearer.equip_to_slot_if_possible(overslot, slot_bitfield_to_slot(overslot.slot_flags), disable_warning = TRUE)) + if(!wearer.equip_to_slot_if_possible(overslot, overslot.slot_flags, disable_warning = TRUE)) overslot.forceMove(get_turf(wearer)) overslotting_parts[part] = null if(mass) diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index af4e47587a8..174ce20a165 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -12,7 +12,7 @@ item_state = "mod_control" base_icon_state = "control" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK strip_delay = 10 SECONDS armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) actions_types = list( @@ -231,14 +231,14 @@ /obj/item/mod/control/equipped(mob/user, slot) ..() - if(slot == SLOT_HUD_BACK) + if(slot == ITEM_SLOT_BACK) set_wearer(user) else if(wearer) unset_wearer() /obj/item/mod/control/item_action_slot_check(slot) - if(slot == SLOT_HUD_BACK) + if(slot == ITEM_SLOT_BACK) return TRUE /obj/item/mod/control/on_mob_move(direction, mob/user) diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 635b99e03d1..29a472134b7 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -20,7 +20,7 @@ /// Default skin of the MOD. var/default_skin = "standard" /// The slot this mod theme fits on - var/slot_flags = SLOT_FLAG_BACK + var/slot_flags = ITEM_SLOT_BACK /// Armor shared across the MOD parts. var/obj/item/mod/armor/armor_type_1 = /obj/item/mod/armor/mod_theme /// the actual armor object placed in a datum as I am tired and I just want this to work diff --git a/code/modules/mod/modules/module_pathfinder.dm b/code/modules/mod/modules/module_pathfinder.dm index 9bb73673b99..c99b4989b09 100644 --- a/code/modules/mod/modules/module_pathfinder.dm +++ b/code/modules/mod/modules/module_pathfinder.dm @@ -51,9 +51,9 @@ if(!ishuman(user)) return var/mob/living/carbon/human/human_user = user - if(human_user.get_item_by_slot(SLOT_HUD_BACK) && !human_user.unEquip(human_user.get_item_by_slot(SLOT_HUD_BACK))) + if(human_user.get_item_by_slot(ITEM_SLOT_BACK) && !human_user.unEquip(human_user.get_item_by_slot(ITEM_SLOT_BACK))) return - if(!human_user.equip_to_slot_if_possible(mod, SLOT_HUD_BACK, disable_warning = TRUE)) + if(!human_user.equip_to_slot_if_possible(mod, ITEM_SLOT_BACK, disable_warning = TRUE)) return mod.quick_deploy(user) human_user.update_action_buttons(TRUE) diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 964478af722..e160887fe6f 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -54,7 +54,7 @@ if(user.put_in_hands(src)) msg = "Your Energy Katana teleports into your hand!" - else if(user.equip_to_slot_if_possible(src, SLOT_HUD_BELT, FALSE, TRUE)) + else if(user.equip_to_slot_if_possible(src, ITEM_SLOT_BELT, FALSE, TRUE)) msg = "Your Energy Katana teleports back to you, sheathing itself as it does so!" else loc = get_turf(user) diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 347f05a1683..620fb395ddf 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -11,7 +11,7 @@ throw_speed = 3 var/obj/item/pen/containedpen var/obj/item/toppaper - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT resistance_flags = FLAMMABLE /obj/item/clipboard/New() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 8666d1d3da4..5135a27ec5c 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -14,7 +14,7 @@ throw_range = 1 throw_speed = 1 pressure_resistance = 0 - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD body_parts_covered = HEAD resistance_flags = FLAMMABLE max_integrity = 50 diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index a1395f0f19a..664dc667eeb 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -15,7 +15,7 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "pen" item_state = "pen" - slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 3 diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index de78f0566fb..42a3cb531e7 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -172,7 +172,7 @@ icon_state = "camera" item_state = "electropack" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT var/list/matter = list("metal" = 2000) var/pictures_max = 10 // cameras historically were varedited to start with 30 shots despite @@ -633,7 +633,7 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor /obj/item/videocam/advanced name = "advanced video camera" desc = "This video camera allows you to send live feeds even when attached to a belt." - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT #undef CAMERA_STATE_COOLDOWN diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index b5155a3acb3..5a09e2eb30c 100644 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(PDAs) icon_state = "pda" item_state = "electronic" w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_FLAG_ID | SLOT_FLAG_BELT | SLOT_FLAG_PDA + slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT | ITEM_SLOT_PDA armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 100) resistance_flags = FIRE_PROOF | ACID_PROOF origin_tech = "programming=2" diff --git a/code/modules/power/cables/cable_coil.dm b/code/modules/power/cables/cable_coil.dm index 6303624dce4..9b651bb9133 100644 --- a/code/modules/power/cables/cable_coil.dm +++ b/code/modules/power/cables/cable_coil.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain throw_range = 5 materials = list(MAT_METAL = 15, MAT_GLASS = 10) flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined", "flogged") usesound = 'sound/items/deconstruct.ogg' toolspeed = 1 diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 5a0fbf434ff..18435e4dd15 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/ammo.dmi' icon_state = "s-casing" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 1 w_class = WEIGHT_CLASS_TINY var/fire_sound = null //What sound should play when this ammo is fired @@ -118,7 +118,7 @@ icon = 'icons/obj/ammo.dmi' icon_state = "10mmbox" // placeholder icon flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT item_state = "syringe_kit" materials = list(MAT_METAL = 30000) throwforce = 2 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index aa6c863cd63..c0d5882cc81 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -5,7 +5,7 @@ icon_state = "revolver_bright" item_state = "gun" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT materials = list(MAT_METAL=2000) w_class = WEIGHT_CLASS_NORMAL throwforce = 5 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 166dc891ac6..f65ba7ddba8 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -166,7 +166,7 @@ w_class = WEIGHT_CLASS_BULKY force = 10 flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK can_holster = FALSE origin_tech = "combat=4;magnets=4;powerstorage=3" ammo_type = list(/obj/item/ammo_casing/energy/laser/accelerator) @@ -218,7 +218,7 @@ w_class = WEIGHT_CLASS_BULKY force = 12 flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK can_holster = FALSE weapon_weight = WEAPON_HEAVY origin_tech = "combat=6;magnets=6;powerstorage=4" diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 9f3a275e618..557a23fd425 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -20,7 +20,7 @@ force = 10 modifystate = TRUE flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) cell_type = /obj/item/stock_parts/cell/pulse execution_speed = 2 SECONDS @@ -57,7 +57,7 @@ name = "pulse carbine" desc = "A lighter, more compact version of the pulse rifle. Easier to store and transport, but has fewer shots. It has a mounting point for a flashlight. The fire selector has three settings: 'stun', 'kill', 'DESTROY'." w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT icon_state = "pulse_carbine" item_state = null cell_type = /obj/item/stock_parts/cell/pulse/carbine @@ -81,7 +81,7 @@ name = "pulse pistol" desc = "A pulse gun miniaturised into a pistol-sized form factor. Easy to conceal, but has a low capacity. The fire selector has three settings: 'stun', 'kill', 'DESTROY'." w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT icon_state = "pulse_pistol" item_state = null can_holster = TRUE diff --git a/code/modules/projectiles/guns/energy/special_eguns.dm b/code/modules/projectiles/guns/energy/special_eguns.dm index 20252da1793..ad76cc81ac7 100644 --- a/code/modules/projectiles/guns/energy/special_eguns.dm +++ b/code/modules/projectiles/guns/energy/special_eguns.dm @@ -32,7 +32,7 @@ w_class = WEIGHT_CLASS_HUGE can_holster = FALSE flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK shaded_charge = TRUE ammo_type = list(/obj/item/ammo_casing/energy/ion) ammo_x_offset = 3 @@ -69,7 +69,7 @@ desc = "The MK.II Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient, it packs the exact same punch and capacity in a smaller, easier to transport package." icon_state = "ioncarbine" w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT ammo_x_offset = 2 flight_x_offset = 18 flight_y_offset = 11 @@ -610,7 +610,7 @@ weapon_weight = WEAPON_HEAVY w_class = WEIGHT_CLASS_BULKY can_holster = FALSE - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK cell_type = /obj/item/stock_parts/cell/bsg shaded_charge = TRUE can_fit_in_turrets = FALSE //Crystal would shatter, or someone would try to put an empty gun in the frame. @@ -733,7 +733,7 @@ icon = 'icons/obj/guns/gun_temperature.dmi' icon_state = "tempgun_4" item_state = "tempgun_4" - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY fire_sound = 'sound/weapons/pulse3.ogg' origin_tech = "combat=4;materials=4;powerstorage=3;magnets=2" diff --git a/code/modules/projectiles/guns/magic/magic_staff.dm b/code/modules/projectiles/guns/magic/magic_staff.dm index aa11d8b862d..90797283e7c 100644 --- a/code/modules/projectiles/guns/magic/magic_staff.dm +++ b/code/modules/projectiles/guns/magic/magic_staff.dm @@ -1,7 +1,7 @@ /obj/item/gun/magic/staff lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/staves_righthand.dmi' - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK ammo_type = /obj/item/ammo_casing/magic flags_2 = NO_MAT_REDEMPTION_2 execution_speed = 3 SECONDS diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index 2eb257881e0..709370ec588 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -240,7 +240,7 @@ CONTENTS: // This is needed to you don't try to perform an execution/suicide when lighting a cigarette. /obj/item/gun/magic/wand/fireball/handle_suicide(mob/user, mob/living/carbon/human/target, params) - var/mask_item = target.get_item_by_slot(SLOT_HUD_WEAR_MASK) + var/mask_item = target.get_item_by_slot(ITEM_SLOT_MASK) if(istype(mask_item, /obj/item/clothing/mask/cigarette) && user.zone_selected == "mouth" && user.a_intent == INTENT_HELP) return . = ..() diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm index 9c75e854f4b..470ff0b0c86 100644 --- a/code/modules/projectiles/guns/projectile/launchers.dm +++ b/code/modules/projectiles/guns/projectile/launchers.dm @@ -58,7 +58,7 @@ icon_state = "speargun" item_state = "speargun" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK origin_tech = "combat=4;engineering=4" force = 10 can_suppress = FALSE diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 3b7a9248989..8d3d20861eb 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -333,7 +333,7 @@ weapon_weight = WEAPON_HEAVY force = 10 flags = CONDUCT - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK mag_type = /obj/item/ammo_box/magazine/internal/shot/dual fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg' sawn_desc = "Omar's coming!" @@ -442,7 +442,7 @@ if(sling) to_chat(user, "The shotgun already has a sling!") else if(C.use(10)) - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK to_chat(user, "You tie the lengths of cable to the shotgun, making a sling.") sling = TRUE update_icon() diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index f65e9467459..e7c537fcd04 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -11,7 +11,7 @@ force = 10 flags = CONDUCT can_holster = FALSE - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK origin_tech = "combat=4;materials=2" mag_type = /obj/item/ammo_box/magazine/internal/shot fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg' @@ -137,8 +137,8 @@ w_class = WEIGHT_CLASS_NORMAL current_skin = "riotshotgun_sawn" item_state = "riotshotgun_sawn" //phil235 is it different with different skin? - slot_flags &= ~SLOT_FLAG_BACK //you can't sling it on your back - slot_flags |= SLOT_FLAG_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) + slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back + slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) sawn_state = SAWN_OFF magazine.max_ammo = 3 update_appearance() @@ -178,8 +178,8 @@ w_class = initial(w_class) current_skin = "riotshotgun" item_state = initial(item_state) - slot_flags &= ~SLOT_FLAG_BELT - slot_flags |= SLOT_FLAG_BACK + slot_flags &= ~ITEM_SLOT_BELT + slot_flags |= ITEM_SLOT_BACK sawn_state = SAWN_INTACT magazine.max_ammo = 6 update_appearance() diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 91d0a879f74..a9469b07f27 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -15,7 +15,7 @@ can_unsuppress = TRUE can_suppress = TRUE w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK actions_types = list() execution_speed = 8 SECONDS var/zoomable = TRUE diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 27d195f82d9..5747af68168 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -89,7 +89,7 @@ inhand_y_dimension = 32 mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow fire_sound = 'sound/items/syringeproj.ogg' - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL /obj/item/gun/projectile/automatic/c20r/toy diff --git a/code/modules/projectiles/guns/projectile_gun.dm b/code/modules/projectiles/guns/projectile_gun.dm index fd8ffce281d..5aac1bb4869 100644 --- a/code/modules/projectiles/guns/projectile_gun.dm +++ b/code/modules/projectiles/guns/projectile_gun.dm @@ -231,8 +231,8 @@ user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].") w_class = WEIGHT_CLASS_NORMAL item_state = "gun"//phil235 is it different with different skin? - slot_flags &= ~SLOT_FLAG_BACK //you can't sling it on your back - slot_flags |= SLOT_FLAG_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) + slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back + slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) sawn_state = SAWN_OFF update_appearance() return 1 diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm index e723d0cabc3..e49398c71a1 100644 --- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm @@ -397,7 +397,7 @@ if(H.wear_mask) H.unEquip(H.wear_mask) var/obj/item/clothing/mask/fakemoustache = new /obj/item/clothing/mask/fakemoustache - H.equip_to_slot(fakemoustache, SLOT_HUD_WEAR_MASK) + H.equip_to_slot(fakemoustache, ITEM_SLOT_MASK) to_chat(H, "Hair bursts forth from your every follicle!") ..() diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 79a8f45d539..b087b879e8e 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -302,7 +302,7 @@ possible_transfer_amounts = list(5,10,15,20,25,30,50,80,100,120) volume = 120 armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 75, ACID = 50) //Weak melee protection, because you can wear it on your head - slot_flags = SLOT_FLAG_HEAD + slot_flags = ITEM_SLOT_HEAD resistance_flags = NONE blocks_emissive = EMISSIVE_BLOCK_GENERIC container_type = OPENCONTAINER @@ -323,7 +323,7 @@ /obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot) ..() - if(slot == SLOT_HUD_HEAD && reagents.total_volume) + if(slot == ITEM_SLOT_HEAD && reagents.total_volume) to_chat(user, "[src]'s contents spill all over you!") reagents.reaction(user, REAGENT_TOUCH) reagents.clear_reagents() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index fd3aa4d3161..290dc1a80cb 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -13,7 +13,7 @@ possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30) resistance_flags = ACID_PROOF container_type = OPENCONTAINER - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT /// If TRUE, the hypospray can inject through most hardsuits/modsuits. var/can_pierce_hardsuits = FALSE /// If TRUE, the hypospray isn't blocked by suits with TRAIT_HYPOSPRAY_IMMUNE. diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index ffe7d3036b1..de67f8769c5 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -7,7 +7,7 @@ belt_icon = "space_cleaner" flags = NOBLUDGEON container_type = OPENCONTAINER - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index c7a23b33c67..8244fef5984 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -247,7 +247,7 @@ w_class = WEIGHT_CLASS_TINY item_state = "electronic" flags = CONDUCT - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT ///Value of the tag var/currTag = 1 //The whole system for the sort_type var is determined based on the order of this list, diff --git a/code/modules/ruins/ghost_bar.dm b/code/modules/ruins/ghost_bar.dm index b3066244a79..2976fe21dcf 100644 --- a/code/modules/ruins/ghost_bar.dm +++ b/code/modules/ruins/ghost_bar.dm @@ -39,8 +39,8 @@ GLOBAL_LIST_EMPTY(occupants_by_key) save_to_load.copy_to(H) if(!H.back) - equip_item(H, /obj/item/storage/backpack, SLOT_HUD_BACK) - equip_item(H, /obj/item/radio/headset/deadsay, SLOT_HUD_LEFT_EAR) + equip_item(H, /obj/item/storage/backpack, ITEM_SLOT_BACK) + equip_item(H, /obj/item/radio/headset/deadsay, ITEM_SLOT_LEFT_EAR) H.dna.species.before_equip_job(/datum/job/assistant, H) H.dna.species.remains_type = /obj/effect/decal/cleanable/ash var/obj/item/bio_chip/dust/I = new @@ -57,12 +57,12 @@ GLOBAL_LIST_EMPTY(occupants_by_key) else H.equip_or_collect(G.spawn_item(null, save_to_load.get_gear_metadata(G))) if(!H.w_uniform) - equip_item(H, /obj/item/clothing/under/color/random, SLOT_HUD_JUMPSUIT) + equip_item(H, /obj/item/clothing/under/color/random, ITEM_SLOT_JUMPSUIT) if(!H.shoes) - equip_item(H, /obj/item/clothing/shoes/black, SLOT_HUD_SHOES) - equip_item(H, /obj/item/stack/spacecash/c1000, SLOT_HUD_LEFT_STORE) + equip_item(H, /obj/item/clothing/shoes/black, ITEM_SLOT_SHOES) + equip_item(H, /obj/item/stack/spacecash/c1000, ITEM_SLOT_LEFT_POCKET) - var/obj/item/card/id/syndicate/our_id = equip_item(H, /obj/item/card/id/syndicate/ghost_bar, SLOT_HUD_WEAR_ID) + var/obj/item/card/id/syndicate/our_id = equip_item(H, /obj/item/card/id/syndicate/ghost_bar, ITEM_SLOT_ID) our_id.assignment = assignedrole our_id.registered_name = H.real_name our_id.sex = capitalize(H.gender) diff --git a/code/modules/surgery/bio_chip_removal.dm b/code/modules/surgery/bio_chip_removal.dm index 5b324bbb714..c447c3dfe95 100644 --- a/code/modules/surgery/bio_chip_removal.dm +++ b/code/modules/surgery/bio_chip_removal.dm @@ -82,10 +82,10 @@ var/obj/item/bio_chip_case/case - if(istype(user.get_item_by_slot(SLOT_HUD_LEFT_HAND), /obj/item/bio_chip_case)) - case = user.get_item_by_slot(SLOT_HUD_LEFT_HAND) - else if(istype(user.get_item_by_slot(SLOT_HUD_RIGHT_HAND), /obj/item/bio_chip_case)) - case = user.get_item_by_slot(SLOT_HUD_RIGHT_HAND) + if(istype(user.get_item_by_slot(ITEM_SLOT_LEFT_HAND), /obj/item/bio_chip_case)) + case = user.get_item_by_slot(ITEM_SLOT_LEFT_HAND) + else if(istype(user.get_item_by_slot(ITEM_SLOT_RIGHT_HAND), /obj/item/bio_chip_case)) + case = user.get_item_by_slot(ITEM_SLOT_RIGHT_HAND) else case = locate(/obj/item/bio_chip_case) in get_turf(target) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 95875da02cf..ce7b3264991 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -117,7 +117,7 @@ var/obj/item/flash/F = holder F.set_light(7) - var/arm_slot = (parent_organ == "r_arm" ? SLOT_HUD_RIGHT_HAND : SLOT_HUD_LEFT_HAND) + var/arm_slot = (parent_organ == "r_arm" ? ITEM_SLOT_RIGHT_HAND : ITEM_SLOT_LEFT_HAND) var/obj/item/arm_item = owner.get_item_by_slot(arm_slot) if(arm_item) @@ -151,7 +151,7 @@ return // You can emag the arm-mounted implant by activating it while holding emag in it's hand. - var/arm_slot = (parent_organ == "r_arm" ? SLOT_HUD_RIGHT_HAND : SLOT_HUD_LEFT_HAND) + var/arm_slot = (parent_organ == "r_arm" ? ITEM_SLOT_RIGHT_HAND : ITEM_SLOT_LEFT_HAND) if(istype(owner.get_item_by_slot(arm_slot), /obj/item/card/emag) && emag_act(owner)) return diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 5878ead2163..9bcba4f51b0 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(GPS_list) icon = 'icons/obj/telescience.dmi' icon_state = "gps-c" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_FLAG_BELT + slot_flags = ITEM_SLOT_BELT origin_tech = "materials=2;magnets=1;bluespace=2" /// Whether the GPS is on. var/tracking = TRUE diff --git a/code/modules/vehicle/tg_vehicles/scooter.dm b/code/modules/vehicle/tg_vehicles/scooter.dm index 5b9d490601a..f275c858eeb 100644 --- a/code/modules/vehicle/tg_vehicles/scooter.dm +++ b/code/modules/vehicle/tg_vehicles/scooter.dm @@ -119,7 +119,7 @@ V.tilt(rider, from_combat = TRUE) return rider.throw_at(throw_target, 3, 2) - var/head_slot = rider.get_item_by_slot(SLOT_HUD_HEAD) + var/head_slot = rider.get_item_by_slot(ITEM_SLOT_HEAD) if(!head_slot || !(istype(head_slot, /obj/item/clothing/head/helmet) || istype(head_slot, /obj/item/clothing/head/hardhat))) rider.adjustBrainLoss(5) rider.updatehealth() @@ -346,7 +346,7 @@ force = 12 throwforce = 4 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_FLAG_BACK + slot_flags = ITEM_SLOT_BACK attack_verb = list("smacks", "whacks", "slams", "smashes") ///The vehicle counterpart for the board var/board_item_type = /obj/tgvehicle/scooter/skateboard