From f3f9bd442ae428f324576050f7f99d593fbf66cd Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Tue, 3 Oct 2023 13:27:51 -0400 Subject: [PATCH] Changes slot number defines from lowercase to all uppercase (#22297) * undo all of it * flags * back * head/mask * left * right * Cuffs * other name changes * ID and PDA * idk about calling them SLOT_HUD now * glasses, gloves, and shoes, oh my! * the rest * comment --- code/__DEFINES/clothing_defines.dm | 51 +-- code/__DEFINES/flags.dm | 32 +- code/__HELPERS/unsorted.dm | 48 +-- code/_onclick/hud/alien_hud.dm | 4 +- code/_onclick/hud/hud_datum.dm | 10 +- code/_onclick/hud/human_hud.dm | 36 +- code/_onclick/hud/screen_objects.dm | 8 +- code/_onclick/telekinesis.dm | 2 +- code/controllers/subsystem/SSjobs.dm | 2 +- code/datums/components/parry.dm | 2 +- code/datums/components/two_handed.dm | 4 +- code/datums/diseases/_MobProcs.dm | 4 +- code/datums/diseases/pierrot_throat.dm | 2 +- code/datums/diseases/wizarditis.dm | 6 +- code/datums/elements/earhealing.dm | 2 +- code/datums/keybindings/human_keybinds.dm | 6 +- code/datums/outfits/outfit.dm | 34 +- code/datums/outfits/outfit_admin.dm | 4 +- code/datums/outfits/outfit_debug.dm | 2 +- code/datums/outfits/vv_outfit.dm | 42 +-- code/datums/spells/banana_touch.dm | 14 +- code/datums/spells/cluwne.dm | 12 +- code/datums/spells/horsemask.dm | 2 +- code/datums/spells/lichdom.dm | 8 +- code/datums/spells/mime_malaise.dm | 12 +- code/datums/spells/summonitem.dm | 8 +- code/datums/spells/touch_attacks.dm | 8 +- code/game/gamemodes/cult/blood_magic.dm | 8 +- code/game/gamemodes/cult/cult_items.dm | 2 +- code/game/gamemodes/cult/cult_mode.dm | 6 +- code/game/gamemodes/cult/runes.dm | 2 +- .../miniantags/abduction/abduction_gear.dm | 4 +- .../miniantags/abduction/abduction_outfits.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 38 +- code/game/gamemodes/nuclear/pinpointer.dm | 4 +- code/game/gamemodes/objective.dm | 10 +- code/game/gamemodes/wizard/artefact.dm | 338 +++++++++--------- code/game/gamemodes/wizard/soulstone.dm | 2 +- code/game/gamemodes/wizard/spellbook.dm | 2 +- code/game/gamemodes/wizard/wizard.dm | 20 +- code/game/gamemodes/wizard/wizloadouts.dm | 12 +- code/game/jobs/job/support.dm | 2 +- code/game/objects/items.dm | 26 +- code/game/objects/items/crayons.dm | 2 +- code/game/objects/items/devices/aicard.dm | 2 +- code/game/objects/items/devices/autopsy.dm | 2 +- .../items/devices/chameleon_counter.dm | 2 +- .../objects/items/devices/chameleonproj.dm | 2 +- code/game/objects/items/devices/flash.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 4 +- .../objects/items/devices/geiger_counter.dm | 2 +- .../objects/items/devices/laserpointer.dm | 2 +- .../objects/items/devices/lightreplacer.dm | 2 +- code/game/objects/items/devices/paicard.dm | 2 +- .../objects/items/devices/painter/painter.dm | 2 +- .../items/devices/radio/electropack.dm | 2 +- .../objects/items/devices/radio/headset.dm | 2 +- .../items/devices/radio/radio_objects.dm | 2 +- code/game/objects/items/devices/scanners.dm | 12 +- .../objects/items/devices/sensor_device.dm | 2 +- .../objects/items/devices/taperecorder.dm | 2 +- code/game/objects/items/robot/robot_parts.dm | 2 +- code/game/objects/items/tools/crowbar.dm | 2 +- code/game/objects/items/tools/screwdriver.dm | 2 +- code/game/objects/items/tools/welder.dm | 2 +- code/game/objects/items/tools/wirecutters.dm | 2 +- code/game/objects/items/tools/wrench.dm | 2 +- code/game/objects/items/toys.dm | 8 +- code/game/objects/items/trash.dm | 2 +- code/game/objects/items/weapons/batons.dm | 6 +- code/game/objects/items/weapons/cards_ids.dm | 2 +- .../objects/items/weapons/chrono_eraser.dm | 4 +- code/game/objects/items/weapons/cigs.dm | 4 +- .../game/objects/items/weapons/clown_items.dm | 2 +- code/game/objects/items/weapons/defib.dm | 10 +- .../items/weapons/grenades/ghettobomb.dm | 2 +- .../objects/items/weapons/grenades/grenade.dm | 2 +- .../items/weapons/grenades/smokebomb.dm | 2 +- code/game/objects/items/weapons/handcuffs.dm | 2 +- .../items/weapons/highlander_swords.dm | 2 +- .../objects/items/weapons/holy_weapons.dm | 28 +- code/game/objects/items/weapons/lighters.dm | 4 +- .../weapons/melee/energy_melee_weapons.dm | 2 +- .../objects/items/weapons/melee/melee_misc.dm | 2 +- code/game/objects/items/weapons/shields.dm | 4 +- .../objects/items/weapons/storage/backpack.dm | 2 +- .../objects/items/weapons/storage/bags.dm | 12 +- .../objects/items/weapons/storage/belt.dm | 2 +- .../objects/items/weapons/storage/boxes.dm | 2 +- .../objects/items/weapons/storage/fancy.dm | 6 +- .../objects/items/weapons/storage/wallets.dm | 2 +- code/game/objects/items/weapons/stunbaton.dm | 6 +- .../objects/items/weapons/tanks/tank_types.dm | 4 +- .../game/objects/items/weapons/tanks/tanks.dm | 2 +- .../objects/items/weapons/tanks/watertank.dm | 8 +- code/game/objects/items/weapons/tape.dm | 2 +- code/game/objects/items/weapons/twohanded.dm | 14 +- code/game/objects/items/weapons/weaponry.dm | 8 +- code/game/objects/mail.dm | 2 +- code/game/objects/structures/bedsheet_bin.dm | 2 +- code/modules/admin/topic.dm | 24 +- code/modules/admin/verbs/debug.dm | 2 +- .../admin/verbs/infiltratorteam_syndicate.dm | 20 +- code/modules/admin/verbs/onlyone.dm | 22 +- code/modules/admin/verbs/onlyoneteam.dm | 14 +- code/modules/admin/verbs/randomverbs.dm | 4 +- .../admin/verbs/striketeam_syndicate.dm | 48 +-- .../changeling/powers/biodegrade.dm | 6 +- .../changeling/powers/mutations.dm | 4 +- .../revolutionary/datum_headrev.dm | 10 +- .../contractor/items/contractor_uplink.dm | 2 +- .../preference/loadout/loadout_accessories.dm | 2 +- .../preference/loadout/loadout_glasses.dm | 2 +- .../preference/loadout/loadout_gloves.dm | 2 +- .../client/preference/loadout/loadout_hat.dm | 2 +- .../preference/loadout/loadout_racial.dm | 4 +- .../preference/loadout/loadout_shoes.dm | 2 +- .../client/preference/loadout/loadout_suit.dm | 2 +- .../preference/loadout/loadout_uniform.dm | 2 +- code/modules/clothing/clothing.dm | 30 +- code/modules/clothing/ears/earmuffs.dm | 2 +- .../clothing/glasses/engine_goggles.dm | 6 +- code/modules/clothing/glasses/glasses.dm | 10 +- code/modules/clothing/glasses/hudglasses.dm | 2 +- .../modules/clothing/gloves/colored_gloves.dm | 4 +- code/modules/clothing/head/helmet.dm | 2 +- code/modules/clothing/head/misc_hats.dm | 2 +- code/modules/clothing/head/misc_special.dm | 4 +- code/modules/clothing/masks/boxing.dm | 2 +- code/modules/clothing/masks/misc_masks.dm | 8 +- code/modules/clothing/shoes/magboots.dm | 8 +- code/modules/clothing/shoes/misc_shoes.dm | 6 +- code/modules/clothing/spacesuits/hardsuit.dm | 14 +- .../clothing/spacesuits/misc_spacesuits.dm | 2 +- code/modules/clothing/suits/armor_suits.dm | 4 +- code/modules/clothing/suits/hood.dm | 8 +- code/modules/clothing/suits/misc_suits.dm | 6 +- code/modules/clothing/suits/toggles.dm | 4 +- .../clothing/under/accessories/accessory.dm | 8 +- .../under/jobs/engineering_jumpsuits.dm | 2 +- code/modules/clothing/under/pants.dm | 2 +- .../clothing/under/syndicate_jumpsuits.dm | 2 +- code/modules/crafting/craft.dm | 2 +- code/modules/customitems/item_defines.dm | 10 +- code/modules/detective_work/scanner.dm | 2 +- code/modules/fish/fish_items.dm | 6 +- .../kitchen_machinery/gibber.dm | 12 +- code/modules/games/cards.dm | 2 +- code/modules/hydroponics/grown/ambrosia.dm | 2 +- code/modules/hydroponics/grown/flowers.dm | 10 +- code/modules/hydroponics/hydroitemdefines.dm | 14 +- .../instruments/objs/items/headphones.dm | 2 +- code/modules/martial_arts/judo.dm | 6 +- code/modules/martial_arts/krav_maga.dm | 4 +- code/modules/martial_arts/martial.dm | 10 +- .../mining/equipment/kinetic_crusher.dm | 2 +- .../mining/equipment/mineral_scanner.dm | 4 +- code/modules/mining/equipment/mining_tools.dm | 4 +- .../mining/equipment/wormhole_jaunter.dm | 4 +- code/modules/mining/fulton.dm | 2 +- .../mining/lavaland/loot/ashdragon_loot.dm | 2 +- .../mining/lavaland/loot/hierophant_loot.dm | 2 +- .../mining/lavaland/loot/legion_loot.dm | 2 +- .../mining/lavaland/loot/tendril_loot.dm | 2 +- code/modules/mob/inventory_procs.dm | 18 +- .../living/carbon/alien/humanoid/humanoid.dm | 8 +- .../alien/humanoid/humanoid_inventory.dm | 12 +- .../alien/humanoid/humanoid_update_icons.dm | 2 +- .../living/carbon/alien/special/facehugger.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 30 +- .../mob/living/carbon/carbon_update_icons.dm | 8 +- code/modules/mob/living/carbon/examine.dm | 2 +- .../living/carbon/human/human_inventory.dm | 132 +++---- .../mob/living/carbon/human/human_mob.dm | 104 +++--- .../living/carbon/human/human_update_icons.dm | 32 +- code/modules/mob/living/carbon/human/npcs.dm | 2 +- .../living/carbon/human/species/_species.dm | 76 ++-- .../mob/living/carbon/human/species/golem.dm | 12 +- .../mob/living/carbon/human/species/monkey.dm | 2 +- .../living/carbon/human/species/plasmaman.dm | 4 +- .../mob/living/carbon/human/species/vox.dm | 4 +- code/modules/mob/living/carbon/superheroes.dm | 56 +-- code/modules/mob/living/living.dm | 2 +- .../mob/living/silicon/robot/component.dm | 2 +- .../hostile/mining/elites/herald.dm | 2 +- .../hostile/mining/elites/pandora.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 8 +- code/modules/mob/mob.dm | 112 +++--- code/modules/mob/mob_holder.dm | 2 +- code/modules/mod/mod_control.dm | 6 +- code/modules/mod/mod_theme.dm | 2 +- code/modules/mod/modules/module_pathfinder.dm | 4 +- code/modules/ninja/energy_katana.dm | 2 +- code/modules/paperwork/clipboard.dm | 2 +- code/modules/paperwork/paper.dm | 2 +- code/modules/paperwork/pen.dm | 2 +- code/modules/paperwork/photography.dm | 4 +- code/modules/pda/PDA.dm | 2 +- code/modules/power/cables/cable_coil.dm | 2 +- code/modules/projectiles/ammunition.dm | 4 +- code/modules/projectiles/gun.dm | 4 +- code/modules/projectiles/guns/energy/laser.dm | 4 +- code/modules/projectiles/guns/energy/pulse.dm | 6 +- .../projectiles/guns/energy/special_eguns.dm | 8 +- .../projectiles/guns/magic/magic_staff.dm | 2 +- .../projectiles/guns/projectile/launchers.dm | 2 +- .../projectiles/guns/projectile/revolver.dm | 4 +- .../projectiles/guns/projectile/shotgun.dm | 10 +- .../projectiles/guns/projectile/sniper.dm | 2 +- .../projectiles/guns/projectile/toy.dm | 2 +- .../projectiles/guns/projectile_gun.dm | 4 +- .../chemistry/reagents/misc_reagents.dm | 2 +- .../reagent_containers/glass_containers.dm | 4 +- .../reagents/reagent_containers/hypospray.dm | 2 +- .../reagents/reagent_containers/spray.dm | 2 +- code/modules/recycling/sortingmachinery.dm | 2 +- code/modules/surgery/implant_removal.dm | 8 +- code/modules/surgery/organs/augments_arms.dm | 4 +- code/modules/telesci/gps.dm | 4 +- 219 files changed, 1114 insertions(+), 1113 deletions(-) diff --git a/code/__DEFINES/clothing_defines.dm b/code/__DEFINES/clothing_defines.dm index 6a4f12e4764..7b1be1150a5 100644 --- a/code/__DEFINES/clothing_defines.dm +++ b/code/__DEFINES/clothing_defines.dm @@ -9,31 +9,32 @@ #define HIDEEYES 4 //APPLIES ONLY TO HELMETS/MASKS!! (eyes means glasses) #define HIDEFACE 8 //APPLIES ONLY TO HELMETS/MASKS!! Dictates whether we appear as unknown. -// slots -#define slot_back 1 -#define slot_wear_mask 2 -#define slot_handcuffed 3 -#define slot_l_hand 4 -#define slot_r_hand 5 -#define slot_belt 6 -#define slot_wear_id 7 -#define slot_l_ear 8 -#define slot_glasses 9 -#define slot_gloves 10 -#define slot_head 11 -#define slot_shoes 12 -#define slot_wear_suit 13 -#define slot_w_uniform 14 -#define slot_l_store 15 -#define slot_r_store 16 -#define slot_s_store 17 -#define slot_in_backpack 18 -#define slot_legcuffed 19 -#define slot_r_ear 20 -#define slot_wear_pda 21 -#define slot_tie 22 -#define slot_collar 23 -#define slots_amt 23 +// Slot defines for var/list/inv_slots, some of these dont really show up on the HUD, +// but still function like it in other ways. I know thats weird, and I hate it too. +#define SLOT_HUD_BACK 1 +#define SLOT_HUD_WEAR_MASK 2 +#define SLOT_HUD_HANDCUFFED 3 +#define SLOT_HUD_LEFT_HAND 4 // l_hand +#define SLOT_HUD_RIGHT_HAND 5 // r_hand +#define SLOT_HUD_BELT 6 +#define SLOT_HUD_WEAR_ID 7 +#define SLOT_HUD_LEFT_EAR 8 // l_ear +#define SLOT_HUD_GLASSES 9 +#define SLOT_HUD_GLOVES 10 +#define SLOT_HUD_HEAD 11 +#define SLOT_HUD_SHOES 12 +#define SLOT_HUD_OUTER_SUIT 13 // wear_suit +#define SLOT_HUD_JUMPSUIT 14 // w_uniform +#define SLOT_HUD_LEFT_STORE 15 // l_store +#define SLOT_HUD_RIGHT_STORE 16 // r_store +#define SLOT_HUD_SUIT_STORE 17 +#define SLOT_HUD_IN_BACKPACK 18 // this just puts stuff a backpack if you have one +#define SLOT_HUD_LEGCUFFED 19 +#define SLOT_HUD_RIGHT_EAR 20 // r_ear +#define SLOT_HUD_WEAR_PDA 21 +#define SLOT_HUD_TIE 22 +#define SLOT_HUD_COLLAR 23 +#define SLOT_HUD_AMOUNT 23 // accessory slots #define ACCESSORY_SLOT_DECOR 1 diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index ad9524414da..d78c8d19335 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -2,7 +2,7 @@ #define NONE 0 //FLAGS BITMASK -#define STOPSPRESSUREDMAGE 1 //This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_BACK) if you see it anywhere To successfully stop you taking all pressure damage you must have both a suit and head item with this flag. +#define STOPSPRESSUREDMAGE 1 //This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_FLAG_BACK) if you see it anywhere To successfully stop you taking all pressure damage you must have both a suit and head item with this flag. #define NODROP 2 // This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted. #define NOBLUDGEON 4 // when an item has this it produces no "X has been hit by Y with Z" message with the default handler #define AIRTIGHT 8 // mask allows internals @@ -143,21 +143,21 @@ #define NO_RUINS 4 //ITEM INVENTORY SLOT BITMASKS -#define SLOT_OCLOTHING (1<<0) -#define SLOT_ICLOTHING (1<<1) -#define SLOT_GLOVES (1<<2) -#define SLOT_EYES (1<<3) -#define SLOT_EARS (1<<4) -#define SLOT_MASK (1<<5) -#define SLOT_HEAD (1<<6) -#define SLOT_FEET (1<<7) -#define SLOT_ID (1<<8) -#define SLOT_BELT (1<<9) -#define SLOT_BACK (1<<10) -#define SLOT_POCKET (1<<11) //this is to allow items with a w_class of 3 or 4 to fit in pockets. -#define SLOT_TWOEARS (1<<12) -#define SLOT_PDA (1<<13) -#define SLOT_TIE (1<<14) +#define SLOT_FLAG_OCLOTHING (1<<0) +#define SLOT_FLAG_ICLOTHING (1<<1) +#define SLOT_FLAG_GLOVES (1<<2) +#define SLOT_FLAG_EYES (1<<3) +#define SLOT_FLAG_EARS (1<<4) +#define SLOT_FLAG_MASK (1<<5) +#define SLOT_FLAG_HEAD (1<<6) +#define SLOT_FLAG_FEET (1<<7) +#define SLOT_FLAG_ID (1<<8) +#define SLOT_FLAG_BELT (1<<9) +#define SLOT_FLAG_BACK (1<<10) +#define SLOT_FLAG_POCKET (1<<11) //this is to allow items with a w_class of 3 or 4 to fit in pockets. +#define SLOT_FLAG_TWOEARS (1<<12) +#define SLOT_FLAG_PDA (1<<13) +#define SLOT_FLAG_TIE (1<<14) //ORGAN TYPE FLAGS #define AFFECT_ROBOTIC_ORGAN 1 diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 16b238049a1..2c2af7b7691 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -2057,30 +2057,30 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) /proc/slot_bitfield_to_slot(input_slot_flags) // Kill off this garbage ASAP; slot flags and clothing flags should be IDENTICAL. GOSH DARN IT. Doesn't work with ears or pockets, either. switch(input_slot_flags) - if(SLOT_OCLOTHING) - return slot_wear_suit - if(SLOT_ICLOTHING) - return slot_w_uniform - if(SLOT_GLOVES) - return slot_gloves - if(SLOT_EYES) - return slot_glasses - if(SLOT_MASK) - return slot_wear_mask - if(SLOT_HEAD) - return slot_head - if(SLOT_FEET) - return slot_shoes - if(SLOT_ID) - return slot_wear_id - if(SLOT_BELT) - return slot_belt - if(SLOT_BACK) - return slot_back - if(SLOT_PDA) - return slot_wear_pda - if(SLOT_TIE) - return slot_tie + if(SLOT_FLAG_OCLOTHING) + return SLOT_HUD_OUTER_SUIT + if(SLOT_FLAG_ICLOTHING) + return SLOT_HUD_JUMPSUIT + if(SLOT_FLAG_GLOVES) + return SLOT_HUD_GLOVES + if(SLOT_FLAG_EYES) + return SLOT_HUD_GLASSES + if(SLOT_FLAG_MASK) + return SLOT_HUD_WEAR_MASK + if(SLOT_FLAG_HEAD) + return SLOT_HUD_HEAD + if(SLOT_FLAG_FEET) + return SLOT_HUD_SHOES + if(SLOT_FLAG_ID) + return SLOT_HUD_WEAR_ID + if(SLOT_FLAG_BELT) + return SLOT_HUD_BELT + if(SLOT_FLAG_BACK) + return SLOT_HUD_BACK + if(SLOT_FLAG_PDA) + return SLOT_HUD_WEAR_PDA + if(SLOT_FLAG_TIE) + return SLOT_HUD_TIE /** diff --git a/code/_onclick/hud/alien_hud.dm b/code/_onclick/hud/alien_hud.dm index c9b0f7fdc4e..1dd86fe5ce5 100644 --- a/code/_onclick/hud/alien_hud.dm +++ b/code/_onclick/hud/alien_hud.dm @@ -65,7 +65,7 @@ inv_box.icon = 'icons/mob/screen_alien.dmi' inv_box.icon_state = "hand_r" inv_box.screen_loc = ui_rhand - inv_box.slot_id = slot_r_hand + inv_box.slot_id = SLOT_HUD_RIGHT_HAND static_inventory += inv_box inv_box = new /obj/screen/inventory/hand() @@ -73,7 +73,7 @@ inv_box.icon = 'icons/mob/screen_alien.dmi' inv_box.icon_state = "hand_l" inv_box.screen_loc = ui_lhand - inv_box.slot_id = slot_l_hand + inv_box.slot_id = SLOT_HUD_LEFT_HAND static_inventory += inv_box using = new /obj/screen/swap_hand() diff --git a/code/_onclick/hud/hud_datum.dm b/code/_onclick/hud/hud_datum.dm index 9abe854bea1..79d799fa9a1 100644 --- a/code/_onclick/hud/hud_datum.dm +++ b/code/_onclick/hud/hud_datum.dm @@ -32,7 +32,7 @@ var/list/toggleable_inventory = list() //the screen objects which can be hidden var/list/hotkeybuttons = list() //the buttons that can be used via hotkeys var/list/infodisplay = list() //the screen objects that display mob info (health, alien plasma, etc...) - var/list/inv_slots[slots_amt] // /obj/screen/inventory objects, ordered by their slot ID. + var/list/inv_slots[SLOT_HUD_AMOUNT] // /obj/screen/inventory objects, ordered by their slot ID. var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle var/action_buttons_hidden = FALSE @@ -151,10 +151,10 @@ mymob.client.screen += infodisplay //These ones are a part of 'static_inventory', 'toggleable_inventory' or 'hotkeybuttons' but we want them to stay - if(inv_slots[slot_l_hand]) - mymob.client.screen += inv_slots[slot_l_hand] //we want the hands to be visible - if(inv_slots[slot_r_hand]) - mymob.client.screen += inv_slots[slot_r_hand] //we want the hands to be visible + if(inv_slots[SLOT_HUD_LEFT_HAND]) + mymob.client.screen += inv_slots[SLOT_HUD_LEFT_HAND] //we want the hands to be visible + if(inv_slots[SLOT_HUD_RIGHT_HAND]) + mymob.client.screen += inv_slots[SLOT_HUD_RIGHT_HAND] //we want the hands to be visible if(action_intent) mymob.client.screen += action_intent //we want the intent switcher visible action_intent.screen_loc = ui_acti_alt //move this to the alternative position, where zone_select usually is. diff --git a/code/_onclick/hud/human_hud.dm b/code/_onclick/hud/human_hud.dm index 6c1b25c05bd..1db2fe7cd1c 100644 --- a/code/_onclick/hud/human_hud.dm +++ b/code/_onclick/hud/human_hud.dm @@ -102,7 +102,7 @@ inv_box = new /obj/screen/inventory() inv_box.name = "i_clothing" inv_box.icon = ui_style - inv_box.slot_id = slot_w_uniform + inv_box.slot_id = SLOT_HUD_JUMPSUIT inv_box.icon_state = "uniform" inv_box.screen_loc = ui_iclothing inv_box.color = ui_color @@ -112,7 +112,7 @@ inv_box = new /obj/screen/inventory() inv_box.name = "o_clothing" inv_box.icon = ui_style - inv_box.slot_id = slot_wear_suit + inv_box.slot_id = SLOT_HUD_OUTER_SUIT inv_box.icon_state = "suit" inv_box.screen_loc = ui_oclothing inv_box.color = ui_color @@ -126,7 +126,7 @@ inv_box.color = ui_color inv_box.alpha = ui_alpha inv_box.screen_loc = ui_rhand - inv_box.slot_id = slot_r_hand + inv_box.slot_id = SLOT_HUD_RIGHT_HAND static_inventory += inv_box inv_box = new /obj/screen/inventory/hand() @@ -136,7 +136,7 @@ inv_box.color = ui_color inv_box.alpha = ui_alpha inv_box.screen_loc = ui_lhand - inv_box.slot_id = slot_l_hand + inv_box.slot_id = SLOT_HUD_LEFT_HAND static_inventory += inv_box using = new /obj/screen/swap_hand() @@ -162,7 +162,7 @@ inv_box.icon = ui_style inv_box.icon_state = "id" inv_box.screen_loc = ui_id - inv_box.slot_id = slot_wear_id + inv_box.slot_id = SLOT_HUD_WEAR_ID inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -172,7 +172,7 @@ inv_box.icon = ui_style inv_box.icon_state = "pda" inv_box.screen_loc = ui_pda - inv_box.slot_id = slot_wear_pda + inv_box.slot_id = SLOT_HUD_WEAR_PDA inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -182,7 +182,7 @@ inv_box.icon = ui_style inv_box.icon_state = "mask" inv_box.screen_loc = ui_mask - inv_box.slot_id = slot_wear_mask + inv_box.slot_id = SLOT_HUD_WEAR_MASK inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -192,7 +192,7 @@ inv_box.icon = ui_style inv_box.icon_state = "back" inv_box.screen_loc = ui_back - inv_box.slot_id = slot_back + inv_box.slot_id = SLOT_HUD_BACK inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -202,7 +202,7 @@ inv_box.icon = ui_style inv_box.icon_state = "pocket" inv_box.screen_loc = ui_storage1 - inv_box.slot_id = slot_l_store + inv_box.slot_id = SLOT_HUD_LEFT_STORE inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -212,7 +212,7 @@ inv_box.icon = ui_style inv_box.icon_state = "pocket" inv_box.screen_loc = ui_storage2 - inv_box.slot_id = slot_r_store + inv_box.slot_id = SLOT_HUD_RIGHT_STORE inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box @@ -224,7 +224,7 @@ inv_box.color = ui_color inv_box.alpha = ui_alpha inv_box.screen_loc = ui_sstore1 - inv_box.slot_id = slot_s_store + inv_box.slot_id = SLOT_HUD_SUIT_STORE static_inventory += inv_box using = new /obj/screen/resist() @@ -253,7 +253,7 @@ inv_box.icon = ui_style inv_box.icon_state = "gloves" inv_box.screen_loc = ui_gloves - inv_box.slot_id = slot_gloves + inv_box.slot_id = SLOT_HUD_GLOVES inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -263,7 +263,7 @@ inv_box.icon = ui_style inv_box.icon_state = "glasses" inv_box.screen_loc = ui_glasses - inv_box.slot_id = slot_glasses + inv_box.slot_id = SLOT_HUD_GLASSES inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -273,7 +273,7 @@ inv_box.icon = ui_style inv_box.icon_state = "ears" inv_box.screen_loc = ui_l_ear - inv_box.slot_id = slot_l_ear + inv_box.slot_id = SLOT_HUD_LEFT_EAR inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -283,7 +283,7 @@ inv_box.icon = ui_style inv_box.icon_state = "ears" inv_box.screen_loc = ui_r_ear - inv_box.slot_id = slot_r_ear + inv_box.slot_id = SLOT_HUD_RIGHT_EAR inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -293,7 +293,7 @@ inv_box.icon = ui_style inv_box.icon_state = "head" inv_box.screen_loc = ui_head - inv_box.slot_id = slot_head + inv_box.slot_id = SLOT_HUD_HEAD inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -303,7 +303,7 @@ inv_box.icon = ui_style inv_box.icon_state = "shoes" inv_box.screen_loc = ui_shoes - inv_box.slot_id = slot_shoes + inv_box.slot_id = SLOT_HUD_SHOES inv_box.color = ui_color inv_box.alpha = ui_alpha toggleable_inventory += inv_box @@ -313,7 +313,7 @@ inv_box.icon = ui_style inv_box.icon_state = "belt" inv_box.screen_loc = ui_belt - inv_box.slot_id = slot_belt + inv_box.slot_id = SLOT_HUD_BELT inv_box.color = ui_color inv_box.alpha = ui_alpha static_inventory += inv_box diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index bc0ccee9dc1..84bd640e68b 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -443,7 +443,7 @@ if(!active_overlay) active_overlay = image("icon"=icon, "icon_state"="hand_active") if(!handcuff_overlay) - var/state = (slot_id == slot_r_hand) ? "markus" : "gabrielle" + var/state = (slot_id == SLOT_HUD_RIGHT_HAND) ? "markus" : "gabrielle" handcuff_overlay = image("icon"='icons/mob/screen_gen.dmi', "icon_state"=state) if(hud && hud.mymob) @@ -452,13 +452,13 @@ if(C.handcuffed) . += handcuff_overlay - var/obj/item/organ/external/hand = C.get_organ("[slot_id == slot_l_hand ? "l" : "r"]_hand") + var/obj/item/organ/external/hand = C.get_organ("[slot_id == SLOT_HUD_LEFT_HAND ? "l" : "r"]_hand") if(!isalien(C) && (!hand || !hand.is_usable())) . += blocked_overlay - if(slot_id == slot_l_hand && hud.mymob.hand) + if(slot_id == SLOT_HUD_LEFT_HAND && hud.mymob.hand) . += active_overlay - else if(slot_id == slot_r_hand && !hud.mymob.hand) + else if(slot_id == SLOT_HUD_RIGHT_HAND && !hud.mymob.hand) . += active_overlay /obj/screen/inventory/hand/Click() diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 159d9d62e39..0a7707e0275 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -89,7 +89,7 @@ //stops TK grabs being equipped anywhere but into hands /obj/item/tk_grab/equipped(mob/user, slot) - if( (slot == slot_l_hand) || (slot== slot_r_hand) ) + if( (slot == SLOT_HUD_LEFT_HAND) || (slot== SLOT_HUD_RIGHT_HAND) ) return qdel(src) diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm index 4b9c30ed143..428a90135dc 100644 --- a/code/controllers/subsystem/SSjobs.dm +++ b/code/controllers/subsystem/SSjobs.dm @@ -516,7 +516,7 @@ SUBSYSTEM_DEF(jobs) //Gives glasses to the vision impaired if(HAS_TRAIT(H, TRAIT_NEARSIGHT)) - var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), slot_glasses) + var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), SLOT_HUD_GLASSES) if(equipped != 1) var/obj/item/clothing/glasses/G = H.glasses if(istype(G) && !G.prescription) diff --git a/code/datums/components/parry.dm b/code/datums/components/parry.dm index f9816c23e9f..69a6f1821fa 100644 --- a/code/datums/components/parry.dm +++ b/code/datums/components/parry.dm @@ -61,7 +61,7 @@ /datum/component/parry/proc/equipped(datum/source, mob/user, slot) SIGNAL_HANDLER - if(slot in list(slot_l_hand, slot_r_hand)) + if(slot in list(SLOT_HUD_LEFT_HAND, SLOT_HUD_RIGHT_HAND)) RegisterSignal(user, COMSIG_HUMAN_PARRY, PROC_REF(start_parry)) else UnregisterSignal(user, COMSIG_HUMAN_PARRY) diff --git a/code/datums/components/two_handed.dm b/code/datums/components/two_handed.dm index 114bc3d1b0a..5c4ebd73490 100644 --- a/code/datums/components/two_handed.dm +++ b/code/datums/components/two_handed.dm @@ -126,7 +126,7 @@ /datum/component/two_handed/proc/on_equip(datum/source, mob/user, slot) SIGNAL_HANDLER // COMSIG_ITEM_EQUIPPED - if(require_twohands && (slot == slot_l_hand || slot == slot_r_hand)) // force equip the item + if(require_twohands && (slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND)) // force equip the item INVOKE_ASYNC(src, PROC_REF(wield), user) if(!user.is_holding(parent) && wielded && !require_twohands) INVOKE_ASYNC(src, PROC_REF(unwield), user) @@ -277,7 +277,7 @@ parent_item.update_appearance() if(istype(user)) // tk showed that we might not have a mob here - if(user.get_item_by_slot(slot_back) == parent) + if(user.get_item_by_slot(SLOT_HUD_BACK) == parent) user.update_inv_back() else user.update_inv_l_hand() diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 62bc1700e94..0ff5231ae30 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -101,8 +101,8 @@ if(isobj(H.wear_suit)) Cl = H.wear_suit passed = prob((Cl.permeability_coefficient*100) - 1) - if(passed && isobj(slot_w_uniform)) - Cl = slot_w_uniform + if(passed && isobj(SLOT_HUD_JUMPSUIT)) + Cl = SLOT_HUD_JUMPSUIT passed = prob((Cl.permeability_coefficient*100) - 1) if(3) if(isobj(H.wear_suit) && H.wear_suit.body_parts_covered&HANDS) diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 3fbb6001447..a00982b9ccd 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -63,4 +63,4 @@ if(!istype(affected_mob.wear_mask, /obj/item/clothing/mask/gas/clown_hat/nodrop)) affected_mob.unEquip(affected_mob.wear_mask, TRUE) - affected_mob.equip_to_slot(new /obj/item/clothing/mask/gas/clown_hat/nodrop(src), slot_wear_mask) + affected_mob.equip_to_slot(new /obj/item/clothing/mask/gas/clown_hat/nodrop(src), SLOT_HUD_WEAR_MASK) diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 6ce443d2a63..d9953747b0e 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -62,19 +62,19 @@ STI KALY - blind if(!istype(H.head, /obj/item/clothing/head/wizard)) if(!H.unEquip(H.head)) qdel(H.head) - H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(H), SLOT_HUD_HEAD) return if(prob(chance)) if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe)) if(!H.unEquip(H.wear_suit)) qdel(H.wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(H), SLOT_HUD_OUTER_SUIT) return if(prob(chance)) if(!istype(H.shoes, /obj/item/clothing/shoes/sandal)) if(!H.unEquip(H.shoes)) qdel(H.shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_HUD_SHOES) return else var/mob/living/carbon/H = affected_mob diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm index 69ac1bafaa5..1f62516f38b 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_l_ear) || (slot == slot_r_ear)) && istype(user)) + if(((slot == SLOT_HUD_LEFT_EAR) || (slot == SLOT_HUD_RIGHT_EAR)) && istype(user)) user_by_item[source] = user else user_by_item -= source diff --git a/code/datums/keybindings/human_keybinds.dm b/code/datums/keybindings/human_keybinds.dm index b4ea4e66b6c..e1bc0f54386 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_back) + M.quick_equip_item(SLOT_HUD_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_belt) + M.quick_equip_item(SLOT_HUD_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_s_store) + M.quick_equip_item(SLOT_HUD_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 0662d5a0067..3ebfef8a4cd 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -57,29 +57,29 @@ //Start with uniform,suit,backpack for additional slots if(uniform) - equip_item(H, uniform, slot_w_uniform) + equip_item(H, uniform, SLOT_HUD_JUMPSUIT) if(suit) - equip_item(H, suit, slot_wear_suit) + equip_item(H, suit, SLOT_HUD_OUTER_SUIT) if(back) - equip_item(H, back, slot_back) + equip_item(H, back, SLOT_HUD_BACK) if(belt) - equip_item(H, belt, slot_belt) + equip_item(H, belt, SLOT_HUD_BELT) if(gloves) - equip_item(H, gloves, slot_gloves) + equip_item(H, gloves, SLOT_HUD_GLOVES) if(shoes) - equip_item(H, shoes, slot_shoes) + equip_item(H, shoes, SLOT_HUD_SHOES) if(head) - equip_item(H, head, slot_head) + equip_item(H, head, SLOT_HUD_HEAD) if(mask) - equip_item(H, mask, slot_wear_mask) + equip_item(H, mask, SLOT_HUD_WEAR_MASK) if(l_ear) - equip_item(H, l_ear, slot_l_ear) + equip_item(H, l_ear, SLOT_HUD_LEFT_EAR) if(r_ear) - equip_item(H, r_ear, slot_r_ear) + equip_item(H, r_ear, SLOT_HUD_RIGHT_EAR) if(glasses) - equip_item(H, glasses, slot_glasses) + equip_item(H, glasses, SLOT_HUD_GLASSES) if(id) - equip_item(H, id, slot_wear_id) + equip_item(H, id, SLOT_HUD_WEAR_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 @@ -89,7 +89,7 @@ C.quick_activation() if(suit_store) - equip_item(H, suit_store, slot_s_store) + equip_item(H, suit_store, SLOT_HUD_SUIT_STORE) if(l_hand) H.put_in_l_hand(new l_hand(H)) @@ -97,7 +97,7 @@ H.put_in_r_hand(new r_hand(H)) if(pda) - equip_item(H, pda, slot_wear_pda) + equip_item(H, pda, SLOT_HUD_WEAR_PDA) if(uniform) for(var/path in accessories) @@ -107,9 +107,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_l_store) + equip_item(H, l_pocket, SLOT_HUD_LEFT_STORE) if(r_pocket) - equip_item(H, r_pocket, slot_r_store) + equip_item(H, r_pocket, SLOT_HUD_RIGHT_STORE) if(box) if(!backpack_contents) @@ -122,7 +122,7 @@ if(!number) number = 1 for(var/i in 1 to number) - H.equip_or_collect(new path(H), slot_in_backpack) + H.equip_or_collect(new path(H), SLOT_HUD_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 61787ada6db..57b7971c1b7 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -9,7 +9,7 @@ /datum/outfit/admin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() - + if(visualsOnly) return @@ -1173,7 +1173,7 @@ if(istype(C)) C.name = "ancient robes" C.hood.name = "ancient hood" - H.equip_to_slot_or_del(C, slot_in_backpack) + H.equip_to_slot_or_del(C, SLOT_HUD_IN_BACKPACK) var/obj/item/card/id/I = H.wear_id if(istype(I)) diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm index 102f18474ef..cc54496a918 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_s_store + internals_slot = SLOT_HUD_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 fa5f3b2af05..5ab0e3aba83 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_w_uniform) + if(SLOT_HUD_JUMPSUIT) uniform = item_path - if(slot_back) + if(SLOT_HUD_BACK) back = item_path - if(slot_wear_suit) + if(SLOT_HUD_OUTER_SUIT) suit = item_path - if(slot_belt) + if(SLOT_HUD_BELT) belt = item_path - if(slot_gloves) + if(SLOT_HUD_GLOVES) gloves = item_path - if(slot_shoes) + if(SLOT_HUD_SHOES) shoes = item_path - if(slot_head) + if(SLOT_HUD_HEAD) head = item_path - if(slot_wear_mask) + if(SLOT_HUD_WEAR_MASK) mask = item_path - if(slot_l_ear) + if(SLOT_HUD_LEFT_EAR) l_ear = item_path - if(slot_r_ear) + if(SLOT_HUD_RIGHT_EAR) r_ear = item_path - if(slot_glasses) + if(SLOT_HUD_GLASSES) glasses = item_path - if(slot_wear_id) + if(SLOT_HUD_WEAR_ID) id = item_path - if(slot_wear_pda) + if(SLOT_HUD_WEAR_PDA) pda = item_path - if(slot_s_store) + if(SLOT_HUD_SUIT_STORE) suit_store = item_path - if(slot_l_store) + if(SLOT_HUD_LEFT_STORE) l_pocket = item_path - if(slot_r_store) + if(SLOT_HUD_RIGHT_STORE) r_pocket = item_path @@ -68,7 +68,7 @@ //Copy equipment var/list/result = list() - var/list/slots_to_check = list(slot_w_uniform, slot_back, slot_wear_suit, slot_belt, slot_gloves, slot_shoes, slot_head, slot_wear_mask, slot_l_ear, slot_r_ear, slot_glasses, slot_wear_id, slot_wear_pda, slot_s_store, slot_l_store, slot_r_store) + 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) for(var/s in slots_to_check) var/obj/item/I = get_item_by_slot(s) var/vedits = collect_vv(I) @@ -79,7 +79,7 @@ //Copy access O.stored_access = list() - var/obj/item/id_slot = get_item_by_slot(slot_wear_id) + var/obj/item/id_slot = get_item_by_slot(SLOT_HUD_WEAR_ID) if(id_slot) O.stored_access |= id_slot.GetAccess() var/obj/item/card/id/ID = id_slot.GetID() @@ -103,7 +103,7 @@ O.vv_values = result //Copy backpack contents if exist. - var/obj/item/backpack = get_item_by_slot(slot_back) + var/obj/item/backpack = get_item_by_slot(SLOT_HUD_BACK) if(istype(backpack) && LAZYLEN(backpack.contents) > 0) var/list/typecounts = list() for(var/obj/item/I in backpack) @@ -127,7 +127,7 @@ O.cybernetic_implants |= aug.type // Copy accessories - var/obj/item/clothing/under/uniform_slot = get_item_by_slot(slot_w_uniform) + var/obj/item/clothing/under/uniform_slot = get_item_by_slot(SLOT_HUD_JUMPSUIT) if(uniform_slot) O.accessories = list() for(var/obj/item/clothing/accessory/A in uniform_slot.accessories) @@ -156,7 +156,7 @@ for(var/vname in edits) I.vv_edit_var(vname,edits[vname]) //Apply access - var/obj/item/id_slot = H.get_item_by_slot(slot_wear_id) + var/obj/item/id_slot = H.get_item_by_slot(SLOT_HUD_WEAR_ID) if(id_slot) var/obj/item/card/id/card = id_slot.GetID() if(istype(card)) diff --git a/code/datums/spells/banana_touch.dm b/code/datums/spells/banana_touch.dm index 61466ef5711..fc4f0dd3f68 100644 --- a/code/datums/spells/banana_touch.dm +++ b/code/datums/spells/banana_touch.dm @@ -43,17 +43,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_head, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/suit/wizrobe/clown, slot_wear_suit, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/magical, slot_shoes, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clownwiz, slot_wear_mask, TRUE, 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) else qdel(shoes) qdel(wear_mask) qdel(w_uniform) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/clown/nodrop, slot_w_uniform, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/clown_shoes/nodrop, slot_shoes, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat/nodrop, slot_wear_mask, TRUE, TRUE) + 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) 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 a501dc56373..a0918ac3c69 100644 --- a/code/datums/spells/cluwne.dm +++ b/code/datums/spells/cluwne.dm @@ -36,10 +36,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_w_uniform, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/gloves/cursedclown, slot_gloves, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/mask/cursedclown, slot_wear_mask, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/cursedclown, slot_shoes, TRUE, TRUE) + 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) /mob/living/carbon/human/proc/makeAntiCluwne() to_chat(src, "You don't feel very funny.") @@ -80,5 +80,5 @@ unEquip(gloves, 1) qdel(G) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/lawyer/black, slot_w_uniform, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, slot_shoes, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/lawyer/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE) + equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, SLOT_HUD_SHOES, TRUE, TRUE) diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index a3906fc32bc..3dd2d35bbe5 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_wear_mask, TRUE, TRUE) + target.equip_to_slot_if_possible(magichead, SLOT_HUD_WEAR_MASK, TRUE, TRUE) target.flash_eyes() diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index 69a5045b79c..be263c915b8 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -129,7 +129,7 @@ equip_lich(H) /obj/effect/proc_holder/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_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform) + 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) diff --git a/code/datums/spells/mime_malaise.dm b/code/datums/spells/mime_malaise.dm index f7e7646d961..471ba5cb1c6 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_wear_mask, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime, slot_w_uniform, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders, slot_wear_suit, TRUE, 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) 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_wear_mask, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/mime/nodrop, slot_w_uniform, TRUE, TRUE) - equip_to_slot_if_possible(new /obj/item/clothing/suit/suspenders/nodrop, slot_wear_suit, TRUE, TRUE) + 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) 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 05880f7c2d0..fe7aa7da854 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -105,12 +105,12 @@ if(target.hand) //left active hand - if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_l_hand, FALSE, TRUE)) - if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_r_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, SLOT_HUD_RIGHT_HAND, FALSE, TRUE)) butterfingers = TRUE else //right active hand - if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_r_hand, FALSE, TRUE)) - if(!target.equip_to_slot_if_possible(item_to_retrieve, slot_l_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, SLOT_HUD_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 fc10eeb27e0..611ab28fc48 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_l_hand, FALSE, TRUE)) - if(!user.equip_to_slot_if_possible(attached_hand, slot_r_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, SLOT_HUD_RIGHT_HAND, FALSE, TRUE)) hand_handled = 0 else //right active hand - if(!user.equip_to_slot_if_possible(attached_hand, slot_r_hand, FALSE, TRUE)) - if(!user.equip_to_slot_if_possible(attached_hand, slot_l_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, SLOT_HUD_LEFT_HAND, FALSE, TRUE)) hand_handled = 0 if(!hand_handled) qdel(attached_hand) diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm index 27dd136900b..c393585ddfe 100644 --- a/code/game/gamemodes/cult/blood_magic.dm +++ b/code/game/gamemodes/cult/blood_magic.dm @@ -668,10 +668,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_wear_suit) - C.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(user), slot_w_uniform) - C.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), slot_back) - C.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes) + 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) 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 7236b05bb9a..9b4127742d8 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -220,7 +220,7 @@ user.unEquip(src, 1) user.Confused(20 SECONDS) user.Weaken(10 SECONDS) - else if(slot == slot_wear_suit) + else if(slot == SLOT_HUD_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/cult_mode.dm b/code/game/gamemodes/cult/cult_mode.dm index 953bb5f0f12..a7baf98882b 100644 --- a/code/game/gamemodes/cult/cult_mode.dm +++ b/code/game/gamemodes/cult/cult_mode.dm @@ -114,9 +114,9 @@ GLOBAL_LIST_EMPTY(all_cults) /datum/game_mode/proc/cult_give_item(obj/item/item_path, mob/living/carbon/human/H) var/list/slots = list( - "backpack" = slot_in_backpack, - "left pocket" = slot_l_store, - "right pocket" = slot_r_store) + "backpack" = SLOT_HUD_IN_BACKPACK, + "left pocket" = SLOT_HUD_LEFT_STORE, + "right pocket" = SLOT_HUD_RIGHT_STORE) var/T = new item_path(H) var/item_name = initial(item_path.name) var/where = H.equip_in_one_of_slots(T, slots) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 337f1687cc4..050bb78a4cd 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -368,7 +368,7 @@ structure_check() searches for nearby cultist structures required for the invoca H.Silence(6 SECONDS) //Prevent "HALP MAINT CULT" before you realise you're converted var/obj/item/melee/cultblade/dagger/D = new(get_turf(src)) - if(H.equip_to_slot_if_possible(D, slot_in_backpack, FALSE, TRUE)) + if(H.equip_to_slot_if_possible(D, SLOT_HUD_IN_BACKPACK, FALSE, TRUE)) to_chat(H, "You have a dagger in your backpack. Use it to do [SSticker.cultdat.entity_title1]'s bidding. ") else to_chat(H, "There is a dagger on the floor. Use it to do [SSticker.cultdat.entity_title1]'s bidding.") diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 4a8daffcfa1..bdac0e91c34 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -54,7 +54,7 @@ A.UpdateButtonIcon() /obj/item/clothing/suit/armor/abductor/vest/item_action_slot_check(slot, mob/user) - if(slot == slot_wear_suit) //we only give the mob the ability to activate the vest if he's actually wearing it. + if(slot == SLOT_HUD_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) @@ -406,7 +406,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' icon_state = "wonderprodStun" item_state = "wonderprod" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 6478a997b76..dcf181903eb 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_back) + var/obj/item/abductor/gizmo/G = locate() in H.get_item_by_slot(SLOT_HUD_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 d3771584f0a..854a5b965ec 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -203,7 +203,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_r_hand) + synd_mind.current.equip_to_slot_or_del(challenge, SLOT_HUD_RIGHT_HAND) update_syndicate_id(synd_mind, leader_title, TRUE) @@ -220,7 +220,7 @@ else var/mob/living/carbon/human/H = synd_mind.current P.loc = H.loc - H.equip_to_slot_or_del(P, slot_r_store, 0) + H.equip_to_slot_or_del(P, SLOT_HUD_RIGHT_STORE, 0) H.update_icons() @@ -258,7 +258,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_l_ear) + synd_mob.equip_to_slot_or_del(R, SLOT_HUD_LEFT_EAR) var/back @@ -274,18 +274,18 @@ else back = /obj/item/storage/backpack - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform) - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), slot_shoes) - synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), slot_gloves) - synd_mob.equip_to_slot_or_del(new /obj/item/card/id/syndicate(synd_mob), slot_wear_id) - synd_mob.equip_to_slot_or_del(new back(synd_mob), slot_back) - synd_mob.equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/pistol(synd_mob), slot_belt) - synd_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(synd_mob.back), slot_in_backpack) - synd_mob.equip_to_slot_or_del(new /obj/item/pinpointer/nukeop(synd_mob), slot_wear_pda) + 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) 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_in_backpack) + synd_mob.equip_to_slot_or_del(U, SLOT_HUD_IN_BACKPACK) synd_mob.mind.offstation_role = TRUE if(synd_mob.dna.species) @@ -293,17 +293,17 @@ switch(race) if("Vox") - synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask) - synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), slot_l_hand) + 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.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_wear_mask) - synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), slot_s_store) - synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), slot_in_backpack) - synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), slot_in_backpack) - synd_mob.internal = synd_mob.get_item_by_slot(slot_s_store) + 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.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 97204085136..fa192e7e31e 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_PDA | SLOT_BELT + slot_flags = SLOT_FLAG_PDA | SLOT_FLAG_BELT w_class = WEIGHT_CLASS_SMALL item_state = "electronic" throw_speed = 4 @@ -279,7 +279,7 @@ /////////////////////// /obj/item/pinpointer/nukeop var/obj/docking_port/mobile/home = null - slot_flags = SLOT_BELT | SLOT_PDA + slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_PDA syndicate = TRUE modes = list(MODE_DISK, MODE_NUKE) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index d4d9c1d3e60..1c818235974 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -564,11 +564,11 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) /datum/objective/steal/proc/give_kit(obj/item/item_path) var/I = new item_path var/list/slots = list( - "backpack" = slot_in_backpack, - "left pocket" = slot_l_store, - "right pocket" = slot_r_store, - "left hand" = slot_l_hand, - "right hand" = slot_r_hand, + "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, ) for(var/datum/mind/M in get_owners()) var/mob/living/carbon/human/H = M.current diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 464fcb600af..c442057007e 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -53,21 +53,21 @@ if("healing") M.mind.AddSpell(new /obj/effect/proc_holder/spell/charge(null)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/forcewall(null)) - M.equip_to_slot_or_del(new /obj/item/gun/magic/staff/healing(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/gun/magic/staff/healing(M), SLOT_HUD_RIGHT_HAND) to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.") if("robeless") M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe/knock(null)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/mind_transfer(null)) to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.") - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/storage/backpack(M), slot_back) - M.equip_to_slot_or_del(new /obj/item/storage/box(M), slot_in_backpack) - M.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(M), slot_r_store) + 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/under/color/lightpurple(M), SLOT_HUD_JUMPSUIT) + 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/clothing/suit/wizrobe(M), SLOT_HUD_OUTER_SUIT) + M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(M), SLOT_HUD_HEAD) + M.equip_to_slot_or_del(new /obj/item/storage/backpack(M), SLOT_HUD_BACK) + M.equip_to_slot_or_del(new /obj/item/storage/box(M), SLOT_HUD_IN_BACKPACK) + M.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(M), SLOT_HUD_RIGHT_STORE) var/wizard_name_first = pick(GLOB.wizard_first) var/wizard_name_second = pick(GLOB.wizard_second) var/randomname = "[wizard_name_first] [wizard_name_second]" @@ -289,7 +289,7 @@ GLOBAL_LIST_EMPTY(multiverse) item_state = "energy_katana" hitsound = 'sound/weapons/bladeslice.ogg' flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT force = 20 throwforce = 10 sharp = TRUE @@ -433,199 +433,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_head) + var/obj/head = H.get_item_by_slot(SLOT_HUD_HEAD) if(head) - M.equip_to_slot_or_del(new head.type(M), slot_head) + M.equip_to_slot_or_del(new head.type(M), SLOT_HUD_HEAD) - var/obj/mask = H.get_item_by_slot(slot_wear_mask) + var/obj/mask = H.get_item_by_slot(SLOT_HUD_WEAR_MASK) if(mask) - M.equip_to_slot_or_del(new mask.type(M), slot_wear_mask) + M.equip_to_slot_or_del(new mask.type(M), SLOT_HUD_WEAR_MASK) - var/obj/glasses = H.get_item_by_slot(slot_glasses) + var/obj/glasses = H.get_item_by_slot(SLOT_HUD_GLASSES) if(glasses) - M.equip_to_slot_or_del(new glasses.type(M), slot_glasses) + M.equip_to_slot_or_del(new glasses.type(M), SLOT_HUD_GLASSES) - var/obj/left_ear = H.get_item_by_slot(slot_l_ear) + var/obj/left_ear = H.get_item_by_slot(SLOT_HUD_LEFT_EAR) if(left_ear) - M.equip_to_slot_or_del(new left_ear.type(M), slot_l_ear) + M.equip_to_slot_or_del(new left_ear.type(M), SLOT_HUD_LEFT_EAR) - var/obj/right_ear = H.get_item_by_slot(slot_r_ear) + var/obj/right_ear = H.get_item_by_slot(SLOT_HUD_RIGHT_EAR) if(right_ear) - M.equip_to_slot_or_del(new right_ear.type(M), slot_r_ear) + M.equip_to_slot_or_del(new right_ear.type(M), SLOT_HUD_RIGHT_EAR) - var/obj/uniform = H.get_item_by_slot(slot_w_uniform) + var/obj/uniform = H.get_item_by_slot(SLOT_HUD_JUMPSUIT) if(uniform) - M.equip_to_slot_or_del(new uniform.type(M), slot_w_uniform) + M.equip_to_slot_or_del(new uniform.type(M), SLOT_HUD_JUMPSUIT) - var/obj/suit = H.get_item_by_slot(slot_wear_suit) + var/obj/suit = H.get_item_by_slot(SLOT_HUD_OUTER_SUIT) if(suit) - M.equip_to_slot_or_del(new suit.type(M), slot_wear_suit) + M.equip_to_slot_or_del(new suit.type(M), SLOT_HUD_OUTER_SUIT) - var/obj/gloves = H.get_item_by_slot(slot_gloves) + var/obj/gloves = H.get_item_by_slot(SLOT_HUD_GLOVES) if(gloves) - M.equip_to_slot_or_del(new gloves.type(M), slot_gloves) + M.equip_to_slot_or_del(new gloves.type(M), SLOT_HUD_GLOVES) - var/obj/shoes = H.get_item_by_slot(slot_shoes) + var/obj/shoes = H.get_item_by_slot(SLOT_HUD_SHOES) if(shoes) - M.equip_to_slot_or_del(new shoes.type(M), slot_shoes) + M.equip_to_slot_or_del(new shoes.type(M), SLOT_HUD_SHOES) - var/obj/belt = H.get_item_by_slot(slot_belt) + var/obj/belt = H.get_item_by_slot(SLOT_HUD_BELT) if(belt) - M.equip_to_slot_or_del(new belt.type(M), slot_belt) + M.equip_to_slot_or_del(new belt.type(M), SLOT_HUD_BELT) - var/obj/pda = H.get_item_by_slot(slot_wear_pda) + var/obj/pda = H.get_item_by_slot(SLOT_HUD_WEAR_PDA) if(pda) - M.equip_to_slot_or_del(new pda.type(M), slot_wear_pda) + M.equip_to_slot_or_del(new pda.type(M), SLOT_HUD_WEAR_PDA) - var/obj/back = H.get_item_by_slot(slot_back) + var/obj/back = H.get_item_by_slot(SLOT_HUD_BACK) if(back) - M.equip_to_slot_or_del(new back.type(M), slot_back) + M.equip_to_slot_or_del(new back.type(M), SLOT_HUD_BACK) - var/obj/suit_storage = H.get_item_by_slot(slot_s_store) + var/obj/suit_storage = H.get_item_by_slot(SLOT_HUD_SUIT_STORE) if(suit_storage) - M.equip_to_slot_or_del(new suit_storage.type(M), slot_s_store) + M.equip_to_slot_or_del(new suit_storage.type(M), SLOT_HUD_SUIT_STORE) - var/obj/left_pocket = H.get_item_by_slot(slot_l_store) + var/obj/left_pocket = H.get_item_by_slot(SLOT_HUD_LEFT_STORE) if(left_pocket) - M.equip_to_slot_or_del(new left_pocket.type(M), slot_l_store) + M.equip_to_slot_or_del(new left_pocket.type(M), SLOT_HUD_LEFT_STORE) - var/obj/right_pocket = H.get_item_by_slot(slot_r_store) + var/obj/right_pocket = H.get_item_by_slot(SLOT_HUD_RIGHT_STORE) if(right_pocket) - M.equip_to_slot_or_del(new right_pocket.type(M), slot_r_store) + M.equip_to_slot_or_del(new right_pocket.type(M), SLOT_HUD_RIGHT_STORE) - M.equip_to_slot_or_del(sword, slot_r_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, 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. else if(istajaran(M) || isunathi(M)) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_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), SLOT_HUD_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_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/clothing/under/suit/really_black(M), slot_w_uniform) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) 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_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/shield/riot/roman(M), slot_l_hand) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("wizard") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), slot_head) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) 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_glasses) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("syndicate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),slot_wear_mask) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("assistant") - M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("animu") - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(M), slot_w_uniform) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("cultist") - M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("highlander") - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("clown") - M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/bikehorn(M), slot_l_store) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("killer") - M.equip_to_slot_or_del(new /obj/item/clothing/under/misc/overalls(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), slot_l_store) - M.equip_to_slot_or_del(new /obj/item/scalpel(M), slot_r_store) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) for(var/obj/item/carried_item in M.contents) if(!istype(carried_item, /obj/item/implant)) carried_item.add_mob_blood(M) if("pirate") - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("soviet") - M.equip_to_slot_or_del(new /obj/item/clothing/head/sovietofficerhat(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/sovietcoat(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/under/new_soviet/sovietofficer(M), slot_w_uniform) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("officer") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) if("gladiator") - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/gladiator(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(sword, slot_r_hand) + 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) else @@ -633,7 +633,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_wear_id) + var/duplicated_access = usr.get_item_by_slot(SLOT_HUD_WEAR_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 @@ -648,7 +648,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_wear_id) + M.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) if(isvox(M)) M.dna.species.after_equip_job(null, M) //Nitrogen tanks @@ -746,38 +746,38 @@ GLOBAL_LIST_EMPTY(multiverse) switch(randomSpooky) if("roman") var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - H.equip_to_slot_or_del(new hat(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/claymore(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/spear(H), slot_back) + H.equip_to_slot_or_del(new hat(H), SLOT_HUD_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_HUD_SHOES) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(new /obj/item/claymore(H), SLOT_HUD_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) if("pirate") - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(H), slot_glasses) - H.equip_to_slot_or_del(new /obj/item/claymore(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/spear(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(H), SLOT_HUD_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(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/glasses/eyepatch(H), SLOT_HUD_GLASSES) + H.equip_to_slot_or_del(new /obj/item/claymore(H), SLOT_HUD_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) if("yand")//mine is an evil laugh - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/katana(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/spear(H), slot_back) + 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/head/kitty(H), SLOT_HUD_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), SLOT_HUD_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/katana(H), SLOT_HUD_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) if("clown") - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask) - H.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/bikehorn(H), slot_l_store) - H.equip_to_slot_or_del(new /obj/item/claymore(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/spear(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), SLOT_HUD_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), SLOT_HUD_WEAR_MASK) + H.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(H), SLOT_HUD_HEAD) + H.equip_to_slot_or_del(new /obj/item/bikehorn(H), SLOT_HUD_LEFT_STORE) + H.equip_to_slot_or_del(new /obj/item/claymore(H), SLOT_HUD_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) /obj/item/necromantic_stone/proc/spawnheresy(mob/living/carbon/human/H as mob) H.set_species(/datum/species/human) @@ -797,13 +797,13 @@ GLOBAL_LIST_EMPTY(multiverse) H.update_body() H.grab_ghost() H.revive() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/katana(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/spear(H), slot_back) + 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/head/kitty(H), SLOT_HUD_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/under/dress/schoolgirl(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), SLOT_HUD_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/katana(H), SLOT_HUD_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) if(!H.real_name || H.real_name == "unknown") H.real_name = "Neko-chan" else diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index e3a5390fbc9..f77857fc3d2 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_BELT + slot_flags = SLOT_FLAG_BELT origin_tech = "bluespace=4;materials=5" /// The body/brain of the player inside this construct, transferred over from the soulstone. diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index cd04b1a328b..3f5ecc3e691 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -1078,7 +1078,7 @@ magichead.voicechange = TRUE //NEEEEIIGHH if(!user.unEquip(user.wear_mask)) qdel(user.wear_mask) - user.equip_to_slot_if_possible(magichead, slot_wear_mask, TRUE, TRUE) + user.equip_to_slot_if_possible(magichead, SLOT_HUD_WEAR_MASK, TRUE, TRUE) qdel(src) else to_chat(user, "I say thee neigh") diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index fdceb146cf2..fcbd48686e5 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -123,22 +123,22 @@ wizard_mob.internal = wizard_mob.r_hand wizard_mob.update_action_buttons_icon() else - wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform) - wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head) + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), SLOT_HUD_JUMPSUIT) + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), SLOT_HUD_HEAD) wizard_mob.dna.species.after_equip_job(null, wizard_mob) wizard_mob.rejuvenate() //fix any damage taken by naked vox/plasmamen/etc while round setups - wizard_mob.equip_to_slot_or_del(new /obj/item/radio/headset(wizard_mob), slot_l_ear) - wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(wizard_mob), slot_shoes) - wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit) - wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(wizard_mob), slot_back) + wizard_mob.equip_to_slot_or_del(new /obj/item/radio/headset(wizard_mob), SLOT_HUD_LEFT_EAR) + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(wizard_mob), SLOT_HUD_SHOES) + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), SLOT_HUD_OUTER_SUIT) + wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(wizard_mob), SLOT_HUD_BACK) if(wizard_mob.dna.species.speciesbox) - wizard_mob.equip_to_slot_or_del(new wizard_mob.dna.species.speciesbox(wizard_mob), slot_in_backpack) + wizard_mob.equip_to_slot_or_del(new wizard_mob.dna.species.speciesbox(wizard_mob), SLOT_HUD_IN_BACKPACK) else - wizard_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival(wizard_mob), slot_in_backpack) - wizard_mob.equip_to_slot_or_del(new /obj/item/teleportation_scroll(wizard_mob), slot_r_store) + wizard_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival(wizard_mob), SLOT_HUD_IN_BACKPACK) + wizard_mob.equip_to_slot_or_del(new /obj/item/teleportation_scroll(wizard_mob), SLOT_HUD_RIGHT_STORE) var/obj/item/spellbook/spellbook = new /obj/item/spellbook(wizard_mob) spellbook.owner = wizard_mob - wizard_mob.equip_to_slot_or_del(spellbook, slot_l_hand) + wizard_mob.equip_to_slot_or_del(spellbook, SLOT_HUD_LEFT_HAND) wizard_mob.faction = list("wizard") wizard_mob.mind.offstation_role = TRUE diff --git a/code/game/gamemodes/wizard/wizloadouts.dm b/code/game/gamemodes/wizard/wizloadouts.dm index 417806505bb..ce2150d4e98 100644 --- a/code/game/gamemodes/wizard/wizloadouts.dm +++ b/code/game/gamemodes/wizard/wizloadouts.dm @@ -61,10 +61,10 @@ is_ragin_restricted = TRUE /obj/effect/proc_holder/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_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), slot_gloves) - H.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(H), slot_w_uniform) + 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) /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_w_uniform) //Just in case they're naked + user.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/glorf, SLOT_HUD_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_wear_id) + user.equip_to_slot_or_del(wizid, SLOT_HUD_WEAR_ID) wizid.registered_name = user.real_name wizid.access = list(ACCESS_MAINT_TUNNELS) wizid.assignment = "Assistant" diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index c6c2e06faed..0ef315a8aab 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -109,7 +109,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_s_store + internals_slot = SLOT_HUD_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 124726bae31..5e47fc27335 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -491,7 +491,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons if(!initial) if(equip_sound && slot == slot_bitfield_to_slot(slot_flags)) playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE) - else if(slot == slot_l_hand || slot == slot_r_hand) + else if(slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND) playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE) /obj/item/proc/item_action_slot_check(slot, mob/user) @@ -809,29 +809,29 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons return var/mob/owner = loc var/flags = slot_flags - if(flags & SLOT_OCLOTHING) + if(flags & SLOT_FLAG_OCLOTHING) owner.update_inv_wear_suit() - if(flags & SLOT_ICLOTHING) + if(flags & SLOT_FLAG_ICLOTHING) owner.update_inv_w_uniform() - if(flags & SLOT_GLOVES) + if(flags & SLOT_FLAG_GLOVES) owner.update_inv_gloves() - if(flags & SLOT_EYES) + if(flags & SLOT_FLAG_EYES) owner.update_inv_glasses() - if(flags & SLOT_EARS) + if(flags & SLOT_FLAG_EARS) owner.update_inv_ears() - if(flags & SLOT_MASK) + if(flags & SLOT_FLAG_MASK) owner.update_inv_wear_mask() - if(flags & SLOT_HEAD) + if(flags & SLOT_FLAG_HEAD) owner.update_inv_head() - if(flags & SLOT_FEET) + if(flags & SLOT_FLAG_FEET) owner.update_inv_shoes() - if(flags & SLOT_ID) + if(flags & SLOT_FLAG_ID) owner.update_inv_wear_id() - if(flags & SLOT_BELT) + if(flags & SLOT_FLAG_BELT) owner.update_inv_belt() - if(flags & SLOT_BACK) + if(flags & SLOT_FLAG_BACK) owner.update_inv_back() - if(flags & SLOT_PDA) + if(flags & SLOT_FLAG_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 875bb2a0a76..1264cf0daa9 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -10,7 +10,7 @@ icon = 'icons/obj/crayons.dmi' icon_state = "crayonred" w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_BELT | SLOT_EARS + slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_EARS attack_verb = list("attacked", "coloured") toolspeed = 1 var/colour = COLOR_RED diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 49b0696a8ef..7b73551245c 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_BELT + slot_flags = SLOT_FLAG_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 3566eff6d05..8877f2a74ea 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_BELT + slot_flags = SLOT_FLAG_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 9c211fb6e3b..c32d56d7f1a 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_BELT + slot_flags = SLOT_FLAG_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 6fdb40bd436..3d4158417dc 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_BELT + slot_flags = SLOT_FLAG_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 70e0fae2ca6..95d379d0479 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -208,7 +208,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_BELT + slot_flags = SLOT_FLAG_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 bf67c82b513..2d0e55a1c73 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_BELT + slot_flags = SLOT_FLAG_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_BELT | SLOT_EARS + slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_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 b5b20e84196..93cce7b9b6d 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -11,7 +11,7 @@ icon_state = "geiger_off" item_state = "multitool" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 44133db70e5..51107e2eba9 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_BELT + slot_flags = SLOT_FLAG_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 dd7b22349a3..74c9a68c1a9 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -47,7 +47,7 @@ belt_icon = "light_replacer" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 3610a8b4919..a5da8d3d7aa 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_BELT + slot_flags = SLOT_FLAG_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 dfa1c32b35e..601606b035b 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_BELT + slot_flags = SLOT_FLAG_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/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 17a55b78578..556c0de2ee3 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_BACK + slot_flags = SLOT_FLAG_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 e5abfe0c342..12951340306 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -9,7 +9,7 @@ materials = list(MAT_METAL = 200) canhear_range = 0 // can't hear headsets from very far away - slot_flags = SLOT_EARS + slot_flags = SLOT_FLAG_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 07094ea3c7b..47c7e4a7ca5 100644 --- a/code/game/objects/items/devices/radio/radio_objects.dm +++ b/code/game/objects/items/devices/radio/radio_objects.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( var/static/list/blacklisted_areas = list(/area/adminconstruction, /area/tdome) flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 0ca3929c975..fa51166be20 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -13,7 +13,7 @@ REAGENT SCANNER icon = 'icons/obj/device.dmi' icon_state = "t-ray0" var/on = FALSE - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT w_class = WEIGHT_CLASS_SMALL item_state = "electronic" materials = list(MAT_METAL = 300) @@ -91,7 +91,7 @@ REAGENT SCANNER item_state = "healthanalyzer" belt_icon = "health_analyzer" flags = CONDUCT | NOBLUDGEON - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT w_class = WEIGHT_CLASS_SMALL throwforce = 3 throw_speed = 3 @@ -331,7 +331,7 @@ REAGENT SCANNER icon = 'icons/obj/device.dmi' icon_state = "atmos" item_state = "analyzer" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT w_class = WEIGHT_CLASS_SMALL flags = CONDUCT throwforce = 0 @@ -473,7 +473,7 @@ REAGENT SCANNER item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT throwforce = 5 throw_speed = 4 throw_range = 20 @@ -548,7 +548,7 @@ REAGENT SCANNER icon_state = "adv_spectrometer_s" item_state = "analyzer" origin_tech = "biotech=2" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT w_class = WEIGHT_CLASS_SMALL flags = CONDUCT throwforce = 0 @@ -602,7 +602,7 @@ REAGENT SCANNER icon = 'icons/obj/device.dmi' icon_state = "bodyanalyzer_0" item_state = "healthanalyser" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 0f2d6fc7822..8f96b7d2f24 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_BELT + slot_flags = SLOT_FLAG_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 ac074ceed62..b66e0040a5c 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_BELT + slot_flags = SLOT_FLAG_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 45d240a6593..76b84dc8be6 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_BELT + slot_flags = SLOT_FLAG_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 e437123c3b6..8c06df0a140 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_BELT + slot_flags = SLOT_FLAG_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 f50e9ba02a1..00c1c14f9e8 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_BELT + slot_flags = SLOT_FLAG_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 45884d4c0c8..5a22b04df84 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_BELT + slot_flags = SLOT_FLAG_BELT force = 3 throwforce = 5 throw_speed = 3 diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 4ec8bc6a984..02f18a39cd4 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_BELT + slot_flags = SLOT_FLAG_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 0b5cfdd8fa7..7873e3a3d03 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -6,7 +6,7 @@ icon_state = "wrench" belt_icon = "wrench" flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 774b03f5e97..6a42ab0295e 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -258,7 +258,7 @@ icon_state = "katana" item_state = "katana" flags = CONDUCT - slot_flags = SLOT_BELT | SLOT_BACK + slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK force = 5 throwforce = 5 w_class = WEIGHT_CLASS_NORMAL @@ -429,7 +429,7 @@ desc = "This baby looks almost real. Wait, did it just burp?" force = 5 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK //This should really be somewhere else but I don't know where. w/e @@ -440,7 +440,7 @@ icon_state = "inflatable" item_state = "inflatable" icon = 'icons/obj/clothing/belts.dmi' - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT /* * Fake meteor @@ -1118,7 +1118,7 @@ righthand_file = 'icons/mob/inhands/guns_righthand.dmi' hitsound = "swing_hit" flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 dbf73f3ae76..954cb3788bb 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -68,7 +68,7 @@ name = "Kentucky Fried Vox" icon_state = "fried_vox_empty" item_state = "fried_vox_empty" - slot_flags = SLOT_HEAD + slot_flags = SLOT_FLAG_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 554c03933b7..8dd0921cbed 100644 --- a/code/game/objects/items/weapons/batons.dm +++ b/code/game/objects/items/weapons/batons.dm @@ -10,7 +10,7 @@ desc = "A wooden truncheon for beating criminal scum." icon_state = "baton" item_state = "classic_baton" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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_BELT + slot_flags = SLOT_FLAG_BELT w_class = WEIGHT_CLASS_SMALL needs_permit = FALSE on = FALSE @@ -197,7 +197,7 @@ else to_chat(user, "You collapse [src].") item_state = null //no sprite for concealment even when in hand - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 037c67a7d99..fa89ec69b95 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -115,7 +115,7 @@ var/total_mining_points = 0 var/list/access = list() var/registered_name = "Unknown" // The name registered_name on the card - slot_flags = SLOT_ID + slot_flags = SLOT_FLAG_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/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index f6464e9d950..32b55d5b29a 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_BACK + slot_flags = SLOT_FLAG_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_back) + if(slot == SLOT_HUD_BACK) return 1 diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 61b2e55b8d3..15452073e86 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -19,7 +19,7 @@ LIGHTERS ARE IN LIGHTERS.DM icon_state = "cigoff" throw_speed = 0.5 item_state = "cigoff" - slot_flags = SLOT_MASK + slot_flags = SLOT_FLAG_MASK w_class = WEIGHT_CLASS_TINY body_parts_covered = null attack_verb = null @@ -405,7 +405,7 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/holo_cigar/equipped(mob/user, slot, initial) . = ..() - if(enabled && slot == slot_wear_mask) + if(enabled && slot == SLOT_HUD_WEAR_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 dc149d1d75b..8d98b7fcdf2 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_BELT + slot_flags = SLOT_FLAG_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 387cf92d5cb..718b564602a 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_BACK + slot_flags = SLOT_FLAG_BACK force = 5 throwforce = 6 w_class = WEIGHT_CLASS_BULKY @@ -165,12 +165,12 @@ /obj/item/defibrillator/equipped(mob/user, slot) ..() - if(slot != slot_back) + if(slot != SLOT_HUD_BACK) remove_paddles(user) update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/item_action_slot_check(slot, mob/user) - if(slot == slot_back) + if(slot == SLOT_HUD_BACK) return TRUE /obj/item/defibrillator/proc/remove_paddles(mob/user) // from your hands @@ -208,7 +208,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_BELT + slot_flags = SLOT_FLAG_BELT origin_tech = "biotech=5" /obj/item/defibrillator/compact/loaded/Initialize(mapload) @@ -217,7 +217,7 @@ update_icon(UPDATE_OVERLAYS) /obj/item/defibrillator/compact/item_action_slot_check(slot, mob/user) - if(slot == slot_belt) + if(slot == SLOT_HUD_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 1373eb0fd32..15d827677b5 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_BELT + slot_flags = SLOT_FLAG_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 45c502d233d..bbb2eac75f4 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 = 4 throw_range = 20 flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT resistance_flags = FLAMMABLE max_integrity = 40 var/active = FALSE diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 2ef0bd82bcf..54074e29ed3 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -5,7 +5,7 @@ icon_state = "smoke" det_time = 20 item_state = "smoke" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 b4fb8b648f2..aa39776c045 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -11,7 +11,7 @@ icon_state = "handcuff" belt_icon = "handcuffs" flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 a1363ebd90b..b0e6e5b91e0 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_r_hand || slot == slot_l_hand) + if(slot == SLOT_HUD_RIGHT_HAND || slot == SLOT_HUD_LEFT_HAND) 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 95aa7cb8b9d..a8c6e0a3634 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -131,7 +131,7 @@ item_state = "godstaff-red" w_class = WEIGHT_CLASS_HUGE force = 5 - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK /obj/item/nullrod/staff/Initialize(mapload) . = ..() @@ -150,7 +150,7 @@ item_state = "claymore" desc = "A weapon fit for a crusade!" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK|SLOT_BELT + slot_flags = SLOT_FLAG_BACK|SLOT_FLAG_BELT sharp = TRUE hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -169,7 +169,7 @@ icon_state = "cultblade" item_state = "darkbalde" desc = "Spread the glory of the dark gods!" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT hitsound = 'sound/hallucinations/growl1.ogg' /obj/item/nullrod/claymore/chainsaw_sword @@ -177,7 +177,7 @@ icon_state = "chainswordon" item_state = "chainswordon" desc = "Suffer not a heretic to live." - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT attack_verb = list("sawed", "torn", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsaw.ogg' @@ -186,21 +186,21 @@ icon_state = "swordon" item_state = "swordon" desc = "The blade glows with the power of faith. Or possibly a battery." - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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_BELT | SLOT_BACK + slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK /obj/item/nullrod/claymore/multiverse name = "extradimensional blade" desc = "Once the harbringer of a interdimensional war, now a dormant souvenir. Still sharp though." icon_state = "multiverse" item_state = "multiverse" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT /obj/item/nullrod/claymore/saber name = "light energy blade" @@ -208,7 +208,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_BELT + slot_flags = SLOT_FLAG_BELT /obj/item/nullrod/claymore/saber/red name = "dark energy blade" @@ -227,7 +227,7 @@ desc = "This thing is so unspeakably HOLY you are having a hard time even holding it." icon_state = "sord" item_state = "sord" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT force = 4.13 throwforce = 1 hitsound = 'sound/weapons/bladeslice.ogg' @@ -240,7 +240,7 @@ desc = "Ask not for whom the bell tolls..." w_class = WEIGHT_CLASS_BULKY armour_penetration_flat = 30 - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK sharp = TRUE attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/rapierhit.ogg' @@ -375,7 +375,7 @@ icon_state = "hammeron" item_state = "hammeron" desc = "This war hammer cost the chaplain fourty thousand space dollars." - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT w_class = WEIGHT_CLASS_HUGE attack_verb = list("smashed", "bashed", "hammered", "crunched") @@ -408,7 +408,7 @@ desc = "The brim of the hat is as sharp as the division between 0 and 1. It makes a mighty throwing weapon." icon_state = "fedora" item_state = "fedora" - slot_flags = SLOT_HEAD + slot_flags = SLOT_FLAG_HEAD icon = 'icons/obj/clothing/hats.dmi' force = 0 throw_speed = 4 @@ -465,7 +465,7 @@ item_state = "bostaff0" w_class = WEIGHT_CLASS_BULKY force = 13 - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK sharp = FALSE hitsound = "swing_hit" attack_verb = list("smashed", "slammed", "whacked", "thwacked") @@ -619,7 +619,7 @@ item_state = "godstaff-red" w_class = WEIGHT_CLASS_HUGE force = 5 - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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 a33b38bb763..1ebdfd2ea39 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_BELT + slot_flags = SLOT_FLAG_BELT attack_verb = null resistance_flags = FIRE_PROOF var/lit = FALSE @@ -300,7 +300,7 @@ return ..() /obj/item/proc/help_light_cig(mob/living/M) - var/mask_item = M.get_item_by_slot(slot_wear_mask) + var/mask_item = M.get_item_by_slot(SLOT_HUD_WEAR_MASK) if(istype(mask_item, /obj/item/clothing/mask/cigarette)) return mask_item 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 42470a44215..bd9fbd120e1 100644 --- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm +++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm @@ -292,7 +292,7 @@ inhand_y_dimension = 64 icon_state = "cleaving_saw" icon_state_on = "cleaving_saw_open" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT var/attack_verb_off = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut") attack_verb_on = list("cleaved", "swiped", "slashed", "chopped") hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/game/objects/items/weapons/melee/melee_misc.dm b/code/game/objects/items/weapons/melee/melee_misc.dm index af374089b4c..1a5bb104de6 100644 --- a/code/game/objects/items/weapons/melee/melee_misc.dm +++ b/code/game/objects/items/weapons/melee/melee_misc.dm @@ -9,7 +9,7 @@ icon_state = "chain" item_state = "chain" flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 371570da50b..e8ac04d21eb 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -20,7 +20,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_BACK + slot_flags = SLOT_FLAG_BACK force = 10 throwforce = 5 throw_speed = 2 @@ -154,7 +154,7 @@ throwforce = 5 throw_speed = 2 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK to_chat(user, "You extend \the [src].") else force = 3 diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 85f6bfef073..acd207cb2d8 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_BACK //ERROOOOO + slot_flags = SLOT_FLAG_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 a063efd88fb..145cc17a7fa 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -21,7 +21,7 @@ allow_quick_empty = 1 display_contents_with_number = 1 // should work fine now use_to_pickup = 1 - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT // ----------------------------- // Trash bag @@ -121,7 +121,7 @@ icon = 'icons/obj/trash.dmi' icon_state = "plasticbag" item_state = "plasticbag" - slot_flags = SLOT_HEAD|SLOT_BELT + slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_BELT throwforce = 0 w_class = WEIGHT_CLASS_BULKY max_w_class = WEIGHT_CLASS_SMALL @@ -132,14 +132,14 @@ /obj/item/storage/bag/plasticbag/mob_can_equip(M as mob, slot) - if(slot==slot_head && contents.len) + if(slot==SLOT_HUD_HEAD && contents.len) to_chat(M, "You need to empty the bag first!") return 0 return ..() /obj/item/storage/bag/plasticbag/equipped(mob/user, slot) - if(slot==slot_head) + if(slot==SLOT_HUD_HEAD) storage_slots = 0 START_PROCESSING(SSobj, src) return @@ -148,7 +148,7 @@ if(is_equipped()) if(ishuman(loc)) var/mob/living/carbon/human/H = loc - if(H.get_item_by_slot(slot_head) == src) + if(H.get_item_by_slot(SLOT_HUD_HEAD) == src) if(H.internal) return H.AdjustLoseBreath(2 SECONDS) @@ -167,7 +167,7 @@ icon = 'icons/obj/mining.dmi' icon_state = "satchel" origin_tech = "engineering=2" - slot_flags = SLOT_BELT | SLOT_POCKET + slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET 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 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index eae691cece0..d59ba4b92a9 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_BELT + slot_flags = SLOT_FLAG_BELT attack_verb = list("whipped", "lashed", "disciplined") max_integrity = 300 equip_sound = 'sound/items/equip/toolbelt_equip.ogg' diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index b21f989f5fa..7b1065feada 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -622,7 +622,7 @@ storage_slots = 10 w_class = WEIGHT_CLASS_TINY max_w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT drop_sound = 'sound/items/handling/matchbox_drop.ogg' pickup_sound = 'sound/items/handling/matchbox_pickup.ogg' can_hold = list(/obj/item/match) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index f556cd73dc3..3f343950c38 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -101,7 +101,7 @@ item_state = "candlebox5" storage_slots = 5 throwforce = 2 - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT /obj/item/storage/fancy/candle_box/full/populate_contents() @@ -173,7 +173,7 @@ belt_icon = "patch_pack" w_class = WEIGHT_CLASS_SMALL throwforce = 2 - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT storage_slots = 6 max_combined_w_class = 6 can_hold = list(/obj/item/clothing/mask/cigarette, @@ -202,7 +202,7 @@ var/obj/item/I = contents[num] if(istype(I, /obj/item/clothing/mask/cigarette)) var/obj/item/clothing/mask/cigarette/C = I - user.equip_to_slot_if_possible(C, slot_wear_mask) + user.equip_to_slot_if_possible(C, SLOT_HUD_WEAR_MASK) to_chat(user, "You take \a [C.name] out of the pack.") update_icon() got_cig = 1 diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 35f67a630a7..d38608a45eb 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_ID + slot_flags = SLOT_FLAG_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 cb84e0d4ec1..8a233f98ec8 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -5,7 +5,7 @@ var/base_icon = "stunbaton" item_state = null belt_icon = "stunbaton" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT force = 10 throwforce = 7 origin_tech = "combat=2" @@ -83,7 +83,7 @@ return cell /obj/item/melee/baton/mob_can_equip(mob/user, slot, disable_warning = TRUE) - if(turned_on && (slot == slot_belt || slot == slot_s_store)) + if(turned_on && (slot == SLOT_HUD_BELT || slot == SLOT_HUD_SUIT_STORE)) to_chat(user, "You can't equip [src] while it's active!") return FALSE return ..(user, slot, disable_warning = TRUE) // call parent but disable warning @@ -293,7 +293,7 @@ knockdown_duration = 6 SECONDS w_class = WEIGHT_CLASS_BULKY hitcost = 2000 - slot_flags = SLOT_BACK | SLOT_BELT + slot_flags = SLOT_FLAG_BACK | SLOT_FLAG_BELT var/obj/item/assembly/igniter/sparkler = null /obj/item/melee/baton/cattleprod/Initialize(mapload) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index e08ec8a31b2..fd17afe2019 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_BELT + slot_flags = SLOT_FLAG_BELT force = 5 volume = 35 w_class = WEIGHT_CLASS_SMALL @@ -130,7 +130,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_BELT + slot_flags = SLOT_FLAG_BELT w_class = WEIGHT_CLASS_SMALL force = 4 distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index cbceaeed68b..17ee75fe833 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_BACK + slot_flags = SLOT_FLAG_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 5acd9936252..3bf5e0fcef7 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_BACK + slot_flags = SLOT_FLAG_BACK slowdown = 1 actions_types = list(/datum/action/item_action/toggle_mister) max_integrity = 200 @@ -30,13 +30,13 @@ toggle_mister() /obj/item/watertank/item_action_slot_check(slot, mob/user) - if(slot == slot_back) + if(slot == SLOT_HUD_BACK) return 1 /obj/item/watertank/verb/toggle_mister() set name = "Toggle Mister" set category = "Object" - if(usr.get_item_by_slot(slot_back) != src) + if(usr.get_item_by_slot(SLOT_HUD_BACK) != src) to_chat(usr, "The watertank needs to be on your back to use.") return if(usr.incapacitated()) @@ -64,7 +64,7 @@ /obj/item/watertank/equipped(mob/user, slot) ..() - if(slot != slot_back) + if(slot != SLOT_HUD_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 3a20fd356d7..360e2150df1 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_wear_mask) + M.equip_to_slot(G, SLOT_HUD_WEAR_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 0f39778b1c0..c2058389579 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -12,7 +12,7 @@ throwforce = 15 sharp = TRUE w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK toolspeed = 0.25 attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") hitsound = 'sound/weapons/bladeslice.ogg' @@ -234,7 +234,7 @@ desc = "A haphazardly-constructed yet still deadly weapon of ancient design." force = 10 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK var/force_unwielded = 10 var/force_wielded = 18 throwforce = 20 @@ -542,7 +542,7 @@ icon_state = "singulohammer0" base_icon_state = "singulohammer" flags = CONDUCT - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK force = 5 throwforce = 15 throw_range = 1 @@ -613,7 +613,7 @@ icon_state = "mjollnir0" base_icon_state = "mjollnir" flags = CONDUCT - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK force = 5 throwforce = 30 throw_range = 7 @@ -660,7 +660,7 @@ icon_state = "knighthammer0" base_icon_state = "knighthammer" flags = CONDUCT - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK force = 5 throwforce = 15 throw_range = 1 @@ -808,7 +808,7 @@ . += "It is missing a pyroclastic anomaly core." /obj/item/clothing/gloves/color/black/pyro_claws/item_action_slot_check(slot) - if(slot == slot_gloves) + if(slot == SLOT_HUD_GLOVES) return TRUE /obj/item/clothing/gloves/color/black/pyro_claws/ui_action_click(mob/user) @@ -1018,7 +1018,7 @@ sharp = TRUE damtype = BURN w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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 8dd7cc7e676..ab1a66fcc40 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -6,7 +6,7 @@ name = "banhammer" icon = 'icons/obj/items.dmi' icon_state = "toyhammer" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 7 @@ -32,7 +32,7 @@ righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' icon_state = "sord" item_state = "sord" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT force = 2 throwforce = 1 w_class = WEIGHT_CLASS_NORMAL @@ -51,7 +51,7 @@ item_state = "claymore" flags = CONDUCT hitsound = 'sound/weapons/bladeslice.ogg' - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT force = 40 throwforce = 10 sharp = TRUE @@ -82,7 +82,7 @@ icon_state = "katana" item_state = "katana" flags = CONDUCT - slot_flags = SLOT_BELT | SLOT_BACK + slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK force = 40 throwforce = 10 sharp = TRUE diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm index 4343bcc79d3..254620415c0 100644 --- a/code/game/objects/mail.dm +++ b/code/game/objects/mail.dm @@ -219,7 +219,7 @@ lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 6a251597119..a8b7a6ca907 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_BACK + slot_flags = SLOT_FLAG_BACK dog_fashion = /datum/dog_fashion/head/ghost var/list/dream_messages = list("white") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 499d7df9464..ea112029149 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1140,8 +1140,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_w_uniform) - prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) + 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) to_chat(M, "You have been sent to the prison station!") log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") @@ -1349,8 +1349,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_w_uniform) - observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), slot_shoes) + 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) if(isliving(M)) var/mob/living/L = M L.Paralyse(10 SECONDS) @@ -1786,9 +1786,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/reagent_containers/food/snacks/cookie(H), slot_l_hand ) + H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), SLOT_HUD_LEFT_HAND ) if(!(istype(H.l_hand,/obj/item/reagent_containers/food/snacks/cookie))) - H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_r_hand ) + H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), SLOT_HUD_RIGHT_HAND ) if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/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)].") @@ -2122,7 +2122,7 @@ evilcookie.bitesize = 100 evilcookie.flags = NODROP | DROPDEL H.drop_l_hand() - H.equip_to_slot_or_del(evilcookie, slot_l_hand) + H.equip_to_slot_or_del(evilcookie, SLOT_HUD_LEFT_HAND) logmsg = "a mutagen cookie." if("Hellwater Cookie") var/obj/item/reagent_containers/food/snacks/cookie/evilcookie = new /obj/item/reagent_containers/food/snacks/cookie @@ -2131,7 +2131,7 @@ evilcookie.bitesize = 100 evilcookie.flags = NODROP | DROPDEL H.drop_l_hand() - H.equip_to_slot_or_del(evilcookie, slot_l_hand) + H.equip_to_slot_or_del(evilcookie, SLOT_HUD_LEFT_HAND) logmsg = "a hellwater cookie." if("Hunter") ADD_TRAIT(H, TRAIT_BADDNA, "smiting") @@ -2178,7 +2178,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_head) + H.equip_to_slot_or_del(S, SLOT_HUD_HEAD) logmsg = "shamebrero" if(logmsg) log_admin("[key_name(owner)] smited [key_name(M)] with: [logmsg]") @@ -2906,8 +2906,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_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes) + 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) else //teleport security person H.loc = pick(GLOB.prisonsecuritywarp) @@ -3467,7 +3467,7 @@ hunter_mind.transfer_to(hunter_mob) 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_in_backpack) + hunter_mob.equip_to_slot_or_del(N, SLOT_HUD_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 46f3c772994..90641bbc56e 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -471,7 +471,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_wear_id) + H.equip_to_slot_or_del(id, SLOT_HUD_WEAR_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 a6523856ec0..218d83e1cfc 100644 --- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm +++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm @@ -140,16 +140,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_back) - equip_to_slot_or_del(new /obj/item/storage/box/survival(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(src), slot_w_uniform) + 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) if(!flag_mgmt) - equip_to_slot_or_del(new /obj/item/flashlight(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/storage/belt/utility/full/multitool(src), slot_belt) + 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) 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_gloves) + equip_to_slot_or_del(G, SLOT_HUD_GLOVES) // Implants: // Uplink @@ -166,11 +166,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_l_ear) - equip_or_collect(new /obj/item/pda(src), slot_in_backpack) + equip_to_slot_or_del(R, SLOT_HUD_LEFT_EAR) + equip_or_collect(new /obj/item/pda(src), SLOT_HUD_IN_BACKPACK) // Other gear - equip_to_slot_or_del(new /obj/item/clothing/shoes/chameleon/noslip(src), slot_shoes) + equip_to_slot_or_del(new /obj/item/clothing/shoes/chameleon/noslip(src), SLOT_HUD_SHOES) var/obj/item/card/id/syndicate/W = new(src) if (flag_mgmt) @@ -190,6 +190,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_wear_id) + equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) return 1 diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 4054ccd3df8..3ab0273e9c8 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -28,12 +28,12 @@ continue qdel(I) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), slot_l_ear) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/claymore/highlander(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/pinpointer(H.loc), slot_l_store) + 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) var/obj/item/card/id/W = new(H) W.name = "[H.real_name]'s ID Card" @@ -42,7 +42,7 @@ W.access += get_all_centcom_access() W.assignment = "Highlander" W.registered_name = H.real_name - H.equip_to_slot_or_del(W, slot_wear_id) + H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) H.dna.species.after_equip_job(null, H) H.regenerate_icons() @@ -75,13 +75,13 @@ to_chat(H, "You are the multiverse summoner. Activate your blade to summon copies of yourself from another universe to fight by your side.") H.mind.announce_objectives(title = FALSE) - var/obj/item/slot_item_ID = H.get_item_by_slot(slot_wear_id) + var/obj/item/slot_item_ID = H.get_item_by_slot(SLOT_HUD_WEAR_ID) qdel(slot_item_ID) - var/obj/item/slot_item_hand = H.get_item_by_slot(slot_r_hand) + var/obj/item/slot_item_hand = H.get_item_by_slot(SLOT_HUD_RIGHT_HAND) H.unEquip(slot_item_hand) var/obj/item/multisword/pure_evil/multi = new(H) - H.equip_to_slot_or_del(multi, slot_r_hand) + H.equip_to_slot_or_del(multi, SLOT_HUD_RIGHT_HAND) var/obj/item/card/id/W = new(H) W.icon_state = "centcom" @@ -90,7 +90,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_wear_id) + H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) H.update_icons() diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm index d71e8b3a687..98299d3607a 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_l_ear) - H.equip_to_slot_or_del(new /obj/item/beach_ball/dodgeball_team(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) + 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) if(!team_toggle) GLOB.team_alpha += H - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/red/dodgeball(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/red/dodgeball(H), SLOT_HUD_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_wear_id) + H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) else GLOB.team_bravo += H - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/blue/dodgeball(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/blue/dodgeball(H), SLOT_HUD_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_wear_id) + H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_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 f2cf78e85a1..1a9a3e946b2 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -38,8 +38,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_w_uniform) - prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) + 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) 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 765ebc3bf5e..a7647db7788 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_l_ear) - equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), slot_w_uniform) + 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) if(!full_gear) - equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(src), slot_shoes) - equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), slot_gloves) + 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/storage/backpack/security(src), slot_back) - equip_to_slot_or_del(new /obj/item/storage/box/survival_syndi(src), slot_in_backpack) + 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/gun/projectile/revolver(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/ammo_box/a357(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), 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) if(is_leader) - equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/disk/nuclear/unrestricted(src), slot_in_backpack) + 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) else - equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), slot_in_backpack) - equip_to_slot_or_del(new /obj/item/card/emag(src), slot_r_store) - equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber/red(src), slot_l_store) + 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) if(full_gear) - equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(src), slot_wear_mask) - equip_to_slot_or_del(new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src), slot_wear_suit) - equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses) - equip_to_slot_or_del(new /obj/item/storage/belt/military/sst(src), slot_belt) - equip_to_slot_or_del(new /obj/item/tank/internals/oxygen/red(src), slot_s_store) - equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/syndie/advance(src), slot_shoes) - equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/l6_saw(src), slot_r_hand) - equip_to_slot_or_del(new /obj/item/ammo_box/magazine/mm556x45(src), slot_in_backpack) + 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/syndie/advance(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) var/obj/item/implant/dust/D = new /obj/item/implant/dust(src) D.implant(src) @@ -163,6 +163,6 @@ 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_wear_id) + equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) return 1 diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm index 6aaaeb808f5..0b9b536837c 100644 --- a/code/modules/antagonists/changeling/powers/biodegrade.dm +++ b/code/modules/antagonists/changeling/powers/biodegrade.dm @@ -16,7 +16,7 @@ var/used = FALSE // only one form of shackles removed per use if(user.handcuffed) - var/obj/O = user.get_item_by_slot(slot_handcuffed) + var/obj/O = user.get_item_by_slot(SLOT_HUD_HANDCUFFED) if(!istype(O)) return FALSE user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O.name]!", \ @@ -25,7 +25,7 @@ used = TRUE if(user.legcuffed) - var/obj/O = user.get_item_by_slot(slot_legcuffed) + var/obj/O = user.get_item_by_slot(SLOT_HUD_LEGCUFFED) if(!istype(O)) return FALSE user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O.name]!", \ @@ -34,7 +34,7 @@ used = TRUE if(user.wear_suit && user.wear_suit.breakouttime && !used) - var/obj/item/clothing/suit/S = user.get_item_by_slot(slot_wear_suit) + var/obj/item/clothing/suit/S = user.get_item_by_slot(SLOT_HUD_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 f4af32e388a..6381788c97b 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -99,8 +99,8 @@ user.unEquip(user.head) user.unEquip(user.wear_suit) - user.equip_to_slot_if_possible(new suit_type(user), slot_wear_suit, TRUE, TRUE) - user.equip_to_slot_if_possible(new helmet_type(user), slot_head, TRUE, TRUE) + 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) cling.chem_recharge_slowdown += recharge_slowdown return TRUE diff --git a/code/modules/antagonists/revolutionary/datum_headrev.dm b/code/modules/antagonists/revolutionary/datum_headrev.dm index d6d8fa5d123..9d207a0db1f 100644 --- a/code/modules/antagonists/revolutionary/datum_headrev.dm +++ b/code/modules/antagonists/revolutionary/datum_headrev.dm @@ -31,11 +31,11 @@ return var/list/slots = list( - "backpack" = slot_in_backpack, - "left pocket" = slot_l_store, - "right pocket" = slot_r_store, - "left hand" = slot_l_hand, - "right hand" = slot_r_hand, + "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, ) 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 21c1618c7d4..5da2b31ad58 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_BELT + slot_flags = SLOT_FLAG_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/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm index 1c74a721b92..567ad7307b4 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_tie + slot = SLOT_HUD_TIE 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 bab9b9d63b0..1eec9f19af3 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_glasses + slot = SLOT_HUD_GLASSES 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 2104ecff292..ccf4de8c44e 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_gloves + slot = SLOT_HUD_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 0b6734a02cc..065211b583e 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_head + slot = SLOT_HUD_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 811c9641ecd..79aaf93c8ec 100644 --- a/code/modules/client/preference/loadout/loadout_racial.dm +++ b/code/modules/client/preference/loadout/loadout_racial.dm @@ -20,7 +20,7 @@ display_name = "Embroidered veil" description = "A common traditional nano-fiber veil worn by many Tajaran, It is rare and offensive to see it on other races." path = /obj/item/clothing/glasses/tajblind - slot = slot_glasses + slot = SLOT_HUD_GLASSES /datum/gear/racial/taj/sec display_name = "Sleek veil" @@ -57,4 +57,4 @@ /datum/gear/racial/footwraps display_name = "Cloth footwraps" path = /obj/item/clothing/shoes/footwraps - slot = slot_shoes + slot = SLOT_HUD_SHOES diff --git a/code/modules/client/preference/loadout/loadout_shoes.dm b/code/modules/client/preference/loadout/loadout_shoes.dm index e7f969c2311..4fbd21d4e34 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_shoes + slot = SLOT_HUD_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 816132df8e6..ee151c4e8e7 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_wear_suit + slot = SLOT_HUD_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 65f4046cfd5..479685ea4fc 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_w_uniform + slot = SLOT_HUD_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 1eea02c14ba..787c811c05f 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -87,7 +87,7 @@ return 0 // Skip species restriction checks on non-equipment slots - if(slot in list(slot_r_hand, slot_l_hand, slot_in_backpack, slot_l_store, slot_r_store)) + if(slot in list(SLOT_HUD_RIGHT_HAND, SLOT_HUD_LEFT_HAND, SLOT_HUD_IN_BACKPACK, SLOT_HUD_LEFT_STORE, SLOT_HUD_RIGHT_STORE)) return 1 if(species_restricted && ishuman(M)) @@ -136,7 +136,7 @@ name = "ears" w_class = WEIGHT_CLASS_TINY throwforce = 2 - slot_flags = SLOT_EARS + slot_flags = SLOT_FLAG_EARS resistance_flags = NONE sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/ears.dmi') //We read you loud and skree-er. @@ -158,7 +158,7 @@ return var/obj/item/clothing/ears/O - if(slot_flags & SLOT_TWOEARS ) + if(slot_flags & SLOT_FLAG_TWOEARS ) O = (H.l_ear == src ? H.r_ear : H.l_ear) user.unEquip(O) if(!istype(src, /obj/item/clothing/ears/offear)) @@ -182,7 +182,7 @@ w_class = WEIGHT_CLASS_HUGE icon = 'icons/mob/screen_gen.dmi' icon_state = "block" - slot_flags = SLOT_EARS | SLOT_TWOEARS + slot_flags = SLOT_FLAG_EARS | SLOT_FLAG_TWOEARS /obj/item/clothing/ears/offear/New(obj/O) . = ..() @@ -199,7 +199,7 @@ icon = 'icons/obj/clothing/glasses.dmi' w_class = WEIGHT_CLASS_SMALL flags_cover = GLASSESCOVERSEYES - slot_flags = SLOT_EYES + slot_flags = SLOT_FLAG_EYES materials = list(MAT_GLASS = 250) var/vision_flags = 0 var/see_in_dark = 0 //Base human is 2 @@ -257,7 +257,7 @@ icon = 'icons/obj/clothing/gloves.dmi' siemens_coefficient = 0.50 body_parts_covered = HANDS - slot_flags = SLOT_GLOVES + slot_flags = SLOT_FLAG_GLOVES attack_verb = list("challenged") var/transfer_prints = FALSE ///Master pickpocket? @@ -372,7 +372,7 @@ name = "head" icon = 'icons/obj/clothing/hats.dmi' body_parts_covered = HEAD - slot_flags = SLOT_HEAD + slot_flags = SLOT_FLAG_HEAD var/HUDType = null var/vision_flags = 0 @@ -388,7 +388,7 @@ name = "mask" icon = 'icons/obj/clothing/masks.dmi' body_parts_covered = HEAD - slot_flags = SLOT_MASK + slot_flags = SLOT_FLAG_MASK var/adjusted_flags = null strip_delay = 40 put_on_delay = 40 @@ -474,7 +474,7 @@ var/can_cut_open = FALSE var/cut_open = FALSE body_parts_covered = FEET - slot_flags = SLOT_FEET + slot_flags = SLOT_FLAG_FEET 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) @@ -543,7 +543,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_OCLOTHING + slot_flags = SLOT_FLAG_OCLOTHING var/blood_overlay_type = "suit" var/suit_toggled = FALSE var/suit_adjusted = FALSE @@ -607,7 +607,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_wear_suit) + if(ishuman(user) && hide_tail_by_species && slot == SLOT_HUD_OUTER_SUIT) if("modsuit" in hide_tail_by_species) return if(user.dna.species.name in hide_tail_by_species) @@ -683,7 +683,7 @@ name = "under" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS permeability_coefficient = 0.90 - slot_flags = SLOT_ICLOTHING + slot_flags = SLOT_FLAG_ICLOTHING 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' @@ -724,7 +724,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(slot_w_uniform) == src) + if(H.get_item_by_slot(SLOT_HUD_JUMPSUIT) == src) for(var/obj/item/clothing/accessory/A in accessories) A.attached_unequip() @@ -732,7 +732,7 @@ ..() if(!ishuman(user)) return - if(slot == slot_w_uniform) + if(slot == SLOT_HUD_JUMPSUIT) for(var/obj/item/clothing/accessory/A in accessories) A.attached_equip() @@ -845,7 +845,7 @@ if(copytext(item_color,-2) != "_d") basecolor = item_color - if(usr.get_item_by_slot(slot_w_uniform) != src) + if(usr.get_item_by_slot(SLOT_HUD_JUMPSUIT) != src) to_chat(usr, "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 3bede64b810..bf47c4bebe1 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_l_ear) || (slot == slot_r_ear))) + if(ishuman(user) && ((slot == SLOT_HUD_LEFT_EAR) || (slot == SLOT_HUD_RIGHT_EAR))) 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 47ff58e840d..1bd791fa8cb 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_glasses) + if(active_on_equip && mode == MODE_MESON && slot == SLOT_HUD_GLASSES) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_glasses[UID()]") - if(active_on_equip_rad && mode == MODE_RAD && slot == slot_glasses) + if(active_on_equip_rad && mode == MODE_RAD && slot == SLOT_HUD_GLASSES) 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_glasses) == src) + if(user.get_item_by_slot(SLOT_HUD_GLASSES) == 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 3a79e8cb07c..8304741ceee 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_glasses) + if(active_on_equip && slot == SLOT_HUD_GLASSES) ADD_TRAIT(user, TRAIT_MESON_VISION, "meson_glasses[UID()]") /obj/item/clothing/glasses/meson/dropped(mob/user) @@ -162,7 +162,7 @@ actions_types = list(/datum/action/item_action/toggle_research_scanner) /obj/item/clothing/glasses/science/item_action_slot_check(slot) - if(slot == slot_glasses) + if(slot == SLOT_HUD_GLASSES) return 1 /obj/item/clothing/glasses/science/night @@ -350,7 +350,7 @@ toggle_noir(user) /obj/item/clothing/glasses/sunglasses/noir/item_action_slot_check(slot) - if(slot == slot_glasses) + if(slot == SLOT_HUD_GLASSES) return 1 /obj/item/clothing/glasses/sunglasses/noir/proc/toggle_noir(mob/user) @@ -384,7 +384,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_glasses) + if(slot == SLOT_HUD_GLASSES) return TRUE /obj/item/clothing/glasses/virussunglasses @@ -409,7 +409,7 @@ flags = NODROP /obj/item/clothing/glasses/sunglasses/lasers/equipped(mob/user, slot) //grant them laser eyes upon equipping it. - if(slot == slot_glasses) + if(slot == SLOT_HUD_GLASSES) 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 6be8280ff52..34ac0fa8fce 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_glasses) + if(slot != SLOT_HUD_GLASSES) return for(var/new_hud in hud_types) var/datum/atom_hud/H = GLOB.huds[new_hud] diff --git a/code/modules/clothing/gloves/colored_gloves.dm b/code/modules/clothing/gloves/colored_gloves.dm index b0120aa41aa..27cee19987a 100644 --- a/code/modules/clothing/gloves/colored_gloves.dm +++ b/code/modules/clothing/gloves/colored_gloves.dm @@ -28,7 +28,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(slot == slot_gloves) + if(slot == SLOT_HUD_GLOVES) if(H.middleClickOverride) old_mclick_override = H.middleClickOverride H.middleClickOverride = mclick_override @@ -42,7 +42,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(slot_gloves) == src && H.middleClickOverride == mclick_override) + if(H.get_item_by_slot(SLOT_HUD_GLOVES) == src && H.middleClickOverride == mclick_override) if(old_mclick_override) H.middleClickOverride = old_mclick_override old_mclick_override = null diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 18c174a87f5..3f0f68fd669 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -57,7 +57,7 @@ /obj/item/clothing/head/helmet/meson/equipped(mob/user, slot, initial) . = ..() - if(slot == slot_head) + if(slot == SLOT_HUD_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 46092ff3d67..d74cf055589 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -284,7 +284,7 @@ tip_fedora(user) /obj/item/clothing/head/fedora/item_action_slot_check(slot) - if(slot == slot_head) + if(slot == SLOT_HUD_HEAD) return 1 /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 a6da408c53d..17ad87abc11 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -202,7 +202,7 @@ /obj/item/clothing/head/kitty/equipped(mob/M, slot) . = ..() - if(ishuman(M) && slot == slot_head) + if(ishuman(M) && slot == SLOT_HUD_HEAD) update_icon(NONE, M) /obj/item/clothing/head/kitty/mouse @@ -226,7 +226,7 @@ /obj/item/clothing/head/cardborg/equipped(mob/living/user, slot) ..() - if(ishuman(user) && slot == slot_head) + if(ishuman(user) && slot == SLOT_HUD_HEAD) var/mob/living/carbon/human/H = user if(istype(H.wear_suit, /obj/item/clothing/suit/cardborg)) var/obj/item/clothing/suit/cardborg/CB = H.wear_suit diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index dabb917e2e5..a2ab2b3c63d 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_HEAD + adjusted_flags = SLOT_FLAG_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 412e653888b..2c980b674a2 100644 --- a/code/modules/clothing/masks/misc_masks.dm +++ b/code/modules/clothing/masks/misc_masks.dm @@ -245,7 +245,7 @@ pontificate(user) /obj/item/clothing/mask/fakemoustache/item_action_slot_check(slot) - if(slot == slot_wear_mask) + if(slot == SLOT_HUD_WEAR_MASK) return 1 /obj/item/clothing/mask/fakemoustache/proc/pontificate(mob/user) @@ -423,8 +423,8 @@ flags_inv = HIDEFACE flags_cover = MASKCOVERSMOUTH w_class = WEIGHT_CLASS_TINY - slot_flags = SLOT_MASK - adjusted_flags = SLOT_HEAD + slot_flags = SLOT_FLAG_MASK + adjusted_flags = SLOT_FLAG_HEAD icon_state = "bandbotany" dyeable = TRUE can_toggle = TRUE @@ -528,7 +528,7 @@ /obj/item/clothing/mask/cursedclown/equipped(mob/user, slot) ..() var/mob/living/carbon/human/H = user - if(istype(H) && slot == slot_wear_mask) + if(istype(H) && slot == SLOT_HUD_WEAR_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 18d0dd9b772..f72c75c6528 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -103,7 +103,7 @@ /obj/item/clothing/shoes/magboots/clown/equipped(mob/user, slot) . = ..() - if(slot == slot_shoes && enabled_waddle) + if(slot == SLOT_HUD_SHOES && enabled_waddle) user.AddElement(/datum/element/waddling) /obj/item/clothing/shoes/magboots/clown/dropped(mob/user) @@ -259,7 +259,7 @@ ..() if(!ishuman(user)) return - if(slot == slot_shoes && cell && core) + if(slot == SLOT_HUD_SHOES && cell && core) style.teach(user, TRUE) /obj/item/clothing/shoes/magboots/gravity/dropped(mob/user) @@ -267,14 +267,14 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(slot_shoes) == src) + if(H.get_item_by_slot(SLOT_HUD_SHOES) == src) style.remove(H) if(magpulse) to_chat(user, "As [src] are removed, they deactivate.") attack_self(user, TRUE) /obj/item/clothing/shoes/magboots/gravity/item_action_slot_check(slot) - if(slot == slot_shoes) + if(slot == SLOT_HUD_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 c138c95492f..d34568e9b46 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -83,7 +83,7 @@ /obj/item/clothing/shoes/clown_shoes/equipped(mob/user, slot) . = ..() - if(slot == slot_shoes && enabled_waddle) + if(slot == SLOT_HUD_SHOES && enabled_waddle) user.AddElement(/datum/element/waddling) /obj/item/clothing/shoes/clown_shoes/dropped(mob/user) @@ -123,7 +123,7 @@ var/recharging_time = 0 /obj/item/clothing/shoes/clown_shoes/slippers/item_action_slot_check(slot, mob/user) - if(slot == slot_shoes) + if(slot == SLOT_HUD_SHOES) return TRUE /obj/item/clothing/shoes/clown_shoes/slippers/proc/slide_one(mob/living/user, progress, prev_dir , prev_flags) @@ -391,7 +391,7 @@ var/recharging_time = 0 //time until next dash /obj/item/clothing/shoes/bhop/item_action_slot_check(slot) - if(slot == slot_shoes) + if(slot == SLOT_HUD_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 78740772fcd..b91971de8c5 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -80,12 +80,12 @@ soundloop.stop(user) /obj/item/clothing/head/helmet/space/hardsuit/item_action_slot_check(slot) - if(slot == slot_head) + if(slot == SLOT_HUD_HEAD) return 1 /obj/item/clothing/head/helmet/space/hardsuit/equipped(mob/user, slot) ..() - if(slot != slot_head) + if(slot != SLOT_HUD_HEAD) if(suit) suit.RemoveHelmet() soundloop.stop(user) @@ -202,7 +202,7 @@ if(jetpack) to_chat(user, "[src] already has a jetpack installed.") return - if(src == user.get_item_by_slot(slot_wear_suit)) //Make sure the player is not wearing the suit before applying the upgrade. + if(src == user.get_item_by_slot(SLOT_HUD_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 @@ -220,7 +220,7 @@ if(!jetpack) to_chat(user, "[src] has no jetpack installed.") return - if(src == user.get_item_by_slot(slot_wear_suit)) + if(src == user.get_item_by_slot(SLOT_HUD_OUTER_SUIT)) to_chat(user, "You cannot remove the jetpack from [src] while wearing it.") return jetpack.turn_off(user) @@ -231,7 +231,7 @@ /obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot) ..() if(jetpack) - if(slot == slot_wear_suit) + if(slot == SLOT_HUD_OUTER_SUIT) for(var/X in jetpack.actions) var/datum/action/A = X A.Grant(user) @@ -244,7 +244,7 @@ A.Remove(user) /obj/item/clothing/suit/space/hardsuit/item_action_slot_check(slot) - if(slot == slot_wear_suit) //we only give the mob the ability to toggle the helmet if he's wearing the hardsuit. + if(slot == SLOT_HUD_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) @@ -572,7 +572,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/rd/equipped(mob/user, slot) ..() - if(slot == slot_head) + if(slot == SLOT_HUD_HEAD) GLOB.doppler_arrays += src //Needed to sense the kabooms if(ishuman(user)) var/mob/living/carbon/human/U = user diff --git a/code/modules/clothing/spacesuits/misc_spacesuits.dm b/code/modules/clothing/spacesuits/misc_spacesuits.dm index c7af4b884c6..c95e169c10e 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_head) + if(ishuman(user) && slot == SLOT_HUD_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 ff3c34f71be..0c137d30831 100644 --- a/code/modules/clothing/suits/armor_suits.dm +++ b/code/modules/clothing/suits/armor_suits.dm @@ -496,7 +496,7 @@ /obj/item/clothing/suit/armor/reactive/fire/equipped(mob/user, slot) ..() - if(slot != slot_wear_suit) + if(slot != SLOT_HUD_OUTER_SUIT) return ADD_TRAIT(user, TRAIT_RESISTHEAT, "[UID()]") @@ -523,7 +523,7 @@ /obj/item/clothing/suit/armor/reactive/cryo/equipped(mob/user, slot) ..() - if(slot != slot_wear_suit) + if(slot != SLOT_HUD_OUTER_SUIT) return ADD_TRAIT(user, TRAIT_RESISTCOLD, "[UID()]") diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm index b6d42e6ea0a..e8c1cb8bd8c 100644 --- a/code/modules/clothing/suits/hood.dm +++ b/code/modules/clothing/suits/hood.dm @@ -25,11 +25,11 @@ ToggleHood() /obj/item/clothing/suit/hooded/item_action_slot_check(slot, mob/user) - if(slot == slot_wear_suit) + if(slot == SLOT_HUD_OUTER_SUIT) return 1 /obj/item/clothing/suit/hooded/equipped(mob/user, slot) - if(slot != slot_wear_suit) + if(slot != SLOT_HUD_OUTER_SUIT) RemoveHood() ..() @@ -61,7 +61,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_head, FALSE, FALSE)) + else if(H.equip_to_slot_if_possible(hood, SLOT_HUD_HEAD, FALSE, FALSE)) suit_adjusted = 1 icon_state = "[initial(icon_state)]_hood" H.update_inv_wear_suit() @@ -90,7 +90,7 @@ /obj/item/clothing/head/hooded/equipped(mob/user, slot) ..() - if(slot != slot_head) + if(slot != SLOT_HUD_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 b57b5e287b4..9e9e5b98b19 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -234,7 +234,7 @@ /obj/item/clothing/suit/cardborg/equipped(mob/living/user, slot) ..() - if(slot == slot_wear_suit) + if(slot == SLOT_HUD_OUTER_SUIT) disguise(user) /obj/item/clothing/suit/cardborg/dropped(mob/living/user) @@ -644,7 +644,7 @@ /obj/item/clothing/suit/straight_jacket/equipped(mob/living/carbon/human/user, slot) . = ..() - if(slot == slot_wear_suit) + if(slot == SLOT_HUD_OUTER_SUIT) ADD_TRAIT(user, TRAIT_RESTRAINED, "straight_jacket") /obj/item/clothing/suit/straight_jacket/dropped(mob/user, silent) @@ -1107,7 +1107,7 @@ return ..() /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/equipped(mob/living/carbon/human/H, slot) - if(!istype(H) || slot != slot_wear_suit) + if(!istype(H) || slot != SLOT_HUD_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 422674268a1..1cd0e2f1e20 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -8,7 +8,7 @@ /obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot) if(!helmettype) return - if(slot != slot_wear_suit) + if(slot != SLOT_HUD_OUTER_SUIT) RemoveHelmet() ..() @@ -46,7 +46,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_head, FALSE, FALSE)) + else if(H.equip_to_slot_if_possible(helmet, SLOT_HUD_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 579cfa71642..22388a01e97 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_TIE + slot_flags = SLOT_FLAG_TIE 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 @@ -291,7 +291,7 @@ desc = "This glowing blue badge marks the holder as THE LAW." icon_state = "holobadge" item_color = "holobadge" - slot_flags = SLOT_BELT | SLOT_TIE + slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_TIE var/stored_name = null @@ -462,7 +462,7 @@ icon_state = "necklace" item_state = "necklace" item_color = "necklace" - slot_flags = SLOT_TIE + slot_flags = SLOT_FLAG_TIE /obj/item/clothing/accessory/necklace/dope name = "gold necklace" @@ -495,7 +495,7 @@ icon_state = "locket" item_state = "locket" item_color = "locket" - slot_flags = SLOT_TIE + slot_flags = SLOT_FLAG_TIE var/base_icon var/open var/obj/item/held //Item inside locket. diff --git a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm index abbf79aceae..0a48a71555c 100644 --- a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm @@ -49,7 +49,7 @@ /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_back,slot_handcuffed,slot_legcuffed,slot_l_hand,slot_r_hand,slot_belt,slot_head,slot_wear_suit) + 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) 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 c65d7da32dc..788e59583e8 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_w_uniform) + if(ishuman(user) && slot == SLOT_HUD_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 ac1645b14f9..5fc8c2aefbb 100644 --- a/code/modules/clothing/under/syndicate_jumpsuits.dm +++ b/code/modules/clothing/under/syndicate_jumpsuits.dm @@ -43,7 +43,7 @@ /obj/item/clothing/under/syndicate/silicon_cham/equipped(mob/user, slot, initial) . = ..() - if(slot == slot_w_uniform) + if(slot == SLOT_HUD_JUMPSUIT) ADD_TRAIT(user, TRAIT_AI_UNTRACKABLE, "silicon_cham[UID()]") user.invisibility = 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 0cc2aeb6924..9f43fc77249 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -83,7 +83,7 @@ if(AM.flags_2 & HOLOGRAM_2) continue . += AM - for(var/slot in list(slot_r_store, slot_l_store)) + for(var/slot in list(SLOT_HUD_RIGHT_STORE, SLOT_HUD_LEFT_STORE)) . += user.get_item_by_slot(slot) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 2bf1e8fc21d..f37366b16a3 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -146,7 +146,7 @@ force = 5 sharp = FALSE flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT throwforce = 5 w_class = WEIGHT_CLASS_NORMAL attack_verb = list("attacked", "slashed", "stabbed", "sliced") @@ -1476,7 +1476,7 @@ icon_state = "fethasnecklace" item_state = "fethasnecklace" item_color = "fethasnecklace" - slot_flags = SLOT_MASK | SLOT_TIE + slot_flags = SLOT_FLAG_MASK | SLOT_FLAG_TIE /obj/item/bedsheet/fluff/hugosheet //HugoLuman: Dan Martinez name = "Cosmic space blankie" @@ -1530,7 +1530,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_head, TRUE) + H.equip_to_slot(F, SLOT_HUD_HEAD, TRUE) H.update_inv_head() qdel(P) @@ -1599,7 +1599,7 @@ icon_state = "panzermedal" item_state = "panzermedal" item_color = "panzermedal" - slot_flags = SLOT_TIE + slot_flags = SLOT_FLAG_TIE /obj/item/clothing/accessory/medal/fluff/XannZxiax //Sagrotter: Xann Zxiax name = "Zxiax Garnet" @@ -1608,7 +1608,7 @@ icon_state = "Xann_necklace" item_state = "Xann_necklace" item_color = "Xann_necklace" - slot_flags = SLOT_TIE + slot_flags = SLOT_FLAG_TIE /obj/item/clothing/accessory/rbscarf //Rb303: Isthel Eisenwald name = "Old purple scarf" diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm index 40cf085fcea..31563fa02b8 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_BELT + slot_flags = SLOT_FLAG_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 aed8d691eb4..758a36ebb1a 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_BELT + slot_flags = SLOT_FLAG_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_BELT + slot_flags = SLOT_FLAG_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_BELT + slot_flags = SLOT_FLAG_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 8497cd19af8..e1324bf52b5 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -297,18 +297,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_s_store)) - var/obj/item/ws = H.get_item_by_slot(slot_s_store) + if(H.get_item_by_slot(SLOT_HUD_SUIT_STORE)) + var/obj/item/ws = H.get_item_by_slot(SLOT_HUD_SUIT_STORE) if(ws.resistance_flags & INDESTRUCTIBLE) ws.forceMove(get_turf(src)) H.s_store = null - if(H.get_item_by_slot(slot_l_store)) - var/obj/item/ls = H.get_item_by_slot(slot_l_store) + if(H.get_item_by_slot(SLOT_HUD_LEFT_STORE)) + var/obj/item/ls = H.get_item_by_slot(SLOT_HUD_LEFT_STORE) if(ls.resistance_flags & INDESTRUCTIBLE) ls.forceMove(get_turf(src)) H.l_store = null - if(H.get_item_by_slot(slot_r_store)) - var/obj/item/rs = H.get_item_by_slot(slot_r_store) + if(H.get_item_by_slot(SLOT_HUD_RIGHT_STORE)) + var/obj/item/rs = H.get_item_by_slot(SLOT_HUD_RIGHT_STORE) 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 c324f2a506b..bcbcbac0d8a 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -396,7 +396,7 @@ if(href_list["pick"] == "Turn") turn_hand(usr) else - if(cardUser.get_item_by_slot(slot_l_hand) == src || cardUser.get_item_by_slot(slot_r_hand) == src) + if(cardUser.get_item_by_slot(SLOT_HUD_LEFT_HAND) == src || cardUser.get_item_by_slot(SLOT_HUD_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 49d24cf838e..9f1f8d8744a 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_HEAD + slot_flags = SLOT_FLAG_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 4f759bafd99..ea4dc842233 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_HEAD + slot_flags = SLOT_FLAG_HEAD filling_color = "#FF6347" bitesize_mod = 3 tastes = list("poppy" = 1) @@ -93,7 +93,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_HEAD + slot_flags = SLOT_FLAG_HEAD filling_color = "#E6E6FA" tastes = list("harebell" = 1) bitesize_mod = 3 @@ -125,7 +125,7 @@ icon_state = "sunflower" damtype = "fire" force = 0 - slot_flags = SLOT_HEAD + slot_flags = SLOT_FLAG_HEAD throwforce = 0 w_class = WEIGHT_CLASS_TINY throw_speed = 1 @@ -154,7 +154,7 @@ name = "moonflower" desc = "Store in a location at least 50 yards away from werewolves." icon_state = "moonflower" - slot_flags = SLOT_HEAD + slot_flags = SLOT_FLAG_HEAD filling_color = "#E6E6FA" bitesize_mod = 2 tastes = list("moonflower" = 1) @@ -181,7 +181,7 @@ icon_state = "novaflower" damtype = "fire" force = 0 - slot_flags = SLOT_HEAD + slot_flags = SLOT_FLAG_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 9b99d631385..0715ea93092 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_BELT + slot_flags = SLOT_FLAG_BELT origin_tech = "magnets=2;biotech=2" materials = list(MAT_METAL = 210, MAT_GLASS = 40) @@ -23,7 +23,7 @@ belt_icon = null volume = 100 container_type = OPENCONTAINER - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -43,7 +43,7 @@ belt_icon = null volume = 100 container_type = OPENCONTAINER - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT throwforce = 0 w_class = WEIGHT_CLASS_SMALL throw_speed = 3 @@ -127,7 +127,7 @@ w_class = WEIGHT_CLASS_BULKY flags = CONDUCT armour_penetration_flat = 20 - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK origin_tech = "materials=3;combat=2" attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/bladeslice.ogg' @@ -177,7 +177,7 @@ sharp = FALSE w_class = WEIGHT_CLASS_SMALL extend = FALSE - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT origin_tech = "materials=3;combat=3" attack_verb = list("hit", "poked") hitsound = "swing_hit" @@ -186,7 +186,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_BACK //won't fit on belt, but can be worn on belt when extended + slot_flags = SLOT_FLAG_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") @@ -195,7 +195,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_BELT //can be worn on belt again, but no longer makes sense to wear on the back + slot_flags = SLOT_FLAG_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 d7812f798dc..8ea5c4b12e4 100644 --- a/code/modules/instruments/objs/items/headphones.dm +++ b/code/modules/instruments/objs/items/headphones.dm @@ -48,7 +48,7 @@ icon_state = item_state = "headphones[on]" /obj/item/clothing/ears/headphones/item_action_slot_check(slot) - if(slot == slot_l_ear || slot == slot_r_ear) + if(slot == SLOT_HUD_LEFT_EAR || slot == SLOT_HUD_RIGHT_EAR) return TRUE /** diff --git a/code/modules/martial_arts/judo.dm b/code/modules/martial_arts/judo.dm index fd7eeea809b..91d42c6f789 100644 --- a/code/modules/martial_arts/judo.dm +++ b/code/modules/martial_arts/judo.dm @@ -17,7 +17,7 @@ righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi' icon_state = "judobelt" item_state = "judo" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT w_class = WEIGHT_CLASS_BULKY var/datum/martial_art/judo/style @@ -28,7 +28,7 @@ /obj/item/judobelt/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == slot_belt) + if(slot == SLOT_HUD_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!") @@ -43,7 +43,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(slot_belt) == src) + if(H.get_item_by_slot(SLOT_HUD_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 43c9ae34ae5..1c59f19ea12 100644 --- a/code/modules/martial_arts/krav_maga.dm +++ b/code/modules/martial_arts/krav_maga.dm @@ -149,7 +149,7 @@ /obj/item/clothing/gloves/color/black/krav_maga/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == slot_gloves) + if(slot == SLOT_HUD_GLOVES) var/mob/living/carbon/human/H = user style.teach(H, TRUE) @@ -158,7 +158,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(slot_gloves) == src) + if(H.get_item_by_slot(SLOT_HUD_GLOVES) == src) style.remove(H) /obj/item/clothing/gloves/color/black/krav_maga/sec//more obviously named, given to sec diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 45c798a1694..8b8256d82f6 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -268,7 +268,7 @@ /obj/item/clothing/gloves/boxing/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == slot_gloves) + if(slot == SLOT_HUD_GLOVES) var/mob/living/carbon/human/H = user style.teach(H, TRUE) return @@ -278,7 +278,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(slot_gloves) == src) + if(H.get_item_by_slot(SLOT_HUD_GLOVES) == src) style.remove(H) /obj/item/storage/belt/champion/wrestling @@ -292,7 +292,7 @@ /obj/item/storage/belt/champion/wrestling/equipped(mob/user, slot) if(!ishuman(user)) return - if(slot == slot_belt) + if(slot == SLOT_HUD_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.") @@ -306,7 +306,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - if(H.get_item_by_slot(slot_belt) == src) + if(H.get_item_by_slot(SLOT_HUD_BELT) == src) style.remove(H) to_chat(user, "You no longer have an urge to flex your muscles.") @@ -392,7 +392,7 @@ righthand_file = 'icons/mob/inhands/staves_righthand.dmi' force = 10 w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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 01a205547eb..c77dab0c9fa 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_BACK + slot_flags = SLOT_FLAG_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 84c8304316d..e610361bdd6 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_BELT + slot_flags = SLOT_FLAG_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_BELT + slot_flags = SLOT_FLAG_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 7a208310e5d..d7b8b2ec423 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/items.dmi' icon_state = "pickaxe" flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT force = 15 throwforce = 10 item_state = "pickaxe" @@ -127,7 +127,7 @@ icon = 'icons/obj/items.dmi' icon_state = "shovel" flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 af384d81e22..db05bac8549 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -10,7 +10,7 @@ throw_speed = 3 throw_range = 5 origin_tech = "bluespace=2" - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT /obj/item/wormhole_jaunter/attack_self(mob/user) user.visible_message("[user.name] activates the [name]!") @@ -52,7 +52,7 @@ qdel(src) /obj/item/wormhole_jaunter/proc/chasm_react(mob/user) - if(user.get_item_by_slot(slot_belt) == src) + if(user.get_item_by_slot(SLOT_HUD_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 e90bd9443c4..68b6bdc7948 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -63,7 +63,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_in_backpack, FALSE, TRUE) + user.equip_to_slot_if_possible(src, SLOT_HUD_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 6ce2b0cdbab..582876edc40 100644 --- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm +++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm @@ -206,7 +206,7 @@ lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/staves_righthand.dmi' item_state = "lavastaff" - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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 4f60005de5c..5fa10329ad2 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_BACK + slot_flags = SLOT_FLAG_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 d1fc417c16f..c832c458516 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_BACK + slot_flags = SLOT_FLAG_BACK w_class = WEIGHT_CLASS_BULKY force = 25 damtype = BURN diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index 3a57d6eb065..677194ab60f 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -13,7 +13,7 @@ desc = "Somehow, it's in two places at once." icon = 'icons/obj/storage.dmi' icon_state = "cultpack" - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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 e1771feafa6..53b883cf0a9 100644 --- a/code/modules/mob/inventory_procs.dm +++ b/code/modules/mob/inventory_procs.dm @@ -61,7 +61,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_l_hand) + W.equipped(src,SLOT_HUD_LEFT_HAND) if(pulling == W) stop_pulling() update_inv_l_hand() @@ -77,7 +77,7 @@ r_hand = W W.layer = ABOVE_HUD_LAYER W.plane = ABOVE_HUD_PLANE - W.equipped(src,slot_r_hand) + W.equipped(src,SLOT_HUD_RIGHT_HAND) if(pulling == W) stop_pulling() update_inv_r_hand() @@ -259,17 +259,17 @@ S.handle_item_insertion(src) return 1 - S = M.get_item_by_slot(slot_wear_id) + S = M.get_item_by_slot(SLOT_HUD_WEAR_ID) if(istype(S) && S.can_be_inserted(src, 1)) //else we put in a wallet S.handle_item_insertion(src) return 1 - S = M.get_item_by_slot(slot_belt) + S = M.get_item_by_slot(SLOT_HUD_BELT) if(istype(S) && S.can_be_inserted(src, 1)) //else we put in belt S.handle_item_insertion(src) return 1 - var/obj/item/O = M.get_item_by_slot(slot_back) //else we put in backpack + var/obj/item/O = M.get_item_by_slot(SLOT_HUD_BACK) //else we put in backpack if(istype(O, /obj/item/storage)) S = O if(S.can_be_inserted(src, 1)) @@ -297,13 +297,13 @@ /mob/proc/get_item_by_slot(slot_id) switch(slot_id) - if(slot_wear_mask) + if(SLOT_HUD_WEAR_MASK) return wear_mask - if(slot_back) + if(SLOT_HUD_BACK) return back - if(slot_l_hand) + if(SLOT_HUD_LEFT_HAND) return l_hand - if(slot_r_hand) + if(SLOT_HUD_RIGHT_HAND) return r_hand return null diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 6a5451e93b7..dbef1fd335e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -83,15 +83,15 @@ user.set_machine(src) var/dat = {" - - + + "} - dat += "" + dat += "" dat += "" - dat += "" + dat += "" dat += "
Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
 
Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
 
Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "Empty"]
Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "Empty"]
Pouches:[((l_store && !(l_store.flags&ABSTRACT)) || (r_store && !(r_store.flags&ABSTRACT))) ? "Full" : "Empty"]" dat += {"
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 223736b3668..8f32256eb35 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_inventory.dm @@ -28,7 +28,7 @@ switch(slot_id) // if("o_clothing") // if("head") - if(slot_l_store) + if(SLOT_HUD_LEFT_STORE) if(l_store) return if(W.w_class > WEIGHT_CLASS_NORMAL) @@ -36,7 +36,7 @@ unEquip(W) l_store = W update_inv_pockets() - if(slot_r_store) + if(SLOT_HUD_RIGHT_STORE) if(r_store) return if(W.w_class > WEIGHT_CLASS_NORMAL) @@ -46,11 +46,11 @@ update_inv_pockets() else switch(slot_id) - if(slot_wear_suit) + if(SLOT_HUD_OUTER_SUIT) if(wear_suit) wear_suit.attack_alien(src) - if(slot_head) + if(SLOT_HUD_HEAD) if(head) head.attack_alien(src) - if(slot_l_store) + if(SLOT_HUD_LEFT_STORE) if(l_store) l_store.attack_alien(src) - if(slot_r_store) + if(SLOT_HUD_RIGHT_STORE) if(r_store) r_store.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 09d22bc5134..4bbc647996b 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 @@ -83,7 +83,7 @@ /mob/living/carbon/alien/humanoid/update_inv_wear_suit() if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_suit] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_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 342cc29e2ea..3eff208e536 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_wear_mask, FALSE, TRUE) + target.equip_to_slot_if_possible(src, SLOT_HUD_WEAR_MASK, FALSE, TRUE) if(!sterile) M.KnockDown(impregnation_time + 2 SECONDS) M.EyeBlind(impregnation_time + 2 SECONDS) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 77d82c1a8cc..7a5494e8301 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -753,19 +753,19 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven user.set_machine(src) var/dat = {" - - + + "} - dat += "" - dat += "" + dat += "" - dat += "" + dat += "" if(istype(wear_mask, /obj/item/clothing/mask/muzzle)) var/obj/item/clothing/mask/muzzle/M = wear_mask @@ -775,9 +775,9 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven dat += "" if(handcuffed) - dat += "" + dat += "" if(legcuffed) - dat += "" + dat += "" dat += {"
Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
 
