diff --git a/code/__DEFINES/time.dm b/code/__DEFINES/time.dm
index 41a4ae3273..f13f13510b 100644
--- a/code/__DEFINES/time.dm
+++ b/code/__DEFINES/time.dm
@@ -32,8 +32,3 @@ When using time2text(), please use "DDD" to find the weekday. Refrain from using
 #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)
-
-//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 dff72feeb7..b2e9861c41 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 = "<span class='nicegreen'>That drink wasn't bad at all.</span>\n"
 	mood_change = 1
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/quality_good
 	description = "<span class='nicegreen'>That drink was pretty good.</span>\n"
 	mood_change = 2
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/quality_verygood
 	description = "<span class='nicegreen'>That drink was great!</span>\n"
 	mood_change = 3
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/quality_fantastic
 	description = "<span class='nicegreen'>That drink was amazing!</span>\n"
 	mood_change = 4
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index 376510fe59..8c4a6c67aa 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -19,7 +19,7 @@
 /datum/mood_event/burnt_thumb
 	description = "<span class='warning'>I shouldn't play with lighters...</span>\n"
 	mood_change = -1
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/cold
 	description = "<span class='warning'>It's way too cold in here.</span>\n"
@@ -32,17 +32,17 @@
 /datum/mood_event/creampie
 	description = "<span class='warning'>I've been creamed. Tastes like pie flavor.</span>\n"
 	mood_change = -2
-	timeout = THREEMINUTES
+	timeout = 3 MINUTESS
 
 /datum/mood_event/slipped
 	description = "<span class='warning'>I slipped. I should be more careful next time...</span>\n"
 	mood_change = -2
-	timeout = THREEMINUTES
+	timeout = 3 MINUTESS
 
 /datum/mood_event/eye_stab
 	description = "<span class='boldwarning'>I used to be an adventurer like you, until I took a screwdriver to the eye.</span>\n"
 	mood_change = -4
-	timeout = THREEMINUTES
+	timeout = 3 MINUTESS
 
 /datum/mood_event/delam //SM delamination
 	description = "<span class='boldwarning'>Those God damn engineers can't do anything right...</span>\n"
@@ -52,12 +52,12 @@
 /datum/mood_event/depression
 	description = "<span class='warning'>I feel sad for no particular reason.</span>\n"
 	mood_change = -9
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/shameful_suicide //suicide_acts that return SHAME, like sord
   description = "<span class='boldwarning'>I can't even end it all!</span>\n"
   mood_change = -10
-  timeout = ONEMINUTE
+  timeout = 1 MINUTES
 
 /datum/mood_event/dismembered
   description = "<span class='boldwarning'>AHH! I WAS USING THAT LIMB!</span>\n"
@@ -71,7 +71,7 @@
 /datum/mood_event/tased
 	description = "<span class='warning'>There's no \"z\" in \"taser\". It's in the zap.</span>\n"
 	mood_change = -3
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/embedded
 	description = "<span class='boldwarning'>Pull it out!</span>\n"
@@ -80,7 +80,7 @@
 /datum/mood_event/table
 	description = "<span class='warning'>Someone threw me on a table!</span>\n"
 	mood_change = -2
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/table/add_effects()
 	if(ishuman(owner))
@@ -122,7 +122,7 @@
 /datum/mood_event/healsbadman
 	description = "<span class='warning'>I feel a lot better, but wow that was disgusting.</span>\n"
 	mood_change = -4
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/jittery
 	description = "<span class='warning'>I'm nervous and on edge and I can't stand still!!</span>\n"
@@ -131,17 +131,17 @@
 /datum/mood_event/vomit
 	description = "<span class='warning'>I just threw up. Gross.</span>\n"
 	mood_change = -2
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/vomitself
 	description = "<span class='warning'>I just threw up all over myself. This is disgusting.</span>\n"
 	mood_change = -4
