From af11280dc022591415429f0924d12cb46719aa1d Mon Sep 17 00:00:00 2001 From: Geeves Date: Fri, 13 Sep 2024 12:17:46 +0200 Subject: [PATCH] Gloves Stuff (#19844) * Added single (one for each hand) and multi-color gloves to the loadout. ![image](https://github.com/user-attachments/assets/10bbb3c5-7002-435e-8c3d-92fbf9cebb83) ![image](https://github.com/user-attachments/assets/77ef91b3-1641-46eb-833e-b5dde9f5411d) ![image](https://github.com/user-attachments/assets/13455104-5d23-423c-af47-c334ed2703a9) --- .../preference_setup/loadout/items/gloves.dm | 17 ++++++++++++++ code/modules/clothing/gloves/miscellaneous.dm | 22 ++++++++++++++++++ code/modules/clothing/gloves/stungloves.dm | 5 +++- html/changelogs/geeves-gloves_stuff.yml | 6 +++++ icons/clothing/gloves/multi_color.dmi | Bin 0 -> 552 bytes icons/clothing/gloves/single.dmi | Bin 0 -> 542 bytes 6 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/geeves-gloves_stuff.yml create mode 100644 icons/clothing/gloves/multi_color.dmi create mode 100644 icons/clothing/gloves/single.dmi 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 0000000000000000000000000000000000000000..b2c978b8350076d4908b59d82703ee01d4be7113 GIT binary patch literal 552 zcmV+@0@wYCP)V;=5QPoB0EoEj{K)${ zF5b5`>=U5-Dh~HQLZdEhaHmqrY*J~y6++DOGq#u~s)`^U2ev~B9J(#4e)k%VnEJhs z#vv?l6YS(fxj-`oABS=Q?)uT#u3Vr#x_%nl;`-{)wEkjJ1MCB|^L$F4`nimGS38-N zF!KTl=(lCOamn&Fv@B!-@Q$ifAbn-&1k1mogz76M;PLl*iTDi&f*>9r>?y}PRKva< z;$hgM3}_!mRBmbfepow@>zuG;0ysYq1VIo4u_AA|>21NC qi#JFFhw!iHkEOv#1y-V93RpR+N~V3Spxui%-u%s5HT=GAA{ygjiES zYVjDYtl;YB0`?pLK|?}okbHWV0003gNklEq0ir9>H-GEjV_Iw0{ispz7?sMEkJ%|)E4k%9N8;Nl_dee0 zaE&sZF+V~4Vd%X857!9e3G=y+SbsvYczjEccpHKs$iD~teJe!)8$g;Gq)-k=?E&Ig zQror7>2cj6#5mKt0w6F9;DmZyxG3;zdZ8p>g#7H3ET7*-G80hLQa;Vys^|V;Gfh;A zNHsBzqd$oFhuH*F4cFv8qd!>i4*_3U)B;>VBY+?Xf*?;39;W&01}8l9@BbF8nt;A8 g5Hhm|2=dlk0M&vdr72vcm;e9(07*qoM6N<$g5IR{A^-pY literal 0 HcmV?d00001