Back:[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "Empty"]" + dat += "
Back:[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "Empty"]" if(istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/tank)) - dat += " [internal ? "Disable Internals" : "Set Internals"]" + dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
 
Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "Empty"]
Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "Empty"]
 
Handcuffed: Remove
Handcuffed: Remove
Legcuffed
Legcuffed
Close @@ -829,19 +829,19 @@ 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_back) + if(SLOT_HUD_BACK) return back - if(slot_wear_mask) + if(SLOT_HUD_WEAR_MASK) return wear_mask - if(slot_wear_suit) + if(SLOT_HUD_OUTER_SUIT) return wear_suit - if(slot_l_hand) + if(SLOT_HUD_LEFT_HAND) return l_hand - if(slot_r_hand) + if(SLOT_HUD_RIGHT_HAND) return r_hand - if(slot_handcuffed) + if(SLOT_HUD_HANDCUFFED) return handcuffed - if(slot_legcuffed) + if(SLOT_HUD_LEGCUFFED) return legcuffed return null diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index e8ef65c138b..5399f6cb059 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/obj/screen/inventory/R = hud_used.inv_slots[slot_r_hand] + var/obj/screen/inventory/R = hud_used.inv_slots[SLOT_HUD_RIGHT_HAND] R?.update_icon() - var/obj/screen/inventory/L = hud_used.inv_slots[slot_l_hand] + var/obj/screen/inventory/L = hud_used.inv_slots[SLOT_HUD_LEFT_HAND] L?.update_icon() /mob/living/carbon/update_inv_r_hand(ignore_cuffs) @@ -63,8 +63,8 @@ update_hud_wear_mask(wear_mask) /mob/living/carbon/update_inv_back() - if(client && hud_used && hud_used.inv_slots[slot_back]) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_back] + if(client && hud_used && hud_used.inv_slots[SLOT_HUD_BACK]) + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_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 fe0b57c2cfb..e3282178012 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -184,7 +184,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_glasses) + var/obj/item/clothing/glasses/E = get_item_by_slot(SLOT_HUD_GLASSES) 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 eb6ffc7946d..e8f4cad7be5 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_back) + if(SLOT_HUD_BACK) return has_organ("chest") - if(slot_wear_mask) + if(SLOT_HUD_WEAR_MASK) return has_organ("head") - if(slot_handcuffed) + if(SLOT_HUD_HANDCUFFED) return has_organ("l_hand") && has_organ("r_hand") - if(slot_legcuffed) + if(SLOT_HUD_LEGCUFFED) return has_organ("l_leg") && has_organ("r_leg") - if(slot_l_hand) + if(SLOT_HUD_LEFT_HAND) return has_organ("l_hand") - if(slot_r_hand) + if(SLOT_HUD_RIGHT_HAND) return has_organ("r_hand") - if(slot_belt) + if(SLOT_HUD_BELT) return has_organ("chest") - if(slot_wear_id) + if(SLOT_HUD_WEAR_ID) // the only relevant check for this is the uniform check return TRUE - if(slot_wear_pda) + if(SLOT_HUD_WEAR_PDA) return TRUE - if(slot_l_ear) + if(SLOT_HUD_LEFT_EAR) return has_organ("head") - if(slot_r_ear) + if(SLOT_HUD_RIGHT_EAR) return has_organ("head") - if(slot_glasses) + if(SLOT_HUD_GLASSES) return has_organ("head") - if(slot_gloves) + if(SLOT_HUD_GLOVES) return has_organ("l_hand") && has_organ("r_hand") - if(slot_head) + if(SLOT_HUD_HEAD) return has_organ("head") - if(slot_shoes) + if(SLOT_HUD_SHOES) return has_organ("r_foot") && has_organ("l_foot") - if(slot_wear_suit) + if(SLOT_HUD_OUTER_SUIT) return has_organ("chest") - if(slot_w_uniform) + if(SLOT_HUD_JUMPSUIT) return has_organ("chest") - if(slot_l_store) + if(SLOT_HUD_LEFT_STORE) return has_organ("chest") - if(slot_r_store) + if(SLOT_HUD_RIGHT_STORE) return has_organ("chest") - if(slot_s_store) + if(SLOT_HUD_SUIT_STORE) return has_organ("chest") - if(slot_in_backpack) + if(SLOT_HUD_IN_BACKPACK) return TRUE - if(slot_tie) + if(SLOT_HUD_TIE) return TRUE /mob/living/carbon/human/unEquip(obj/item/I, force, silent = FALSE) @@ -195,10 +195,10 @@ I.plane = ABOVE_HUD_PLANE switch(slot) - if(slot_back) + if(SLOT_HUD_BACK) back = I update_inv_back() - if(slot_wear_mask) + if(SLOT_HUD_WEAR_MASK) wear_mask = I if((wear_mask.flags & BLOCKHAIR) || (wear_mask.flags & BLOCKHEADHAIR)) update_hair() //rebuild hair @@ -208,48 +208,48 @@ sec_hud_set_ID() wear_mask_update(I, toggle_off = TRUE) update_inv_wear_mask() - if(slot_handcuffed) + if(SLOT_HUD_HANDCUFFED) handcuffed = I update_inv_handcuffed() - if(slot_legcuffed) + if(SLOT_HUD_LEGCUFFED) legcuffed = I update_inv_legcuffed() - if(slot_l_hand) + if(SLOT_HUD_LEFT_HAND) l_hand = I update_inv_l_hand() - if(slot_r_hand) + if(SLOT_HUD_RIGHT_HAND) r_hand = I update_inv_r_hand() - if(slot_belt) + if(SLOT_HUD_BELT) belt = I update_inv_belt() - if(slot_wear_id) + if(SLOT_HUD_WEAR_ID) wear_id = I if(hud_list.len) sec_hud_set_ID() update_inv_wear_id() - if(slot_wear_pda) + if(SLOT_HUD_WEAR_PDA) wear_pda = I update_inv_wear_pda() - if(slot_l_ear) + if(SLOT_HUD_LEFT_EAR) l_ear = I - if(l_ear.slot_flags & SLOT_TWOEARS) + 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 update_inv_ears() - if(slot_r_ear) + if(SLOT_HUD_RIGHT_EAR) r_ear = I - if(r_ear.slot_flags & SLOT_TWOEARS) + 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 update_inv_ears() - if(slot_glasses) + if(SLOT_HUD_GLASSES) glasses = I var/obj/item/clothing/glasses/G = I if(G.tint) @@ -260,10 +260,10 @@ update_sight() update_inv_glasses() update_client_colour() - if(slot_gloves) + if(SLOT_HUD_GLOVES) gloves = I update_inv_gloves() - if(slot_head) + if(SLOT_HUD_HEAD) head = I if((head.flags & BLOCKHAIR) || (head.flags & BLOCKHEADHAIR)) update_hair() //rebuild hair @@ -276,27 +276,27 @@ update_sight() head_update(I) update_inv_head() - if(slot_shoes) + if(SLOT_HUD_SHOES) shoes = I update_inv_shoes() - if(slot_wear_suit) + if(SLOT_HUD_OUTER_SUIT) wear_suit = I if(wear_suit.flags_inv & HIDESHOES) update_inv_shoes() update_inv_wear_suit() - if(slot_w_uniform) + if(SLOT_HUD_JUMPSUIT) w_uniform = I update_inv_w_uniform() - if(slot_l_store) + if(SLOT_HUD_LEFT_STORE) l_store = I update_inv_pockets() - if(slot_r_store) + if(SLOT_HUD_RIGHT_STORE) r_store = I update_inv_pockets() - if(slot_s_store) + if(SLOT_HUD_SUIT_STORE) s_store = I update_inv_s_store() - if(slot_in_backpack) + if(SLOT_HUD_IN_BACKPACK) if(get_active_hand() == I) unEquip(I) if(ismodcontrol(back)) @@ -305,7 +305,7 @@ I.forceMove(C.bag) else I.forceMove(back) - if(slot_tie) + if(SLOT_HUD_TIE) var/obj/item/clothing/under/uniform = src.w_uniform uniform.attackby(I, src) else @@ -329,45 +329,45 @@ // Return the item currently in the slot ID /mob/living/carbon/human/get_item_by_slot(slot_id) switch(slot_id) - if(slot_back) + if(SLOT_HUD_BACK) return back - if(slot_wear_mask) + if(SLOT_HUD_WEAR_MASK) return wear_mask - if(slot_handcuffed) + if(SLOT_HUD_HANDCUFFED) return handcuffed - if(slot_legcuffed) + if(SLOT_HUD_LEGCUFFED) return legcuffed - if(slot_l_hand) + if(SLOT_HUD_LEFT_HAND) return l_hand - if(slot_r_hand) + if(SLOT_HUD_RIGHT_HAND) return r_hand - if(slot_belt) + if(SLOT_HUD_BELT) return belt - if(slot_wear_id) + if(SLOT_HUD_WEAR_ID) return wear_id - if(slot_wear_pda) + if(SLOT_HUD_WEAR_PDA) return wear_pda - if(slot_l_ear) + if(SLOT_HUD_LEFT_EAR) return l_ear - if(slot_r_ear) + if(SLOT_HUD_RIGHT_EAR) return r_ear - if(slot_glasses) + if(SLOT_HUD_GLASSES) return glasses - if(slot_gloves) + if(SLOT_HUD_GLOVES) return gloves - if(slot_head) + if(SLOT_HUD_HEAD) return head - if(slot_shoes) + if(SLOT_HUD_SHOES) return shoes - if(slot_wear_suit) + if(SLOT_HUD_OUTER_SUIT) return wear_suit - if(slot_w_uniform) + if(SLOT_HUD_JUMPSUIT) return w_uniform - if(slot_l_store) + if(SLOT_HUD_LEFT_STORE) return l_store - if(slot_r_store) + if(SLOT_HUD_RIGHT_STORE) return r_store - if(slot_s_store) + if(SLOT_HUD_SUIT_STORE) return s_store return null diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm index 9b6d126828b..b7274c8d065 100644 --- a/code/modules/mob/living/carbon/human/human_mob.dm +++ b/code/modules/mob/living/carbon/human/human_mob.dm @@ -306,21 +306,21 @@ var/list/obscured = check_obscured_slots() var/dat = {" - - + + "} - dat += "" - dat += "" + dat += "" var/obj/item/organ/internal/headpocket/C = get_int_organ(/obj/item/organ/internal/headpocket) if(C) - if(slot_wear_mask in obscured) + if(SLOT_HUD_WEAR_MASK in obscured) dat += "" else if(C.held_item) @@ -328,10 +328,10 @@ else dat += "" - if(slot_wear_mask in obscured) + if(SLOT_HUD_WEAR_MASK in obscured) dat += "" else - dat += "" if(!issmall(src)) - if(slot_glasses in obscured) + if(SLOT_HUD_GLASSES in obscured) dat += "" else - dat += "" + dat += "" - if(slot_l_ear in obscured) + if(SLOT_HUD_LEFT_EAR in obscured) dat += "" else - dat += "" + dat += "" - if(slot_r_ear in obscured) + if(SLOT_HUD_RIGHT_EAR in obscured) dat += "" else - dat += "" + dat += "" dat += "" - dat += "" + dat += "" if(wear_suit) - dat += "" else dat += "" - if(slot_shoes in obscured) + if(SLOT_HUD_SHOES in obscured) dat += "" else - dat += "" + dat += "" - if(slot_gloves in obscured) + if(SLOT_HUD_GLOVES in obscured) dat += "" else - dat += "" + dat += "" - if(slot_w_uniform in obscured) + if(SLOT_HUD_JUMPSUIT in obscured) dat += "" else - dat += "" + dat += "" - if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (slot_w_uniform in obscured)) + if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (SLOT_HUD_JUMPSUIT in obscured)) dat += "" dat += "" dat += "" dat += "" dat += "" else - dat += "" // Pockets dat += "" - dat += "" - dat += "" + dat += "" + dat += "" if(istype(w_uniform, /obj/item/clothing/under)) var/obj/item/clothing/under/U = w_uniform @@ -421,9 +421,9 @@ if(handcuffed) - dat += "" + dat += "" if(legcuffed) - dat += "" + dat += "" dat += {"
Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
 
