diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 5050fbcb80..10e57f2896 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -12,7 +12,7 @@ /obj/item/clothing/under/rank/chief_engineer/skirt, /obj/item/clothing/head/hardhat/white, /obj/item/clothing/head/welding, - /obj/item/clothing/gloves/yellow, + /obj/item/clothing/gloves/heavy_engineer, //VOREStation Edit: chief gets the good shit /obj/item/clothing/shoes/brown, /obj/item/weapon/cartridge/ce, /obj/item/device/radio/headset/heads/ce, diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 35bb3a1b9e..7384c9946e 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -243,6 +243,7 @@ prob(3);/obj/item/weapon/material/butterfly, prob(3);/obj/item/weapon/material/butterfly/switchblade, prob(3);/obj/item/clothing/gloves/knuckledusters, + prob(3);/obj/item/clothing/gloves/heavy_engineer, prob(3);/obj/item/weapon/reagent_containers/syringe/drugs, prob(2);/obj/item/weapon/implanter/sizecontrol, prob(2);/obj/item/weapon/handcuffs/fuzzy, diff --git a/code/modules/clothing/gloves/miscellaneous_vr.dm b/code/modules/clothing/gloves/miscellaneous_vr.dm index a9b21cafc7..8244a60b52 100644 --- a/code/modules/clothing/gloves/miscellaneous_vr.dm +++ b/code/modules/clothing/gloves/miscellaneous_vr.dm @@ -60,3 +60,27 @@ name = "knight gauntlets" icon_state = "brown" item_state = "brown" +<<<<<<< HEAD +======= + +/obj/item/clothing/gloves/heavy_engineer + desc = "Elbow-length insulated gloves, with added reinforcement. They'll keep your fingers and forearms just that little bit safer from things that might try to melt, mangle, or burn them. A tag on the inside of each glove reads \'PROPERTY OF ENGINEERING, RETURN IF FOUND\'." + name = "heavy-duty engineering gloves" + icon_state = "heavy_engi" + item_state = "heavy_engi" + siemens_coefficient = 0 + permeability_coefficient = 0.05 + flags = THICKMATERIAL + armor = list(melee = 10, bullet = 10, laser = 10, energy = 5, bomb = 0, bio = 30, rad = 30) + icon = 'icons/inventory/hands/item_vr.dmi' + default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' + sprite_sheets = list( + SPECIES_TESHARI = 'icons/inventory/hands/mob_vr_teshari.dmi', + SPECIES_VOX = 'icons/inventory/hands/mob_vr_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/hands/mob_vr_werebeast.dmi') + + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE +>>>>>>> 9b8bc2c486a... Merge pull request #12233 from KillianKirilenko/kk-fluff diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 9c850be60c..968dd57d0b 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -633,7 +633,7 @@ /obj/item/device/flashlight/glowstick/yellow = 3) contraband = list(/obj/item/weapon/weldingtool/hugetank = 2, /obj/item/clothing/gloves/fyellow = 2) - premium = list(/obj/item/clothing/gloves/yellow = 1) + premium = list(/obj/item/clothing/gloves/heavy_engineer = 1) //VOREStation Edit - yellow gloves are common in engineering, let's make "premium" actually mean something req_log_access = access_ce has_logs = 1 diff --git a/icons/inventory/hands/item_vr.dmi b/icons/inventory/hands/item_vr.dmi index 749d4df189..302f4be618 100644 Binary files a/icons/inventory/hands/item_vr.dmi and b/icons/inventory/hands/item_vr.dmi differ diff --git a/icons/inventory/hands/mob_vr.dmi b/icons/inventory/hands/mob_vr.dmi index 3a8806e48c..8aed1c166d 100644 Binary files a/icons/inventory/hands/mob_vr.dmi and b/icons/inventory/hands/mob_vr.dmi differ diff --git a/icons/inventory/hands/mob_vr_teshari.dmi b/icons/inventory/hands/mob_vr_teshari.dmi new file mode 100644 index 0000000000..2d79a8ac14 Binary files /dev/null and b/icons/inventory/hands/mob_vr_teshari.dmi differ diff --git a/icons/inventory/hands/mob_vr_vox.dmi b/icons/inventory/hands/mob_vr_vox.dmi new file mode 100644 index 0000000000..405ce4b76f Binary files /dev/null and b/icons/inventory/hands/mob_vr_vox.dmi differ diff --git a/icons/inventory/hands/mob_vr_werebeast.dmi b/icons/inventory/hands/mob_vr_werebeast.dmi index 7b14f5bf96..f117406623 100644 Binary files a/icons/inventory/hands/mob_vr_werebeast.dmi and b/icons/inventory/hands/mob_vr_werebeast.dmi differ