cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Slight rework of how tajaran watches work and new papercode for taj time (#21582)

Browse Source 
This does a few times, after the scope got bigger than I originally
planned:
- Watches now have an action button top left to check time.
- Taj time checking code was moved over to the time helper file to not
be watch exclusive.
- The taj wrist watches now shows the time on adhomai.
- Papercode now has the ability to show taj time and date, and to insert
the credit symbol.
This commit is contained in:
Casper3667
2025-11-30 11:17:14 +00:00
committed by GitHub
parent 2b40f5f8d8
commit 3541ce57fd
11 changed files with 116 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/tajara.dm
+2 -22
View File
@@ -137,8 +137,7 @@
icon_state = "adhomai_clock"
item_state = "adhomai_clock"
contained_sprite = TRUE
slot_flags = SLOT_MASK
var/static/months = list("Menshe-aysaif", "Sil'nryy-aysaif", "Menshe-rhazzimy", "Sil'nryy-rhazzimy")
slot_flags = SLOT_MASK | SLOT_WRISTS | SLOT_BELT | SLOT_S_STORE
/obj/item/clothing/wrists/watch/pocketwatch/adhomai/get_mask_examine_text(mob/user)
return "around [user.get_pronoun("his")] neck"
@@ -151,26 +150,7 @@
if(closed)
to_chat(usr, SPAN_WARNING("You check your watch, realising it's closed."))
else
var/adhomian_year = GLOB.game_year + 1158
var/current_month = text2num(time2text(world.realtime, "MM"))
var/current_day = text2num(time2text(world.realtime, "DD"))
var/adhomian_day
var/adhomian_month = src.months[Ceiling(current_month/3)]
switch(current_month)
if(2, 5, 8, 11)
current_day += 31
if(6, 9, 12)
current_day += 61
if(3)
current_day += 59 + isLeap(text2num(time2text(world.realtime, "YYYY"))) // we can conveniently use the result of `isLeap` to add 1 when we are in a leap year
var/real_time = text2num(time2text(world.time + (REALTIMEOFDAY - (TIME_OFFSET HOURS)), "hh"))
var/adhomian_time = real_time
if(ISEVEN(current_day))
adhomian_time = real_time + 24
adhomian_day = FLOOR(current_day / 2, 1)
to_chat(usr, "You check your [src.name], glancing over at the watch face, reading the time to be '[adhomian_time]'. Today's date is the '[adhomian_day]th day of [adhomian_month], [adhomian_year]'.")
to_chat(usr, SPAN_NOTICE("You check your [name], glancing over at the watch face, reading the time to be '[tajaran_time()]'. Today's date is the '[tajaran_date()]th day of [tajaran_month()], [tajaran_year()]'."))
/obj/item/flame/lighter/adhomai
name = "adhomian lighter"