diff --git a/code/modules/client/preference_setup/loadout/items/gloves.dm b/code/modules/client/preference_setup/loadout/items/gloves.dm index d1ad000bdae..757ce6e6fd0 100644 --- a/code/modules/client/preference_setup/loadout/items/gloves.dm +++ b/code/modules/client/preference_setup/loadout/items/gloves.dm @@ -71,3 +71,20 @@ /datum/gear/gloves/circuitry display_name = "gloves, circuitry (empty)" path = /obj/item/clothing/gloves/circuitry + +/datum/gear/gloves/single + display_name = "single glove (colourable)" + path = /obj/item/clothing/gloves/single + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/gloves/single/New() + ..() + var/list/glove_types = list() + glove_types["single glove, right"] = /obj/item/clothing/gloves/single + glove_types["single glove, left"] = /obj/item/clothing/gloves/single/left + gear_tweaks += new /datum/gear_tweak/path(glove_types) + +/datum/gear/gloves/multi_color + display_name = "multi-color gloves (colourable)" + path = /obj/item/clothing/gloves/multi_color + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 052f6a4f620..03e5c2312bf 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -435,3 +435,25 @@ icon_state = "forensic" item_state = "forensicgloves" species_restricted = list("exclude",BODYTYPE_GOLEM,BODYTYPE_VAURCA_BREEDER,BODYTYPE_VAURCA_WARFORM,BODYTYPE_VAURCA_BULWARK) + +/obj/item/clothing/gloves/single + name = "single glove" + desc = "A single glove. This one is for the right hand." + icon = 'icons/clothing/gloves/single.dmi' + contained_sprite = TRUE + icon_state = "single" + item_state = "single" + +/obj/item/clothing/gloves/single/left + desc = "A single glove. This one is for the left hand." + icon_state = "single_left" + item_state = "single_left" + +/obj/item/clothing/gloves/multi_color + name = "multi-color gloves" + desc = "A pair of gloves, each is a different color." + icon = 'icons/clothing/gloves/multi_color.dmi' + contained_sprite = TRUE + icon_state = "multi_color" + item_state = "multi_color" + has_accents = TRUE diff --git a/code/modules/clothing/gloves/stungloves.dm b/code/modules/clothing/gloves/stungloves.dm index 791ffb02098..896b6d318c0 100644 --- a/code/modules/clothing/gloves/stungloves.dm +++ b/code/modules/clothing/gloves/stungloves.dm @@ -1,7 +1,10 @@ /obj/item/clothing/gloves/update_icon() ..() - ClearOverlays() if(wired) AddOverlays("gloves_wire") + else + CutOverlays("gloves_wire") if(cell) AddOverlays("gloves_cell") + else + CutOverlays("gloves_cell") diff --git a/html/changelogs/geeves-gloves_stuff.yml b/html/changelogs/geeves-gloves_stuff.yml new file mode 100644 index 00000000000..e93f43af497 --- /dev/null +++ b/html/changelogs/geeves-gloves_stuff.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Added single (one for each hand) and multi-color gloves to the loadout." \ No newline at end of file diff --git a/icons/clothing/gloves/multi_color.dmi b/icons/clothing/gloves/multi_color.dmi new file mode 100644 index 00000000000..b2c978b8350 Binary files /dev/null and b/icons/clothing/gloves/multi_color.dmi differ diff --git a/icons/clothing/gloves/single.dmi b/icons/clothing/gloves/single.dmi new file mode 100644 index 00000000000..f06d81fe3c5 Binary files /dev/null and b/icons/clothing/gloves/single.dmi differ