diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index c2d16a67767..779858b8871 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -634,7 +634,7 @@
/obj/random/spacecash
name = "random credit chips"
- desc = "This is a random credit ships."
+ desc = "This is a random credit chip."
icon = 'icons/obj/cash.dmi'
icon_state = "spacecash1"
problist = list(
@@ -673,7 +673,7 @@
/obj/random/colored_jumpsuit
name = "random colored jumpsuit"
- desc = "This is a random colowerd jumpsuit."
+ desc = "This is a random colored jumpsuit."
icon = 'icons/obj/clothing/uniforms.dmi'
icon_state = "black"
spawnlist = list(
@@ -880,7 +880,8 @@
/obj/random/technology_scanner = 1,
/obj/random/tool = 1,
/obj/random/toolbox = 1,
- /obj/random_produce = 0.25
+ /obj/random_produce = 0.25,
+ /obj/random/watches = 1
)
@@ -936,10 +937,20 @@
/obj/item/clothing/gloves/fyellow = 1.2,
/obj/item/clothing/gloves/latex = 0.5,
/obj/item/clothing/gloves/latex/nitrile = 0.4,
- /obj/item/clothing/gloves/watch = 0.3,
/obj/item/clothing/gloves/yellow = 0.9
)
+/obj/random/watches
+ name = "random watches"
+ desc = "Random watches, probably able to tell the time."
+ icon = 'icons/obj/clothing/gloves.dmi'
+ icon_state = "watch"
+ problist = list(
+ /obj/item/clothing/gloves/watch = 1,
+ /obj/item/clothing/gloves/watch/silver = 0.7,
+ /obj/item/clothing/gloves/watch/gold = 0.5,
+ /obj/item/clothing/gloves/watch/spy = 0.3,
+ )
/obj/random/hoodie
name = "random winter coat"
diff --git a/code/game/objects/structures/therapy.dm b/code/game/objects/structures/therapy.dm
index f9a1834f7ac..9d123a3d07b 100644
--- a/code/game/objects/structures/therapy.dm
+++ b/code/game/objects/structures/therapy.dm
@@ -72,15 +72,75 @@
return
-/obj/item/mesmetron
- name = "mesmetron pocketwatch"
- desc = "An elaborate pocketwatch, with captivating gold etching and an enchanting face. . ."
+/obj/item/pocketwatch
+ name = "pocketwatch"
+ desc = "A watch that goes in your pocket."
+ description_fluff = "Because your wrists have better things to do."
icon = 'icons/obj/items.dmi'
icon_state = "pocketwatch"
+ drop_sound = 'sound/items/drop/accessory.ogg'
+ matter = list("glass" = 150, "gold" = 50)
+ w_class = 1
+ var/closed = FALSE
+
+/obj/item/pocketwatch/AltClick(mob/user)
+ if(!closed)
+ icon_state = "[initial(icon_state)]_closed"
+ to_chat(user, "You clasp the [name] shut.")
+ playsound(src.loc, 'sound/weapons/blade_close.ogg', 50, 1)
+ else
+ icon_state = "[initial(icon_state)]"
+ to_chat(user, "You flip the [name] open.")
+ playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1)
+ closed = !closed
+
+/obj/item/pocketwatch/examine(mob/user)
+ ..()
+ if (get_dist(src, user) <= 1)
+ checktime()
+
+/obj/item/pocketwatch/verb/checktime(mob/user)
+ set category = "Object"
+ set name = "Check Time"
+ set src in usr
+
+ if(closed)
+ to_chat(usr, "You check your watch, realising it's closed.")
+ else
+ to_chat(usr, "You check your watch, glancing over at the watch face, reading the time to be '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [game_year]'.")
+
+/obj/item/pocketwatch/verb/pointatwatch()
+ set category = "Object"
+ set name = "Point at watch"
+ set src in usr
+
+ if(closed)
+ usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes, not noticing it's closed."), span("notice", "You point down at the [src], an arrogant look about your eyes."))
+ else
+ usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes."), span("notice", "You point down at the [src], an arrogant look about your eyes."))
+
+/obj/item/mesmetron
+ name = "mesmetron pocketwatch"
+ desc = "An elaborate pocketwatch, with a captivating gold etching and an enchanting face. . ."
+ icon = 'icons/obj/items.dmi'
+ icon_state = "pocketwatch"
+ drop_sound = 'sound/items/drop/accessory.ogg'
matter = list("glass" = 150, "gold" = 50)
w_class = 1
var/datum/weakref/thrall = null
var/time_counter = 0
+ var/closed = FALSE
+
+/obj/item/mesmetron/AltClick(mob/user)
+ if(!closed)
+ icon_state = "[initial(icon_state)]_closed"
+ to_chat(user, "You clasp the [name] shut.")
+ playsound(src.loc, 'sound/weapons/blade_close.ogg', 50, 1)
+ else
+ icon_state = "[initial(icon_state)]"
+ to_chat(user, "You flip the [name] open.")
+ playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1)
+ closed = !closed
/obj/item/mesmetron/Destroy()
STOP_PROCESSING(SSfast_process, src)
@@ -113,7 +173,7 @@
STOP_PROCESSING(SSfast_process, src)
/obj/item/mesmetron/attack_self(mob/user as mob)
- if(!thrall || !thrall.resolve())
+ if(!closed || !thrall || !thrall.resolve())
thrall = null
to_chat(user, "You decipher the watch's mesmerizing face, discerning the time to be: '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [game_year]'.")
return
@@ -143,6 +203,9 @@
thrall = null
/obj/item/mesmetron/afterattack(mob/living/carbon/human/H, mob/user, proximity)
+ if(closed)
+ return
+
if(!proximity)
return
diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves.dm b/code/modules/client/preference_setup/loadout/loadout_gloves.dm
index e15112d884c..741f02e8c6e 100644
--- a/code/modules/client/preference_setup/loadout/loadout_gloves.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_gloves.dm
@@ -1,6 +1,6 @@
/datum/gear/gloves
- display_name = "watch"
- path = /obj/item/clothing/gloves/watch
+ display_name = "fingerless gloves"
+ path = /obj/item/clothing/gloves/fingerless
cost = 1
slot = slot_gloves
sort_category = "Gloves and Handwear"
@@ -36,7 +36,7 @@
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/gloves/ring
- display_name = "ring"
+ display_name = "ring selection"
description = "A selection of rings."
path = /obj/item/clothing/ring/engagement
@@ -56,9 +56,20 @@
ringtype["ring, plastic"] = /obj/item/clothing/ring/material/plastic
gear_tweaks += new/datum/gear_tweak/path(ringtype)
-/datum/gear/gloves/fingerless
- display_name = "fingerless gloves"
- path = /obj/item/clothing/gloves/fingerless
+/datum/gear/gloves/watch
+ display_name = "watch selection"
+ description = "A selection of watches."
+ path = /obj/item/clothing/gloves/watch
+
+/datum/gear/gloves/watch/New()
+ ..()
+ var/watchtype = list()
+ watchtype["watch"] = /obj/item/clothing/gloves/watch
+ watchtype["silver watch"] = /obj/item/clothing/gloves/watch/silver
+ watchtype["gold watch"] = /obj/item/clothing/gloves/watch/gold
+ watchtype["spy watch"] = /obj/item/clothing/gloves/watch/spy
+ watchtype["pocketwatch"] = /obj/item/pocketwatch
+ gear_tweaks += new/datum/gear_tweak/path(watchtype)
/datum/gear/gloves/circuitry
display_name = "gloves, circuitry (empty)"
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index b1a26bb9e7d..9d4326a2f5f 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -238,7 +238,7 @@
/obj/item/clothing/gloves/chameleon
name = "black gloves"
icon_state = "black"
- item_state = "bgloves"
+ item_state = "black"
desc = "It looks like a pair of gloves, but it seems to have a small dial inside."
origin_tech = list(TECH_ILLEGAL = 3)
var/global/list/clothing_choices
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 6645ed66f58..4ff082f8928 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -319,6 +319,10 @@
gender = PLURAL //Carn: for grammarically correct text-parsing
w_class = 2.0
icon = 'icons/obj/clothing/gloves.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_gloves.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_gloves.dmi'
+ )
siemens_coefficient = 0.75
var/wired = 0
var/obj/item/cell/cell = 0
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 67b81d5d70f..025787aef5d 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -2,7 +2,7 @@
desc = "These gloves will protect the wearer from electric shock."
name = "insulated gloves"
icon_state = "yellow"
- item_state = "ygloves"
+ item_state = "yellow"
siemens_coefficient = 0
permeability_coefficient = 0.05
drop_sound = 'sound/items/drop/rubber.ogg'
@@ -11,7 +11,7 @@
desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly."
name = "budget insulated gloves"
icon_state = "yellow"
- item_state = "ygloves"
+ item_state = "yellow"
siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
permeability_coefficient = 0.05
drop_sound = 'sound/items/drop/rubber.ogg'
@@ -24,7 +24,7 @@
desc = "These work gloves are thick and fire-resistant."
name = "black gloves"
icon_state = "black"
- item_state = "bgloves"
+ item_state = "black"
siemens_coefficient = 0.50
permeability_coefficient = 0.05
@@ -37,67 +37,67 @@
name = "orange gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "orange"
- item_state = "orangegloves"
+ item_state = "orange"
/obj/item/clothing/gloves/red
name = "red gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "red"
- item_state = "redgloves"
+ item_state = "red"
/obj/item/clothing/gloves/rainbow
name = "rainbow gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "rainbow"
- item_state = "rainbowgloves"
+ item_state = "rainbow"
/obj/item/clothing/gloves/blue
name = "blue gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "blue"
- item_state = "bluegloves"
+ item_state = "blue"
/obj/item/clothing/gloves/purple
name = "purple gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "purple"
- item_state = "purplegloves"
+ item_state = "purple"
/obj/item/clothing/gloves/green
name = "green gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "green"
- item_state = "greengloves"
+ item_state = "green"
/obj/item/clothing/gloves/grey
name = "grey gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "gray"
- item_state = "graygloves"
+ item_state = "gray"
/obj/item/clothing/gloves/light_brown
name = "light brown gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "lightbrown"
- item_state = "lightbrowngloves"
+ item_state = "lightbrown"
/obj/item/clothing/gloves/brown
name = "brown gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "brown"
- item_state = "browngloves"
+ item_state = "brown"
/obj/item/clothing/gloves/white
name = "white gloves"
desc = "These look pretty fancy."
icon_state = "latex"
- item_state = "lgloves"
+ item_state = "latex"
/obj/item/clothing/gloves/yellow/specialu
desc = "These gloves will protect the wearer from electric shock. Made special for Unathi use."
name = "unathi electrical gloves"
icon_state = "yellow"
- item_state = "ygloves"
+ item_state = "yellow"
siemens_coefficient = 0
permeability_coefficient = 0.05
species_restricted = list("Unathi")
@@ -153,7 +153,7 @@
name = "black leather gloves"
desc = "A pair of tight-fitting synthleather gloves."
icon_state = "black_leather"
- item_state = "black_leather_gloves"
+ item_state = "black_leather"
/obj/item/clothing/gloves/fingerless
desc = "A pair of gloves that don't actually cover the fingers."
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index fb0f58fa372..dcf8b093bf4 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -2,20 +2,20 @@
desc = "Regal blue gloves, with a nice gold trim. Swanky."
name = "captain's gloves"
icon_state = "captain"
- item_state = "egloves"
+ item_state = "captain"
/obj/item/clothing/gloves/cyborg
desc = "beep boop borp"
name = "cyborg gloves"
icon_state = "black"
- item_state = "r_hands"
+ item_state = "black"
siemens_coefficient = 1.0
/obj/item/clothing/gloves/swat
desc = "These tactical gloves are somewhat fire and impact-resistant."
name = "\improper SWAT gloves"
icon_state = "black"
- item_state = "swat_gl"
+ item_state = "black"
siemens_coefficient = 0.50
permeability_coefficient = 0.05
@@ -30,14 +30,14 @@
/obj/item/clothing/gloves/swat/tactical
name = "\improper tactical gloves"
icon_state = "black_leather"
- item_state = "black_leather_gloves"
+ item_state = "black_leather"
species_restricted = null
/obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves
desc = "These tactical gloves are somewhat fire and impact resistant."
name = "combat gloves"
icon_state = "black"
- item_state = "swat_gl"
+ item_state = "black"
siemens_coefficient = 0
permeability_coefficient = 0.05
cold_protection = HANDS
@@ -49,8 +49,8 @@
desc = "A pair of plain black infiltration gloves. Too thin to protect anything, but can fit underneath a hardsuit gauntlet."
name = "black slipgloves"
icon = 'icons/obj/clothing/gloves.dmi'
- icon_state = "s-ninja"
- item_state = "s-ninja"
+ icon_state = "black"
+ item_state = "black"
siemens_coefficient = 0
permeability_coefficient = 0.05
undergloves = 1
@@ -63,7 +63,7 @@
name = "latex gloves"
desc = "Sterile latex gloves."
icon_state = "latex"
- item_state = "lgloves"
+ item_state = "latex"
siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC)
permeability_coefficient = 0.01
germ_level = 0
@@ -74,7 +74,7 @@
name = "nitrile gloves"
desc = "Sterile nitrile gloves."
icon_state = "nitrile"
- item_state = "ngloves"
+ item_state = "nitrile"
/obj/item/clothing/gloves/latex/nitrile/unathi
name = "unathi nitrile gloves"
@@ -104,7 +104,7 @@
desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
name = "leather gloves"
icon_state = "leather"
- item_state = "ggloves"
+ item_state = "leather"
permeability_coefficient = 0.05
siemens_coefficient = 0.50 //thick work gloves
drop_sound = 'sound/items/drop/leather.ogg'
@@ -118,10 +118,11 @@
species_restricted = list("Tajara")
/obj/item/clothing/gloves/watch
- desc = "A small wristwatch, capable of telling time."
name = "watch"
+ desc = "It's a GaussIo ZeitMeister, a finely tuned wristwatch encased in black plastic."
+ description_fluff = "For those who want too much time on their wrists instead."
icon_state = "watch"
- item_state = "watchgloves"
+ item_state = "watch"
w_class = 1
wired = 1
species_restricted = null
@@ -131,6 +132,32 @@
var/flipped = 0
drop_sound = 'sound/items/drop/accessory.ogg'
+/obj/item/clothing/gloves/watch/silver
+ desc = "It's a GaussIo ZeitMeister, a finely tuned wristwatch encased in silver."
+ description_fluff = "To unleash the telemarketer in you!"
+ icon_state = "watch_silver"
+ item_state = "watch_silver"
+
+/obj/item/clothing/gloves/watch/gold
+ desc = "It's a GaussIo ZeitMeister, a finely tuned wristwatch encased in REAL faux gold."
+ description_fluff = "Be the jerk-ass pawn shop owner you'll never be."
+ icon_state = "watch_gold"
+ item_state = "watch_gold"
+
+/obj/item/clothing/gloves/watch/spy
+ desc = "It's a GENUINE Spy-Tech Invisi-watch! WARNING : Does not actually make you invisible."
+ description_fluff = "Makes you want to wear a balaclava and smoke a cigarette."
+ icon_state = "watch_spy"
+ item_state = "watch_silver"
+
+/obj/item/clothing/gloves/watch/spy/checktime()
+ to_chat(usr, "You check your watch. Unfortunately for you, it's not a real watch, dork.")
+
+/obj/item/clothing/gloves/watch/examine(mob/user)
+ ..()
+ if (get_dist(src, user) <= 1)
+ checktime()
+
/obj/item/clothing/gloves/watch/verb/checktime()
set category = "Object"
set name = "Check Time"
@@ -139,11 +166,11 @@
if(wired && !clipped)
to_chat(usr, "You check your watch, spotting a digital collection of numbers reading '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [game_year]'.")
if (emergency_shuttle.get_status_panel_eta())
- to_chat(usr, "The shuttle's status is reported as: [emergency_shuttle.get_status_panel_eta()].")
+ to_chat(usr, span("warning", "The shuttle's status is reported as: [emergency_shuttle.get_status_panel_eta()]."))
else if(wired && clipped)
- to_chat(usr, "You check your watch realising it's still open")
+ to_chat(usr, "You check your watch, realising it's still open.")
else
- to_chat(usr, "You check your watch as it dawns on you that it's broken")
+ to_chat(usr, "You check your watch as it dawns on you that it's broken.")
/obj/item/clothing/gloves/watch/verb/pointatwatch()
set category = "Object"
@@ -151,11 +178,11 @@
set src in usr
if(wired && !clipped)
- usr.visible_message ("[usr] taps their foot on the floor, arrogantly pointing at the [src] on their wrist with a look of derision in their eyes.", "You point down at the [src], an arrogant look about your eyes.")
+ usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] on their wrist with a look of derision in their eyes."), span("notice", "You point down at the [src], an arrogant look about your eyes."))
else if(wired && clipped)
- usr.visible_message ("[usr] taps their foot on the floor, arrogantly pointing at the [src] on their wrist with a look of derision in their eyes, not noticing it's open", "You point down at the [src], an arrogant look about your eyes.")
+ usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] on their wrist with a look of derision in their eyes, not noticing it's open."), span("notice", "You point down at the [src], an arrogant look about your eyes."))
else
- usr.visible_message ("[usr] taps their foot on the floor, arrogantly pointing at the [src] on their wrist with a look of derision in their eyes, not noticing it's broken", "You point down at the [src], an arrogant look about your eyes.")
+ usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] on their wrist with a look of derision in their eyes, not noticing it's broken."), span("notice", "You point down at the [src], an arrogant look about your eyes."))
/obj/item/clothing/gloves/watch/verb/swapwrists()
set category = "Object"
@@ -173,19 +200,14 @@
to_chat(usr, "You change \the [src] to be on your [src.flipped ? "left" : "right"] hand.")
update_clothing_icon()
-/obj/item/clothing/gloves/watch/examine(mob/user)
- ..()
- if (get_dist(src, user) <= 1)
- checktime()
-
/obj/item/clothing/gloves/watch/attackby(obj/item/W, mob/user)
if(W.isscrewdriver())
if (clipped) //Using clipped because adding a new var for something is dumb
- user.visible_message("[user] screws the cover of the [src] closed.","You screw the cover of the [src] closed..")
+ user.visible_message(span("notice", "[user] screws the cover of the [src] closed."), span("notice", "You screw the cover of the [src] closed."))
clipped = 0
return
// playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
- user.visible_message("[user] unscrew the cover of the [src].","You unscrew the cover of the [src].")
+ user.visible_message(span("notice", "[user] unscrews the cover of the [src]."), span("notice", "You unscrew the cover of the [src]."))
clipped = 1
return
if(wired)
@@ -193,20 +215,20 @@
if(W.iscoil())
var/obj/item/stack/cable_coil/C = W
if (!clipped)
- to_chat(user, "The [src] is not open.")
+ to_chat(user, span("notice", "The [src] is not open."))
return
if(wired)
- to_chat(user, "The [src] are already wired.")
+ to_chat(user, span("notice", "The [src] are already wired."))
return
if(C.amount < 2)
- to_chat(user, "There is not enough wire to cover the [src].")
+ to_chat(user, span("notice", "There is not enough wire to cover the [src]."))
return
C.use(2)
wired = 1
- to_chat(user, "You repair some wires in the [src].")
+ to_chat(user, span("notice", "You repair some wires in the [src]."))
return
/obj/item/clothing/gloves/watch/emp_act(severity)
@@ -295,13 +317,14 @@
name = "brass knuckles"
desc = "A pair of brass knuckles. Generally used to enhance the user's punches."
icon_state = "knuckledusters"
+ item_state = "knuckledusters"
attack_verb = list("punched", "beaten", "struck")
siemens_coefficient = 1
fingerprint_chance = 100
force = 5
punch_force = 5
clipped = 1
- drop_sound = 'sound/items/drop/metalboots.ogg'
+ drop_sound = 'sound/items/drop/sword.ogg'
/obj/item/clothing/gloves/powerfist
name = "power fist"
@@ -341,6 +364,7 @@
name = "clawed gauntlets"
desc = "A pair of metal gauntlets outfited with menacing sharp blades."
icon_state = "warping_claws"
+ item_state = "warping_claws"
attack_verb = list("ripped", "torn", "cut")
armor = list(melee = 50, bullet = 15, laser = 15, energy = 10, bomb = 10, bio = 0, rad = 0)
siemens_coefficient = 1
@@ -422,7 +446,7 @@
/obj/item/clothing/gloves/ballistic/double
name = "ballistic gauntlets"
icon_state = "dual-ballisticfist"
- item_state = "dual-ballisticfist"
+ item_state = "ballisticfist" //just reuse the single inhand
fingerprint_chance = 0
gender = PLURAL
diff --git a/html/changelogs/wezzy_gloves_inhands.yml b/html/changelogs/wezzy_gloves_inhands.yml
new file mode 100644
index 00000000000..2d72f969fe0
--- /dev/null
+++ b/html/changelogs/wezzy_gloves_inhands.yml
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - tweak: "Tweaks gloves, watches, skrell armchain and bracer sprites."
+ - imageadd: "Adds new glove inhand sprites."
+ - rscadd: "Adds new types of watches! Choose from five awesome designs!"
diff --git a/icons/clothing/gloves/lyodsuit.dmi b/icons/clothing/gloves/lyodsuit.dmi
index 88383d143ab..b3814de5838 100644
Binary files a/icons/clothing/gloves/lyodsuit.dmi and b/icons/clothing/gloves/lyodsuit.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
index 1086dd16ab3..291cc8f31d2 100644
Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ
diff --git a/icons/mob/items/lefthand_gloves.dmi b/icons/mob/items/lefthand_gloves.dmi
new file mode 100644
index 00000000000..321055a3e1a
Binary files /dev/null and b/icons/mob/items/lefthand_gloves.dmi differ
diff --git a/icons/mob/items/righthand_gloves.dmi b/icons/mob/items/righthand_gloves.dmi
new file mode 100644
index 00000000000..8ccb22a14d0
Binary files /dev/null and b/icons/mob/items/righthand_gloves.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index ec1f73d213e..e8ac2dbc78e 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index c7feb6943b9..52ddf886cb1 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