Back:[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "Empty"]" + dat += "
Back:[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "Empty"]" if(has_breathable_mask && istype(back, /obj/item/tank)) - dat += " [internal ? "Disable Internals" : "Set Internals"]" + dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
 
Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
 ↳Headpocket:Obscured
 ↳Headpocket:Empty
Mask:Obscured
Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "Empty"]" + dat += "
Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "Empty"]" if(istype(wear_mask, /obj/item/clothing/mask/muzzle)) var/obj/item/clothing/mask/muzzle/M = wear_mask @@ -341,57 +341,57 @@ dat += "
 
Eyes:Obscured
Eyes:[(glasses && !(glasses.flags&ABSTRACT)) ? html_encode(glasses) : "Empty"]
Eyes:[(glasses && !(glasses.flags&ABSTRACT)) ? html_encode(glasses) : "Empty"]
Left Ear:Obscured
Left Ear:[(l_ear && !(l_ear.flags&ABSTRACT)) ? html_encode(l_ear) : "Empty"]
Left Ear:[(l_ear && !(l_ear.flags&ABSTRACT)) ? html_encode(l_ear) : "Empty"]
Right Ear:Obscured
Right Ear:[(r_ear && !(r_ear.flags&ABSTRACT)) ? html_encode(r_ear) : "Empty"]
Right Ear:[(r_ear && !(r_ear.flags&ABSTRACT)) ? html_encode(r_ear) : "Empty"]
 
Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "Empty"]
Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "Empty"]
 ↳Suit Storage:[(s_store && !(s_store.flags&ABSTRACT)) ? html_encode(s_store) : "Empty"]" + dat += "
 ↳Suit Storage:[(s_store && !(s_store.flags&ABSTRACT)) ? html_encode(s_store) : "Empty"]" if(has_breathable_mask && istype(s_store, /obj/item/tank)) - dat += " [internal ? "Disable Internals" : "Set Internals"]" + dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
 ↳Suit Storage:
