diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index 489ea8edd1e..5825d5be73a 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -79,12 +79,12 @@ /datum/greyscale_config/jumpsuit_inhand_left name = "Held Jumpsuit, Left" - icon_file = 'icons/mob/inhands/clothing_lefthand.dmi' + icon_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' json_config = 'code/datums/greyscale/json_configs/jumpsuit_inhand.json' /datum/greyscale_config/jumpsuit_inhand_right name = "Held Jumpsuit, Right" - icon_file = 'icons/mob/inhands/clothing_righthand.dmi' + icon_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' json_config = 'code/datums/greyscale/json_configs/jumpsuit_inhand.json' /datum/greyscale_config/jumpsuit_prison @@ -99,12 +99,12 @@ /datum/greyscale_config/jumpsuit_prison_inhand_left name = "Held Prison Jumpsuit, Left" - icon_file = 'icons/mob/inhands/clothing_lefthand.dmi' + icon_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison_inhand.json' /datum/greyscale_config/jumpsuit_prison_inhand_right name = "Held Prison Jumpsuit, Right" - icon_file = 'icons/mob/inhands/clothing_righthand.dmi' + icon_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison_inhand.json' /datum/greyscale_config/tablet diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 4ef4664c0ec..35b1f8bf2d9 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -14,10 +14,8 @@ var/visor_flags = 0 //flags that are added/removed when an item is adjusted up/down var/visor_flags_inv = 0 //same as visor_flags, but for flags_inv var/visor_flags_cover = 0 //same as above, but for flags_cover -//what to toggle when toggled with weldingvisortoggle() + ///What to toggle when toggled with weldingvisortoggle() var/visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_VISIONFLAGS | VISOR_DARKNESSVIEW | VISOR_INVISVIEW - lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' - righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' var/alt_desc = null var/toggle_message = null var/alt_toggle_message = null diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm index 4c2aa14b305..285d3e2c157 100644 --- a/code/modules/clothing/ears/_ears.dm +++ b/code/modules/clothing/ears/_ears.dm @@ -2,6 +2,8 @@ //Ears: currently only used for headsets and earmuffs /obj/item/clothing/ears name = "ears" + lefthand_file = 'icons/mob/inhands/clothing/ears_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/ears_righthand.dmi' w_class = WEIGHT_CLASS_TINY throwforce = 0 slot_flags = ITEM_SLOT_EARS diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index e27a11629f9..22586459f37 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -2,6 +2,8 @@ /obj/item/clothing/glasses name = "glasses" icon = 'icons/obj/clothing/glasses.dmi' + lefthand_file = 'icons/mob/inhands/clothing/glasses_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/glasses_righthand.dmi' w_class = WEIGHT_CLASS_SMALL flags_cover = GLASSESCOVERSEYES slot_flags = ITEM_SLOT_EYES diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index f09e1fc62f1..ecf518b319c 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -3,6 +3,8 @@ gender = PLURAL //Carn: for grammarically correct text-parsing w_class = WEIGHT_CLASS_SMALL icon = 'icons/obj/clothing/gloves.dmi' + lefthand_file = 'icons/mob/inhands/clothing/gloves_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/gloves_righthand.dmi' siemens_coefficient = 0.5 body_parts_covered = HANDS slot_flags = ITEM_SLOT_GLOVES @@ -40,7 +42,7 @@ if(ismob(loc)) var/mob/M = loc M.update_worn_gloves() - + /obj/item/clothing/gloves/proc/can_cut_with(obj/item/tool) if(!cut_type) return FALSE @@ -54,7 +56,7 @@ if (!can_cut_with(tool)) return balloon_alert(user, "cutting off fingertips...") - + if(!do_after(user, 3 SECONDS, target=src, extra_checks = CALLBACK(src, .proc/can_cut_with, tool))) return balloon_alert(user, "cut fingertips off") diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index 34d01faa2a6..01ad06c94ed 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -1,6 +1,8 @@ /obj/item/clothing/head name = BODY_ZONE_HEAD icon = 'icons/obj/clothing/hats.dmi' + lefthand_file = 'icons/mob/inhands/clothing/hats_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/hats_righthand.dmi' body_parts_covered = HEAD slot_flags = ITEM_SLOT_HEAD var/can_toggle = null diff --git a/code/modules/clothing/head/cakehat.dm b/code/modules/clothing/head/cakehat.dm index d78664430f6..efcc07c886c 100644 --- a/code/modules/clothing/head/cakehat.dm +++ b/code/modules/clothing/head/cakehat.dm @@ -4,8 +4,8 @@ icon_state = "hardhat0_cakehat" inhand_icon_state = "hardhat0_cakehat" hat_type = "cakehat" - lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' - righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' + lefthand_file = 'icons/mob/inhands/clothing/hats_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/hats_righthand.dmi' hitsound = 'sound/weapons/tap.ogg' var/hitsound_on = 'sound/weapons/sear.ogg' //so we can differentiate between cakehat and energyhat var/hitsound_off = 'sound/weapons/tap.ogg' diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index 4e793306c3b..7c3672c6fdf 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -1,6 +1,8 @@ /obj/item/clothing/mask name = "mask" icon = 'icons/obj/clothing/masks.dmi' + lefthand_file = 'icons/mob/inhands/clothing/masks_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/masks_righthand.dmi' body_parts_covered = HEAD slot_flags = ITEM_SLOT_MASK strip_delay = 40 diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 398e4769f50..393d10f838e 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -309,6 +309,7 @@ name = "owl mask" desc = "Twoooo!" icon_state = "owl" + inhand_icon_state = "owl_mask" clothing_flags = MASKINTERNALS flags_cover = MASKCOVERSEYES resistance_flags = FLAMMABLE diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 5c89b23025d..7c9a1de6b19 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -1,6 +1,8 @@ /obj/item/clothing/shoes name = "shoes" icon = 'icons/obj/clothing/shoes.dmi' + lefthand_file = 'icons/mob/inhands/clothing/shoes_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/shoes_righthand.dmi' desc = "Comfortable-looking shoes." gender = PLURAL //Carn: for grammarically correct text-parsing var/chained = FALSE diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 7fe69348d99..6040305aa52 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -27,6 +27,8 @@ desc = "A suit that protects against low pressure environments. Has a big 13 on the back." icon_state = "spaceold" icon = 'icons/obj/clothing/suits/spacesuit.dmi' + lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' worn_icon = 'icons/mob/clothing/suits/spacesuit.dmi' inhand_icon_state = "s_suit" w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index 9c16b476860..461aad3e786 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -1,6 +1,8 @@ /obj/item/clothing/suit - icon = 'icons/obj/clothing/suits/default.dmi' name = "suit" + icon = 'icons/obj/clothing/suits/default.dmi' + lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' var/fire_resist = T0C+100 allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 57124a1176d..cac7b8f8abe 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -2,6 +2,7 @@ name = "wizard hat" desc = "Strange-looking hat-wear that most certainly belongs to a real magic user." icon_state = "wizard" + inhand_icon_state = "wizhat" armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 30, BOMB = 20, BIO = 100, FIRE = 100, ACID = 100, WOUND = 20) strip_delay = 50 equip_delay_other = 50 diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index ab707347272..f5248f051d6 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -2,6 +2,8 @@ name = "under" icon = 'icons/obj/clothing/under/default.dmi' worn_icon = 'icons/mob/clothing/under/default.dmi' + lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' body_parts_covered = CHEST|GROIN|LEGS|ARMS slot_flags = ITEM_SLOT_ICLOTHING armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 0, WOUND = 5) diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 4315ab92f01..51ac6064ee5 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -104,6 +104,8 @@ name = "sheriff vest" desc = "Now you just have to pick your favourite deputy." icon_state = "vest_sheriff" + lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' inhand_icon_state = "vest_sheriff" minimize_when_attached = TRUE attachment_slot = null @@ -121,6 +123,8 @@ desc = "The best part of a maid costume." icon_state = "maidapron" inhand_icon_state = "maidapron" + lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' minimize_when_attached = FALSE attachment_slot = null diff --git a/code/modules/instruments/piano_synth.dm b/code/modules/instruments/piano_synth.dm index e2dc842dad0..4b07533926f 100644 --- a/code/modules/instruments/piano_synth.dm +++ b/code/modules/instruments/piano_synth.dm @@ -17,8 +17,8 @@ name = "headphones" desc = "Unce unce unce unce. Boop!" icon = 'icons/obj/clothing/accessories.dmi' - lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' - righthand_file = 'icons/mob/inhands/clothing_righthand.dmi' + lefthand_file = 'icons/mob/inhands/clothing/ears_lefthand.dmi' + righthand_file = 'icons/mob/inhands/clothing/ears_righthand.dmi' icon_state = "headphones" inhand_icon_state = "headphones" slot_flags = ITEM_SLOT_EARS | ITEM_SLOT_HEAD diff --git a/icons/mob/inhands/clothing/ears_lefthand.dmi b/icons/mob/inhands/clothing/ears_lefthand.dmi new file mode 100644 index 00000000000..04406bbfc8b Binary files /dev/null and b/icons/mob/inhands/clothing/ears_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/ears_righthand.dmi b/icons/mob/inhands/clothing/ears_righthand.dmi new file mode 100644 index 00000000000..1a2b7701142 Binary files /dev/null and b/icons/mob/inhands/clothing/ears_righthand.dmi differ diff --git a/icons/mob/inhands/clothing/glasses_lefthand.dmi b/icons/mob/inhands/clothing/glasses_lefthand.dmi new file mode 100644 index 00000000000..a6fa6121cf3 Binary files /dev/null and b/icons/mob/inhands/clothing/glasses_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/glasses_righthand.dmi b/icons/mob/inhands/clothing/glasses_righthand.dmi new file mode 100644 index 00000000000..b4de970ff2b Binary files /dev/null and b/icons/mob/inhands/clothing/glasses_righthand.dmi differ diff --git a/icons/mob/inhands/clothing/gloves_lefthand.dmi b/icons/mob/inhands/clothing/gloves_lefthand.dmi new file mode 100644 index 00000000000..bcf74323bbf Binary files /dev/null and b/icons/mob/inhands/clothing/gloves_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/gloves_righthand.dmi b/icons/mob/inhands/clothing/gloves_righthand.dmi new file mode 100644 index 00000000000..f7bfae8e0c7 Binary files /dev/null and b/icons/mob/inhands/clothing/gloves_righthand.dmi differ diff --git a/icons/mob/inhands/clothing/hats_lefthand.dmi b/icons/mob/inhands/clothing/hats_lefthand.dmi new file mode 100644 index 00000000000..fccb54acd0d Binary files /dev/null and b/icons/mob/inhands/clothing/hats_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/hats_righthand.dmi b/icons/mob/inhands/clothing/hats_righthand.dmi new file mode 100644 index 00000000000..90cee0d22f3 Binary files /dev/null and b/icons/mob/inhands/clothing/hats_righthand.dmi differ diff --git a/icons/mob/inhands/clothing/masks_lefthand.dmi b/icons/mob/inhands/clothing/masks_lefthand.dmi new file mode 100644 index 00000000000..42c74be1b36 Binary files /dev/null and b/icons/mob/inhands/clothing/masks_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/masks_righthand.dmi b/icons/mob/inhands/clothing/masks_righthand.dmi new file mode 100644 index 00000000000..afc02b6d6d1 Binary files /dev/null and b/icons/mob/inhands/clothing/masks_righthand.dmi differ diff --git a/icons/mob/inhands/clothing/shoes_lefthand.dmi b/icons/mob/inhands/clothing/shoes_lefthand.dmi new file mode 100644 index 00000000000..e2a2d1284b8 Binary files /dev/null and b/icons/mob/inhands/clothing/shoes_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/shoes_righthand.dmi b/icons/mob/inhands/clothing/shoes_righthand.dmi new file mode 100644 index 00000000000..6c396c841a4 Binary files /dev/null and b/icons/mob/inhands/clothing/shoes_righthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi new file mode 100644 index 00000000000..dc72a6e62c5 Binary files /dev/null and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi new file mode 100644 index 00000000000..7c97039e006 Binary files /dev/null and b/icons/mob/inhands/clothing/suits_righthand.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi deleted file mode 100644 index b2f95564683..00000000000 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and /dev/null differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi deleted file mode 100644 index 55fb568bd7f..00000000000 Binary files a/icons/mob/inhands/clothing_righthand.dmi and /dev/null differ