diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 6ae0ec5c..f31830e5 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -25,6 +25,11 @@ proc/populate_gear_list() path = /obj/item/weapon/dice/d20 cost = 1 +/datum/gear/watch + display_name = "watch" + path = /obj/item/clothing/gloves/watch + cost = 1 + /datum/gear/wallet display_name = "wallet" path = /obj/item/weapon/storage/wallet diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index df98c7e0..8c68b807 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -60,3 +60,27 @@ item_state = "ggloves" permeability_coefficient = 0.9 siemens_coefficient = 0.9 + +/obj/item/clothing/gloves/watch + desc = "A small wristwatch, capable of telling time." + name = "watch" + icon_state = "watch" + item_state = "watchgloves" + w_class = 1 + var/time = 1 + + verb/checktime() + set category = "Object" + set name = "Check Time" + set src in usr + + if(time == 1) + usr << "You check your watch, spotting a digital collection of numbers reading '[worldtime2text()]'" + + verb/pointatwatch() + set category = "Object" + set name = "Point at watch" + set src in usr + + if(time == 1) + 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.") diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index bf12bc27..d92ae787 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -839,4 +839,25 @@ spamcheck = 1 spawn(20) spamcheck = 0 - return \ No newline at end of file + return + +/obj/item/clothing/tie/fluff/hamil_badge + name = "Internal Investigations Badge" + desc = "An Internal Investigation badge. Used by a special branch of the Elyran police force." + icon = 'icons/obj/custom_items.dmi' + item_state = "hamil_badge" + +/obj/item/clothing/tie/fluff/hamil_badge/attack_self(mob/user as mob) + if(isliving(user)) + user.visible_message("\red [user] flashes their [src].\nIt reads: Muhammad Hamil, Internal Investigations, Persepolis..","\red You display the [src].\nIt reads: Muhammad Hamil, Internal Investigations, Persepolis.") + +/obj/item/clothing/tie/fluff/hamil_badge/attack(mob/living/carbon/human/M, mob/living/user) + if(isliving(user)) + user.visible_message("\red [user] invades [M]'s personal space, thrusting [src] into their face insistently.","\red You invade [M]'s personal space, thrusting [src] into their face insistently. You are the law.") + +/obj/item/clothing/mask/gas/fluff/stefan_mask + desc = "This odd looking gas mask is quite clearly not of NanoTrasen origin as it sports a black metal polish, as well as a reflective face plate that mirrors the view of the mask itself. This particular mask appears to breathe with the user, hissing when they exhale, and whining softly as they inhale." + name = "Modified Gas Mask" + icon = 'icons/obj/custom_items.dmi' + icon_state = "stefan_mask" + item_state = "stefan_mask" \ No newline at end of file diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 3d1258db..c6acbcf8 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 1a55d3c7..fcf36551 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