diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index ce320d26..5a9688b5 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -11,6 +11,20 @@ cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT +/obj/item/clothing/gloves/guncaster + name = "fingerless leather gloves" + desc = "Sturdy leather gloves with no fingertips, buckled at the wrist." + icon_state = "guncaster" + item_state = "guncaster" + icon = 'hyperstation/icons/obj/clothing/gloves.dmi' + alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi' + item_color = null //So they don't wash. + transfer_prints = TRUE + strip_delay = 40 + equip_delay_other = 20 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + /obj/item/clothing/gloves/botanic_leather name = "botanist's leather gloves" desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They're also quite warm." diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index b5ec7e12..92d5b25a 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -129,6 +129,9 @@ /obj/item/clothing/under/syndicate/tacticool/skirt = 3, /obj/item/clothing/mask/balaclava = 3, /obj/item/clothing/head/ushanka = 3, + /obj/item/clothing/suit/gcvest = 2, + /obj/item/clothing/suit/gcvest/alt = 2, + /obj/item/clothing/gloves/guncaster = 4, /obj/item/clothing/under/soviet = 3, /obj/item/storage/belt/fannypack/black = 3, /obj/item/clothing/suit/jacket/letterman_syndie = 5, diff --git a/hyperstation/code/modules/clothing/suits/misc.dm b/hyperstation/code/modules/clothing/suits/misc.dm index 63b16e84..f50df01b 100644 --- a/hyperstation/code/modules/clothing/suits/misc.dm +++ b/hyperstation/code/modules/clothing/suits/misc.dm @@ -7,3 +7,19 @@ icon = 'hyperstation/icons/obj/clothing/suits.dmi' alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION + + +/obj/item/clothing/suit/gcvest + name = "Guncaster's Vest" + desc = "An open leather vest with battlescarred metal shoulderpads, perfect for hunting interdimensional wazards. Smells of gunpowder and plasma." + icon_state = "guncaster" + item_state = "guncaster" + icon = 'hyperstation/icons/obj/clothing/suits.dmi' + alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi' + mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/suit/gcvest/alt + name = "Hellraider's Vest" + desc = "An open leather vest with battlescarred metal shoulderpads, discovered in a dimensional anomaly. Smells of gunpowder and plasma." + icon_state = "guncaster_alt" + item_state = "guncaster_alt" \ No newline at end of file diff --git a/hyperstation/icons/mobs/gloves.dmi b/hyperstation/icons/mobs/gloves.dmi index 4ac51a78..70fa72dc 100644 Binary files a/hyperstation/icons/mobs/gloves.dmi and b/hyperstation/icons/mobs/gloves.dmi differ diff --git a/hyperstation/icons/mobs/suits.dmi b/hyperstation/icons/mobs/suits.dmi index 16b97a02..1fee3289 100644 Binary files a/hyperstation/icons/mobs/suits.dmi and b/hyperstation/icons/mobs/suits.dmi differ diff --git a/hyperstation/icons/obj/clothing/gloves.dmi b/hyperstation/icons/obj/clothing/gloves.dmi index 652a7a56..6f425bd0 100644 Binary files a/hyperstation/icons/obj/clothing/gloves.dmi and b/hyperstation/icons/obj/clothing/gloves.dmi differ diff --git a/hyperstation/icons/obj/clothing/suits.dmi b/hyperstation/icons/obj/clothing/suits.dmi index 0c317c7d..b3e25949 100644 Binary files a/hyperstation/icons/obj/clothing/suits.dmi and b/hyperstation/icons/obj/clothing/suits.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 7d0f0543..7252fc78 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -3,6 +3,11 @@ category = SLOT_GLOVES path = /obj/item/clothing/gloves/fingerless +/datum/gear/gcgloves + name = "Fingerless Leather Gloves" + category = SLOT_GLOVES + path = /obj/item/clothing/gloves/guncaster + /datum/gear/goldring name = "A gold ring" category = SLOT_GLOVES diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index b43dd4c0..94fe309f 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -209,6 +209,16 @@ category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/polychromic/kromacrop +/datum/gear/gcvest + name = "Guncaster's Vest" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/gcvest + +/datum/gear/gcvestalt + name = "Hellraider's Vest" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/gcvest/alt + /datum/gear/blacksuitjacket name = "Black Suit Jacket" category = SLOT_WEAR_SUIT