Shoes:Obscured
Shoes:[(shoes && !(shoes.flags&ABSTRACT)) ? html_encode(shoes) : "Empty"]
Shoes:[(shoes && !(shoes.flags&ABSTRACT)) ? html_encode(shoes) : "Empty"]
Gloves:Obscured
Gloves:[(gloves && !(gloves.flags&ABSTRACT)) ? html_encode(gloves) : "Empty"]
Gloves:[(gloves && !(gloves.flags&ABSTRACT)) ? html_encode(gloves) : "Empty"]
Uniform:Obscured
Uniform:[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? html_encode(w_uniform) : "Empty"]
Uniform:[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? html_encode(w_uniform) : "Empty"]
 ↳Pockets:
 ↳ID:
 ↳Belt:
 ↳Suit Sensors:
 ↳PDA:
 ↳Belt:[(belt && !(belt.flags&ABSTRACT)) ? html_encode(belt) : "Empty"]" + dat += "
 ↳Belt:[(belt && !(belt.flags&ABSTRACT)) ? html_encode(belt) : "Empty"]" if(has_breathable_mask && istype(belt, /obj/item/tank)) - dat += " [internal ? "Disable Internals" : "Set Internals"]" + dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
 ↳Pockets:" @@ -409,8 +409,8 @@ else dat += "Right (Empty)" dat += "
 ↳ID:[(wear_id && !(wear_id.flags&ABSTRACT)) ? html_encode(wear_id) : "Empty"]
 ↳PDA:[(wear_pda && !(wear_pda.flags&ABSTRACT)) ? "Full" : "Empty"]
 ↳ID:[(wear_id && !(wear_id.flags&ABSTRACT)) ? html_encode(wear_id) : "Empty"]
 ↳PDA:[(wear_pda && !(wear_pda.flags&ABSTRACT)) ? "Full" : "Empty"]
