From 2483cb5f3a00a72e6d9902e3a6d268811186dc69 Mon Sep 17 00:00:00 2001 From: skull132 Date: Thu, 5 Nov 2015 13:29:00 +0200 Subject: [PATCH] Watch Update The watch now shows the shuttle ETA/ETD whenever applicable. Also shows the date, and checks time whenever you just examine it and are within a tile radius. --- code/modules/clothing/gloves/miscellaneous.dm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 761e22a7..5970828f 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -79,7 +79,6 @@ w_class = 1 wired = 1 species_restricted = null -// var/time = 1 verb/checktime() set category = "Object" @@ -87,7 +86,9 @@ set src in usr if(wired && !clipped) - usr << "You check your watch, spotting a digital collection of numbers reading '[worldtime2text()]'" + 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()) + usr << "\red The shuttle's status is reported as: [emergency_shuttle.get_status_panel_eta()]." else if(wired && clipped) usr << "You check your watch realising it's still open" else @@ -105,6 +106,11 @@ 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.") + examine(mob/user) + ..() + if (get_dist(src, user) <= 1) + checktime() + attackby(obj/item/weapon/W, mob/user) if(istype(W, /obj/item/weapon/screwdriver)) if (clipped) //Using clipped because adding a new var for something is dumb @@ -215,4 +221,4 @@ amplification = 2.5 usr << "You wiggle your fingers, setting the gloves to the highest setting: Extremely Lethal. You will now hit 2.5x as hard." -*/ \ No newline at end of file +*/