diff --git a/code/__DEFINES/time.dm b/code/__DEFINES/time.dm index c5d6f3051e..41a4ae3273 100644 --- a/code/__DEFINES/time.dm +++ b/code/__DEFINES/time.dm @@ -31,4 +31,9 @@ When using time2text(), please use "DDD" to find the weekday. Refrain from using #define WORLDTIMEOFDAY2TEXT(format) GAMETIMESTAMP(format, world.timeofday) #define TIME_STAMP(format, showds) showds ? "[WORLDTIMEOFDAY2TEXT(format)]:[world.timeofday % 10]" : WORLDTIMEOFDAY2TEXT(format) #define STATION_TIME(display_only) ((((world.time - SSticker.round_start_time) * SSticker.station_time_rate_multiplier) + SSticker.gametime_offset) % 864000) - (display_only? GLOB.timezoneOffset : 0) -#define STATION_TIME_TIMESTAMP(format) time2text(STATION_TIME(TRUE), format) \ No newline at end of file +#define STATION_TIME_TIMESTAMP(format) time2text(STATION_TIME(TRUE), format) + +//For moodlets +#define ONEMINUTE 600 +#define TWOMINUTES 1200 +#define THREEMINUTES 1800 diff --git a/code/datums/mood_events/drink_events.dm b/code/datums/mood_events/drink_events.dm index db5a91009e..dff72feeb7 100644 --- a/code/datums/mood_events/drink_events.dm +++ b/code/datums/mood_events/drink_events.dm @@ -6,19 +6,19 @@ /datum/mood_event/quality_nice description = "That drink wasn't bad at all.\n" mood_change = 1 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/quality_good description = "That drink was pretty good.\n" mood_change = 2 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/quality_verygood description = "That drink was great!\n" mood_change = 3 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/quality_fantastic description = "That drink was amazing!\n" mood_change = 4 - timeout = 1200 + timeout = TWOMINUTES diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index c9a5b80060..376510fe59 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -1,3 +1,5 @@ + + /datum/mood_event/handcuffed description = "I guess my antics have finally caught up with me.\n" mood_change = -1 @@ -17,7 +19,7 @@ /datum/mood_event/burnt_thumb description = "I shouldn't play with lighters...\n" mood_change = -1 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/cold description = "It's way too cold in here.\n" @@ -30,17 +32,17 @@ /datum/mood_event/creampie description = "I've been creamed. Tastes like pie flavor.\n" mood_change = -2 - timeout = 1800 + timeout = THREEMINUTES /datum/mood_event/slipped description = "I slipped. I should be more careful next time...\n" mood_change = -2 - timeout = 1800 + timeout = THREEMINUTES /datum/mood_event/eye_stab description = "I used to be an adventurer like you, until I took a screwdriver to the eye.\n" mood_change = -4 - timeout = 1800 + timeout = THREEMINUTES /datum/mood_event/delam //SM delamination description = "Those God damn engineers can't do anything right...\n" @@ -50,12 +52,12 @@ /datum/mood_event/depression description = "I feel sad for no particular reason.\n" mood_change = -9 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/shameful_suicide //suicide_acts that return SHAME, like sord description = "I can't even end it all!\n" mood_change = -10 - timeout = 600 + timeout = ONEMINUTE /datum/mood_event/dismembered description = "AHH! I WAS USING THAT LIMB!\n" @@ -69,7 +71,7 @@ /datum/mood_event/tased description = "There's no \"z\" in \"taser\". It's in the zap.\n" mood_change = -3 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/embedded description = "Pull it out!\n" @@ -78,7 +80,7 @@ /datum/mood_event/table description = "Someone threw me on a table!\n" mood_change = -2 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/table/add_effects() if(ishuman(owner)) @@ -118,9 +120,9 @@ mood_change = -4 /datum/mood_event/healsbadman - description = "I feel a lot better, but wow that was disgusting.\n" //when you read the latest felinid removal PR and realize you're really not that much of a degenerate + description = "I feel a lot better, but wow that was disgusting.\n" mood_change = -4 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/jittery description = "I'm nervous and on edge and I can't stand still!!\n" @@ -129,17 +131,17 @@ /datum/mood_event/vomit description = "I just threw up. Gross.\n" mood_change = -2 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/vomitself description = "I just threw up all over myself. This is disgusting.\n" mood_change = -4 - timeout = 1800 + timeout = THREEMINUTES /datum/mood_event/painful_medicine description = "Medicine may be good for me but right now it stings like hell.\n" mood_change = -5 - timeout = 600 + timeout = ONEMINUTE //These are unused so far but I want to remember them to use them later /datum/mood_event/cloned_corpse diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 2cd4d951d7..a92e946526 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -1,7 +1,7 @@ /datum/mood_event/hug description = "Hugs are nice.\n" mood_change = 1 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/arcade description = "I beat the arcade game!\n" @@ -50,7 +50,7 @@ /datum/mood_event/jolly description = "I feel happy for no particular reason.\n" mood_change = 6 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/focused description = "I have a goal, and I will reach it, whatever it takes!\n" //Used for syndies, nukeops etc so they can focus on their goals @@ -74,7 +74,7 @@ /datum/mood_event/goodmusic description = "There is something soothing about this music.\n" mood_change = 3 - timeout = 600 + timeout = ONEMINUTE /datum/mood_event/chemical_euphoria description = "Heh...hehehe...hehe...\n" @@ -83,9 +83,9 @@ /datum/mood_event/chemical_laughter description = "Laughter really is the best medicine! Or is it?\n" mood_change = 4 - timeout = 1800 + timeout = THREEMINUTES /datum/mood_event/chemical_superlaughter description = "*WHEEZE*\n" mood_change = 12 - timeout = 1800 + timeout = THREEMINUTES diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm index 75b7e6931f..30b9d64953 100644 --- a/code/datums/mood_events/needs_events.dm +++ b/code/datums/mood_events/needs_events.dm @@ -59,4 +59,4 @@ /datum/mood_event/nice_shower description = "I have recently had a nice shower.\n" mood_change = 2 - timeout = 1800 + timeout = THREEMINUTES diff --git a/modular_citadel/code/datums/mood_events/chem_events.dm b/modular_citadel/code/datums/mood_events/chem_events.dm index 4e1be8d67f..c82615d796 100644 --- a/modular_citadel/code/datums/mood_events/chem_events.dm +++ b/modular_citadel/code/datums/mood_events/chem_events.dm @@ -10,14 +10,14 @@ /datum/mood_event/enthrallpraise mood_change = 10 - timeout = 600 + timeout = ONEMINUTE /datum/mood_event/enthrallpraise/add_effects(message) description = "[message]\n" /datum/mood_event/enthrallscold mood_change = -10 - timeout = 600 + timeout = ONEMINUTE /datum/mood_event/enthrallscold/add_effects(message) description = "[message]\n"//aaa I'm not kinky enough for this diff --git a/modular_citadel/code/datums/mood_events/generic_negative_events.dm b/modular_citadel/code/datums/mood_events/generic_negative_events.dm index c0f2591656..93c4cfe59c 100644 --- a/modular_citadel/code/datums/mood_events/generic_negative_events.dm +++ b/modular_citadel/code/datums/mood_events/generic_negative_events.dm @@ -3,19 +3,19 @@ /datum/mood_event/plushjack description = "I have butchered a plush recently.\n" mood_change = -1 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/plush_nostuffing description = "A plush I tried to pet had no stuffing...\n" mood_change = -1 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/emptypred description = "I had to let someone out.\n" mood_change = -2 - timeout = 600 + timeout = ONEMINUTE /datum/mood_event/emptyprey description = "It feels quite cold out here.\n" mood_change = -2 - timeout = 600 \ No newline at end of file + timeout = ONEMINUTE diff --git a/modular_citadel/code/datums/mood_events/generic_positive_events.dm b/modular_citadel/code/datums/mood_events/generic_positive_events.dm index 717fe5a47d..ff6944201b 100644 --- a/modular_citadel/code/datums/mood_events/generic_positive_events.dm +++ b/modular_citadel/code/datums/mood_events/generic_positive_events.dm @@ -3,12 +3,12 @@ /datum/mood_event/headpat description = "Headpats are nice.\n" mood_change = 2 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/hugbox description = "I hugged a box of hugs recently.\n" mood_change = 1 - timeout = 1200 + timeout = TWOMINUTES /datum/mood_event/plushpet description = "I pet a plush recently.\n" @@ -24,11 +24,11 @@ description = "I came!\n" //funny meme haha mood_change = 3 timeout = 1000 - + /datum/mood_event/fedpred description = "I've devoured someone!\n" mood_change = 3 /datum/mood_event/fedprey description = "It feels quite cozy in here.\n" - mood_change = 3 \ No newline at end of file + mood_change = 3