Handcuffed: Remove
Handcuffed: Remove
Legcuffed: Remove
Legcuffed: Remove
Close @@ -644,8 +644,8 @@ if(href_list["pockets"]) var/pocket_side = href_list["pockets"] - var/pocket_id = (pocket_side == "right" ? slot_r_store : slot_l_store) - var/obj/item/pocket_item = (pocket_id == slot_r_store ? r_store : l_store) + var/pocket_id = (pocket_side == "right" ? SLOT_HUD_RIGHT_STORE : SLOT_HUD_LEFT_STORE) + var/obj/item/pocket_item = (pocket_id == SLOT_HUD_RIGHT_STORE ? r_store : l_store) var/obj/item/place_item = usr.get_active_hand() // Item to place in the pocket, if it's empty var/delay_denominator = 1 @@ -661,7 +661,7 @@ if(do_mob(usr, src, POCKET_STRIP_DELAY/delay_denominator)) //placing an item into the pocket is 4 times faster if(pocket_item) - if(pocket_item == (pocket_id == slot_r_store ? r_store : l_store)) //item still in the pocket we search + if(pocket_item == (pocket_id == SLOT_HUD_RIGHT_STORE ? r_store : l_store)) //item still in the pocket we search unEquip(pocket_item) if(thief_mode) usr.put_in_hands(pocket_item) @@ -1066,20 +1066,20 @@ if(wear_suit) if(wear_suit.flags_inv & HIDEGLOVES) - obscured |= slot_gloves + obscured |= SLOT_HUD_GLOVES if(wear_suit.flags_inv & HIDEJUMPSUIT) - obscured |= slot_w_uniform + obscured |= SLOT_HUD_JUMPSUIT if(wear_suit.flags_inv & HIDESHOES) - obscured |= slot_shoes + obscured |= SLOT_HUD_SHOES if(head) if(head.flags_inv & HIDEMASK) - obscured |= slot_wear_mask + obscured |= SLOT_HUD_WEAR_MASK if(head.flags_inv & HIDEEYES) - obscured |= slot_glasses + obscured |= SLOT_HUD_GLASSES if(head.flags_inv & HIDEEARS) - obscured |= slot_r_ear - obscured |= slot_l_ear + obscured |= SLOT_HUD_RIGHT_EAR + obscured |= SLOT_HUD_LEFT_EAR if(obscured.len > 0) return obscured @@ -1096,7 +1096,7 @@ /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_w_uniform in obscured) && skipface) + if((SLOT_HUD_JUMPSUIT in obscured) && skipface) return PLURAL return gender @@ -1300,7 +1300,7 @@ if(!(dna.species.bodyflags & HAS_SKIN_TONE)) s_tone = 0 - var/list/thing_to_check = list(slot_wear_mask, slot_head, slot_shoes, slot_gloves, slot_l_ear, slot_r_ear, slot_glasses, slot_l_hand, slot_r_hand) + 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/kept_items[0] var/list/item_flags[0] for(var/thing in thing_to_check) @@ -1963,8 +1963,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 = slots_amt - for(var/i = 1, i < slots_amt, i++) + equip_list.len = SLOT_HUD_AMOUNT + for(var/i = 1, i < SLOT_HUD_AMOUNT, i++) var/obj/item/thing = get_item_by_slot(i) if(thing != null) equip_list[i] = thing.serialize() @@ -2023,16 +2023,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_w_uniform])) - var/obj/item/clothing/C = list_to_object(equip_list[slot_w_uniform], T) - equip_to_slot_if_possible(C, slot_w_uniform) + 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[slot_wear_suit])) - var/obj/item/clothing/C = list_to_object(equip_list[slot_wear_suit], T) - equip_to_slot_if_possible(C, slot_wear_suit) + 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) - for(var/i = 1, i < slots_amt, i++) - if(i == slot_w_uniform || i == slot_wear_suit) + for(var/i = 1, i < SLOT_HUD_AMOUNT, i++) + if(i == SLOT_HUD_JUMPSUIT || i == SLOT_HUD_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_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 9d9f813e217..11040ae537b 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -572,7 +572,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_w_uniform() remove_overlay(UNIFORM_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_w_uniform] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_JUMPSUIT] if(inv) inv.update_icon() @@ -646,7 +646,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_id() remove_overlay(ID_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_id] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_ID] if(inv) inv.update_icon() @@ -662,7 +662,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_gloves() remove_overlay(GLOVES_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_gloves] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLOVES] if(inv) inv.update_icon() @@ -702,7 +702,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) remove_overlay(OVER_MASK_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_glasses] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLASSES] if(inv) inv.update_icon() @@ -740,12 +740,12 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_ears() remove_overlay(EARS_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_l_ear] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_LEFT_EAR] if(inv) inv.update_icon() if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_r_ear] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_RIGHT_EAR] if(inv) inv.update_icon() @@ -788,7 +788,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_shoes() remove_overlay(SHOES_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_shoes] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SHOES] if(inv) inv.update_icon() @@ -824,7 +824,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/obj/screen/inventory/inv = hud_used.inv_slots[slot_s_store] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_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/obj/screen/inventory/inv = hud_used.inv_slots[slot_head] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_HEAD] if(inv) inv.update_icon() @@ -875,7 +875,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_belt() remove_overlay(BELT_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_belt] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BELT] if(inv) inv.update_icon() @@ -901,7 +901,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_suit() remove_overlay(SUIT_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_suit] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT] if(inv) inv.update_icon() @@ -947,11 +947,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(client && hud_used) var/obj/screen/inventory/inv - inv = hud_used.inv_slots[slot_l_store] + inv = hud_used.inv_slots[SLOT_HUD_LEFT_STORE] if(inv) inv.update_icon() - inv = hud_used.inv_slots[slot_r_store] + inv = hud_used.inv_slots[SLOT_HUD_RIGHT_STORE] if(inv) inv.update_icon() @@ -966,7 +966,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_pda() if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_pda] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_PDA] if(inv) inv.update_icon() @@ -978,11 +978,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) ..() remove_overlay(FACEMASK_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_mask] + var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_MASK] if(inv) inv.update_icon() if(wear_mask && (istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/accessory))) - if(!(slot_wear_mask in check_obscured_slots())) + if(!(SLOT_HUD_WEAR_MASK in check_obscured_slots())) 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 2a98b978f6e..e291abe72ce 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_w_uniform) + equip_to_slot(new /obj/item/clothing/under/punpun(src), SLOT_HUD_JUMPSUIT) /mob/living/carbon/human/monkey/teeny/Initialize(mapload) . = ..() diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 266c188dcc3..fd7422a00db 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -732,21 +732,21 @@ return FALSE switch(slot) - if(slot_l_hand) + if(SLOT_HUD_LEFT_HAND) return !H.l_hand && !H.incapacitated() - if(slot_r_hand) + if(SLOT_HUD_RIGHT_HAND) return !H.r_hand && !H.incapacitated() - if(slot_wear_mask) - return !H.wear_mask && (I.slot_flags & SLOT_MASK) - if(slot_back) - return !H.back && (I.slot_flags & SLOT_BACK) - if(slot_wear_suit) - return !H.wear_suit && (I.slot_flags & SLOT_OCLOTHING) - if(slot_gloves) - return !H.gloves && (I.slot_flags & SLOT_GLOVES) - if(slot_shoes) - return !H.shoes && (I.slot_flags & SLOT_FEET) - if(slot_belt) + 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(H.belt) return FALSE var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST) @@ -755,20 +755,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_BELT)) + if(!(I.slot_flags & SLOT_FLAG_BELT)) return return TRUE - if(slot_glasses) - return !H.glasses && (I.slot_flags & SLOT_EYES) - if(slot_head) - return !H.head && (I.slot_flags & SLOT_HEAD) - if(slot_l_ear) - return !H.l_ear && (I.slot_flags & SLOT_EARS) && !((I.slot_flags & SLOT_TWOEARS) && H.r_ear) - if(slot_r_ear) - return !H.r_ear && (I.slot_flags & SLOT_EARS) && !((I.slot_flags & SLOT_TWOEARS) && H.l_ear) - if(slot_w_uniform) - return !H.w_uniform && (I.slot_flags & SLOT_ICLOTHING) - if(slot_wear_id) + 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(H.wear_id) return FALSE var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST) @@ -777,10 +777,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_ID)) + if(!(I.slot_flags & SLOT_FLAG_ID)) return FALSE return TRUE - if(slot_wear_pda) + if(SLOT_HUD_WEAR_PDA) if(H.wear_pda) return FALSE var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST) @@ -789,10 +789,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_PDA)) + if(!(I.slot_flags & SLOT_FLAG_PDA)) return FALSE return TRUE - if(slot_l_store) + if(SLOT_HUD_LEFT_STORE) if(I.flags & NODROP) //Pockets aren't visible, so you can't move NODROP items into them. return FALSE if(H.l_store) @@ -803,9 +803,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_POCKET)) + if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_FLAG_POCKET)) return TRUE - if(slot_r_store) + if(SLOT_HUD_RIGHT_STORE) if(I.flags & NODROP) return FALSE if(H.r_store) @@ -816,10 +816,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_POCKET)) + if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_FLAG_POCKET)) return TRUE return FALSE - if(slot_s_store) + if(SLOT_HUD_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) @@ -839,11 +839,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_handcuffed) + if(SLOT_HUD_HANDCUFFED) return !H.handcuffed && istype(I, /obj/item/restraints/handcuffs) - if(slot_legcuffed) + if(SLOT_HUD_LEGCUFFED) return !H.legcuffed && istype(I, /obj/item/restraints/legcuffs) - if(slot_in_backpack) + if(SLOT_HUD_IN_BACKPACK) if(H.back && istype(H.back, /obj/item/storage/backpack)) var/obj/item/storage/backpack/B = H.back if(B.contents.len < B.storage_slots && I.w_class <= B.max_w_class) @@ -855,7 +855,7 @@ if(B.contents.len < B.storage_slots && I.w_class <= B.max_w_class) return TRUE return FALSE - if(slot_tie) + if(SLOT_HUD_TIE) if(!istype(I, /obj/item/clothing/accessory)) return FALSE var/obj/item/clothing/under/uniform = H.w_uniform @@ -867,7 +867,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_TIE)) + if(!(I.slot_flags & SLOT_FLAG_TIE)) 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 b8de9b24229..709012df947 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_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform, slot_s_store) + no_equip = list(SLOT_HUD_WEAR_MASK, SLOT_HUD_OUTER_SUIT, SLOT_HUD_GLOVES, SLOT_HUD_SHOES, SLOT_HUD_JUMPSUIT, SLOT_HUD_SUIT_STORE) nojumpsuit = TRUE dietflags = DIET_OMNI //golems can eat anything because they are magic or something @@ -571,8 +571,8 @@ ..() last_banana = world.time last_honk = world.time - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(H), slot_r_store) - H.equip_to_slot_or_del(new /obj/item/bikehorn(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(H), SLOT_HUD_RIGHT_STORE) + H.equip_to_slot_or_del(new /obj/item/bikehorn(H), SLOT_HUD_LEFT_STORE) H.AddElement(/datum/element/waddling) /datum/species/golem/bananium/on_species_loss(mob/living/carbon/C) @@ -649,9 +649,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_head) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_r_store) - H.equip_to_slot_or_del(new /obj/item/cane(H), slot_l_hand) + 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/food/drinks/bottle/bottleofnothing(H), SLOT_HUD_RIGHT_STORE) + H.equip_to_slot_or_del(new /obj/item/cane(H), SLOT_HUD_LEFT_HAND) if(H.mind) H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe/conjure/build/mime_wall(null)) H.mind.AddSpell(new /obj/effect/proc_holder/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 d92d3d7784d..d65bfb4fde7 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_belt, slot_wear_id, slot_l_ear, slot_r_ear, slot_glasses, slot_gloves, slot_shoes, slot_wear_suit, slot_w_uniform, slot_l_store, slot_r_store, slot_s_store, slot_wear_pda) + 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) 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 0a1d7cd5514..e1dea402481 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -178,7 +178,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_wear_mask) + H.equip_or_collect(new /obj/item/clothing/mask/breath(H), SLOT_HUD_WEAR_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 @@ -187,7 +187,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_l_hand) + H.equip_or_collect(internal_tank, SLOT_HUD_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 6cca4fe763f..ea903cbd2b1 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -80,7 +80,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_wear_mask) + H.equip_or_collect(new /obj/item/clothing/mask/breath/vox/respirator(H), SLOT_HUD_WEAR_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 @@ -90,7 +90,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_l_hand) + H.equip_or_collect(internal_tank, SLOT_HUD_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 c71fdbe47b5..3fa20d25a33 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/code/modules/mob/living/carbon/superheroes.dm @@ -22,7 +22,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_l_ear) + H.equip_to_slot_or_del(new /obj/item/radio/headset(H), SLOT_HUD_LEFT_EAR) /datum/superheroes/proc/fixflags(mob/living/carbon/human/H) for(var/obj/item/W in H.get_all_slots()) @@ -58,7 +58,7 @@ W.SetOwnerInfo(H) W.UpdateName() W.flags |= NODROP - H.equip_to_slot_or_del(W, slot_wear_id) + H.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) H.regenerate_icons() to_chat(H, desc) @@ -73,12 +73,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_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/owl(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask/super_hero(H), slot_wear_mask) - H.equip_to_slot_or_del(new /obj/item/storage/belt/bluespace/owlman(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), slot_glasses) + 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) /datum/superheroes/griffin @@ -92,10 +92,10 @@ /datum/superheroes/griffin/equip(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/griffin(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/griffin(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin/(H), slot_head) + 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) var/obj/item/implant/freedom/L = new/obj/item/implant/freedom(H) L.implant(H) @@ -112,12 +112,12 @@ /datum/superheroes/lightnian/equip(mob/living/carbon/human/H) ..() - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/brown(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(H), slot_gloves) - H.equip_to_slot_or_del(new /obj/item/bedsheet/orange(H), slot_back) + 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) /datum/superheroes/electro @@ -131,11 +131,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_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit/super_hero/en(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi/super_hero/en(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/bedsheet/cult(H), slot_back) + 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) @@ -229,10 +229,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_w_uniform) - target.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(target), slot_shoes) - target.equip_to_slot_or_del(new /obj/item/storage/toolbox/mechanical/greytide(target), slot_l_hand) - target.equip_to_slot_or_del(new /obj/item/radio/headset(target), slot_l_ear) + 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) var/obj/item/card/id/syndicate/W = new(target) W.icon_state = "lifetimeid" W.access = list(ACCESS_MAINT_TUNNELS) @@ -241,5 +241,5 @@ W.flags |= NODROP W.SetOwnerInfo(target) W.UpdateName() - target.equip_to_slot_or_del(W, slot_wear_id) + target.equip_to_slot_or_del(W, SLOT_HUD_WEAR_ID) target.regenerate_icons() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 062950b45d7..f9b4ac442cf 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -881,7 +881,7 @@ */ /mob/living/proc/get_strip_slot_name_override(slot) switch(slot) - if(slot_wear_pda) + if(SLOT_HUD_WEAR_PDA) return "PDA" // The src mob is trying to strip an item from someone diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index 068f4e5050a..c6cff44ef43 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -254,7 +254,7 @@ item_state = "analyzer" desc = "A hand-held scanner able to diagnose robotic injuries." flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT throwforce = 3 w_class = WEIGHT_CLASS_SMALL throw_speed = 5 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 8adf5597e4f..d2032db0a90 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_TIE + slot_flags = SLOT_FLAG_TIE 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 4fe89181b20..eebe50d1adf 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_TIE + slot_flags = SLOT_FLAG_TIE 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 89ff2298aad..5ca0bd8b87d 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -509,7 +509,7 @@ return user.set_machine(src) - var/dat = "
Collar:[(pcollar && !(pcollar.flags & ABSTRACT)) ? html_encode(pcollar) : "Empty"]
" + var/dat = "
Collar:[(pcollar && !(pcollar.flags & ABSTRACT)) ? html_encode(pcollar) : "Empty"]
" dat += "Close" var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 250) @@ -518,14 +518,14 @@ /mob/living/simple_animal/get_item_by_slot(slot_id) switch(slot_id) - if(slot_collar) + if(SLOT_HUD_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_collar) + if(SLOT_HUD_COLLAR) if(pcollar) return FALSE if(!can_collar) @@ -545,7 +545,7 @@ W.plane = ABOVE_HUD_PLANE switch(slot) - if(slot_collar) + if(SLOT_HUD_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 94fe7b8ddec..9cb51cd2f6a 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -206,9 +206,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_l_hand, del_on_fail, disable_warning)) + if(equip_to_slot_if_possible(W, SLOT_HUD_LEFT_HAND, del_on_fail, disable_warning)) return 1 - else if(equip_to_slot_if_possible(W, slot_r_hand, del_on_fail, disable_warning)) + else if(equip_to_slot_if_possible(W, SLOT_HUD_RIGHT_HAND, del_on_fail, disable_warning)) return 1 return 0 @@ -268,23 +268,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_back,\ - slot_wear_pda,\ - slot_wear_id,\ - slot_w_uniform,\ - slot_wear_suit,\ - slot_wear_mask,\ - slot_head,\ - slot_shoes,\ - slot_gloves,\ - slot_l_ear,\ - slot_r_ear,\ - slot_glasses,\ - slot_belt,\ - slot_s_store,\ - slot_tie,\ - slot_l_store,\ - slot_r_store\ + 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\ )) //puts the item "W" into an appropriate slot in a human's inventory @@ -293,7 +293,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_head) // Storage items should be put on the belt before the head + if(isstorage(W) && slot == SLOT_HUD_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 @@ -317,22 +317,22 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ var/mob/living/carbon/human/H = M switch(slot) - if(slot_l_hand) + if(SLOT_HUD_LEFT_HAND) if(H.l_hand) return 0 return 1 - if(slot_r_hand) + if(SLOT_HUD_RIGHT_HAND) if(H.r_hand) return 0 return 1 - if(slot_wear_mask) - if( !(slot_flags & SLOT_MASK) ) + if(SLOT_HUD_WEAR_MASK) + if( !(slot_flags & SLOT_FLAG_MASK) ) return 0 if(H.wear_mask) return 0 return 1 - if(slot_back) - if( !(slot_flags & SLOT_BACK) ) + if(SLOT_HUD_BACK) + if( !(slot_flags & SLOT_FLAG_BACK) ) return 0 if(H.back) if(!(H.back.flags & NODROP)) @@ -340,8 +340,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_wear_suit) - if( !(slot_flags & SLOT_OCLOTHING) ) + if(SLOT_HUD_OUTER_SUIT) + if( !(slot_flags & SLOT_FLAG_OCLOTHING) ) return 0 if(H.wear_suit) if(!(H.wear_suit.flags & NODROP)) @@ -349,8 +349,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_gloves) - if( !(slot_flags & SLOT_GLOVES) ) + if(SLOT_HUD_GLOVES) + if( !(slot_flags & SLOT_FLAG_GLOVES) ) return 0 if(H.gloves) if(!(H.gloves.flags & NODROP)) @@ -358,8 +358,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_shoes) - if( !(slot_flags & SLOT_FEET) ) + if(SLOT_HUD_SHOES) + if( !(slot_flags & SLOT_FLAG_FEET) ) return 0 if(H.shoes) if(!(H.shoes.flags & NODROP)) @@ -367,12 +367,12 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_belt) + if(SLOT_HUD_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_BELT) ) + if( !(slot_flags & SLOT_FLAG_BELT) ) return 0 if(H.belt) if(!(H.belt.flags & NODROP)) @@ -380,8 +380,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_glasses) - if( !(slot_flags & SLOT_EYES) ) + if(SLOT_HUD_GLASSES) + if( !(slot_flags & SLOT_FLAG_EYES) ) return 0 if(H.glasses) if(!(H.glasses.flags & NODROP)) @@ -389,8 +389,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_head) - if( !(slot_flags & SLOT_HEAD) ) + if(SLOT_HUD_HEAD) + if( !(slot_flags & SLOT_FLAG_HEAD) ) return 0 if(H.head) if(!(H.head.flags & NODROP)) @@ -398,8 +398,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_l_ear) - if( !(slot_flags & slot_l_ear) ) + if(SLOT_HUD_LEFT_EAR) + if( !(slot_flags & SLOT_HUD_LEFT_EAR) ) return 0 if(H.l_ear) if(!(H.l_ear.flags & NODROP)) @@ -407,8 +407,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_r_ear) - if( !(slot_flags & slot_r_ear) ) + if(SLOT_HUD_RIGHT_EAR) + if( !(slot_flags & SLOT_HUD_RIGHT_EAR) ) return 0 if(H.r_ear) if(!(H.r_ear.flags & NODROP)) @@ -416,8 +416,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_w_uniform) - if( !(slot_flags & SLOT_ICLOTHING) ) + if(SLOT_HUD_JUMPSUIT) + if( !(slot_flags & SLOT_FLAG_ICLOTHING) ) return 0 if(H.w_uniform) if(!(H.w_uniform.flags & NODROP)) @@ -425,12 +425,12 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_wear_id) + if(SLOT_HUD_WEAR_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_ID) ) + if( !(slot_flags & SLOT_FLAG_ID) ) return 0 if(H.wear_id) if(!(H.wear_id.flags & NODROP)) @@ -438,26 +438,26 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 0 return 1 - if(slot_l_store) + if(SLOT_HUD_LEFT_STORE) 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_POCKET) ) + if( w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_FLAG_POCKET) ) return 1 - if(slot_r_store) + if(SLOT_HUD_RIGHT_STORE) 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_POCKET) ) + if( w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_FLAG_POCKET) ) return 1 return 0 - if(slot_s_store) + if(SLOT_HUD_SUIT_STORE) if(!H.wear_suit) if(!disable_warning) to_chat(H, "You need a suit before you can attach this [name].") @@ -479,19 +479,19 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ else return 1 return 0 - if(slot_handcuffed) + if(SLOT_HUD_HANDCUFFED) if(H.handcuffed) return 0 if(!istype(src, /obj/item/restraints/handcuffs)) return 0 return 1 - if(slot_legcuffed) + if(SLOT_HUD_LEGCUFFED) if(H.legcuffed) return 0 if(!istype(src, /obj/item/restraints/legcuffs)) return 0 return 1 - if(slot_in_backpack) + if(SLOT_HUD_IN_BACKPACK) if(H.back && istype(H.back, /obj/item/storage/backpack)) var/obj/item/storage/backpack/B = H.back if(B.contents.len < B.storage_slots && w_class <= B.max_w_class) @@ -588,8 +588,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ /mob/proc/show_inv(mob/user) user.set_machine(src) var/dat = {" - - + + "} dat += {"
Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
 