-	timeout = THREEMINUTES
+	timeout = 3 MINUTESS
 
 /datum/mood_event/painful_medicine
 	description = "<span class='warning'>Medicine may be good for me but right now it stings like hell.</span>\n"
 	mood_change = -5
-	timeout = ONEMINUTE
+	timeout = 1 MINUTES
 
 //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 a92e946526..7710c730eb 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 = "<span class='nicegreen'>Hugs are nice.</span>\n"
 	mood_change = 1
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/arcade
 	description = "<span class='nicegreen'>I beat the arcade game!</span>\n"
@@ -50,7 +50,7 @@
 /datum/mood_event/jolly
 	description = "<span class='nicegreen'>I feel happy for no particular reason.</span>\n"
 	mood_change = 6
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/focused
 	description = "<span class='nicegreen'>I have a goal, and I will reach it, whatever it takes!</span>\n" //Used for syndies, nukeops etc so they can focus on their goals
@@ -74,7 +74,7 @@
 /datum/mood_event/goodmusic
 	description = "<span class='nicegreen'>There is something soothing about this music.</span>\n"
 	mood_change = 3
-	timeout = ONEMINUTE
+	timeout = 1 MINUTES
 
 /datum/mood_event/chemical_euphoria
 	description = "<span class='nicegreen'>Heh...hehehe...hehe...</span>\n"
@@ -83,9 +83,9 @@
  /datum/mood_event/chemical_laughter
 	description = "<span class='nicegreen'>Laughter really is the best medicine! Or is it?</span>\n"
 	mood_change = 4
-	timeout = THREEMINUTES
+	timeout = 3 MINUTESS
 
  /datum/mood_event/chemical_superlaughter
 	description = "<span class='nicegreen'>*WHEEZE*</span>\n"
 	mood_change = 12
-	timeout = THREEMINUTES
+	timeout = 3 MINUTESS
diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm
index 30b9d64953..4d8a397b73 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 = "<span class='nicegreen'>I have recently had a nice shower.</span>\n"
 	mood_change = 2
-	timeout = THREEMINUTES
+	timeout = 3 MINUTESS
diff --git a/modular_citadel/code/datums/mood_events/chem_events.dm b/modular_citadel/code/datums/mood_events/chem_events.dm
index c82615d796..55e0c1b617 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 = ONEMINUTE
+	timeout = 1 MINUTES
 
 /datum/mood_event/enthrallpraise/add_effects(message)
    description = "<span class='nicegreen'>[message]</span>\n"
 
 /datum/mood_event/enthrallscold
    mood_change = -10
-   timeout = ONEMINUTE
+   timeout = 1 MINUTES
 
 /datum/mood_event/enthrallscold/add_effects(message)
 	description = "<span class='warning'>[message]</span>\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 93c4cfe59c..83ec1c8d23 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 = "<span class='warning'>I have butchered a plush recently.</span>\n"
 	mood_change = -1
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/plush_nostuffing
 	description = "<span class='warning'>A plush I tried to pet had no stuffing...</span>\n"
 	mood_change = -1
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/emptypred
 	description = "<span class='nicegreen'>I had to let someone out.</span>\n"
 	mood_change = -2
-	timeout = ONEMINUTE
+	timeout = 1 MINUTES
 
 /datum/mood_event/emptyprey
 	description = "<span class='nicegreen'>It feels quite cold out here.</span>\n"
 	mood_change = -2
-	timeout = ONEMINUTE
+	timeout = 1 MINUTES
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 ff6944201b..971efdd7ca 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 = "<span class='nicegreen'>Headpats are nice.</span>\n"
 	mood_change = 2
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/hugbox
 	description = "<span class='nicegreen'>I hugged a box of hugs recently.</span>\n"
 	mood_change = 1
-	timeout = TWOMINUTES
+	timeout = 2 MINUTESS
 
 /datum/mood_event/plushpet
 	description = "<span class='nicegreen'>I pet a plush recently.</span>\n"