TGS Test Merge (#6093)

Citadel-Station-13 · Oct 20, 2023 · 5387880 · 5387880
2 parents cd7c796 + a7a75d7
commit 5387880
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
@@ -650,3 +650,11 @@
 	icon = 'icons/clothing/gloves/darkcleric.dmi'
 	icon_state = "darkcleric"
 	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+
+/obj/item/clothing/gloves/armsocks
+	name = "Fingerless Sleeves"
+	desc = "A pair of fingerless, full arm sleeves. Perfect for fashion, not so much winter."
+	icon = 'icons/clothing/gloves/fingerless.dmi'
+	icon_state = "armsleeves_color"
+	worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+
diff --git a/code/modules/loadout/loadout_gloves.dm b/code/modules/loadout/loadout_gloves.dm
@@ -136,3 +136,7 @@
 /datum/loadout_entry/gloves/utility_fur_gloves
 	name = "Utility Fur Gloves"
 	path = /obj/item/clothing/gloves/utility_fur_gloves
+
+/datum/loadout_entry/gloves/armsock_alt
+	name = "Fingerless Sleeves (Simple)"
+	path = /obj/item/clothing/gloves/armsocks
diff --git a/icons/clothing/gloves/fingerless.dmi b/icons/clothing/gloves/fingerless.dmi