diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm index e546ce517b9..ad03bc9ecd9 100644 --- a/code/datums/outfits/outfit_antag.dm +++ b/code/datums/outfits/outfit_antag.dm @@ -404,6 +404,8 @@ /obj/item/clothing/wrists/watch, /obj/item/clothing/wrists/watch/silver, /obj/item/clothing/wrists/watch/gold, + /obj/item/clothing/wrists/watch/holo, + /obj/item/clothing/wrists/watch/leather, /obj/item/clothing/wrists/watch/spy ) diff --git a/code/modules/client/preference_setup/loadout/loadout_wrists.dm b/code/modules/client/preference_setup/loadout/loadout_wrists.dm index 8e14ce32077..cc3f286683a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_wrists.dm +++ b/code/modules/client/preference_setup/loadout/loadout_wrists.dm @@ -26,6 +26,8 @@ watchtype["watch"] = /obj/item/clothing/wrists/watch watchtype["silver watch"] = /obj/item/clothing/wrists/watch/silver watchtype["gold watch"] = /obj/item/clothing/wrists/watch/gold + watchtype["holo watch"] = /obj/item/clothing/wrists/watch/holo + watchtype["leather watch"] = /obj/item/clothing/wrists/watch/leather watchtype["spy watch"] = /obj/item/clothing/wrists/watch/spy watchtype["pocketwatch"] = /obj/item/pocketwatch gear_tweaks += new /datum/gear_tweak/path(watchtype) diff --git a/code/modules/clothing/wrists/watches.dm b/code/modules/clothing/wrists/watches.dm index 5c3292fd9ff..e43f4b3b85f 100644 --- a/code/modules/clothing/wrists/watches.dm +++ b/code/modules/clothing/wrists/watches.dm @@ -19,6 +19,18 @@ icon_state = "watch_gold" item_state = "watch_gold" +/obj/item/clothing/wrists/watch/holo + desc = "It's a GaussIo ZeitMeister with a holographic screen." + desc_fluff = "The latest Elyran technology!" + icon_state = "watch_holo" + item_state = "watch_holo" + +/obj/item/clothing/wrists/watch/leather + desc = "It's a GaussIo ZeitMeister, a finely tuned wristwatch encased in leather." + desc_fluff = "Made from real synth leather." + icon_state = "watch_leather" + item_state = "watch_leather" + /obj/item/clothing/wrists/watch/spy desc = "It's a GENUINE Spy-Tech Invisi-watch! WARNING : Does not actually make you invisible." desc_fluff = "Makes you want to wear a balaclava and smoke a cigarette." diff --git a/code/modules/ghostroles/spawner/human/emergencypod.dm b/code/modules/ghostroles/spawner/human/emergencypod.dm index 9ebe7393808..8edb4627125 100644 --- a/code/modules/ghostroles/spawner/human/emergencypod.dm +++ b/code/modules/ghostroles/spawner/human/emergencypod.dm @@ -399,6 +399,8 @@ /obj/item/clothing/wrists/watch, /obj/item/clothing/wrists/watch/silver, /obj/item/clothing/wrists/watch/gold, + /obj/item/clothing/wrists/watch/holo, + /obj/item/clothing/wrists/watch/leather, /obj/item/clothing/wrists/watch/spy ) diff --git a/html/changelogs/desven-watches.yml b/html/changelogs/desven-watches.yml new file mode 100644 index 00000000000..a67598fbbb9 --- /dev/null +++ b/html/changelogs/desven-watches.yml @@ -0,0 +1,6 @@ +author: Desven & BunkyB + +delete-after: True + +changes: + - rscadd: "Adds new watches to the loadout." diff --git a/icons/mob/items/clothing/lefthand_wrists.dmi b/icons/mob/items/clothing/lefthand_wrists.dmi index 83e0b15da1c..87498694351 100644 Binary files a/icons/mob/items/clothing/lefthand_wrists.dmi and b/icons/mob/items/clothing/lefthand_wrists.dmi differ diff --git a/icons/mob/items/clothing/righthand_wrists.dmi b/icons/mob/items/clothing/righthand_wrists.dmi index 45ddd2d56d2..cd5b144cb2f 100644 Binary files a/icons/mob/items/clothing/righthand_wrists.dmi and b/icons/mob/items/clothing/righthand_wrists.dmi differ diff --git a/icons/mob/wrist.dmi b/icons/mob/wrist.dmi index 437f5d80287..f66a87f47f9 100644 Binary files a/icons/mob/wrist.dmi and b/icons/mob/wrist.dmi differ diff --git a/icons/obj/clothing/wrists.dmi b/icons/obj/clothing/wrists.dmi index c72a45f0541..f979fd1cf00 100644 Binary files a/icons/obj/clothing/wrists.dmi and b/icons/obj/clothing/wrists.dmi differ