Close diff --git a/code/modules/mob/mob_holder.dm b/code/modules/mob/mob_holder.dm index 4b73f319432..d5c0b5d0b27 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_HEAD|SLOT_EARS + slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_EARS /obj/item/holder/New() ..() diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 3019f00c71d..eef28485dcf 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -13,7 +13,7 @@ item_state = "mod_control" base_icon_state = "control" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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( @@ -206,14 +206,14 @@ /obj/item/mod/control/equipped(mob/user, slot) ..() - if(slot == slot_back) + if(slot == SLOT_HUD_BACK) set_wearer(user) else if(wearer) unset_wearer() /obj/item/mod/control/item_action_slot_check(slot) - if(slot == slot_back) + if(slot == SLOT_HUD_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 b6d4eefd894..0cb1688f77d 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_BACK + var/slot_flags = SLOT_FLAG_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 4379c6d6446..2a09c01a11e 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_back) && !human_user.unEquip(human_user.get_item_by_slot(slot_back))) + if(human_user.get_item_by_slot(SLOT_HUD_BACK) && !human_user.unEquip(human_user.get_item_by_slot(SLOT_HUD_BACK))) return - if(!human_user.equip_to_slot_if_possible(mod, slot_back, disable_warning = TRUE)) + if(!human_user.equip_to_slot_if_possible(mod, SLOT_HUD_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 50b510a93bb..218c5432c67 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -53,7 +53,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_belt, FALSE, TRUE)) + else if(user.equip_to_slot_if_possible(src, SLOT_HUD_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 377b03ecd65..8b4252b8f8c 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_BELT + slot_flags = SLOT_FLAG_BELT resistance_flags = FLAMMABLE /obj/item/clipboard/New() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 876c303bff3..4826977b4d9 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_HEAD + slot_flags = SLOT_FLAG_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 2a92ab8cf44..a5d8a48717e 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_BELT | SLOT_EARS + slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_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 3ce718dbdab..1e7610dcde6 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -159,7 +159,7 @@ icon_state = "camera" item_state = "electropack" w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT var/list/matter = list("metal" = 2000) var/pictures_max = 10 var/pictures_left = 10 @@ -616,7 +616,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_BELT + slot_flags = SLOT_FLAG_BELT #undef CAMERA_STATE_COOLDOWN diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index bc32d97e761..f0ee565a36b 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_ID | SLOT_BELT | SLOT_PDA + slot_flags = SLOT_FLAG_ID | SLOT_FLAG_BELT | SLOT_FLAG_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 6ddd43a8f2c..ce021bc5e1b 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_BELT + slot_flags = SLOT_FLAG_BELT item_state = "coil" attack_verb = list("whipped", "lashed", "disciplined", "flogged") usesound = 'sound/items/deconstruct.ogg' diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 61e52037557..2a4a41e8fd9 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_BELT + slot_flags = SLOT_FLAG_BELT throwforce = 1 w_class = WEIGHT_CLASS_TINY var/fire_sound = null //What sound should play when this ammo is fired @@ -119,7 +119,7 @@ icon = 'icons/obj/ammo.dmi' icon_state = "10mmbox" // placeholder icon flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 98e9cfe0877..ca2f3674cb7 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_BELT + slot_flags = SLOT_FLAG_BELT materials = list(MAT_METAL=2000) w_class = WEIGHT_CLASS_NORMAL throwforce = 5 @@ -547,7 +547,7 @@ */ /obj/item/gun/proc/ZoomGrantCheck(datum/source, mob/user, slot) // Checks if the gun got equipped into either of the user's hands. - if(slot != slot_r_hand && slot != slot_l_hand) + if(slot != SLOT_HUD_RIGHT_HAND && slot != SLOT_HUD_LEFT_HAND) // If its not in their hands, un-zoom, and remove the zoom action button. zoom(user, FALSE) azoom.Remove(user) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index b6d6a801dee..2b6c58e2c61 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -81,7 +81,7 @@ w_class = WEIGHT_CLASS_BULKY force = 10 flags = CONDUCT - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK can_holster = FALSE origin_tech = "combat=4;magnets=4;powerstorage=3" ammo_type = list(/obj/item/ammo_casing/energy/laser/accelerator) @@ -121,7 +121,7 @@ w_class = WEIGHT_CLASS_BULKY force = 12 flags = CONDUCT - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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 41e944159db..1d12f211255 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -8,7 +8,7 @@ force = 10 modifystate = TRUE flags = CONDUCT - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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 @@ -25,7 +25,7 @@ name = "pulse carbine" desc = "A compact variant of the pulse rifle with less firepower but easier storage." w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT icon_state = "pulse_carbine" item_state = null cell_type = /obj/item/stock_parts/cell/pulse/carbine @@ -37,7 +37,7 @@ name = "pulse pistol" desc = "A pulse rifle in an easily concealed handgun package with low capacity." w_class = WEIGHT_CLASS_SMALL - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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 8cb90adf9c3..e02af412ed2 100644 --- a/code/modules/projectiles/guns/energy/special_eguns.dm +++ b/code/modules/projectiles/guns/energy/special_eguns.dm @@ -12,7 +12,7 @@ w_class = WEIGHT_CLASS_HUGE can_holster = FALSE flags = CONDUCT - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK shaded_charge = TRUE ammo_type = list(/obj/item/ammo_casing/energy/ion) ammo_x_offset = 3 @@ -27,7 +27,7 @@ desc = "The MK.II Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient." icon_state = "ioncarbine" w_class = WEIGHT_CLASS_NORMAL - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_BELT ammo_x_offset = 2 flight_x_offset = 18 flight_y_offset = 11 @@ -462,7 +462,7 @@ weapon_weight = WEAPON_HEAVY w_class = WEIGHT_CLASS_BULKY can_holster = FALSE - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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. @@ -567,7 +567,7 @@ icon = 'icons/obj/guns/gun_temperature.dmi' icon_state = "tempgun_4" item_state = "tempgun_4" - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK w_class = WEIGHT_CLASS_BULKY fire_sound = 'sound/weapons/pulse3.ogg' desc = "A gun that changes the body temperature of its targets." diff --git a/code/modules/projectiles/guns/magic/magic_staff.dm b/code/modules/projectiles/guns/magic/magic_staff.dm index e374875844b..a1a136476ee 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_BACK + slot_flags = SLOT_FLAG_BACK ammo_type = /obj/item/ammo_casing/magic flags_2 = NO_MAT_REDEMPTION_2 diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm index 1df39ef409b..5e79e0f888b 100644 --- a/code/modules/projectiles/guns/projectile/launchers.dm +++ b/code/modules/projectiles/guns/projectile/launchers.dm @@ -57,7 +57,7 @@ icon_state = "speargun" item_state = "speargun" w_class = WEIGHT_CLASS_BULKY - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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 2769820cd89..24f873a4021 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -332,7 +332,7 @@ weapon_weight = WEAPON_HEAVY force = 10 flags = CONDUCT - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK mag_type = /obj/item/ammo_box/magazine/internal/shot/dual fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg' sawn_desc = "Omar's coming!" @@ -410,7 +410,7 @@ if(sling) to_chat(user, "The shotgun already has a sling!") else if(C.use(10)) - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_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 d46fd7253e3..c41718b28e7 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_BACK + slot_flags = SLOT_FLAG_BACK origin_tech = "combat=4;materials=2" mag_type = /obj/item/ammo_box/magazine/internal/shot fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg' @@ -141,8 +141,8 @@ w_class = WEIGHT_CLASS_NORMAL current_skin = "riotshotgun_sawn" item_state = "riotshotgun_sawn" //phil235 is it different with different skin? - slot_flags &= ~SLOT_BACK //you can't sling it on your back - slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) + 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) sawn_state = SAWN_OFF magazine.max_ammo = 3 update_appearance() @@ -182,8 +182,8 @@ w_class = initial(w_class) current_skin = "riotshotgun" item_state = initial(item_state) - slot_flags &= ~SLOT_BELT - slot_flags |= SLOT_BACK + slot_flags &= ~SLOT_FLAG_BELT + slot_flags |= SLOT_FLAG_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 efb4ca3d8c0..28ae5fa498f 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -17,7 +17,7 @@ w_class = WEIGHT_CLASS_NORMAL zoomable = TRUE zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you. - slot_flags = SLOT_BACK + slot_flags = SLOT_FLAG_BACK actions_types = list() /obj/item/gun/projectile/automatic/sniper_rifle/process_fire(atom/target, mob/living/user, message = TRUE, params, zone_override, bonus_spread = 0) diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 7f42486d358..810077a519e 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_BELT + slot_flags = SLOT_FLAG_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 c49be4a00f7..2510b9cec39 100644 --- a/code/modules/projectiles/guns/projectile_gun.dm +++ b/code/modules/projectiles/guns/projectile_gun.dm @@ -228,8 +228,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_BACK //you can't sling it on your back - slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) + 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) 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 f4584a967e1..3e98206f47a 100644 --- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm @@ -399,7 +399,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_wear_mask) + H.equip_to_slot(fakemoustache, SLOT_HUD_WEAR_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 6a4bd61c5cc..27f67b98d24 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -297,7 +297,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_HEAD + slot_flags = SLOT_FLAG_HEAD resistance_flags = NONE blocks_emissive = EMISSIVE_BLOCK_GENERIC container_type = OPENCONTAINER @@ -313,7 +313,7 @@ /obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot) ..() - if(slot == slot_head && reagents.total_volume) + if(slot == SLOT_HUD_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 13afce6c879..8a97a036e85 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -14,7 +14,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_BELT + slot_flags = SLOT_FLAG_BELT var/ignore_flags = FALSE var/safety_hypo = FALSE var/static/list/safe_chem_list = list("antihol", "charcoal", "epinephrine", "insulin", "teporone", "salbutamol","omnizine", diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 98f15e57e1a..6a24e3375ea 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_BELT + slot_flags = SLOT_FLAG_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 3bc3a19c1c5..4945a753bb6 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -237,7 +237,7 @@ w_class = WEIGHT_CLASS_TINY item_state = "electronic" flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_FLAG_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/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index 88d7ed8894c..dfd26cea744 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -77,10 +77,10 @@ var/obj/item/implantcase/case - if(istype(user.get_item_by_slot(slot_l_hand), /obj/item/implantcase)) - case = user.get_item_by_slot(slot_l_hand) - else if(istype(user.get_item_by_slot(slot_r_hand), /obj/item/implantcase)) - case = user.get_item_by_slot(slot_r_hand) + if(istype(user.get_item_by_slot(SLOT_HUD_LEFT_HAND), /obj/item/implantcase)) + case = user.get_item_by_slot(SLOT_HUD_LEFT_HAND) + else if(istype(user.get_item_by_slot(SLOT_HUD_RIGHT_HAND), /obj/item/implantcase)) + case = user.get_item_by_slot(SLOT_HUD_RIGHT_HAND) else case = locate(/obj/item/implantcase) in get_turf(target) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 01e02780ad0..65a98fed5d9 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -113,7 +113,7 @@ var/obj/item/flash/F = holder F.set_light(7) - var/arm_slot = (parent_organ == "r_arm" ? slot_r_hand : slot_l_hand) + var/arm_slot = (parent_organ == "r_arm" ? SLOT_HUD_RIGHT_HAND : SLOT_HUD_LEFT_HAND) var/obj/item/arm_item = owner.get_item_by_slot(arm_slot) if(arm_item) @@ -146,7 +146,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_r_hand : slot_l_hand) + var/arm_slot = (parent_organ == "r_arm" ? SLOT_HUD_RIGHT_HAND : SLOT_HUD_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 8952c63f967..3deaedca139 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_BELT + slot_flags = SLOT_FLAG_BELT origin_tech = "materials=2;magnets=1;bluespace=2" /// Whether the GPS is on. var/tracking = TRUE @@ -168,7 +168,7 @@ GLOBAL_LIST_EMPTY(GPS_list) /obj/item/gps/mod icon_state = "gps-m" gpstag = "MOD0" - desc = "A positioning system helpful for rescuing trapped or injured miners, after you have become lost from rolling around at the speed of sound." + desc = "A positioning system helpful for rescuing trapped or injured miners, after you have become lost from rolling around at the speed of sound." /obj/item/gps/cyborg icon_state = "gps-b"