diff --git a/game/scripts/cg/hermione.rpy b/game/scripts/cg/hermione.rpy
index 47df4cca..ff514362 100644
--- a/game/scripts/cg/hermione.rpy
+++ b/game/scripts/cg/hermione.rpy
@@ -266,7 +266,7 @@ layeredimage her_sex_personal bent_over:
 
     always "her_sex_personal_background_clutter"
 
-    if game.daytime:
+    if states.env.daytime:
         "her_sex_personal_overlay_day"
     else:
         "her_sex_personal_overlay_night"
@@ -310,7 +310,7 @@ layeredimage her_sex_personal lean_back:
 
     always "her_sex_personal_background_clutter"
 
-    if game.daytime:
+    if states.env.daytime:
         "her_sex_personal_overlay_day"
     else:
         "her_sex_personal_overlay_night"
@@ -352,7 +352,7 @@ layeredimage her_sex_personal lean_forward:
 
     always "her_sex_personal_background_clutter"
 
-    if game.daytime:
+    if states.env.daytime:
         "her_sex_personal_overlay_day"
     else:
         "her_sex_personal_overlay_night"
diff --git a/game/scripts/characters/astoria/events/clothing.rpy b/game/scripts/characters/astoria/events/clothing.rpy
index 41eb293f..ab0200dc 100644
--- a/game/scripts/characters/astoria/events/clothing.rpy
+++ b/game/scripts/characters/astoria/events/clothing.rpy
@@ -39,7 +39,7 @@ label astoria_summon_setup:
         call describe_mood("Astoria", states.ast.mood)
         call tutorial("moodngifts")
     else:
-        if game.daytime:
+        if states.env.daytime:
             ast "Mornin', [name_genie_astoria]." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
         else:
             ast "Evenin', [name_genie_astoria]." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
diff --git a/game/scripts/characters/astoria/events/intro.rpy b/game/scripts/characters/astoria/events/intro.rpy
index 46600cf0..492b238c 100644
--- a/game/scripts/characters/astoria/events/intro.rpy
+++ b/game/scripts/characters/astoria/events/intro.rpy
@@ -769,7 +769,7 @@ label astoria_intro_E3:
 
     ton "That should be all for now, Miss Greengrass." ("open", "base", "base", "L")
     ast "..." ("annoyed", "base", "base", "down")
-    if game.daytime:
+    if states.env.daytime:
         ton "Have a great day, cutie." ("base", "happyCl", "base", "mid")
         ast "*Uhm*...{w=0.3} Right..." ("open", "base", "base", "mid")
     else:
diff --git a/game/scripts/characters/astoria/events/spells/imperio_susan.rpy b/game/scripts/characters/astoria/events/spells/imperio_susan.rpy
index 005f6d23..ce5a08ab 100644
--- a/game/scripts/characters/astoria/events/spells/imperio_susan.rpy
+++ b/game/scripts/characters/astoria/events/spells/imperio_susan.rpy
@@ -609,7 +609,7 @@ label ag_se_imperio_sb_E2:
 
     call sus_walk(action="leave")
 
-    if game.daytime:
+    if states.env.daytime:
         ast "See you, [name_genie_astoria]!" ("grin", "closed", "base", "mid")
         gen "..." ("base", xpos="far_left", ypos="head")
     else:
@@ -977,7 +977,7 @@ label ag_se_imperio_sb_E3:
     sus "..." ("soft", "narrow", "base", "stare")
     gen "..." ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         ast "We're going to be late for classes, Suzy!" ("annoyed", "narrow", "base", "R")
         ast "Let's head to Tonks' study, shall we." ("smile", "narrow", "base", "R")
         sus "Yes..." ("open", "narrow", "base", "stare")
diff --git a/game/scripts/characters/astoria/spells.rpy b/game/scripts/characters/astoria/spells.rpy
index 8b1498f8..e9953c6c 100644
--- a/game/scripts/characters/astoria/spells.rpy
+++ b/game/scripts/characters/astoria/spells.rpy
@@ -1,10 +1,10 @@
 # Imperius Curse
 
-default ast_ev_imperio_training_t1_e1 = Event(id="ast_ev_imperio_training_t1_e1", label="ag_st_imperio_E1", req="game.daytime==False")
-default ast_ev_imperio_training_t1_e2 = Event(id="ast_ev_imperio_training_t1_e2", label="ag_st_imperio_E2", req="game.daytime==False")
-default ast_ev_imperio_training_t1_e3 = Event(id="ast_ev_imperio_training_t1_e3", label="ag_st_imperio_E3", req="game.daytime==False")
-default ast_ev_imperio_training_t1_e4 = Event(id="ast_ev_imperio_training_t1_e4", label="ag_st_imperio_E4", req="game.daytime==False")
-default ast_ev_imperio_training_t1_e5 = Event(id="ast_ev_imperio_training_t1_e5", label="ag_st_imperio_E5", req="game.daytime==False")
+default ast_ev_imperio_training_t1_e1 = Event(id="ast_ev_imperio_training_t1_e1", label="ag_st_imperio_E1", req="states.env.daytime==False")
+default ast_ev_imperio_training_t1_e2 = Event(id="ast_ev_imperio_training_t1_e2", label="ag_st_imperio_E2", req="states.env.daytime==False")
+default ast_ev_imperio_training_t1_e3 = Event(id="ast_ev_imperio_training_t1_e3", label="ag_st_imperio_E3", req="states.env.daytime==False")
+default ast_ev_imperio_training_t1_e4 = Event(id="ast_ev_imperio_training_t1_e4", label="ag_st_imperio_E4", req="states.env.daytime==False")
+default ast_ev_imperio_training_t1_e5 = Event(id="ast_ev_imperio_training_t1_e5", label="ag_st_imperio_E5", req="states.env.daytime==False")
 
 default ast_eventqueue_imperio_training_tonks = EventQueue("ast_eventqueue_imperio_training_tonks")
 default ast_ev_imperio_training_t1_e1_hub = Event(id="ast_ev_imperio_training_t1_e1_hub", label="ag_st_imperio", req="states.ast.tier >= 1", queue="ast_eventqueue_imperio_training_tonks", autoenqueue=True, autodequeue=False, subevents=["ast_ev_imperio_training_t1_e1"])
diff --git a/game/scripts/characters/astoria/summon.rpy b/game/scripts/characters/astoria/summon.rpy
index 791e87b9..fd381278 100644
--- a/game/scripts/characters/astoria/summon.rpy
+++ b/game/scripts/characters/astoria/summon.rpy
@@ -54,7 +54,7 @@ label summon_astoria:
         "-Dismiss her-":
             stop music fadeout 3.0
 
-            if game.daytime:
+            if states.env.daytime:
                 ast "I will go back to classes then, [name_genie_astoria]." ("base", "base", "base", "mid")
             else:
                 ast "Oh, alright. Good night, [name_genie_astoria]." ("base", "base", "base", "mid")
diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy
index 2defd5de..87783d57 100644
--- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy
+++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy
@@ -746,7 +746,7 @@ label cc_pf_strip_T2_intro_E2:
 
     cho @ cheeks blush "(...)" ("disgust", "narrow", "worried", "down", xpos="right", ypos="base")
     cho @ cheeks blush "*Uhm*..." ("soft", "narrow", "worried", "mid")
-    if game.daytime:
+    if states.env.daytime:
         cho @ cheeks blush "Have a good day..." ("soft", "base", "base", "R")
     else:
         cho @ cheeks blush "Have a good night..." ("soft", "base", "base", "R")
diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy
index 05996504..480b8729 100644
--- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy
+++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy
@@ -227,7 +227,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
             her "I {b}did{/b} enjoy this little obscene \"freak-show\" you arranged for me..." ("grin", "narrow", "base", "mid_soft")
             cho @ cheeks heavy_blush "You'll regret this, Granger!" ("clench", "narrow", "angry", "L")
 
-            if game.daytime:
+            if states.env.daytime:
                 her "Have a nice day, Professor." ("soft", "closed", "base", "mid")
             else:
                 her "Have a good night, Professor." ("soft", "closed", "base", "mid")
@@ -348,7 +348,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
             cho "Already missing your books, are you?" ("annoyed", "narrow", "base", "L")
             her "I am not.{w} And I don't appreciate being made fun of!" ("angry", "closed", "angry", "mid")
 
-            if game.daytime:
+            if states.env.daytime:
                 her "Good day, Sir." ("soft", "base", "angry", "mid")
                 cho "See ya around, Granger..." ("smile", "narrow", "angry", "L")
                 her "*Hmpf*" ("annoyed", "narrow", "angry", "R")
@@ -381,7 +381,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
 
             cho "Now, if you excuse me..." ("soft", "base", "base", "mid")
 
-            if game.daytime:
+            if states.env.daytime:
                 cho "I have to head back to classes." ("soft", "base", "base", "R")
                 gen "I still got your--" ("base", xpos="far_left", ypos="head")
                 cho "See ya next time, [name_genie_cho]!" ("smile", "narrow", "angry", "mid")
diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy
index bd591b34..63b57c4a 100644
--- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy
+++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy
@@ -272,7 +272,7 @@ label cc_pf_strip_T3_intro_E1:
     cho "" ("base", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
     pause .5
 
-    if game.daytime:
+    if states.env.daytime:
         cho "I'll head back to classes, then." ("soft", "narrow", "base", "mid")
     else:
         cho "I'll head back to our dorms, then." ("soft", "narrow", "base", "mid")
@@ -362,7 +362,7 @@ label cc_pf_strip_T3_intro_E2:
 
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
     cho @ cheeks blush "" ("soft", "narrow", "worried", "L", xpos="left", ypos="base", flip=True)
-    if game.daytime:
+    if states.env.daytime:
         ton "Hello, Professor." ("base", "base", "base", "mid", xpos="right", ypos="base")
     else:
         ton "Good evening, Professor." ("base", "base", "base", "mid", xpos="right", ypos="base")
@@ -968,7 +968,7 @@ label cc_pf_strip_T3_intro_E2:
     gen "Yes please." ("base", xpos="far_left", ypos="head")
     cho "" ("annoyed", "narrow", "angry", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         ton @ hair horny "Let me escort you back to class, Miss Chang." ("soft", "base", "base", "L")
     else:
         ton @ hair horny "Let me escort you back to your common room. It's getting late." ("soft", "base", "base", "L")
@@ -1001,7 +1001,7 @@ label cc_pf_strip_T3_intro_E2:
     pause .5
 
     ton "Thank you for your time, Professor." ("base", "base", "base", "mid", ypos="head", flip=False)
-    if game.daytime:
+    if states.env.daytime:
         cho "Good day, Sir." ("base", "base", "base", "mid", ypos="head", flip=False)
     else:
         cho "Good night, Sir." ("base", "base", "base", "mid", ypos="head", flip=False)
@@ -1587,7 +1587,7 @@ label cc_pf_strip_T3_intro_E3:
 
     show dustfloating as cg_effects zorder 18
 
-    if game.daytime:
+    if states.env.daytime:
         show cho_strip_personal_t3_e3_on_knees tonks_eyes_open_look_at_cho as cg zorder 17
     else:
         show cho_strip_personal_t3_e3_on_knees tonks_eyes_open_look_at_cho as cg zorder 17 at color_temperature(1.0)
@@ -3038,7 +3038,7 @@ label cc_pf_strip_T3_intro_E3:
     gen "And Tonks... Next time we do this, wear the clothes I usually ask you to wear around my office." ("grin", xpos="far_left", ypos="head")
     ton @ hair horny "With pleasure." ("base", "narrow", "base", "mid", ypos="head", flip=False)
 
-    if game.daytime:
+    if states.env.daytime:
         ton @ hair horny "I'll escort you back to classes, Miss Chang." ("open", "narrow", "base", "L")
         ton @ hair horny "Have a good day, Professor." ("base", "narrow", "base", "mid")
     else:
diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
index b3b6a0a7..a1b7e780 100644
--- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
+++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
@@ -1419,7 +1419,7 @@ label .end_event:
     pause .5
 
     call bld
-    if game.daytime:
+    if states.env.daytime:
         ton "We should get going, Miss Chang. Classes are about to start..." ("open", "base", "base", "L", ypos="head", flip=False)
         cho "Until next time, Professor." ("grin", "base", "base", "mid", ypos="head", flip=False)
     else:
diff --git a/game/scripts/characters/cho/events/favors/suck_it.rpy b/game/scripts/characters/cho/events/favors/suck_it.rpy
index 7f5f1ef5..94e75c15 100644
--- a/game/scripts/characters/cho/events/favors/suck_it.rpy
+++ b/game/scripts/characters/cho/events/favors/suck_it.rpy
@@ -111,7 +111,7 @@ label cc_pf_blowjob_T3_intro_E1:
 
         $ camera.set_imagepath("cho_bj/kneel/")
         $ camera.set_image("mid_shock")
-        if game.daytime:
+        if states.env.daytime:
             $ camera.set_overlay("day_overlay")
         else:
             $ camera.set_overlay("night_overlay")
@@ -662,7 +662,7 @@ label cc_pf_blowjob_1:
     cho @ cheeks blush "Are you...{w=0.4} Are we done?" ("open", "narrow", "base", "downR") #Blush
     gen "Yes, for now..." ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         cho "Alright... In that case, I better head back to class." ("open", "base", "base", "R")
     else:
         cho "Alright... I'll head off to bed then." ("open", "base", "base", "R")
@@ -700,7 +700,7 @@ label cc_pf_blowjob_T3_E2:
 
     $ camera.set_imagepath("cho_bj/kneel/")
     $ camera.set_image("mid")
-    if game.daytime:
+    if states.env.daytime:
         $ camera.set_overlay("day_overlay")
     else:
         $ camera.set_overlay("night_overlay")
@@ -1194,7 +1194,7 @@ label cc_pf_blowjob_T3_E2:
                         cho "I don't know how Granger could do this, without getting exhausted." ("soft", "narrow", "base", "down")
                         gen "(*Heh*, practice makes perfect...)" ("grin", xpos="far_left", ypos="head")
 
-                    if game.daytime:
+                    if states.env.daytime:
                         gen "No time for a lie down I'm afraid..." ("base", xpos="far_left", ypos="head")
                         cho @ cheeks blush "What, don't tell me you're already--" ("clench", "wide", "base", "mid")
                         gen "You've got class to get to." ("base", xpos="far_left", ypos="head")
@@ -1299,7 +1299,7 @@ label cc_pf_blowjob_T3_E2:
                     gen "[name_cho_genie]?" ("base", xpos="far_left", ypos="head")
                     cho @ cheeks blush "Yes...{w=0.5} Sorry...{w=0.5} Thank you [name_genie_cho]." ("angry", "base", "base", "downR")
                     cho @ cheeks blush "Is that all?" ("soft", "narrow", "base", "down")
-                    if game.daytime:
+                    if states.env.daytime:
                         gen "That will be all for today..." ("base", xpos="far_left", ypos="head")
                     else:
                         gen "That will be all for tonight..." ("base", xpos="far_left", ypos="head")
@@ -1320,7 +1320,7 @@ label cc_pf_blowjob_T3_E2:
                     $ cho.wear("all")
                     with fade
 
-                    if game.daytime:
+                    if states.env.daytime:
                         cho @ cheeks blush "Bye then!" ("open", "happyCl", "base", "downR")
                     else:
                         cho "Good night then!" ("base", "base", "base", "mid")
@@ -1450,7 +1450,7 @@ label cc_pf_blowjob_T3_E3:
 
     $ camera.set_imagepath("cho_bj/kneel/")
     $ camera.set_image("mid")
-    if game.daytime:
+    if states.env.daytime:
         $ camera.set_overlay("day_overlay")
     else:
         $ camera.set_overlay("night_overlay")
@@ -1747,7 +1747,7 @@ label cc_pf_blowjob_T3_E3:
     $ cho.set_cum(None)
     with fade
 
-    if game.daytime:
+    if states.env.daytime:
         cho @ cheeks blush "In that case, I'll head back to class." ("open", "base", "base", "R")
     else:
         cho "I'll head back to my dorms then..." ("base", "base", "base", "mid")
diff --git a/game/scripts/characters/cho/events/favors/talk_to_me.rpy b/game/scripts/characters/cho/events/favors/talk_to_me.rpy
index dcc5a1d9..a52e9515 100644
--- a/game/scripts/characters/cho/events/favors/talk_to_me.rpy
+++ b/game/scripts/characters/cho/events/favors/talk_to_me.rpy
@@ -238,7 +238,7 @@ label cc_pf_talk_T1_intro_E1:
 
     cho "I'm sorry, Sir. It's just that..." ("open", "closed", "raised", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         cho "I'm really late for classes. May we postpone this talk to some other time?" ("soft", "narrow", "worried", "R")
     else:
         cho "It's getting really late. May we postpone this talk to some other time?" ("soft", "narrow", "worried", "R")
@@ -594,7 +594,7 @@ label cc_pf_talk_T1_E3:
         gen "Did our little talk about panties maybe... excite you?" ("grin", xpos="far_left", ypos="head")
         cho "What? No, of course not!" ("angry", "wide", "base", "mid")
 
-        if game.daytime:
+        if states.env.daytime:
             cho "I simply have to go to my next lesson..." ("soft", "closed", "base", "mid")
             cho "Or I will be late again." ("annoyed", "base", "base", "R")
         else:
@@ -657,7 +657,7 @@ label cc_pf_talk_T1_E3:
             gen "I mean who doesn't..." ("base", xpos="far_left", ypos="head")
 
         cho "Sir, if you don't mind..." ("soft", "closed", "base", "mid")
-        if game.daytime:
+        if states.env.daytime:
             cho "I'm already late for class." ("soft", "narrow", "base", "R")
             cho "I really should be going now..." ("angry", "narrow", "worried", "mid")
         else:
@@ -666,7 +666,7 @@ label cc_pf_talk_T1_E3:
 
         gen "Of course. You are dismissed." ("base", xpos="far_left", ypos="head")
         cho "Thank you, Sir." ("base", "base", "base", "mid")
-        if game.daytime:
+        if states.env.daytime:
             cho "Until next time." ("smile", "narrow", "base", "mid")
         else:
             cho "Have a good night." ("smile", "narrow", "base", "mid")
@@ -825,7 +825,7 @@ label cc_pf_talk_T2_intro_E1:
     cho "Very funny, [name_genie_cho]..." ("annoyed", "narrow", "angry", "R")
     cho "Now, if that's everything..." ("soft", "closed", "base", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         cho "Classes are about to start, and I'm already late for them..." ("open", "narrow", "base", "R")
         cho "I hope it would be okay if I leave?" ("soft", "narrow", "base", "mid")
     else:
@@ -1277,7 +1277,7 @@ label cc_pf_talk_T2_E3:
         cho @ cheeks blush "I am not!" ("clench", "closed", "angry", "mid")
         cho "Sir, are we done here?" ("soft", "narrow", "angry", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         cho "I'm late for class." ("soft", "narrow", "angry", "R")
     else:
         cho "I need to get some sleep." ("soft", "narrow", "angry", "R")
@@ -1472,7 +1472,7 @@ label cc_pf_talk_T3_intro_E1:
         gen "Okay then..." ("base", xpos="far_left", ypos="head")
         cho @ cheeks blush "I think--{w=0.3} I better--{w=0.3}" ("clench", "narrow", "base", "R")
 
-        if game.daytime:
+        if states.env.daytime:
             cho @ cheeks blush "Head back to class." ("disgust", "narrow", "base", "R")
         else:
             cho @ cheeks blush "Go to bed." ("disgust", "narrow", "base", "R")
@@ -1486,7 +1486,7 @@ label cc_pf_talk_T3_intro_E1:
         gen "I said that's enough." ("base", xpos="far_left", ypos="head")
         cho "Fine..." ("annoyed", "narrow", "base", "mid")
 
-        if game.daytime:
+        if states.env.daytime:
             cho "I'll just head back to class then..." ("annoyed", "base", "base", "R")
         else:
             cho "I'll just head off to bed then..." ("annoyed", "base", "base", "R")
@@ -1598,7 +1598,7 @@ label cc_pf_talk_T3_intro_E2:
     gen "In any case, you'll have to tell me more about them later... I'm sure we've only scratched the surface regarding those three." ("base", xpos="far_left", ypos="head")
     cho "Alright..." ("annoyed", "base", "base", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         cho "I'll head back to class in that case." ("open", "base", "base", "R")
         gen "Certainly..." ("base", xpos="far_left", ypos="head")
     else:
diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
index 79900d1a..5760d3b5 100644
--- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
@@ -126,7 +126,7 @@ label gryffindor_match:
 
         $ game.gold = 1984
         $ game.day = 665
-        $ game.daytime = True
+        $ states.env.daytime = True
         $ game.weather = "clear"
         call room("main_room")
 
@@ -588,7 +588,7 @@ label gryffindor_match:
         $ cho.equip(cho_outfit_quidditch_gryffindor)
         $ game.gold = 1984
         $ game.day = 667
-        $ game.daytime = True
+        $ states.env.daytime = True
         $ game.weather = "clear"
         $ snape_chibi.zorder = 3
         $ tonks_chibi.zorder = 4
@@ -730,7 +730,7 @@ label gryffindor_match:
         $ cho.equip(cho_outfit_quidditch_gryffindor)
         $ game.gold = 1984
         $ game.day = 667
-        $ game.daytime = True
+        $ states.env.daytime = True
         $ game.weather = "clear"
         $ snape_chibi.zorder = 3
         $ tonks_chibi.zorder = 4
diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy
index ee0919e7..4e679f81 100644
--- a/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy
+++ b/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy
@@ -104,7 +104,7 @@ label cc_gt_return:
         $ cho.equip(cho_outfit_quidditch_gryffindor)
         $ game.gold = 1984
         $ game.day = 665
-        $ game.daytime = False
+        $ states.env.daytime = False
         $ game.weather = "clear"
         call room("main_room")
         call cho_chibi(xpos="mid", ypos="base")
diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy
index 47c3d906..a76ac904 100644
--- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy
@@ -1029,7 +1029,7 @@ label hufflepuff_match:
     play sound "sounds/steps_grass.ogg"
     nar "You hurry back to your office before giving anyone a chance to talk to you."
 
-    $ game.daytime = False
+    $ states.env.daytime = False
     call room("main_room")
     call gen_chibi("hide")
     call hide_blkfade
@@ -1070,7 +1070,7 @@ label hufflepuff_match_return:
     # Demands that you will find somebody to replace her.
 
     # The office, evening after the game
-    $ game.daytime = False
+    $ states.env.daytime = False
 
     stop music fadeout 1
     call room("main_room")
diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy
index e85b83ad..30829d08 100644
--- a/game/scripts/characters/cho/events/quidditch/intros.rpy
+++ b/game/scripts/characters/cho/events/quidditch/intros.rpy
@@ -126,7 +126,7 @@ label cho_quid_E1:
     gen "And you, think about using that petite body of yours to get closer to your dreams!" ("grin", xpos="far_left", ypos="head")
     cho "*Tzzzz*" ("angry", "closed", "angry", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         cho "Good day, Sir..." ("soft", "narrow", "angry", "mid")
     else:
         cho "Good night, Sir..." ("soft", "narrow", "angry", "mid")
@@ -440,7 +440,7 @@ label cho_quid_E5:
     call cho_walk(action="enter")
     call cho_walk("mid", "base")
 
-    if game.daytime:
+    if states.env.daytime:
         cho "Good morning, [name_genie_cho]..." ("annoyed", "narrow", "worried", "downR", xpos="right", ypos="base", trans=d3)
         gen "Mornin'." ("base", xpos="far_left", ypos="head")
     else:
@@ -766,7 +766,7 @@ label cho_quid_E7:
     gen "I'd say that was a success." ("base", xpos="far_left", ypos="head")
     cho "(...)" ("annoyed", "narrow", "angry", "R")
 
-    if game.daytime:
+    if states.env.daytime:
         cho "Good day, Sir." ("open", "narrow", "angry", "mid")
     else:
         cho "Good night, Sir." ("open", "narrow", "angry", "mid")
@@ -930,7 +930,7 @@ label cho_quid_E8:
     ton "*Hick*!... whoopsie..." ("upset", "wide", "base", "mid")
     ton @ hair horny "Now, I better get going convincing those boys to play again..." ("open", "base", "raised", "R")
 
-    if game.daytime:
+    if states.env.daytime:
         nar "You finish your drinks before calling it a day."
     else:
         nar "You finish your drinks before calling it a night."
@@ -997,7 +997,7 @@ label cho_quid_E10:
 
     call cho_walk("mid", "base", action="enter")
 
-    if game.daytime:
+    if states.env.daytime:
         cho "Good morning, [name_genie_cho]..." ("open", "base", "base", "mid", xpos="right", ypos="base", trans=d3)
         gen "Good morning [name_cho_genie]." ("base", xpos="far_left", ypos="head")
     else:
@@ -1508,7 +1508,7 @@ label cho_quid_E12:
         $ cho.equip(cho_outfit_quidditch_gryffindor)
         $ game.gold = 1984
         $ game.day = 666
-        $ game.daytime = True
+        $ states.env.daytime = True
         $ game.weather = "clear"
         $ hooch_chibi.zoom = 0.38
         $ hooch_chibi.zorder = 4
@@ -1788,7 +1788,7 @@ label cho_quid_E14:
     cho "There we go!"
     cho "You can open your eyes now."
 
-    if game.daytime:
+    if states.env.daytime:
         show cho_handjob as cg zorder 16
     else:
         show cho_handjob as cg zorder 16 at color_temperature(1.0)
@@ -2217,7 +2217,7 @@ label cho_quid_E14:
 
     gen "*Ah*...{w=0.4} Why did you--"
 
-    if game.daytime:
+    if states.env.daytime:
         show cho_handjob cho_body_idle mouth_neutral eyes_open_right penis_hard_spit_on_shaft as cg zorder 16
     else:
         show cho_handjob cho_body_idle mouth_neutral eyes_open_right penis_hard_spit_on_shaft as cg zorder 16 at color_temperature(1.0)
@@ -2784,7 +2784,7 @@ label cho_quid_E14:
     else:
         play sound "sounds/steps_grass.ogg"
         nar "You grab Cho's clothing and start making your way down to the Quidditch pitch..."
-        if game.daytime:
+        if states.env.daytime:
             nar "After catching a couple of glances from the students, you quickly tuck her underwear underneath her outer clothing..."
             nar "Once you reach the pitch, Cho is already circling around it at breakneck speeds..."
             nar "Rather than heading up to the tower, you decide it'd be best to keep a look-out from the entrance-way... Since you'd get a much better angle from below."
@@ -2862,7 +2862,7 @@ label cho_quid_E14_facefuck:
 
     # Throatfuck CG:
 
-    if game.daytime:
+    if states.env.daytime:
         if _no_shirt:
             show cho_facefuck up eyebrows_low eyes_narrow_down no_shirt as cg zorder 15
         else:
@@ -3528,7 +3528,7 @@ label cho_quid_E14_facefuck:
     play sound "sounds/cloth_sound3.ogg"
     pause 0.8
 
-    if game.daytime:
+    if states.env.daytime:
         if _no_shirt:
             show cho_handjob no_shirt cho_body_idle eyebrows_base mouth_smile eyes_open_forward penis_soft as cg zorder 16
         else:
diff --git a/game/scripts/characters/cho/events/quidditch/quiz.rpy b/game/scripts/characters/cho/events/quidditch/quiz.rpy
index ae49fc3b..00cb1bed 100644
--- a/game/scripts/characters/cho/events/quidditch/quiz.rpy
+++ b/game/scripts/characters/cho/events/quidditch/quiz.rpy
@@ -537,7 +537,7 @@ label cho_quiz_checkpoint:
         cho "And should you not be able to help me and my team beat Hufflepuff, this will be over before you can even say Snitch!" ("scream", "closed", "base", "mid")
         gen "..." ("angry", xpos="far_left", ypos="head")
 
-        if game.daytime:
+        if states.env.daytime:
             cho "Anyway, got to go now, or I'll be late for class." ("smile", "base", "base", "mid")
             cho "But I should have some time this evening if you'd like to get started with the training." ("soft", "base", "base", "down")
             gen "{size=-4}Oh, you bet I do...{/size}" ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
index 1b98e2cd..dedfd490 100644
--- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
+++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
@@ -1400,7 +1400,7 @@ label slytherin_match:
 label slytherin_match_return:
 
     # The office, evening after the game
-    $ game.daytime = False
+    $ states.env.daytime = False
 
     stop music fadeout 1
     #show screen blkfade
diff --git a/game/scripts/characters/cho/events/quidditch/training.rpy b/game/scripts/characters/cho/events/quidditch/training.rpy
index 901022ba..99501605 100644
--- a/game/scripts/characters/cho/events/quidditch/training.rpy
+++ b/game/scripts/characters/cho/events/quidditch/training.rpy
@@ -364,7 +364,7 @@ label cho_training:
 
             jump cho_training.choices
 
-        "-Start Practice Match-" if game.daytime and not states.cho.ev.quidditch.lock_practice:
+        "-Start Practice Match-" if states.env.daytime and not states.cho.ev.quidditch.lock_practice:
             if states.cho.tier == 1:
                 # Hufflepuff
                 jump cc_ht_start
@@ -375,7 +375,7 @@ label cho_training:
                 # Gryffindor
                 jump cc_gt_start
 
-        "-Start Practice Match-" (style="disabled") if not game.daytime or states.cho.ev.quidditch.lock_practice:
+        "-Start Practice Match-" (style="disabled") if not states.env.daytime or states.cho.ev.quidditch.lock_practice:
             if states.cho.ev.quidditch.lock_practice:
                 if (states.cho.tier == 1 and states.cho.ev.quidditch.hufflepuff_training) or (states.cho.tier == 2 and states.cho.ev.quidditch.slytherin_training) or (states.cho.tier == 3 and states.cho.ev.quidditch.gryffindor_training):
                     gen "(She doesn't need any more practice.)" ("base", xpos="far_left", ypos="head")
@@ -484,7 +484,7 @@ label cho_tactics:
             gen "I certainly shall." ("grin", xpos="far_left", ypos="head")
             gen "But this will do for today, [name_cho_genie]." ("base", xpos="far_left", ypos="head")
 
-            if game.daytime:
+            if states.env.daytime:
                 cho "I'll head back to class then." ("open", "base", "base", "R")
             else:
                 cho "I'll head back to my dorm then." ("open", "base", "base", "R")
@@ -574,7 +574,7 @@ label cho_tactics:
             cho "*Sigh* Just let me know when and I'll set one up with their captain." ("open", "narrow", "base", "R")
             gen "Excellent." ("base", xpos="far_left", ypos="head")
 
-            if game.daytime:
+            if states.env.daytime:
                 cho "If that is all, I'll head back to class." ("open", "base", "base", "mid")
                 gen "Yes, that shall do for today." ("base", xpos="far_left", ypos="head")
                 cho "Good day then, Sir..." ("soft", "narrow", "base", "mid")
@@ -688,7 +688,7 @@ label cho_tactics:
             cho @ cheeks blush "It's just deodorant..." ("clench", "base", "raised", "mid")
             gen "Yes, that! Keep wearing it!" ("base", xpos="far_left", ypos="head")
 
-            if game.daytime:
+            if states.env.daytime:
                 cho "If that is all, I'll head back to class." ("base", "narrow", "base", "R")
                 gen "Yes, that shall do for today." ("base", xpos="far_left", ypos="head")
                 cho "Good day to you, [name_genie_cho]..." ("soft", "narrow", "base", "mid")
diff --git a/game/scripts/characters/cho/events/summon.rpy b/game/scripts/characters/cho/events/summon.rpy
index 6859b3a6..e801dc4f 100644
--- a/game/scripts/characters/cho/events/summon.rpy
+++ b/game/scripts/characters/cho/events/summon.rpy
@@ -42,7 +42,7 @@ label cho_summon_setup:
         call describe_mood("Cho", states.cho.mood)
         call tutorial("moodngifts")
     else:
-        if game.daytime:
+        if states.env.daytime:
             cho "Good morning, [name_genie_cho]." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
         else:
             cho "Good evening, [name_genie_cho]." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
diff --git a/game/scripts/characters/cho/requests.rpy b/game/scripts/characters/cho/requests.rpy
index 7b6f4cce..c2a8575d 100644
--- a/game/scripts/characters/cho/requests.rpy
+++ b/game/scripts/characters/cho/requests.rpy
@@ -1,16 +1,16 @@
-default cho_ev_spy_on_boys_t3_e1 = Event(id="cho_ev_spy_on_boys_t3_e1", label="cc_pr_spy_boys_T3_twins", req="game.daytime==False")
-default cho_ev_spy_on_boys_t3_e2 = Event(id="cho_ev_spy_on_boys_t3_e2", label="cc_pr_spy_boys_T3_ron", req="game.daytime==False")
-default cho_ev_spy_on_boys_t3_e3 = Event(id="cho_ev_spy_on_boys_t3_e3", label="cc_pr_spy_boys_T3_harry", req="game.daytime==False")
+default cho_ev_spy_on_boys_t3_e1 = Event(id="cho_ev_spy_on_boys_t3_e1", label="cc_pr_spy_boys_T3_twins", req="states.env.daytime==False")
+default cho_ev_spy_on_boys_t3_e2 = Event(id="cho_ev_spy_on_boys_t3_e2", label="cc_pr_spy_boys_T3_ron", req="states.env.daytime==False")
+default cho_ev_spy_on_boys_t3_e3 = Event(id="cho_ev_spy_on_boys_t3_e3", label="cc_pr_spy_boys_T3_harry", req="states.env.daytime==False")
 
 default cho_eventqueue_spy_on_boys = EventQueue("cho_eventqueue_spy_on_boys")
 default cho_ev_spy_on_boys_t3_e1_hub = Event(id="cho_ev_spy_on_boys_t3_e1_hub", label="cc_pr_spy_boys_start", req="states.cho.tier == 3", queue="cho_eventqueue_spy_on_boys", autoenqueue=True, autodequeue=False, subevents=["cho_ev_spy_on_boys_t3_e1"])
 default cho_ev_spy_on_boys_t3_e2_hub = Event(id="cho_ev_spy_on_boys_t3_e2_hub", label="cc_pr_spy_boys_start", req="states.cho.tier == 3", queue="cho_eventqueue_spy_on_boys", autoenqueue=True, autodequeue=False, subevents=["cho_ev_spy_on_boys_t3_e2"])
 default cho_ev_spy_on_boys_t3_e3_hub = Event(id="cho_ev_spy_on_boys_t3_e3_hub", label="cc_pr_spy_boys_start", req="states.cho.tier == 3", queue="cho_eventqueue_spy_on_boys", autoenqueue=True, autodequeue=False, subevents=["cho_ev_spy_on_boys_t3_e3"])
 
-default cho_ev_spy_on_girls_t3_e1 = Event(id="cho_ev_spy_on_girls_t3_e1", label="cc_pr_spy_girls_T3_showers", req="game.daytime==False")
-default cho_ev_spy_on_girls_t3_e2 = Event(id="cho_ev_spy_on_girls_t3_e2", label="cc_pr_spy_girls_T3_alicia", req="game.daytime==False")
-default cho_ev_spy_on_girls_t3_e3 = Event(id="cho_ev_spy_on_girls_t3_e3", label="cc_pr_spy_girls_T3_katie", req="game.daytime==False")
-default cho_ev_spy_on_girls_t3_e4 = Event(id="cho_ev_spy_on_girls_t3_e4", label="cc_pr_spy_girls_T3_angelina", req="game.daytime==False")
+default cho_ev_spy_on_girls_t3_e1 = Event(id="cho_ev_spy_on_girls_t3_e1", label="cc_pr_spy_girls_T3_showers", req="states.env.daytime==False")
+default cho_ev_spy_on_girls_t3_e2 = Event(id="cho_ev_spy_on_girls_t3_e2", label="cc_pr_spy_girls_T3_alicia", req="states.env.daytime==False")
+default cho_ev_spy_on_girls_t3_e3 = Event(id="cho_ev_spy_on_girls_t3_e3", label="cc_pr_spy_girls_T3_katie", req="states.env.daytime==False")
+default cho_ev_spy_on_girls_t3_e4 = Event(id="cho_ev_spy_on_girls_t3_e4", label="cc_pr_spy_girls_T3_angelina", req="states.env.daytime==False")
 
 default cho_eventqueue_spy_on_girls = EventQueue("cho_eventqueue_spy_on_girls")
 default cho_ev_spy_on_girls_t3_e1_hub = Event(id="cho_ev_spy_on_girls_t3_e1_hub", label="cc_pr_spy_girls_start", req="states.cho.tier == 3", queue="cho_eventqueue_spy_on_girls", autoenqueue=True, autodequeue=False, subevents=["cho_ev_spy_on_girls_t3_e1"])
@@ -18,18 +18,18 @@ default cho_ev_spy_on_girls_t3_e2_hub = Event(id="cho_ev_spy_on_girls_t3_e2_hub"
 default cho_ev_spy_on_girls_t3_e3_hub = Event(id="cho_ev_spy_on_girls_t3_e3_hub", label="cc_pr_spy_girls_start", req="states.cho.tier == 3", queue="cho_eventqueue_spy_on_girls", autoenqueue=True, autodequeue=False, subevents=["cho_ev_spy_on_girls_t3_e3"])
 default cho_ev_spy_on_girls_t3_e4_hub = Event(id="cho_ev_spy_on_girls_t3_e4_hub", label="cc_pr_spy_girls_start", req="states.cho.tier == 3", queue="cho_eventqueue_spy_on_girls", autoenqueue=True, autodequeue=False, subevents=["cho_ev_spy_on_girls_t3_e4"])
 
-default cho_ev_manipulate_boys_t1_e1 = Event(id="cho_ev_manipulate_boys_t1_e1", label="cc_pr_manipulate_boys_T1_intro_E1", req="game.daytime==False", repeat=False)
-default cho_ev_manipulate_boys_t1_e2 = Event(id="cho_ev_manipulate_boys_t1_e2", label="cc_pr_manipulate_boys_T1_E1", req="game.daytime==False")
-default cho_ev_manipulate_boys_t1_e3 = Event(id="cho_ev_manipulate_boys_t1_e3", label="cc_pr_manipulate_boys_T1_E2", req="game.daytime==False")
-default cho_ev_manipulate_boys_t1_e4 = Event(id="cho_ev_manipulate_boys_t1_e4", label="cc_pr_manipulate_boys_T1_E3", req="game.daytime==False")
-default cho_ev_manipulate_boys_t2_e1 = Event(id="cho_ev_manipulate_boys_t2_e1", label="cc_pr_manipulate_boys_T2_intro_E1", req="game.daytime==False", repeat=False)
-default cho_ev_manipulate_boys_t2_e2 = Event(id="cho_ev_manipulate_boys_t2_e2", label="cc_pr_manipulate_boys_T2_E1", req="game.daytime==False")
-default cho_ev_manipulate_boys_t2_e3 = Event(id="cho_ev_manipulate_boys_t2_e3", label="cc_pr_manipulate_boys_T2_intro_E2", req="game.daytime==False", repeat=False)
-default cho_ev_manipulate_boys_t2_e4 = Event(id="cho_ev_manipulate_boys_t2_e4", label="cc_pr_manipulate_boys_T2_intro_E3", req="game.daytime==False", repeat=False)
-default cho_ev_manipulate_boys_t2_e5 = Event(id="cho_ev_manipulate_boys_t2_e5", label="cc_pr_manipulate_boys_T2_E3", req="game.daytime==False")
-default cho_ev_manipulate_boys_t3_e1 = Event(id="cho_ev_manipulate_boys_t3_e1", label="cc_pr_manipulate_boys_T3_twins", req="game.daytime==False")
-default cho_ev_manipulate_boys_t3_e2 = Event(id="cho_ev_manipulate_boys_t3_e2", label="cc_pr_manipulate_boys_T3_ron", req="game.daytime==False")
-default cho_ev_manipulate_boys_t3_e3 = Event(id="cho_ev_manipulate_boys_t3_e3", label="cc_pr_manipulate_boys_T3_harry", req="game.daytime==False")
+default cho_ev_manipulate_boys_t1_e1 = Event(id="cho_ev_manipulate_boys_t1_e1", label="cc_pr_manipulate_boys_T1_intro_E1", req="states.env.daytime==False", repeat=False)
+default cho_ev_manipulate_boys_t1_e2 = Event(id="cho_ev_manipulate_boys_t1_e2", label="cc_pr_manipulate_boys_T1_E1", req="states.env.daytime==False")
+default cho_ev_manipulate_boys_t1_e3 = Event(id="cho_ev_manipulate_boys_t1_e3", label="cc_pr_manipulate_boys_T1_E2", req="states.env.daytime==False")
+default cho_ev_manipulate_boys_t1_e4 = Event(id="cho_ev_manipulate_boys_t1_e4", label="cc_pr_manipulate_boys_T1_E3", req="states.env.daytime==False")
+default cho_ev_manipulate_boys_t2_e1 = Event(id="cho_ev_manipulate_boys_t2_e1", label="cc_pr_manipulate_boys_T2_intro_E1", req="states.env.daytime==False", repeat=False)
+default cho_ev_manipulate_boys_t2_e2 = Event(id="cho_ev_manipulate_boys_t2_e2", label="cc_pr_manipulate_boys_T2_E1", req="states.env.daytime==False")
+default cho_ev_manipulate_boys_t2_e3 = Event(id="cho_ev_manipulate_boys_t2_e3", label="cc_pr_manipulate_boys_T2_intro_E2", req="states.env.daytime==False", repeat=False)
+default cho_ev_manipulate_boys_t2_e4 = Event(id="cho_ev_manipulate_boys_t2_e4", label="cc_pr_manipulate_boys_T2_intro_E3", req="states.env.daytime==False", repeat=False)
+default cho_ev_manipulate_boys_t2_e5 = Event(id="cho_ev_manipulate_boys_t2_e5", label="cc_pr_manipulate_boys_T2_E3", req="states.env.daytime==False")
+default cho_ev_manipulate_boys_t3_e1 = Event(id="cho_ev_manipulate_boys_t3_e1", label="cc_pr_manipulate_boys_T3_twins", req="states.env.daytime==False")
+default cho_ev_manipulate_boys_t3_e2 = Event(id="cho_ev_manipulate_boys_t3_e2", label="cc_pr_manipulate_boys_T3_ron", req="states.env.daytime==False")
+default cho_ev_manipulate_boys_t3_e3 = Event(id="cho_ev_manipulate_boys_t3_e3", label="cc_pr_manipulate_boys_T3_harry", req="states.env.daytime==False")
 
 default cho_eventqueue_manipulate_boys = EventQueue("cho_eventqueue_manipulate_boys")
 default cho_ev_manipulate_boys_t1_e1_hub = Event(id="cho_ev_manipulate_boys_t1_e1_hub", label="cc_pr_manipulate_boys_start", req="states.cho.tier == 1", queue="cho_eventqueue_manipulate_boys", autoenqueue=True, autodequeue=False, subevents=["cho_ev_manipulate_boys_t1_e1"])
@@ -45,10 +45,10 @@ default cho_ev_manipulate_boys_t3_e1_hub = Event(id="cho_ev_manipulate_boys_t3_e
 default cho_ev_manipulate_boys_t3_e2_hub = Event(id="cho_ev_manipulate_boys_t3_e2_hub", label="cc_pr_manipulate_boys_start", req="states.cho.tier == 3", queue="cho_eventqueue_manipulate_boys", autoenqueue=True, autodequeue=False, subevents=["cho_ev_manipulate_boys_t3_e2"])
 default cho_ev_manipulate_boys_t3_e3_hub = Event(id="cho_ev_manipulate_boys_t3_e3_hub", label="cc_pr_manipulate_boys_start", req="states.cho.tier == 3", queue="cho_eventqueue_manipulate_boys", autoenqueue=True, autodequeue=False, subevents=["cho_ev_manipulate_boys_t3_e3"])
 
-default cho_ev_manipulate_girls_t3_e1 = Event(id="cho_ev_manipulate_girls_t3_e1", label="cc_pr_manipulate_girls_T3_alicia", req="game.daytime==False")
-default cho_ev_manipulate_girls_t3_e2 = Event(id="cho_ev_manipulate_girls_t3_e2", label="cc_pr_manipulate_girls_T3_katie_part1", req="game.daytime==False")
-default cho_ev_manipulate_girls_t3_e3 = Event(id="cho_ev_manipulate_girls_t3_e3", label="cc_pr_manipulate_girls_T3_katie_part2", req="game.daytime==False")
-default cho_ev_manipulate_girls_t3_e4 = Event(id="cho_ev_manipulate_girls_t3_e4", label="cc_pr_manipulate_girls_T3_angelina", req="game.daytime==False")
+default cho_ev_manipulate_girls_t3_e1 = Event(id="cho_ev_manipulate_girls_t3_e1", label="cc_pr_manipulate_girls_T3_alicia", req="states.env.daytime==False")
+default cho_ev_manipulate_girls_t3_e2 = Event(id="cho_ev_manipulate_girls_t3_e2", label="cc_pr_manipulate_girls_T3_katie_part1", req="states.env.daytime==False")
+default cho_ev_manipulate_girls_t3_e3 = Event(id="cho_ev_manipulate_girls_t3_e3", label="cc_pr_manipulate_girls_T3_katie_part2", req="states.env.daytime==False")
+default cho_ev_manipulate_girls_t3_e4 = Event(id="cho_ev_manipulate_girls_t3_e4", label="cc_pr_manipulate_girls_T3_angelina", req="states.env.daytime==False")
 
 default cho_eventqueue_manipulate_girls = EventQueue("cho_eventqueue_manipulate_girls")
 default cho_ev_manipulate_girls_t3_e1_hub = Event(id="cho_ev_manipulate_girls_t3_e1_hub", label="cc_pr_manipulate_girls_start", req="states.cho.tier == 3", queue="cho_eventqueue_manipulate_girls", autoenqueue=True, autodequeue=False, subevents=["cho_ev_manipulate_girls_t3_e1"])
diff --git a/game/scripts/characters/cho/summon.rpy b/game/scripts/characters/cho/summon.rpy
index 392da71d..ff207a6e 100644
--- a/game/scripts/characters/cho/summon.rpy
+++ b/game/scripts/characters/cho/summon.rpy
@@ -165,14 +165,14 @@ label cho_favor_menu:
             else:
                 $ result.start()
 
-        "-Public Requests-" (icon="interface/icons/small/star_yellow.webp", style="disabled") if not game.daytime or not states.cho.requests_unlocked:
+        "-Public Requests-" (icon="interface/icons/small/star_yellow.webp", style="disabled") if not states.env.daytime or not states.cho.requests_unlocked:
             if not states.cho.requests_unlocked:
                 nar "Progress further to unlock public requests."
-            elif not game.daytime:
+            elif not states.env.daytime:
                 nar "Public requests are available during the day only."
             jump cho_favor_menu
 
-        "-Public Requests-" (icon="interface/icons/small/star_yellow.webp") if game.daytime and states.cho.requests_unlocked:
+        "-Public Requests-" (icon="interface/icons/small/star_yellow.webp") if states.env.daytime and states.cho.requests_unlocked:
             label .requests:
 
             call tutorial("hearts")
diff --git a/game/scripts/characters/hermione/events/cardgame_wager.rpy b/game/scripts/characters/hermione/events/cardgame_wager.rpy
index acc73bb5..60f9c137 100644
--- a/game/scripts/characters/hermione/events/cardgame_wager.rpy
+++ b/game/scripts/characters/hermione/events/cardgame_wager.rpy
@@ -296,7 +296,7 @@ label hg_wager_bj:
                     hide screen blkfade
                     with d5
 
-                    if game.daytime:
+                    if states.env.daytime:
                         her "Bye then..." ("smile", "base", "base", "mid", trans=dissolve, flip=False)
                         gen "Bye, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
                     else:
@@ -427,7 +427,7 @@ label hg_wager_bj:
                             her "" ("base", "happy", "base", "mid_soft", ypos="base")
                             gen "You've done more than enough to save those points." ("base", xpos="far_left", ypos="head")
                             her "Thank you, [name_genie_hermione]." ("smile", "happy", "base", "mid_soft")
-                            if game.daytime: #should play if day time
+                            if states.env.daytime: #should play if day time
                                 her "Bye then..." ("open", "base", "base", "mid")
                                 gen "Bye, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
                             else:
@@ -486,7 +486,7 @@ label hg_wager_bj:
                                 her "Why would you suddenly start playing cards, when I'm being so kind as to give you a blowjob?" ("annoyed", "narrow", "base", "mid_soft")
                                 gen "That's fair..." ("base", xpos="far_left", ypos="head")
                                 gen "Very well, as promised, I won't be deducting those points..." ("base", xpos="far_left", ypos="head")
-                                if game.daytime:
+                                if states.env.daytime:
                                     her "Great... Goodbye for now then, [name_genie_hermione]." ("base", "base", "base", "mid")
                                 else:
                                     her "Great... Good night then, [name_genie_hermione]." ("base", "base", "base", "mid")
@@ -566,7 +566,7 @@ label hg_wager_bj:
                                         gen "A net gain is when--" ("base", xpos="far_left", ypos="head")
                                         her "I know what it means..." ("open", "narrow", "base", "mid_soft")
                                         gen "Right." ("base", xpos="far_left", ypos="head")
-                                        if game.daytime:
+                                        if states.env.daytime:
                                             her "good day to you then, [name_genie_hermione]." ("base", "base", "base", "mid")
                                         else:
                                             her "Good night then..." ("base", "base", "base", "mid")
@@ -612,7 +612,7 @@ label hg_wager_bj:
                                 $ gryffindor += 20
                                 her "That's not--" ("normal", "narrow", "base", "down")
                                 her "Thank you, [name_genie_hermione]..." ("open", "closed", "base", "mid")
-                                if game.daytime:
+                                if states.env.daytime:
                                     her "Goodbye then..." ("base", "base", "base", "mid")
                                 else:
                                     her "Good night then..." ("base", "base", "base", "mid")
diff --git a/game/scripts/characters/hermione/events/clothing.rpy b/game/scripts/characters/hermione/events/clothing.rpy
index 493f59c7..160b5825 100644
--- a/game/scripts/characters/hermione/events/clothing.rpy
+++ b/game/scripts/characters/hermione/events/clothing.rpy
@@ -10,7 +10,7 @@ label hermione_summon_setup:
     #
     # if game.weather == "clear":
 
-        # if states.her.tier >= 3 and game.daytime and not hg_muggle_hot_ITEM.unlocked:
+        # if states.her.tier >= 3 and states.env.daytime and not hg_muggle_hot_ITEM.unlocked:
             # $ hg_muggle_hot_ITEM.unlocked = True
 
             # if not persistent.game_complete:
@@ -336,7 +336,7 @@ label hermione_summon_setup:
         call describe_mood("Hermione", states.her.mood)
         call tutorial("moodngifts")
     else:
-        if game.daytime:
+        if states.env.daytime:
             her "Good morning, [name_genie_hermione]." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
         else:
             her "Good evening, [name_genie_hermione]." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy
index 40e91934..b60eb4af 100644
--- a/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy
+++ b/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy
@@ -99,7 +99,7 @@ label hg_pf_strip_T4_fingering:
         her "For how long did you want me to do this?" ("open", "base", "worried", "mid")
         gen "Until you finish, [name_hermione_genie]..." ("base", xpos="far_left", ypos="head")
 
-        if game.daytime:
+        if states.env.daytime:
             her "But my classes are about to start, [name_genie_hermione]..." ("annoyed", "base", "worried", "mid")
         else:
             her "But it's getting late, [name_genie_hermione]..." ("annoyed", "base", "worried", "mid")
@@ -111,7 +111,7 @@ label hg_pf_strip_T4_fingering:
         her "I presume that you're expecting me to do this until--" ("open", "base", "worried", "mid")
         gen "Until you finish, [name_hermione_genie]..." ("base", xpos="far_left", ypos="head")
 
-        if game.daytime:
+        if states.env.daytime:
             her "But, what if I don't make it back to class in time, [name_genie_hermione]..." ("annoyed", "base", "worried", "mid")
         else:
             her "Right... I Just thought... Well, it's getting a bit late, [name_genie_hermione]..." ("annoyed", "base", "worried", "mid")
diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy
index 6422821d..3c7078b3 100644
--- a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy
+++ b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy
@@ -778,7 +778,7 @@ label hg_pf_strip_T4_snape_watch:
     sna "Good job, harlot!" ("snape_22")
     her @ cheeks blush "............." ("soft", "narrow", "base", "R")
 
-    if game.daytime:
+    if states.env.daytime:
         sna "Well, my class is about to start, so I will be leaving now." ("snape_22")
         sna "Don't you have potion class with me today, Miss Granger?" ("snape_22")
         her @ cheeks blush "Yes..." ("disgust", "narrow", "base", "down")
diff --git a/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy b/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy
index 9f9e0afe..17957a2b 100644
--- a/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy
+++ b/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy
@@ -374,7 +374,7 @@ label hg_pf_handjob_1:
     her "How long do you think this will take?" ("angry", "base", "worried", "mid")
     gen "Why?" ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         her "Well, it's just that my classes are about to start..." ("upset", "wink", "base", "mid")
     else:
         her "Well, it's just that I have this paper that I need to finish..." ("upset", "wink", "base", "mid")
@@ -560,7 +560,7 @@ label hg_pf_handjob_1:
     her "......" ("annoyed", "narrow", "base", "down")
     gen "Go on...{w=0.4} You said you were in a hurry." ("base", xpos="far_left", ypos="head")
     her "..............." ("annoyed", "narrow", "angry", "R")
-    if game.daytime:
+    if states.env.daytime:
         gen "Once we're done here, you can get out and head back to class." ("base", xpos="far_left", ypos="head")
     else:
         gen "Once we're done here, you can get back to working on your paper." ("base", xpos="far_left", ypos="head")
@@ -639,7 +639,7 @@ label hg_pf_handjob_1:
             play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed # HERMIONE'S THEME.
             her "I don't know...{w=0.4} I suppose I just panicked..." ("angry", "happyCl", "worried", "mid", emote="sweat")
 
-            if game.daytime:
+            if states.env.daytime:
                 if hermione.is_worn("top"):
                     her "My classes are about to start, and I didn't want to get it on top of my clothes, [name_genie_hermione]..." ("angry", "happyCl", "worried", "mid", emote="sweat")
                     gen "So you'd rather go to class--" ("base", xpos="far_left", ypos="head")
@@ -735,7 +735,7 @@ label hg_pf_handjob_1:
                 her "My clothes are ruined!" ("annoyed", "narrow", "angry", "R")
             else:
                 her "My face... It's been defiled..." ("annoyed", "narrow", "angry", "R")
-            if game.daytime:
+            if states.env.daytime:
                 her "How could you do this to me?" ("angry", "narrow", "worried", "down")
                 her "Classes are about to start, I can't go out looking like this!" ("open", "narrow", "worried", "down")
                 gen "Of course you can." ("base", xpos="far_left", ypos="head")
@@ -1186,7 +1186,7 @@ label hg_pf_handjob_2_cumming:
             with fade
             pause.8
 
-            if game.daytime:
+            if states.env.daytime:
                 her "Well, I think I'd better go now...{w=0.4} My classes are about to start." ("open", "base", "base", "R", xpos="right", ypos="base")
             else:
                 her "Well, I think I'd better go now...{w=0.4} It's getting late." ("open", "base", "base", "R", xpos="right", ypos="base")
@@ -1324,7 +1324,7 @@ label hg_pf_handjob_2_cumming:
             gen "Well, the deed is done, and you're perfectly clean." ("base", xpos="far_left", ypos="head")
             her "Yes! I know! It's so much easier this way!" ("grin", "closed", "worried", "down")
 
-            if game.daytime:
+            if states.env.daytime:
                 her "I can just go to classes now as if nothing ever happened." ("grin", "squint", "base", "mid")
             else:
                 her "I can just go and spend some time with the guys in the common room now and nobody will know..." ("base", "narrow", "worried", "down")
diff --git a/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy b/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy
index d54d9790..0d2cd345 100644
--- a/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy
+++ b/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy
@@ -52,7 +52,7 @@ label end_hg_pf_titjob:
 
     her "Thank you, [name_genie_hermione]..." ("soft", "base", "base", "R")
 
-    if game.daytime:
+    if states.env.daytime:
         her "Classes are about to start..."
     else:
         her "It's getting late..."
@@ -446,7 +446,7 @@ label hg_pf_titjob_1:
     her "Are you almost...{w=0.3} there?" ("open", "base", "base", "mid")
     gen "Almost there? Why you've only just started, [name_hermione_genie]..." ("base", xpos="far_left", ypos="head")
     show her_titjob_personal h7 as cg
-    if game.daytime:
+    if states.env.daytime:
         her "Well, it's just that...{w=0.3} my classes are about to start..." ("upset", "wink", "base", "mid")
     else:
         her "Well, it's just that...{w=0.3} I promised I would meet up with a friend tonight..." ("upset", "wink", "base", "mid")
@@ -650,7 +650,7 @@ label hg_pf_titjob_1:
             her "But that doesn't change the fact that I still failed..." ("annoyed", "narrow", "base", "R", emote="sweat")
             gen "(She sounds like she's just failed a test...)" ("base", xpos="far_left", ypos="head")
             her "I mean, the most optimal thing would've been to swallow it all." ("base", "narrow", "base", "down", emote="sweat")
-            if game.daytime:
+            if states.env.daytime:
                 her "That way, I don't have to go to class, smelling like semen..." ("open", "closed", "base", "mid", emote="sweat")
             else:
                 her "That way, I don't have to go through the common-room, smelling like semen..." ("angry", "happyCl", "worried", "mid", emote="sweat")
@@ -658,7 +658,7 @@ label hg_pf_titjob_1:
             her "Of course, [name_genie_hermione]... I always strive to achieve the highest level of excellence in any task I am given." ("open", "closed", "base", "mid")
             gen "Well, I'm sure you'll do better next time..." ("base", xpos="far_left", ypos="head")
             her "Most certainly..." ("soft", "narrow", "base", "down")
-            if game.daytime:
+            if states.env.daytime:
                 her "{size=-2}Maybe if I skip breakfast... Or practice relaxing my throat...{/size}" ("base", "narrow", "base", "down")
             else:
                 her "{size=-2}Maybe if I skip dinner... Or practice relaxing my throat...{/size}" ("base", "narrow", "base", "down")
@@ -713,7 +713,7 @@ label hg_pf_titjob_1:
                 her @ cheeks blush "Right..." ("disgust", "narrow", "base", "down")
                 her @ cheeks blush "Still..." ("annoyed", "narrow", "base", "down")
 
-            if game.daytime:
+            if states.env.daytime:
                 her "I can't exactly attend classes looking like this..." ("angry", "happyCl", "worried", "down")
             else:
                 her "How am I supposed to go back to the Gryffindor common-room, looking like this?!" ("angry", "happyCl", "worried", "mid")
@@ -1104,7 +1104,7 @@ label hg_pf_titjob_2_cumming:
             call bld
             nar "Hermione releases your cock from between her tits."
 
-            if game.daytime:
+            if states.env.daytime:
                 her "Well then, I think I'd better go... My classes are about to begin." ("base", "base", "base", "mid")
             else:
                 her "Well then, I think I'd better go... It's getting late." ("base", "base", "base", "mid")
diff --git a/game/scripts/characters/hermione/events/favors/grope_her.rpy b/game/scripts/characters/hermione/events/favors/grope_her.rpy
index 434cbddf..93d360a7 100644
--- a/game/scripts/characters/hermione/events/favors/grope_her.rpy
+++ b/game/scripts/characters/hermione/events/favors/grope_her.rpy
@@ -64,7 +64,7 @@ label end_hg_pf_grope:
         her ".................." ("soft", "narrow", "annoyed", "up")
         her "Thank you, [name_genie_hermione]..." ("soft", "narrow", "base", "mid_soft")
 
-    if game.daytime:
+    if states.env.daytime:
         her "Now, if you don't mind, I'd better go. My classes are about to start."
     else:
         her "I'd better go now. It's getting pretty late..."
diff --git a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy
index 8b5be7c8..16bc692d 100644
--- a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy
+++ b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy
@@ -357,7 +357,7 @@ label hg_pf_grope_breasts_T4_continue:
     gen "I think you like me squeezing your tits like this." ("base", xpos="far_left", ypos="head")
     her "[name_genie_hermione], please..." ("angry", "narrow", "base", "down")
 
-    if game.daytime:
+    if states.env.daytime:
         her "Classes are about to start..." ("angry", "narrow", "base", "down")
     else:
         her "It's getting late..." ("angry", "narrow", "base", "down")
diff --git a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
index bb4fbeda..37343129 100644
--- a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
+++ b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
@@ -56,7 +56,7 @@ label end_hg_pf_sex:
     her @ cheeks blush "Did you need anything else?" ("normal", "base", "base", "mid")
     gen "No, that shall do for today..." ("base", xpos="far_left", ypos="head")
     her @ cheeks blush "Okay..." ("soft", "base", "base", "R")
-    if game.daytime:
+    if states.env.daytime:
         her @ cheeks blush "I'll head back to class then." ("open", "base", "base", "R")
     else:
         her @ cheeks blush "I'll head off to bed then..." ("open", "base", "base", "mid")
@@ -144,7 +144,7 @@ label hg_pf_sex_T3_E1:
     gen "Let's cut the bullshit, and get to why we're both here!" ("base", xpos="far_left", ypos="head")
     her "What do you--" ("angry", "base", "base", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         gen "Let's fuck until sunrise!" ("base", xpos="far_left", ypos="head")
     else:
         gen "Let's fucking until the sun sets!" ("base", xpos="far_left", ypos="head")
@@ -786,7 +786,7 @@ label hg_sex_1:
     show her_sex_personal mouth_angry eyebrows_worried eyes_narrow_down cheeks_blush as cg
     her "*Ah-ah*...{heart}"
 
-    if game.daytime:
+    if states.env.daytime:
         gen "Going to classes after this?"
     else:
         gen "Going to bed after this?"
@@ -915,7 +915,7 @@ label hg_sex_1:
             her "Although my legs are still shaking...{heart}"
             call ctc
 
-            if game.daytime:
+            if states.env.daytime:
                 show her_sex_personal mouth_soft eyebrows_worried eyes_narrow_mid cheeks_blush as cg
                 her "But I think I will be able to make it to my classes..."
             else:
diff --git a/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy b/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy
index da346c06..7f2334bd 100644
--- a/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy
+++ b/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy
@@ -612,7 +612,7 @@ label hg_anal_sex_1_intro:
             show her_sex_personal mouth_base eyes_narrow_down eyebrows_base cheeks_blush as cg
             her "If I can..."
 
-            if game.daytime:
+            if states.env.daytime:
                 show her_sex_personal mouth_soft eyes_narrow_l eyebrows_base cheeks_blush as cg
                 her "I hope it won't start leaking too much during my classes..."
             else:
@@ -1149,7 +1149,7 @@ label hg_anal_sex_2_intro:
             her "Or maybe not..."
             show her_sex_personal mouth_grin eyes_narrow_down eyebrows_worried cheeks_blush tears_soft as cg
             her "Everything is in a daze...{w=0.3} And my legs feel so weak..."
-            if game.daytime:
+            if states.env.daytime:
                 gen "Well you better get on your feet, so you can receive your payment, [name_hermione_genie]... You've still got lessons to get to."
             else:
                 gen "Then I better get to awarding you your points, so you can get some rest..."
@@ -1279,7 +1279,7 @@ label hg_anal_sex_3:
             her "They--{w=0.2} *Ah*...{w=0.4} They wouldn't..."
             gen "Are you sure? I mean, it's not like the door is locked or anything..."
             gen "Anyone could walk in here!"
-            if game.daytime:
+            if states.env.daytime:
                 random:
                     block:
                         show her_sex_personal mouth_soft eyes_narrow_down eyebrows_base cheeks_blush as cg
@@ -1604,7 +1604,7 @@ label hg_anal_sex_3:
             gen "[name_hermione_genie]?"
             show her_sex_personal mouth_base eyes_narrow_down eyebrows_base cheeks_blush as cg
             her "..."
-            if game.daytime:
+            if states.env.daytime:
                 gen "You've got classes to get to..."
             else:
                 gen "*Err*... Perhaps you should go get some rest..."
diff --git a/game/scripts/characters/hermione/events/favors/luna_threesome.txt b/game/scripts/characters/hermione/events/favors/luna_threesome.txt
index c588b4a3..61fca1f1 100644
--- a/game/scripts/characters/hermione/events/favors/luna_threesome.txt
+++ b/game/scripts/characters/hermione/events/favors/luna_threesome.txt
@@ -28,7 +28,7 @@ label hg_sex_luna:
     her "Does it--{heart} *Ah*...{heart}" ("open", "happyCl", "worried", "mid")
     her "That's all because of you [genie_name]...{heart}" ("shock", "happyCl", "worried", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         her "I've been... looking forward to this all morning...{heart}" ("silly", "narrow", "annoyed", "up")
     else:
         her "I've been... looking forward to this all day...{heart}" ("silly", "narrow", "annoyed", "up")
diff --git a/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy b/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy
index 05754b52..6965edc4 100644
--- a/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy
+++ b/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy
@@ -54,7 +54,7 @@ label end_hg_pf_admire_panties:
             her "Except that I can't actually tell them about any of this..." ("annoyed", "narrow", "angry", "R")
 
     pause 1.0
-    if game.daytime:
+    if states.env.daytime:
         her "Well, my classes are about to start..." ("open", "closed", "base", "mid")
     else:
         her "It's getting pretty late, [name_genie_hermione]..." ("open", "closed", "base", "mid")
diff --git a/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy b/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy
index b8f26ae5..f23842a5 100644
--- a/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy
+++ b/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy
@@ -55,7 +55,7 @@ label end_hg_pf_admire_breasts:
         her ".................." ("base", "happyCl", "base", "mid")
         her "Thank you, [name_genie_hermione]..." ("soft", "narrow", "base", "mid_soft")
 
-    if game.daytime:
+    if states.env.daytime:
         her "Now if you don't mind, I'd better go... My classes are about to start."
     else:
         her "I'd better head off for today, It's getting pretty late..."
diff --git a/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy b/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy
index 61022266..9d16b35d 100644
--- a/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy
+++ b/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy
@@ -621,7 +621,7 @@ label hg_pf_admire_breasts_T4_touch: # Call label
     nar "You pull her breasts in opposite directions, and then squish them together..."
 
     her @ cheeks blush "*Ah*...{heart} [name_genie_hermione]... I really need to go." ("angry", "narrow", "base", "up")
-    if game.daytime:
+    if states.env.daytime:
         her @ cheeks blush "Classes are about to start..." ("angry", "narrow", "base", "R")
     else:
         her @ cheeks blush "It is getting late..." ("open", "narrow", "base", "R")
diff --git a/game/scripts/characters/hermione/events/favors/suck_it.rpy b/game/scripts/characters/hermione/events/favors/suck_it.rpy
index 9dd9c649..f5537c40 100644
--- a/game/scripts/characters/hermione/events/favors/suck_it.rpy
+++ b/game/scripts/characters/hermione/events/favors/suck_it.rpy
@@ -723,7 +723,7 @@ label hg_pf_blowjob_1:
             her "My stomach is so full..." ("soft", "closed", "annoyed", "up")
             gen "You did get fed, I fed you with my cum!" ("grin", xpos="far_left", ypos="head")
 
-            if game.daytime:
+            if states.env.daytime:
                 her "I suppose you did... I think I may skip lunch today..." ("soft", "closed", "base", "up")
             else:
                 her "I suppose you did... I think I may skip supper tonight..." ("soft", "narrow", "annoyed", "up")
@@ -757,7 +757,7 @@ label hg_pf_blowjob_1:
             gen "Alright, I'm done..." ("base", xpos="far_left", ypos="head")
             her "................." ("disgust", "base", "base", "mid")
 
-            if game.daytime:
+            if states.env.daytime:
                 her "My classes are about to start..." ("disgust", "narrow", "base", "down")
             else:
                 her "I just took a shower recently..." ("open", "base", "base", "mid")
@@ -776,7 +776,7 @@ label hg_pf_blowjob_1:
             her "No, thanks!" ("angry", "happyCl", "worried", "mid", emote="sweat")
 
             stop music fadeout 1.0
-            if game.daytime:
+            if states.env.daytime:
                 gen "Very well... Then quickly clean yourself up, or you'll be late for your classes..." ("base", xpos="far_left", ypos="head")
             else:
                 gen "Very well... Then quickly clean yourself up and head to bed..." ("base", xpos="far_left", ypos="head")
@@ -807,7 +807,7 @@ label hg_pf_hidden_blowjob:
     her "{size=+7}!!!{/size}" ("open_wide_tongue", "squint", "base", "stare")
     gen "*Hmm*?!" ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         gen "Who could that be?" ("base", xpos="far_left", ypos="head")
     else:
         gen "Who could that be at this hour?" ("base", xpos="far_left", ypos="head")
@@ -930,7 +930,7 @@ label hg_hidden_blowjob_snape:
     gen "Certainly... I've got her covered--{w=0.2} I mean it! I've got it, covered!" ("angry", xpos="far_left", ypos="head")
     sna "Good... That is all I wanted to hear." ("snape_06")
 
-    if game.daytime:
+    if states.env.daytime:
         gen "Well, have a good day, Severus." ("base", xpos="far_left", ypos="head")
         sna "Yes, thank you." ("snape_06")
     else:
@@ -972,7 +972,7 @@ label hg_hidden_blowjob_luna: #TODO Once Luna X Hermione sex scenes are added, a
         "\"I am busy right now, Miss Lovegood.\"":
             her "{size=-2}Thank you, [name_genie_hermione]{/size}." ("angry", "base", "base", "mid")
             lun "Oh... I suppose I'll visit you later then, sir."
-            if game.daytime:
+            if states.env.daytime:
                 lun "Have a good day!"
             else:
                 lun "Have a good night!"
@@ -1103,7 +1103,7 @@ label hg_hidden_blowjob_luna: #TODO Once Luna X Hermione sex scenes are added, a
     gen "Give her my thanks, Miss Lovegood." ("grin", xpos="far_left", ypos="head")
     lun "Certainly, sir." ("base", "base", "base", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         lun "Have a nice day!" ("base", "base", "base", "R")
     else:
         lun "Good night!" ("base", "base", "base", "mid")
@@ -1145,7 +1145,7 @@ label hg_hidden_blowjob_tonks:
             ton "Busy?"
             ton "Could it be..."
             ton "Is Snape with you?"
-            if game.daytime:
+            if states.env.daytime:
                 ton "Are you two having one of your silly little duels again?"
             else:
                 ton "Don't stay up drinking again..."
@@ -1215,7 +1215,7 @@ label hg_hidden_blowjob_tonks:
 
     call ton_walk("mid","base")
 
-    if game.daytime:
+    if states.env.daytime:
         ton "Hello, Sir." ("base", "base", "base", "mid", xpos="right", ypos="base", trans=d3)
     else:
         ton "Good evening, Sir." ("base", "base", "shocked", "mid", xpos="right", ypos="base", trans=d3)
@@ -1375,7 +1375,7 @@ label hg_hidden_blowjob_tonks:
         gen "The more, the merrier!" ("grin", xpos="far_left", ypos="head")
 
     ton "I'm sorry, Professor... I'm already pre-occupied with something..." ("open", "narrow", "base", "R")
-    if game.daytime:
+    if states.env.daytime:
         ton "I'm currently teaching a class, how to cast a simple deflection spell..." ("open", "base", "raised", "down")
     else:
         ton "I'm preparing some material, on how to cast a simple deflection spell..." ("open", "base", "raised", "down")
@@ -1415,7 +1415,7 @@ label hg_hidden_blowjob_tonks:
     ton "Make sure she swallows for me." ("horny", "base", "base", "mid")
     gen "Every last drop!" ("grin", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         ton "See you in class, {i}Parseltongue{/i}!" ("horny", "base", "angry", "down")
     else:
         ton "Have a good night, {i}Parseltongue{/i}!" ("horny", "base", "annoyed", "down")
@@ -1502,7 +1502,7 @@ label hg_hidden_blowjob_cumming:
                 block:
                     her "I suppose I wouldn't mind if you came in my mouth..." ("base", "narrow", "base", "down")
                     gen "Oh?" ("base", xpos="far_left", ypos="head")
-                    if game.daytime:
+                    if states.env.daytime:
                         her "I mean, since this has taken so long, I'm sure I've missed lunch..." ("soft", "closed", "base", "mid")
                     else:
                         her "I mean, I need to go to bed soon... I'd rather not spend time cleaning up...." ("open", "closed", "base", "mid")
@@ -1601,7 +1601,7 @@ label hg_hidden_blowjob_cumming:
                 her "It's fine [name_genie_hermione]... I don't mind..." ("base", "narrow", "base", "dead")
             if _mouth:
                 her "You allowed me ample time to prepare myself..." ("grin", "narrow", "base", "dead")
-            if game.daytime:
+            if states.env.daytime:
                 gen "So, will you be skipping lunch today?" ("base", xpos="far_left", ypos="head")
                 her "Yes, most likely..." ("grin", "narrow", "base", "dead")
             her "How come you always cum so much, [name_genie_hermione]..." ("open", "wink", "base", "mid")
@@ -1610,7 +1610,7 @@ label hg_hidden_blowjob_cumming:
             her @ cheeks blush "May I get paid now?" ("soft", "wink", "base", "mid")
 
             if states.her.tier >= 6:
-                if game.daytime:
+                if states.env.daytime:
                     gen "You want points, even though I just gave you lunch?" ("base", xpos="far_left", ypos="head")
                 else:
                     gen "You want points, even though I fed you dinner?" ("base", xpos="far_left", ypos="head")
@@ -2044,7 +2044,7 @@ label hg_pf_blowjob_2:
 
             her @ tears mascara "*Shakes her head from side to side*" ("full_cum", "narrow", "base", "dead")
 
-            if game.daytime:
+            if states.env.daytime:
                 gen "So, you're going to leave my office, with a mouth full of cum?" ("base", xpos="far_left", ypos="head")
             else:
                 gen "So, you're going to go to sleep, with a mouth full of cum?" ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
index 5ec2abaa..d825fab8 100644
--- a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
+++ b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy
@@ -765,7 +765,7 @@ label hg_pf_talk_tonks:
 
     ton @ hair basic "" ("base", "base", "base", "mid", xpos=600, ypos="base", trans=d3)
     her "" ("base", "base", "base", "mid", xpos="right", ypos="base", trans=d3)
-    if game.daytime:
+    if states.env.daytime:
         gen "Good day, Miss Tonks." ("base", xpos="far_left", ypos="head")
         ton "Good day, Professor." ("base", "happyCl", "base", "mid")
     else:
@@ -1161,7 +1161,7 @@ label hg_pf_talk_tonks:
                 ton @ hair basic "Right..." ("open", "closed", "raised", "mid")
                 ton "Well, then... I think we're done here..." ("base", "narrow", "raised", "R")
                 her @ cheeks blush "..." ("normal", "base", "base", "R")
-                if game.daytime:
+                if states.env.daytime:
                     ton "I'll leave you two to it, have a lovely day, Miss Granger." ("base", "base", "base", "L")
                     her "Good day, professor." ("soft", "base", "base", "R")
                 else:
@@ -1186,7 +1186,7 @@ label hg_pf_talk_tonks:
 
                 ton "Well then, I think we're done here." ("open", "base", "worried", "mid")
                 ton "I'll leave you two to it..." ("base", "base", "base", "mid")
-                if game.daytime:
+                if states.env.daytime:
                     ton "Have a good day, Miss Granger." ("base", "base", "base", "L")
                     her "Good day, professor." ("open", "base", "base", "R")
                 else:
@@ -1220,7 +1220,7 @@ label hg_pf_talk_tonks:
                     ton "I've thoroughly enjoyed our little chat, either way." ("base", "base", "base", "L")
                     gen "Good to hear." ("grin", xpos="far_left", ypos="head")
                     ton "I'll leave you two to it..." ("base", "base", "base", "mid")
-                    if game.daytime:
+                    if states.env.daytime:
                         ton "Have a good day, Miss Granger." ("base", "base", "base", "L")
                         her "Good day, Professor Tonks." ("open", "base", "base", "R")
                     else:
@@ -1343,7 +1343,7 @@ label hg_pf_talk_tonks:
                         her @ cheeks blush "Thank you, Professor..." ("base", "base", "base", "R")
 
                     ton @ hair basic "I'll leave you two to it..." ("base", "base", "base", "mid")
-                    if game.daytime:
+                    if states.env.daytime:
                         ton "Have a good day, Miss Granger." ("base", "base", "base", "L")
                         her "Good day, professor." ("open", "base", "base", "R")
                     else:
diff --git a/game/scripts/characters/hermione/events/intro.rpy b/game/scripts/characters/hermione/events/intro.rpy
index 50d63e0c..01c141cb 100644
--- a/game/scripts/characters/hermione/events/intro.rpy
+++ b/game/scripts/characters/hermione/events/intro.rpy
@@ -1038,7 +1038,7 @@ label nt_he_hermione_E1:
         ton @ hair horny "Unless that's something you're into..." ("horny", "narrow", "base", "mid") # looks at Genie
         play sound "sounds/gulp.ogg"#Genie gulps
         gen "..." ("angry", xpos="far_left", ypos="head")
-        if game.daytime:
+        if states.env.daytime:
             nar "You spend the afternoon talking about how big your feet are, and its implications..."
         else:
             nar "You spend the evening talking about how big your feet are, and its implications..."
@@ -1077,7 +1077,7 @@ label nt_he_hermione_E1:
     ton "And the mortality rate..." ("upset", "base", "worried", "R")
     ton "If I had known the benefits of being a teacher at Hogwarts, I would have signed up straight away!" ("horny", "base", "base", "up")
 
-    if game.daytime:
+    if states.env.daytime:
         nar "You spend the afternoon conspiring against Hermione with Tonks..."
     else:
         nar "You spend the evening conspiring against Hermione with Tonks..."
diff --git a/game/scripts/characters/hermione/events/items/butt_plugs.rpy b/game/scripts/characters/hermione/events/items/butt_plugs.rpy
index 16bedde1..b6b1c070 100644
--- a/game/scripts/characters/hermione/events/items/butt_plugs.rpy
+++ b/game/scripts/characters/hermione/events/items/butt_plugs.rpy
@@ -1,6 +1,6 @@
-default ev_her_small_plug = Event(id="ev_her_small_plug", label="hg_butt_plugs_small_return", req="game.daytime==False")
-default ev_her_medium_plug = Event(id="ev_her_medium_plug", label="hg_butt_plugs_medium_return", req="game.daytime==False")
-default ev_her_large_plug = Event(id="ev_her_large_plug", label="hg_butt_plugs_large_return", req="game.daytime==False")
+default ev_her_small_plug = Event(id="ev_her_small_plug", label="hg_butt_plugs_small_return", req="states.env.daytime==False")
+default ev_her_medium_plug = Event(id="ev_her_medium_plug", label="hg_butt_plugs_medium_return", req="states.env.daytime==False")
+default ev_her_large_plug = Event(id="ev_her_large_plug", label="hg_butt_plugs_large_return", req="states.env.daytime==False")
 
 label hg_butt_plugs_fail:
     jump end_hermione_event
diff --git a/game/scripts/characters/hermione/events/items/collars.rpy b/game/scripts/characters/hermione/events/items/collars.rpy
index 8a0323ee..f820e8e8 100644
--- a/game/scripts/characters/hermione/events/items/collars.rpy
+++ b/game/scripts/characters/hermione/events/items/collars.rpy
@@ -468,7 +468,7 @@ label slut_scene:
     her @ cheeks blush "...{w} Yes [name_genie_hermione]." ("annoyed", "narrow", "base", "R")
     gen "Well then...{w=0.4} Get going." ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         her @ cheeks blush "Bye then... [name_genie_hermione]." ("open", "narrow", "base", "mid_soft")
     else:
         her "Good night then... [name_genie_hermione]." ("base", "narrow", "base", "mid_soft")
@@ -1171,7 +1171,7 @@ label flasher_scene:
 
         call give_reward("A new collar has been unlocked in the wardrobe!")
 
-    if game.daytime:
+    if states.env.daytime:
         her @ cheeks blush "Have a Good day." ("soft", "base", "base", "R")
         gen "Good day... [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
     else:
@@ -1286,7 +1286,7 @@ label good_girl_scene:
 
         call give_reward("A new collar has been unlocked in the wardrobe!")
 
-    if game.daytime:
+    if states.env.daytime:
         her "Have a Good day." ("grin", "base", "base", "mid")
     else:
         her "Have a Good night." ("grin", "base", "base", "mid")
diff --git a/game/scripts/characters/hermione/events/items/vibrators.rpy b/game/scripts/characters/hermione/events/items/vibrators.rpy
index cfcba914..ae478f50 100644
--- a/game/scripts/characters/hermione/events/items/vibrators.rpy
+++ b/game/scripts/characters/hermione/events/items/vibrators.rpy
@@ -1,5 +1,5 @@
 
-default ev_her_vibrators_public_return = Event(id="her_vibrators_public_return", label="hg_vibrators_public_return", req="game.daytime==False")
+default ev_her_vibrators_public_return = Event(id="her_vibrators_public_return", label="hg_vibrators_public_return", req="states.env.daytime==False")
 
 label hg_vibrators:
 
@@ -290,22 +290,22 @@ label hg_vibrators:
     label .choices:
 
     menu:
-        "-Send her out-" if not _temp_lockout and game.daytime:
+        "-Send her out-" if not _temp_lockout and states.env.daytime:
             jump hg_vibrators_public
 
-        "-Send her out-" (style="disabled") if _temp_lockout and game.daytime:
+        "-Send her out-" (style="disabled") if _temp_lockout and states.env.daytime:
             gen "She already said no..." ("base", xpos="far_left", ypos="head")
 
             jump .choices
 
-        "-Send her out-" (style="disabled") if not game.daytime:
+        "-Send her out-" (style="disabled") if not states.env.daytime:
             her "But it's already past curfew..."
             gen "Oh, right..." ("base", xpos="far_left", ypos="head")
             nar "This option is only available during the day."
 
             jump .choices
 
-        "-Finish early-" if _temp_lockout or not game.daytime:
+        "-Finish early-" if _temp_lockout or not states.env.daytime:
             jump her_vibrators_nevermind
 
         "-Have her stay for a personal session-":
@@ -315,7 +315,7 @@ label her_vibrators_nevermind:
     gen "In that case, that shall do for now." ("base", xpos="far_left", ypos="head")
     her "Really?!" ("angry", "base", "base", "mid")
 
-    if not game.daytime:
+    if not states.env.daytime:
         gen "Yes, I've realized that my options are too limited at night." ("base", xpos="far_left", ypos="head")
         her "Options?" ("angry", "base", "base", "mid")
         gen "Yes, I know. It's a difficult concept, but I do in fact have options at times." ("base", xpos="far_left", ypos="head")
@@ -345,7 +345,7 @@ label her_vibrators_nevermind:
     with fade
     pause 1
 
-    if game.daytime:
+    if states.env.daytime:
         her @ cheeks blush "Good day to you, [name_genie_hermione]." ("open", "base", "base", "mid")
         gen "Until next time." ("base", xpos="far_left", ypos="head")
     else:
@@ -795,7 +795,7 @@ label hg_vibrators_personal:
         stop music fadeout 1
 
         #Hermione legs closed
-        if game.daytime:
+        if states.env.daytime:
             show her_vibrators_personal hermione1 noshake eyebrows_upset eyes_squint_right mouth_annoyed zorder 15 as cg with fade
         else:
             show her_vibrators_personal hermione1 noshake eyebrows_upset eyes_squint_right mouth_annoyed zorder 15 as cg at color_temperature(1.0) with fade
diff --git a/game/scripts/characters/hermione/events/odd_jobs/init.rpy b/game/scripts/characters/hermione/events/odd_jobs/init.rpy
index 2202c7b1..8fdd4a95 100644
--- a/game/scripts/characters/hermione/events/odd_jobs/init.rpy
+++ b/game/scripts/characters/hermione/events/odd_jobs/init.rpy
@@ -1,17 +1,17 @@
 init offset = 5
 
-default her_ev_maid_job_return = Event(id="her_ev_maid_job_return", label="her_maid_job_return", priority=5, req="not game.daytime")
+default her_ev_maid_job_return = Event(id="her_ev_maid_job_return", label="her_maid_job_return", priority=5, req="not states.env.daytime")
 default her_eventqueue_jobs_maid = EventQueue("her_eventqueue_jobs_maid")
 default her_ev_maid_job_hub = Event(id="her_ev_maid_job_hub", label="her_maid_job", priority=5, req="her_outfit_maid.unlocked", repeat=True, autoenqueue=True, autodequeue=False, queue="her_eventqueue_jobs_maid", subevents=["her_ev_maid_job_return"])
 
-default her_ev_promoter_job_return = Event(id="her_ev_promoter_job_return", label="her_promoter_job_return", priority=5, req="not game.daytime")
+default her_ev_promoter_job_return = Event(id="her_ev_promoter_job_return", label="her_promoter_job_return", priority=5, req="not states.env.daytime")
 default her_eventqueue_jobs_promoter = EventQueue("her_eventqueue_jobs_promoter")
 default her_ev_promoter_job_hub = Event(id="her_ev_promoter_job_hub", label="her_promoter_job", priority=5, req="states.her.ev.promote_cardgame.offered and poker_outfit_ITEM.unlocked", repeat=True, autoenqueue=True, autodequeue=False, queue="her_eventqueue_jobs_promoter", subevents=["her_ev_promoter_job_return"])
 
 default her_eventqueue_panty_thief = EventQueue("her_eventqueue_panty_thief")
 default her_ev_panty_thief_t1_e1 = Event(id="her_ev_panty_thief_t1_e1", label="hg_pr_panty_thief_T1_E1", req="states.her.tier == 1", autoenqueue=True, autodequeue=False, queue="her_eventqueue_panty_thief")
 default her_ev_panty_thief_t2_e1 = Event(id="her_ev_panty_thief_t2_e1", label="hg_pr_panty_thief_T2_E1", req="states.her.tier == 2", autoenqueue=True, autodequeue=False, queue="her_eventqueue_panty_thief")
-default her_ev_panty_thief_t3_e1 = Event(id="her_ev_panty_thief_t3_e1", label="hg_pr_panty_thief_e1_return", req="game.daytime==False")
+default her_ev_panty_thief_t3_e1 = Event(id="her_ev_panty_thief_t3_e1", label="hg_pr_panty_thief_e1_return", req="states.env.daytime==False")
 default her_ev_panty_thief_t3_e1_hub = Event(id="her_ev_panty_thief_t3_e1_hub", label="hg_pr_panty_thief_e1", req="states.her.tier >= 3", autoenqueue=True, autodequeue=False, queue="her_eventqueue_panty_thief", subevents=["her_ev_panty_thief_t3_e1"])
 
 define hermione_jobs = [
diff --git a/game/scripts/characters/hermione/events/tentacles.rpy b/game/scripts/characters/hermione/events/tentacles.rpy
index 5be634bf..b646af71 100644
--- a/game/scripts/characters/hermione/events/tentacles.rpy
+++ b/game/scripts/characters/hermione/events/tentacles.rpy
@@ -82,7 +82,7 @@ label tentacle_scene_intro:
         gen "(Ah, that's it... It's supposed to turn me into some sort of magical tentacle plant...)" ("base", xpos="far_left", ypos="head")
         gen "(I have everything I need to perform the ritual and have some fun with Hermione.)" ("base", xpos="far_left", ypos="head")
 
-        if not game.daytime:
+        if not states.env.daytime:
             gen "(*Hmm*... But it's too late for me to use it now. I should do it at dawn, before class has started.)" ("base", xpos="far_left", ypos="head")
             jump main_room_menu
         elif states.her.busy:
diff --git a/game/scripts/characters/hermione/requests.rpy b/game/scripts/characters/hermione/requests.rpy
index a2fcd600..a6d1f873 100644
--- a/game/scripts/characters/hermione/requests.rpy
+++ b/game/scripts/characters/hermione/requests.rpy
@@ -1,14 +1,14 @@
 # Public requests
 
-default her_ev_flirt_students_t1_e1 = Event(id="her_ev_flirt_students_t1_e1", label="hg_pr_flirt_T1_E1", req="game.daytime == False")
-default her_ev_flirt_students_t1_e2 = Event(id="her_ev_flirt_students_t1_e2", label="hg_pr_flirt_T1_E2", req="game.daytime == False")
-default her_ev_flirt_students_t1_e3 = Event(id="her_ev_flirt_students_t1_e3", label="hg_pr_flirt_T1_E3", req="game.daytime == False")
-default her_ev_flirt_students_t2_e1 = Event(id="her_ev_flirt_students_t2_e1", label="hg_pr_flirt_T2_E1", req="game.daytime == False")
-default her_ev_flirt_students_t2_e2 = Event(id="her_ev_flirt_students_t2_e2", label="hg_pr_flirt_T2_E2", req="game.daytime == False")
-default her_ev_flirt_students_t2_e3 = Event(id="her_ev_flirt_students_t2_e3", label="hg_pr_flirt_T2_E3", req="game.daytime == False")
-default her_ev_flirt_students_t3_e1 = Event(id="her_ev_flirt_students_t3_e1", label="hg_pr_flirt_T3_E1", req="game.daytime == False")
-default her_ev_flirt_students_t3_e2 = Event(id="her_ev_flirt_students_t3_e2", label="hg_pr_flirt_T3_E2", req="game.daytime == False")
-default her_ev_flirt_students_t3_e3 = Event(id="her_ev_flirt_students_t3_e3", label="hg_pr_flirt_T3_E3", req="game.daytime == False")
+default her_ev_flirt_students_t1_e1 = Event(id="her_ev_flirt_students_t1_e1", label="hg_pr_flirt_T1_E1", req="states.env.daytime == False")
+default her_ev_flirt_students_t1_e2 = Event(id="her_ev_flirt_students_t1_e2", label="hg_pr_flirt_T1_E2", req="states.env.daytime == False")
+default her_ev_flirt_students_t1_e3 = Event(id="her_ev_flirt_students_t1_e3", label="hg_pr_flirt_T1_E3", req="states.env.daytime == False")
+default her_ev_flirt_students_t2_e1 = Event(id="her_ev_flirt_students_t2_e1", label="hg_pr_flirt_T2_E1", req="states.env.daytime == False")
+default her_ev_flirt_students_t2_e2 = Event(id="her_ev_flirt_students_t2_e2", label="hg_pr_flirt_T2_E2", req="states.env.daytime == False")
+default her_ev_flirt_students_t2_e3 = Event(id="her_ev_flirt_students_t2_e3", label="hg_pr_flirt_T2_E3", req="states.env.daytime == False")
+default her_ev_flirt_students_t3_e1 = Event(id="her_ev_flirt_students_t3_e1", label="hg_pr_flirt_T3_E1", req="states.env.daytime == False")
+default her_ev_flirt_students_t3_e2 = Event(id="her_ev_flirt_students_t3_e2", label="hg_pr_flirt_T3_E2", req="states.env.daytime == False")
+default her_ev_flirt_students_t3_e3 = Event(id="her_ev_flirt_students_t3_e3", label="hg_pr_flirt_T3_E3", req="states.env.daytime == False")
 
 default her_eventqueue_flirt_students = EventQueue("her_eventqueue_flirt_students")
 default her_ev_flirt_students_t1_e1_hub = Event(id="her_ev_flirt_students_t1_e1_hub", label="hg_pr_flirt", req="states.her.tier == 1", autoenqueue=True, autodequeue=False, queue="her_eventqueue_flirt_students", subevents=["her_ev_flirt_students_t1_e1"])
@@ -21,15 +21,15 @@ default her_ev_flirt_students_t3_e1_hub = Event(id="her_ev_flirt_students_t3_e1_
 default her_ev_flirt_students_t3_e2_hub = Event(id="her_ev_flirt_students_t3_e2_hub", label="hg_pr_flirt", req="states.her.tier >= 3", autoenqueue=True, autodequeue=False, queue="her_eventqueue_flirt_students", subevents=["her_ev_flirt_students_t3_e2"])
 default her_ev_flirt_students_t3_e3_hub = Event(id="her_ev_flirt_students_t3_e3_hub", label="hg_pr_flirt", req="states.her.tier >= 3", autoenqueue=True, autodequeue=False, queue="her_eventqueue_flirt_students", subevents=["her_ev_flirt_students_t3_e3"])
 
-default her_ev_flirt_teachers_t1_e1 = Event(id="her_ev_flirt_teachers_t1_e1", label="hg_pr_flirt_teacher_T1_E1", req="game.daytime == False")
-default her_ev_flirt_teachers_t1_e2 = Event(id="her_ev_flirt_teachers_t1_e2", label="hg_pr_flirt_teacher_T1_E2", req="game.daytime == False")
-default her_ev_flirt_teachers_t1_e3 = Event(id="her_ev_flirt_teachers_t1_e3", label="hg_pr_flirt_teacher_T1_E3", req="game.daytime == False")
-default her_ev_flirt_teachers_t2_e1 = Event(id="her_ev_flirt_teachers_t2_e1", label="hg_pr_flirt_teacher_T2_E1", req="game.daytime == False")
-default her_ev_flirt_teachers_t2_e2 = Event(id="her_ev_flirt_teachers_t2_e2", label="hg_pr_flirt_teacher_T2_E2", req="game.daytime == False")
-default her_ev_flirt_teachers_t2_e3 = Event(id="her_ev_flirt_teachers_t2_e3", label="hg_pr_flirt_teacher_T2_E3", req="game.daytime == False")
-default her_ev_flirt_teachers_t3_e1 = Event(id="her_ev_flirt_teachers_t3_e1", label="hg_pr_flirt_teacher_T3_E1", req="game.daytime == False")
-default her_ev_flirt_teachers_t3_e2 = Event(id="her_ev_flirt_teachers_t3_e2", label="hg_pr_flirt_teacher_T3_E2", req="game.daytime == False")
-default her_ev_flirt_teachers_t3_e3 = Event(id="her_ev_flirt_teachers_t3_e3", label="hg_pr_flirt_teacher_T3_E3", req="game.daytime == False")
+default her_ev_flirt_teachers_t1_e1 = Event(id="her_ev_flirt_teachers_t1_e1", label="hg_pr_flirt_teacher_T1_E1", req="states.env.daytime == False")
+default her_ev_flirt_teachers_t1_e2 = Event(id="her_ev_flirt_teachers_t1_e2", label="hg_pr_flirt_teacher_T1_E2", req="states.env.daytime == False")
+default her_ev_flirt_teachers_t1_e3 = Event(id="her_ev_flirt_teachers_t1_e3", label="hg_pr_flirt_teacher_T1_E3", req="states.env.daytime == False")
+default her_ev_flirt_teachers_t2_e1 = Event(id="her_ev_flirt_teachers_t2_e1", label="hg_pr_flirt_teacher_T2_E1", req="states.env.daytime == False")
+default her_ev_flirt_teachers_t2_e2 = Event(id="her_ev_flirt_teachers_t2_e2", label="hg_pr_flirt_teacher_T2_E2", req="states.env.daytime == False")
+default her_ev_flirt_teachers_t2_e3 = Event(id="her_ev_flirt_teachers_t2_e3", label="hg_pr_flirt_teacher_T2_E3", req="states.env.daytime == False")
+default her_ev_flirt_teachers_t3_e1 = Event(id="her_ev_flirt_teachers_t3_e1", label="hg_pr_flirt_teacher_T3_E1", req="states.env.daytime == False")
+default her_ev_flirt_teachers_t3_e2 = Event(id="her_ev_flirt_teachers_t3_e2", label="hg_pr_flirt_teacher_T3_E2", req="states.env.daytime == False")
+default her_ev_flirt_teachers_t3_e3 = Event(id="her_ev_flirt_teachers_t3_e3", label="hg_pr_flirt_teacher_T3_E3", req="states.env.daytime == False")
 
 default her_eventqueue_flirt_teachers = EventQueue("her_eventqueue_flirt_teachers")
 default her_ev_flirt_teachers_t1_e1_hub = Event(id="her_ev_flirt_teachers_t1_e1_hub", label="hg_pr_flirt_teacher", req="states.her.tier == 1", autoenqueue=True, autodequeue=False, queue="her_eventqueue_flirt_teachers", subevents=["her_ev_flirt_teachers_t1_e1"])
@@ -42,15 +42,15 @@ default her_ev_flirt_teachers_t3_e1_hub = Event(id="her_ev_flirt_teachers_t3_e1_
 default her_ev_flirt_teachers_t3_e2_hub = Event(id="her_ev_flirt_teachers_t3_e2_hub", label="hg_pr_flirt_teacher", req="states.her.tier >= 3", autoenqueue=True, autodequeue=False, queue="her_eventqueue_flirt_teachers", subevents=["her_ev_flirt_teachers_t3_e2"])
 default her_ev_flirt_teachers_t3_e3_hub = Event(id="her_ev_flirt_teachers_t3_e3_hub", label="hg_pr_flirt_teacher", req="states.her.tier >= 3", autoenqueue=True, autodequeue=False, queue="her_eventqueue_flirt_teachers", subevents=["her_ev_flirt_teachers_t3_e3"])
 
-default her_ev_grope_public_t2_e1 = Event(id="her_ev_grope_public_t2_e1", label="hg_pr_grope_T2_E1", req="game.daytime == False")
-default her_ev_grope_public_t2_e2 = Event(id="her_ev_grope_public_t2_e2", label="hg_pr_grope_T2_E2", req="game.daytime == False")
-default her_ev_grope_public_t2_e3 = Event(id="her_ev_grope_public_t2_e3", label="hg_pr_grope_T2_E3", req="game.daytime == False")
-default her_ev_grope_public_t3_e1 = Event(id="her_ev_grope_public_t3_e1", label="hg_pr_grope_T3_E1", req="game.daytime == False")
-default her_ev_grope_public_t3_e2 = Event(id="her_ev_grope_public_t3_e2", label="hg_pr_grope_T3_E2", req="game.daytime == False")
-default her_ev_grope_public_t3_e3 = Event(id="her_ev_grope_public_t3_e3", label="hg_pr_grope_T3_E3", req="game.daytime == False")
-default her_ev_grope_public_t4_e1 = Event(id="her_ev_grope_public_t4_e1", label="hg_pr_grope_T4_E1", req="game.daytime == False")
-default her_ev_grope_public_t4_e2 = Event(id="her_ev_grope_public_t4_e2", label="hg_pr_grope_T4_E2", req="game.daytime == False")
-default her_ev_grope_public_t4_e3 = Event(id="her_ev_grope_public_t4_e3", label="hg_pr_grope_T4_E3", req="game.daytime == False")
+default her_ev_grope_public_t2_e1 = Event(id="her_ev_grope_public_t2_e1", label="hg_pr_grope_T2_E1", req="states.env.daytime == False")
+default her_ev_grope_public_t2_e2 = Event(id="her_ev_grope_public_t2_e2", label="hg_pr_grope_T2_E2", req="states.env.daytime == False")
+default her_ev_grope_public_t2_e3 = Event(id="her_ev_grope_public_t2_e3", label="hg_pr_grope_T2_E3", req="states.env.daytime == False")
+default her_ev_grope_public_t3_e1 = Event(id="her_ev_grope_public_t3_e1", label="hg_pr_grope_T3_E1", req="states.env.daytime == False")
+default her_ev_grope_public_t3_e2 = Event(id="her_ev_grope_public_t3_e2", label="hg_pr_grope_T3_E2", req="states.env.daytime == False")
+default her_ev_grope_public_t3_e3 = Event(id="her_ev_grope_public_t3_e3", label="hg_pr_grope_T3_E3", req="states.env.daytime == False")
+default her_ev_grope_public_t4_e1 = Event(id="her_ev_grope_public_t4_e1", label="hg_pr_grope_T4_E1", req="states.env.daytime == False")
+default her_ev_grope_public_t4_e2 = Event(id="her_ev_grope_public_t4_e2", label="hg_pr_grope_T4_E2", req="states.env.daytime == False")
+default her_ev_grope_public_t4_e3 = Event(id="her_ev_grope_public_t4_e3", label="hg_pr_grope_T4_E3", req="states.env.daytime == False")
 
 default her_eventqueue_grope_public = EventQueue("her_eventqueue_grope_public")
 default her_ev_grope_public_t1_e1_hub = Event(id="her_ev_grope_public_t1_e1_hub", label="hg_pr_grope_fail", req="states.her.tier == 1", autoenqueue=True, autodequeue=False, queue="her_eventqueue_grope_public")
@@ -64,15 +64,15 @@ default her_ev_grope_public_t4_e1_hub = Event(id="her_ev_grope_public_t4_e1_hub"
 default her_ev_grope_public_t4_e2_hub = Event(id="her_ev_grope_public_t4_e2_hub", label="hg_pr_grope", req="states.her.tier >= 4", autoenqueue=True, autodequeue=False, queue="her_eventqueue_grope_public", subevents=["her_ev_grope_public_t4_e2"])
 default her_ev_grope_public_t4_e3_hub = Event(id="her_ev_grope_public_t4_e3_hub", label="hg_pr_grope", req="states.her.tier >= 4", autoenqueue=True, autodequeue=False, queue="her_eventqueue_grope_public", subevents=["her_ev_grope_public_t4_e3"])
 
-default her_ev_flash_public_t3_e1 = Event(id="her_ev_flash_public_t3_e1", label="hg_pr_flash_T3_E1", req="game.daytime == False")
-default her_ev_flash_public_t3_e2 = Event(id="her_ev_flash_public_t3_e2", label="hg_pr_flash_T3_E2", req="game.daytime == False")
-default her_ev_flash_public_t3_e3 = Event(id="her_ev_flash_public_t3_e3", label="hg_pr_flash_T3_E3", req="game.daytime == False")
-default her_ev_flash_public_t4_e1 = Event(id="her_ev_flash_public_t4_e1", label="hg_pr_flash_T4_E1", req="game.daytime == False")
-default her_ev_flash_public_t4_e2 = Event(id="her_ev_flash_public_t4_e2", label="hg_pr_flash_T4_E2", req="game.daytime == False")
-default her_ev_flash_public_t4_e3 = Event(id="her_ev_flash_public_t4_e3", label="hg_pr_flash_T4_E3", req="game.daytime == False")
-default her_ev_flash_public_t5_e1 = Event(id="her_ev_flash_public_t5_e1", label="hg_pr_flash_T5_E1", req="game.daytime == False")
-default her_ev_flash_public_t5_e2 = Event(id="her_ev_flash_public_t5_e2", label="hg_pr_flash_T5_E2", req="game.daytime == False")
-default her_ev_flash_public_t5_e3 = Event(id="her_ev_flash_public_t5_e3", label="hg_pr_flash_T5_E3", req="game.daytime == False")
+default her_ev_flash_public_t3_e1 = Event(id="her_ev_flash_public_t3_e1", label="hg_pr_flash_T3_E1", req="states.env.daytime == False")
+default her_ev_flash_public_t3_e2 = Event(id="her_ev_flash_public_t3_e2", label="hg_pr_flash_T3_E2", req="states.env.daytime == False")
+default her_ev_flash_public_t3_e3 = Event(id="her_ev_flash_public_t3_e3", label="hg_pr_flash_T3_E3", req="states.env.daytime == False")
+default her_ev_flash_public_t4_e1 = Event(id="her_ev_flash_public_t4_e1", label="hg_pr_flash_T4_E1", req="states.env.daytime == False")
+default her_ev_flash_public_t4_e2 = Event(id="her_ev_flash_public_t4_e2", label="hg_pr_flash_T4_E2", req="states.env.daytime == False")
+default her_ev_flash_public_t4_e3 = Event(id="her_ev_flash_public_t4_e3", label="hg_pr_flash_T4_E3", req="states.env.daytime == False")
+default her_ev_flash_public_t5_e1 = Event(id="her_ev_flash_public_t5_e1", label="hg_pr_flash_T5_E1", req="states.env.daytime == False")
+default her_ev_flash_public_t5_e2 = Event(id="her_ev_flash_public_t5_e2", label="hg_pr_flash_T5_E2", req="states.env.daytime == False")
+default her_ev_flash_public_t5_e3 = Event(id="her_ev_flash_public_t5_e3", label="hg_pr_flash_T5_E3", req="states.env.daytime == False")
 
 default her_eventqueue_flash_public = EventQueue("her_eventqueue_flash_public")
 default her_ev_flash_public_t1_to_t3 = Event(id="her_ev_flash_public_t1_to_t3", label="hg_pr_flash_fail", req="states.her.tier < 3", autoenqueue=True, autodequeue=False, queue="her_eventqueue_flash_public")
@@ -86,14 +86,14 @@ default her_ev_flash_public_t5_e1_hub = Event(id="her_ev_flash_public_t5_e1_hub"
 default her_ev_flash_public_t5_e2_hub = Event(id="her_ev_flash_public_t5_e2_hub", label="hg_pr_flash", req="states.her.tier >= 5", autoenqueue=True, autodequeue=False, queue="her_eventqueue_flash_public", subevents=["her_ev_flash_public_t5_e2"])
 default her_ev_flash_public_t5_e3_hub = Event(id="her_ev_flash_public_t5_e3_hub", label="hg_pr_flash", req="states.her.tier >= 5", autoenqueue=True, autodequeue=False, queue="her_eventqueue_flash_public", subevents=["her_ev_flash_public_t5_e3"])
 
-default her_ev_kiss_public_t3_e1 = Event(id="her_ev_kiss_public_t3_e1", label="hg_pr_kiss_T3_E1", req="game.daytime==False")
-default her_ev_kiss_public_t3_e2 = Event(id="her_ev_kiss_public_t3_e2", label="hg_pr_kiss_T3_E2", req="game.daytime==False")
-default her_ev_kiss_public_t3_e3 = Event(id="her_ev_kiss_public_t3_e3", label="hg_pr_kiss_T3_E3", req="game.daytime==False")
-default her_ev_kiss_public_t4_e1 = Event(id="her_ev_kiss_public_t4_e1", label="hg_pr_kiss_T4_E1", req="game.daytime==False")
-default her_ev_kiss_public_t4_e2 = Event(id="her_ev_kiss_public_t4_e2", label="hg_pr_kiss_T4_E2", req="game.daytime==False")
-default her_ev_kiss_public_t4_e3 = Event(id="her_ev_kiss_public_t4_e3", label="hg_pr_kiss_T4_E3", req="game.daytime==False")
-default her_ev_kiss_public_t5_e1 = Event(id="her_ev_kiss_public_t5_e1", label="hg_pr_kiss_T5_E1", req="game.daytime==False")
-default her_ev_kiss_public_t5_e2 = Event(id="her_ev_kiss_public_t5_e2", label="hg_pr_kiss_T5_E2", req="game.daytime==False")
+default her_ev_kiss_public_t3_e1 = Event(id="her_ev_kiss_public_t3_e1", label="hg_pr_kiss_T3_E1", req="states.env.daytime==False")
+default her_ev_kiss_public_t3_e2 = Event(id="her_ev_kiss_public_t3_e2", label="hg_pr_kiss_T3_E2", req="states.env.daytime==False")
+default her_ev_kiss_public_t3_e3 = Event(id="her_ev_kiss_public_t3_e3", label="hg_pr_kiss_T3_E3", req="states.env.daytime==False")
+default her_ev_kiss_public_t4_e1 = Event(id="her_ev_kiss_public_t4_e1", label="hg_pr_kiss_T4_E1", req="states.env.daytime==False")
+default her_ev_kiss_public_t4_e2 = Event(id="her_ev_kiss_public_t4_e2", label="hg_pr_kiss_T4_E2", req="states.env.daytime==False")
+default her_ev_kiss_public_t4_e3 = Event(id="her_ev_kiss_public_t4_e3", label="hg_pr_kiss_T4_E3", req="states.env.daytime==False")
+default her_ev_kiss_public_t5_e1 = Event(id="her_ev_kiss_public_t5_e1", label="hg_pr_kiss_T5_E1", req="states.env.daytime==False")
+default her_ev_kiss_public_t5_e2 = Event(id="her_ev_kiss_public_t5_e2", label="hg_pr_kiss_T5_E2", req="states.env.daytime==False")
 
 default her_eventqueue_kiss_public = EventQueue("her_eventqueue_kiss_public")
 default her_ev_kiss_public_t1_to_t3 = Event(id="her_ev_kiss_public_t1_to_t3", label="hg_pr_kiss_fail", req="states.her.tier < 3", autoenqueue=True, autodequeue=False, queue="her_eventqueue_kiss_public")
@@ -106,15 +106,15 @@ default her_ev_kiss_public_t4_e3_hub = Event(id="her_ev_kiss_public_t4_e3_hub",
 default her_ev_kiss_public_t5_e1_hub = Event(id="her_ev_kiss_public_t5_e1_hub", label="hg_pr_kiss", req="states.her.tier >= 5", autoenqueue=True, autodequeue=False, queue="her_eventqueue_kiss_public", subevents=["her_ev_kiss_public_t5_e1"])
 default her_ev_kiss_public_t5_e2_hub = Event(id="her_ev_kiss_public_t5_e2_hub", label="hg_pr_kiss", req="states.her.tier >= 5", autoenqueue=True, autodequeue=False, queue="her_eventqueue_kiss_public", subevents=["her_ev_kiss_public_t5_e2"])
 
-default her_ev_handjob_public_t4_e1 = Event(id="her_ev_handjob_public_t4_e1", label="hg_pr_handjob_T4_E1", req="game.daytime==False")
-default her_ev_handjob_public_t4_e2 = Event(id="her_ev_handjob_public_t4_e2", label="hg_pr_handjob_T4_E2", req="game.daytime==False")
-default her_ev_handjob_public_t4_e3 = Event(id="her_ev_handjob_public_t4_e3", label="hg_pr_handjob_T4_E3", req="game.daytime==False")
-default her_ev_handjob_public_t5_e1 = Event(id="her_ev_handjob_public_t5_e1", label="hg_pr_handjob_T5_E1", req="game.daytime==False")
-default her_ev_handjob_public_t5_e2 = Event(id="her_ev_handjob_public_t5_e2", label="hg_pr_handjob_T5_E2", req="game.daytime==False")
-default her_ev_handjob_public_t5_e3 = Event(id="her_ev_handjob_public_t5_e3", label="hg_pr_handjob_T5_E3", req="game.daytime==False")
-default her_ev_handjob_public_t6_e1 = Event(id="her_ev_handjob_public_t6_e1", label="hg_pr_handjob_T6_intro_E1", req="game.daytime==False")
-default her_ev_handjob_public_t6_e2 = Event(id="her_ev_handjob_public_t6_e2", label="hg_pr_handjob_T6_E2", req="game.daytime==False")
-default her_ev_handjob_public_t6_e3 = Event(id="her_ev_handjob_public_t6_e3", label="hg_pr_handjob_T6_E3", req="game.daytime==False")
+default her_ev_handjob_public_t4_e1 = Event(id="her_ev_handjob_public_t4_e1", label="hg_pr_handjob_T4_E1", req="states.env.daytime==False")
+default her_ev_handjob_public_t4_e2 = Event(id="her_ev_handjob_public_t4_e2", label="hg_pr_handjob_T4_E2", req="states.env.daytime==False")
+default her_ev_handjob_public_t4_e3 = Event(id="her_ev_handjob_public_t4_e3", label="hg_pr_handjob_T4_E3", req="states.env.daytime==False")
+default her_ev_handjob_public_t5_e1 = Event(id="her_ev_handjob_public_t5_e1", label="hg_pr_handjob_T5_E1", req="states.env.daytime==False")
+default her_ev_handjob_public_t5_e2 = Event(id="her_ev_handjob_public_t5_e2", label="hg_pr_handjob_T5_E2", req="states.env.daytime==False")
+default her_ev_handjob_public_t5_e3 = Event(id="her_ev_handjob_public_t5_e3", label="hg_pr_handjob_T5_E3", req="states.env.daytime==False")
+default her_ev_handjob_public_t6_e1 = Event(id="her_ev_handjob_public_t6_e1", label="hg_pr_handjob_T6_intro_E1", req="states.env.daytime==False")
+default her_ev_handjob_public_t6_e2 = Event(id="her_ev_handjob_public_t6_e2", label="hg_pr_handjob_T6_E2", req="states.env.daytime==False")
+default her_ev_handjob_public_t6_e3 = Event(id="her_ev_handjob_public_t6_e3", label="hg_pr_handjob_T6_E3", req="states.env.daytime==False")
 
 default her_eventqueue_handjob_public = EventQueue("her_eventqueue_handjob_public")
 default her_ev_handjob_public_t1_to_t4 = Event(id="her_ev_handjob_public_t1_to_t4", label="hg_pr_handjob_fail", req="states.her.tier < 4", autoenqueue=True, autodequeue=False, queue="her_eventqueue_handjob_public")
@@ -128,12 +128,12 @@ default her_ev_handjob_public_t6_e1_hub = Event(id="her_ev_handjob_public_t6_e1_
 default her_ev_handjob_public_t6_e2_hub = Event(id="her_ev_handjob_public_t6_e2_hub", label="hg_pr_handjob", req="states.her.tier >= 6", autoenqueue=True, autodequeue=False, queue="her_eventqueue_handjob_public", subevents=["her_ev_handjob_public_t6_e2"])
 default her_ev_handjob_public_t6_e3_hub = Event(id="her_ev_handjob_public_t6_e3_hub", label="hg_pr_handjob", req="states.her.tier >= 6", autoenqueue=True, autodequeue=False, queue="her_eventqueue_handjob_public", subevents=["her_ev_handjob_public_t6_e3"])
 
-default her_ev_blowjob_public_t5_e1 = Event(id="her_ev_blowjob_public_t5_e1", label="hg_pr_blowjob_T5_E1", req="game.daytime==False")
-default her_ev_blowjob_public_t5_e2 = Event(id="her_ev_blowjob_public_t5_e2", label="hg_pr_blowjob_T5_E2", req="game.daytime==False")
-default her_ev_blowjob_public_t5_e3 = Event(id="her_ev_blowjob_public_t5_e3", label="hg_pr_blowjob_T5_E3", req="game.daytime==False")
-default her_ev_blowjob_public_t6_e1 = Event(id="her_ev_blowjob_public_t6_e1", label="hg_pr_blowjob_T6_intro_E1", req="game.daytime==False")
-default her_ev_blowjob_public_t6_e2 = Event(id="her_ev_blowjob_public_t6_e2", label="hg_pr_blowjob_T6_E2", req="game.daytime==False")
-default her_ev_blowjob_public_t6_e3 = Event(id="her_ev_blowjob_public_t6_e3", label="hg_pr_blowjob_T6_E3", req="game.daytime==False")
+default her_ev_blowjob_public_t5_e1 = Event(id="her_ev_blowjob_public_t5_e1", label="hg_pr_blowjob_T5_E1", req="states.env.daytime==False")
+default her_ev_blowjob_public_t5_e2 = Event(id="her_ev_blowjob_public_t5_e2", label="hg_pr_blowjob_T5_E2", req="states.env.daytime==False")
+default her_ev_blowjob_public_t5_e3 = Event(id="her_ev_blowjob_public_t5_e3", label="hg_pr_blowjob_T5_E3", req="states.env.daytime==False")
+default her_ev_blowjob_public_t6_e1 = Event(id="her_ev_blowjob_public_t6_e1", label="hg_pr_blowjob_T6_intro_E1", req="states.env.daytime==False")
+default her_ev_blowjob_public_t6_e2 = Event(id="her_ev_blowjob_public_t6_e2", label="hg_pr_blowjob_T6_E2", req="states.env.daytime==False")
+default her_ev_blowjob_public_t6_e3 = Event(id="her_ev_blowjob_public_t6_e3", label="hg_pr_blowjob_T6_E3", req="states.env.daytime==False")
 
 default her_eventqueue_blowjob_public = EventQueue("her_eventqueue_blowjob_public")
 default her_ev_blowjob_public_t1_to_t5 = Event(id="her_ev_blowjob_public_t1_to_t5", label="hg_pr_blowjob_fail", req="states.her.tier < 5", autoenqueue=True, autodequeue=False, queue="her_eventqueue_blowjob_public")
@@ -144,10 +144,10 @@ default her_ev_blowjob_public_t6_e1_hub = Event(id="her_ev_blowjob_public_t6_e1_
 default her_ev_blowjob_public_t6_e2_hub = Event(id="her_ev_blowjob_public_t6_e2_hub", label="hg_pr_blowjob", req="states.her.tier >= 6", autoenqueue=True, autodequeue=False, queue="her_eventqueue_blowjob_public", subevents=["her_ev_blowjob_public_t6_e2"])
 default her_ev_blowjob_public_t6_e3_hub = Event(id="her_ev_blowjob_public_t6_e3_hub", label="hg_pr_blowjob", req="states.her.tier >= 6", autoenqueue=True, autodequeue=False, queue="her_eventqueue_blowjob_public", subevents=["her_ev_blowjob_public_t6_e3"])
 
-default her_ev_sex_public_t6_e1 = Event(id="her_ev_sex_public_t6_e1", label="hg_pr_sex_T6_intro_E1", req="game.daytime==False")
-default her_ev_sex_public_t6_e2 = Event(id="her_ev_sex_public_t6_e2", label="hg_pr_sex_T6_intro_E2", req="game.daytime==True", wait=1)
-default her_ev_sex_public_t6_e3 = Event(id="her_ev_sex_public_t6_e3", label="hg_pr_sex_T6_E3", req="game.daytime==False")
-default her_ev_sex_public_t6_e4 = Event(id="her_ev_sex_public_t6_e4", label="hg_pr_sex_T6_E4", req="game.daytime==False")
+default her_ev_sex_public_t6_e1 = Event(id="her_ev_sex_public_t6_e1", label="hg_pr_sex_T6_intro_E1", req="states.env.daytime==False")
+default her_ev_sex_public_t6_e2 = Event(id="her_ev_sex_public_t6_e2", label="hg_pr_sex_T6_intro_E2", req="states.env.daytime==True", wait=1)
+default her_ev_sex_public_t6_e3 = Event(id="her_ev_sex_public_t6_e3", label="hg_pr_sex_T6_E3", req="states.env.daytime==False")
+default her_ev_sex_public_t6_e4 = Event(id="her_ev_sex_public_t6_e4", label="hg_pr_sex_T6_E4", req="states.env.daytime==False")
 
 default her_eventqueue_sex_public = EventQueue("her_eventqueue_sex_public")
 default her_ev_sex_public_t1_to_t6 = Event(id="her_ev_sex_public_t1_to_t6", label="hg_pr_sex_fail", req="states.her.tier < 6", autoenqueue=True, autodequeue=False, queue="her_eventqueue_sex_public")
@@ -155,13 +155,13 @@ default her_ev_sex_public_t6_e1_hub = Event(id="her_ev_sex_public_t6_e1_hub", la
 default her_ev_sex_public_t6_e2_hub = Event(id="her_ev_sex_public_t6_e2_hub", label="hg_pr_sex", req="states.her.tier >= 6", autoenqueue=True, autodequeue=False, queue="her_eventqueue_sex_public", subevents=["her_ev_sex_public_t6_e3"])
 default her_ev_sex_public_t6_e3_hub = Event(id="her_ev_sex_public_t6_e3_hub", label="hg_pr_sex", req="states.her.tier >= 6", autoenqueue=True, autodequeue=False, queue="her_eventqueue_sex_public", subevents=["her_ev_sex_public_t6_e4"])
 
-default her_ev_cumslut_public_t5_e1 = Event(id="her_ev_cumslut_public_t5_e1", label="hg_pr_cumslut_T5_return", req="game.daytime==False")
-default her_ev_cumslut_public_t5_e2 = Event(id="her_ev_cumslut_public_t5_e2", label="hg_pr_cumslut_T5_return", req="game.daytime==False")
-default her_ev_cumslut_public_t5_e3 = Event(id="her_ev_cumslut_public_t5_e3", label="hg_pr_cumslut_T5_return", req="game.daytime==False")
-default her_ev_cumslut_public_t6_e1 = Event(id="her_ev_cumslut_public_t6_e1", label="hg_pr_cumslut_T6_return", req="game.daytime==False")
-default her_ev_cumslut_public_t6_e2 = Event(id="her_ev_cumslut_public_t6_e2", label="hg_pr_cumslut_T6_return", req="game.daytime==False")
-default her_ev_cumslut_public_t6_e3 = Event(id="her_ev_cumslut_public_t6_e3", label="hg_pr_cumslut_T6_return", req="game.daytime==False")
-default her_ev_cumslut_public_t6_e4 = Event(id="her_ev_cumslut_public_t6_e4", label="hg_pr_cumslut_T6_return", req="game.daytime==False")
+default her_ev_cumslut_public_t5_e1 = Event(id="her_ev_cumslut_public_t5_e1", label="hg_pr_cumslut_T5_return", req="states.env.daytime==False")
+default her_ev_cumslut_public_t5_e2 = Event(id="her_ev_cumslut_public_t5_e2", label="hg_pr_cumslut_T5_return", req="states.env.daytime==False")
+default her_ev_cumslut_public_t5_e3 = Event(id="her_ev_cumslut_public_t5_e3", label="hg_pr_cumslut_T5_return", req="states.env.daytime==False")
+default her_ev_cumslut_public_t6_e1 = Event(id="her_ev_cumslut_public_t6_e1", label="hg_pr_cumslut_T6_return", req="states.env.daytime==False")
+default her_ev_cumslut_public_t6_e2 = Event(id="her_ev_cumslut_public_t6_e2", label="hg_pr_cumslut_T6_return", req="states.env.daytime==False")
+default her_ev_cumslut_public_t6_e3 = Event(id="her_ev_cumslut_public_t6_e3", label="hg_pr_cumslut_T6_return", req="states.env.daytime==False")
+default her_ev_cumslut_public_t6_e4 = Event(id="her_ev_cumslut_public_t6_e4", label="hg_pr_cumslut_T6_return", req="states.env.daytime==False")
 
 default her_eventqueue_cumslut_public = EventQueue("her_eventqueue_cumslut_public")
 default her_ev_cumslut_public_t1_to_t5 = Event(id="her_ev_cumslut_public_t1_to_t5", label="hg_pr_cumslut_fail", req="states.her.tier < 5", autoenqueue=True, autodequeue=False, queue="her_eventqueue_cumslut_public")
diff --git a/game/scripts/characters/hermione/summon.rpy b/game/scripts/characters/hermione/summon.rpy
index 342223f7..5178b403 100644
--- a/game/scripts/characters/hermione/summon.rpy
+++ b/game/scripts/characters/hermione/summon.rpy
@@ -29,7 +29,7 @@ label summon_hermione:
             call hermione_chitchat
             jump hermione_talk
 
-        "-Tutoring-" (icon="interface/icons/small/book.webp") if not game.daytime and states.her.ev.tutoring.stage < 15: #14 is last level.
+        "-Tutoring-" (icon="interface/icons/small/book.webp") if not states.env.daytime and states.her.ev.tutoring.stage < 15: #14 is last level.
             if states.her.mood >=1 and states.her.mood < 3:
                 her "I'm sorry, maybe tomorrow..."
                 jump hermione_requests
@@ -47,7 +47,7 @@ label summon_hermione:
             else:
                 jump hg_tutor_start
 
-        "-Tutoring-" (icon="interface/icons/small/book.webp", style="disabled") if game.daytime and states.her.ev.tutoring.stage < 15:
+        "-Tutoring-" (icon="interface/icons/small/book.webp", style="disabled") if states.env.daytime and states.her.ev.tutoring.stage < 15:
             nar "Tutoring is available during the night only."
             jump hermione_requests
 
@@ -93,7 +93,7 @@ label summon_hermione:
         "-Dismiss her-":
             stop music fadeout 3.0
 
-            if game.daytime:
+            if states.env.daytime:
                 if states.her.mood >=3 and states.her.mood < 7:
                     her "..............................."
                 elif states.her.mood >=7:
@@ -174,11 +174,11 @@ label hermione_favor_menu:
                 else:
                     $ result.start()
 
-            "-Public requests-" (icon="interface/icons/small/star_yellow.webp", style="disabled") if not game.daytime:
+            "-Public requests-" (icon="interface/icons/small/star_yellow.webp", style="disabled") if not states.env.daytime:
                 nar "Public requests are available during the day only."
                 jump .skip_points_check
 
-            "-Public requests-" (icon="interface/icons/small/star_yellow.webp") if game.daytime:
+            "-Public requests-" (icon="interface/icons/small/star_yellow.webp") if states.env.daytime:
                 label .requests:
 
                 if states.her.public_level >= 16 and not "public" in states.her.ev.yule_ball.variant:
@@ -205,7 +205,7 @@ label hermione_favor_menu:
                 else:
                     $ result.start()
 
-            "-Odd Jobs-" (icon="interface/icons/small/gold.webp") if game.daytime:
+            "-Odd Jobs-" (icon="interface/icons/small/gold.webp") if states.env.daytime:
                 label .odd_jobs:
 
                 $ result = show_events_menu(hermione_jobs, report_progress=False)
@@ -218,7 +218,7 @@ label hermione_favor_menu:
                 else:
                     $ result.start()
 
-            "-Odd Jobs-" (icon="interface/icons/small/gold.webp", style="disabled") if not game.daytime:
+            "-Odd Jobs-" (icon="interface/icons/small/gold.webp", style="disabled") if not states.env.daytime:
                 nar "Public requests are available during the day only."
                 jump .skip_points_check
 
diff --git a/game/scripts/characters/hermione/wardrobe_reactions.rpy b/game/scripts/characters/hermione/wardrobe_reactions.rpy
index bd3f8cae..e1877593 100644
--- a/game/scripts/characters/hermione/wardrobe_reactions.rpy
+++ b/game/scripts/characters/hermione/wardrobe_reactions.rpy
@@ -428,7 +428,7 @@ label her_reaction_equip_outfit(item):
     ###################
     elif item == her_outfit_pajama:
         gen "Could you put on your Pyjamas for me?" ("base", xpos="far_left", ypos="head")
-        if game.daytime:
+        if states.env.daytime:
             her "My pyjamas?" ("annoyed", "base", "worried", "mid")
             her "But it's the middle of the day!" ("clench", "base", "worried", "mid")
             gen "So?" ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
index 26e61796..73c5a00a 100644
--- a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
+++ b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
@@ -375,7 +375,7 @@ label ll_pf_inspect_T2_E1_intro:
     lun "" ("base", "base", "base", "mid", xpos="base", ypos="base", flip=False, trans=d3)
     pause .2
 
-    if game.daytime:
+    if states.env.daytime:
         gen "You better head back to class, [name_luna_genie]." ("base", xpos="far_left", ypos="head")
         lun "Okay." ("open", "base", "base", "mid")
         lun "Good day then, [name_genie_luna]!" ("base", "base", "base", "mid")
@@ -463,7 +463,7 @@ label ll_pf_inspect_T2_E2_intro:
     nar "Without any further instructions, she plants her cheeks firmly in your lap, waiting for your next move expectantly."
 
     #Luna CG in Genie lap
-    if game.daytime:
+    if states.env.daytime:
         show lun_inspect legs_together eyes_closed as cg zorder 16
     else:
         show lun_inspect legs_together eyes_closed as cg zorder 16 at color_temperature(1.0)
@@ -563,7 +563,7 @@ label ll_pf_inspect_T2_E2_intro:
     show image "#00000080" as cg_effect1 zorder 15
     with d3
     show lun_grind_border as cg_effect2 zorder 15 at cg_transition
-    if game.daytime:
+    if states.env.daytime:
         show lun_grind resting as cg2 zorder 16 at cg_transition
     else:
         show lun_grind resting as cg2 zorder 16 at color_temperature(1.0), cg_transition
@@ -706,7 +706,7 @@ label ll_pf_inspect_T2_E2_intro:
     gen "I'll give you some more pointers next time...{w=0.3} I'm sure we'll get there." ("base", xpos="far_left", ypos="head")
     lun "Okay...{w=0.3} Thank you [name_genie_luna]!" ("base", "narrow", "base", "mid") #looks at you smiling
 
-    if game.daytime:
+    if states.env.daytime:
         lun "If I may, then I'll head back to class for today, [name_genie_luna]." ("soft", "base", "base", "R")
         gen "Certainly, [name_luna_genie]." ("base", xpos="far_left", ypos="head")
     else:
@@ -770,7 +770,7 @@ label ll_pf_inspect_T2_E3_intro:
     if luna.is_worn("stockings"):
         show lun_inspect spread_legs stockings as cg
 
-    if game.daytime:
+    if states.env.daytime:
         show lun_inspect spread_legs eyebrows_worried eyes_halflid_stare mouth_soft bra panties arm_right_down as cg
     else:
         show lun_inspect spread_legs eyebrows_worried eyes_halflid_stare mouth_soft bra panties arm_right_down as cg at color_temperature(1.0)
@@ -1200,7 +1200,7 @@ label ll_pf_inspect_T2_E3_intro:
     gen "Hopefully..." ("base", xpos="far_left", ypos="head")
     gen "(Although I doubt it.)" ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         gen "Well then, you've got class to attend [name_luna_genie]." ("base", xpos="far_left", ypos="head")
         gen "Off you go." ("base", xpos="far_left", ypos="head")
         lun "Yes [name_genie_luna], thank you [name_genie_luna]..." ("base", "wink", "base", "mid")
@@ -1254,7 +1254,7 @@ label ll_pf_inspect_T2_E4_repeat:
     nar "Luna quickly rushes up to your desk, and begins undressing both you and herself..."
 
     #Luna CG in Genie lap
-    if game.daytime:
+    if states.env.daytime:
         show lun_inspect legs_together eyes_halflid_right arm_right_down as cg zorder 16
     else:
         show lun_inspect legs_together eyes_halflid_right arm_right_down as cg zorder 16 at color_temperature(1.0)
@@ -1453,7 +1453,7 @@ label ll_pf_inspect_T2_E4_repeat:
     lun @ cheeks blush "Oh, yes [name_genie_luna]...{w=0.4} I'm...{w=0.3} I feel great!" ("crooked_smile", "narrow", "base", "mid")
     gen "You look exhausted, you better get some rest..." ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         lun @ cheeks blush "*Ehm*...{w=0.4} I've still got classes..." ("soft", "narrow", "base", "R")
         gen "Right..." ("base", xpos="far_left", ypos="head")
         gen "Maybe I should go a bit easier on you during the--" ("base", xpos="far_left", ypos="head")
@@ -1489,7 +1489,7 @@ label ll_pf_inspect_T3_E1_repeat:
     else:
         nar "Luna quickly rushes up to your desk, and begins undressing you..."
 
-    if game.daytime:
+    if states.env.daytime:
         show lun_inspect legs_together eyes_base_down mouth_grin as cg zorder 16
     else:
         show lun_inspect legs_together eyes_base_down mouth_grin as cg zorder 16 at color_temperature(1.0)
@@ -1510,7 +1510,7 @@ label ll_pf_inspect_T3_E1_repeat:
     lun "I know your time is valuable."
     gen "Assisting my students is part of my job, [name_luna_genie]."
 
-    if game.daytime:
+    if states.env.daytime:
         gen "Even if that meant treating you for an entire day, then so be it..."
     else:
         gen "Even if that meant treating you all night, then so be it..."
@@ -1798,7 +1798,7 @@ label ll_pf_inspect_T3_E1_repeat:
     gen "So, feeling better now?" ("base", xpos="far_left", ypos="head")
     lun "Yes, [name_genie_luna]...{w=0.4} Thank you..." ("base", "base", "base", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         gen "Then you better make your way to class, [name_luna_genie]." ("base", xpos="far_left", ypos="head")
     else:
         gen "Then you best be off to bed, [name_luna_genie]." ("base", xpos="far_left", ypos="head")
@@ -1860,7 +1860,7 @@ label ll_pf_inspect_T4_E1_repeat:
 
     nar "As you undress, Luna rushes up to your desk, and jumps into your lap with such force that you fall into the chair."
 
-    if game.daytime:
+    if states.env.daytime:
         show lun_inspect spread_legs eyebrows_worried eyes_base_right mouth_open as cg zorder 16
     else:
         show lun_inspect spread_legs eyebrows_worried eyes_base_right mouth_open as cg zorder 16 at color_temperature(1.0)
@@ -2155,7 +2155,7 @@ label ll_pf_inspect_T4_E1_repeat:
     gen "(Here we go...)" ("base", xpos="far_left", ypos="head")
     lun "Going where?" ("soft", "base", "base", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         gen "I think it's about time for you to head back to class..." ("base", xpos="far_left", ypos="head")
     else:
         gen "I think it's about time you went to bed..." ("base", xpos="far_left", ypos="head")
@@ -2195,7 +2195,7 @@ label ll_pf_inspect_T4_E1_repeat:
     gen "Anyhow... I presume you feel better now?" ("base", xpos="far_left", ypos="head")
     lun "Oh... Yes, thank you, [name_genie_luna]!" ("grin", "base", "base", "mid")
     gen "You're very welcome." ("base", xpos="far_left", ypos="head")
-    if game.daytime:
+    if states.env.daytime:
         lun "I better head to bed then." ("base", "base", "base", "mid")
         gen "Don't you mean \"class\"?" ("base", xpos="far_left", ypos="head")
         lun "Oh, yeah!" ("smile", "happyCl", "base", "mid")
diff --git a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy
index 8e066ad8..ab0cebc6 100644
--- a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy
+++ b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy
@@ -1066,7 +1066,7 @@ label ll_pf_masturbate_T3_E4_repeat:
     gen "(Just smile and nod...)" ("grin", xpos="far_left", ypos="head")
     gen "Well then... I'll let you know when our next session will be [name_luna_genie]." ("base", xpos="far_left", ypos="head")
     lun "Of course... Thank you [name_genie_luna]." ("base", "base", "base", "mid")
-    if game.daytime:
+    if states.env.daytime:
         gen "Now, you best head back to class." ("base", xpos="far_left", ypos="head")
     else:
         gen "Now, you best head back to your dorm." ("base", xpos="far_left", ypos="head")
@@ -1370,7 +1370,7 @@ label ll_pf_masturbate_T4_E1_repeat:
     lun "Does this mean I've failed the test?" ("disgust", "narrow", "base", "R")
     gen "Your grading is pretty clear in that regard, is it not?" ("base", xpos="far_left", ypos="head")
     lun "*Ehm*... I suppose..." ("annoyed", "narrow", "base", "down")
-    if game.daytime:
+    if states.env.daytime:
         gen "Well then, I think you better head back to class." ("base", xpos="far_left", ypos="head")
     else:
         gen "Well then, I think you better head to bed." ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/characters/luna/events/favors/suck_it.rpy b/game/scripts/characters/luna/events/favors/suck_it.rpy
index 729253c4..75190292 100644
--- a/game/scripts/characters/luna/events/favors/suck_it.rpy
+++ b/game/scripts/characters/luna/events/favors/suck_it.rpy
@@ -125,7 +125,7 @@ label ll_pf_blowjob_T4_E1_intro:
         nar "Luna hurriedly makes her way around your desk and crawls underneath..."
     gen "*Err*... It's probably not the best idea to go under my--"
 
-    if game.daytime:
+    if states.env.daytime:
         show lun_blowjob_personal_pose1 as cg
     else:
         show lun_blowjob_personal_pose1 as cg at color_temperature(1.0)
@@ -554,7 +554,7 @@ label ll_pf_blowjob_T4_E2_intro:
     else:
         nar "Luna quickly makes her way around your desk, and crawls underneath."
 
-    if game.daytime:
+    if states.env.daytime:
         show lun_blowjob_personal_pose1 as cg
     else:
         show lun_blowjob_personal_pose1 as cg at color_temperature(1.0)
@@ -760,7 +760,7 @@ label ll_pf_blowjob_T4_E2_intro:
         with d3
         pause .5
 
-    if game.daytime:
+    if states.env.daytime:
         lun "I best be off to divination class..." ("base", "base", "base", "mid")
     else:
         lun "I better head off to bed then." ("base", "base", "base", "mid")
@@ -794,7 +794,7 @@ label ll_pf_blowjob_T4_E2_intro:
     lun "..." ("base", "base", "base", "mid")
     gen "Well, go on then... How am I supposed to call you, unless you leave?" ("base", xpos="far_left", ypos="head")
     lun "Oh, right!" ("angry", "base", "base", "mid")
-    if game.daytime:
+    if states.env.daytime:
         lun "Have a nice day!" ("smile", "base", "base", "mid")
     else:
         lun "Have a nice evening!" ("base", "base", "base", "mid")
@@ -840,7 +840,7 @@ label ll_pf_blowjob_T4_E3_intro:
             gen "So, since it's \"Suckday\" today...{w=0.4} You think you could help me?" ("base", xpos="far_left", ypos="head")
             lun "Of course!" ("angry", "base", "base", "mid")
         "-Humour her-":
-            if game.daytime:
+            if states.env.daytime:
                 if game.weather == "clear": #Sunny
                     gen "Right..." ("base", xpos="far_left", ypos="head")
                     lun "Can't you see the radiant joy on Mister Sun's face?" ("grin", "base", "base", "L")
@@ -943,7 +943,7 @@ label ll_pf_blowjob_T4_E3_intro:
     lun "I like it down here..."
     gen "Very well..."
 
-    if game.daytime:
+    if states.env.daytime:
         show lun_blowjob_personal_pose1 no_trousers eyebrows_angry eyes_halflid_down_hearts mouth_base as cg
     else:
         show lun_blowjob_personal_pose1 no_trousers eyebrows_angry eyes_halflid_down_hearts mouth_base as cg at color_temperature(1.0)
@@ -1197,7 +1197,7 @@ label ll_pf_blowjob_T4_E4_repeat:
         $ _wearing_clothes = True
         $ luna.strip("clothes")
 
-    if game.daytime:
+    if states.env.daytime:
         show lun_blowjob_personal_pose1 eyes_closed mouth_soft as cg
     else:
         show lun_blowjob_personal_pose1 eyes_closed mouth_soft as cg at color_temperature(1.0)
@@ -1558,7 +1558,7 @@ label ll_pf_blowjob_T4_E4_repeat:
                 with d3
                 pause .5
 
-            if game.daytime:
+            if states.env.daytime:
                 lun @ cheeks blush "*Ah*...{w=0.4} *Ehm*...{w=0.4} Have a nice day!" ("angry", "narrow", "base", "R")
                 gen "Have a--" ("base", xpos="far_left", ypos="head")
             else:
diff --git a/game/scripts/characters/luna/events/favors/talk_to_me.rpy b/game/scripts/characters/luna/events/favors/talk_to_me.rpy
index 2f7cdcd0..7ff47ed1 100644
--- a/game/scripts/characters/luna/events/favors/talk_to_me.rpy
+++ b/game/scripts/characters/luna/events/favors/talk_to_me.rpy
@@ -166,7 +166,7 @@ label ll_pf_talk_T1_E1_intro:
     gen "I need to conduct some more tests, and once that's done, I'll put it into practice." ("base", xpos="far_left", ypos="head")
     lun "Oh! I can't wait!" ("crooked_smile", "happyCl", "base", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         gen "So for now, you better head back to class." ("base", xpos="far_left", ypos="head")
         lun "Of course... Good luck [name_genie_luna]." ("grin", "base", "base", "mid")
     else:
@@ -333,7 +333,7 @@ label ll_pf_talk_T1_E2_intro:
     gen "I'm sure with your help, we'll find a way to get those spurts." ("base", xpos="far_left", ypos="head")
     lun @ cheeks blush "Okay, thank you [name_genie_luna]..." ("open", "base", "base", "down")
 
-    if game.daytime:
+    if states.env.daytime:
         lun @ cheeks blush "I'll head back to class then, [name_genie_luna]." ("open", "base", "base", "R")
     else:
         lun @ cheeks blush "I'll head back to my dorm then, [name_genie_luna]." ("open", "base", "base", "R")
@@ -517,7 +517,7 @@ label ll_pf_talk_T1_E3_intro:
     lun "Thank you [name_genie_luna]!" ("grin", "narrow", "base", "mid")
     lun "..." ("base", "base", "base", "R") #glances off
 
-    if game.daytime:
+    if states.env.daytime:
         lun "Oh, shoot... I need to go... My lunch break is almost over." ("mad", "base", "base", "stare")
         gen "Of course... Off you go!" ("base", xpos="far_left", ypos="head")
     else:
@@ -747,7 +747,7 @@ label ll_pf_talk_T2_E1_repeat:
     gen "Much better..." ("base", xpos="far_left", ypos="head")
     lun "I'm so glad..." ("grin", "closed", "base", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         lun "Well, I better head back to class." ("base", "base", "base", "mid")
         gen "Of course... Off you go!" ("base", xpos="far_left", ypos="head")
     else:
@@ -914,7 +914,7 @@ label ll_pf_talk_T3_E1_repeat:
     gen "I sure feel more powerful when I do it." ("base", xpos="far_left", ypos="head")
     lun "Interesting... Thank you for answering." ("grin", "base", "base", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         lun "Well, I better head back to class." ("base", "base", "base", "mid")
         gen "Of course... Off you go!" ("base", xpos="far_left", ypos="head")
     else:
@@ -1133,7 +1133,7 @@ label ll_pf_talk_T4_E1_repeat:
     show screen blkfade
     with d5
 
-    if game.daytime:
+    if states.env.daytime:
         show lun_talk mouth_soft as cg zorder 16
     else:
         show lun_talk mouth_soft as cg zorder 16 at color_temperature(1.0)
diff --git a/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy b/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy
index 14d901bd..427ded92 100644
--- a/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy
+++ b/game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy
@@ -103,7 +103,7 @@ label spectrespecs_E3:
     $ thequibbler_ITEM.owned = 0
     $ thequibbler_ITEM.used = True
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
diff --git a/game/scripts/characters/luna/summon.rpy b/game/scripts/characters/luna/summon.rpy
index 65384442..fc27bb3f 100644
--- a/game/scripts/characters/luna/summon.rpy
+++ b/game/scripts/characters/luna/summon.rpy
@@ -62,7 +62,7 @@ label summon_luna:
         "-Dismiss her-":
             stop music fadeout 3.0
 
-            if game.daytime:
+            if states.env.daytime:
                 if states.lun.mood >= 3:
                     lun "Good day..."
                 else:
diff --git a/game/scripts/characters/luna/wardrobe_reactions.rpy b/game/scripts/characters/luna/wardrobe_reactions.rpy
index 0ca23527..5b1bb68f 100644
--- a/game/scripts/characters/luna/wardrobe_reactions.rpy
+++ b/game/scripts/characters/luna/wardrobe_reactions.rpy
@@ -329,7 +329,7 @@ label lun_reaction_equip_outfit(item):
     ###################
     elif item == lun_outfit_pajama: #Req 0
         gen "Put on your pyjamas for me." ("base", xpos="far_left", ypos="head")
-        if game.daytime:
+        if states.env.daytime:
             lun "You can do that?" ("angry", "wide", "base", "mid")
             gen "Do what?" ("base", xpos="far_left", ypos="head")
             lun "Wear pyjamas during the day!" ("mad", "narrow", "base", "mid")
@@ -448,7 +448,7 @@ label lun_reaction_equip_outfit(item):
     elif item == lun_outfit_summer: #Req 7 (No Bra)
         gen "I've got this great summer outfit for you to wear!" ("base", xpos="far_left", ypos="head")
         gen "It's pretty hot!" ("base", xpos="far_left", ypos="head")
-        if game.daytime:
+        if states.env.daytime:
             lun "It is? I didn't notice!" ("angry", "base", "base", "stare")
             gen "Weather's pretty warm too!" ("base", xpos="far_left", ypos="head")
             lun "*Huh*?" ("soft", "base", "base", "mid")
diff --git a/game/scripts/characters/snape/chibi.rpy b/game/scripts/characters/snape/chibi.rpy
index 5a6a2f36..175639af 100644
--- a/game/scripts/characters/snape/chibi.rpy
+++ b/game/scripts/characters/snape/chibi.rpy
@@ -54,14 +54,14 @@ screen with_snape(ani=False):
     tag hanging_with_snape
     zorder 3
     if ani:
-        if game.daytime:
+        if states.env.daytime:
             add "ch_gen toast_goblet_daytime" xpos 435 ypos 200 # Different shadow.
         else:
             add "ch_gen toast_goblet" xpos 435 ypos 200
         add "snape_toast_goblet" xpos 618 ypos 200 zoom 0.5
 
     else:
-        if game.daytime:
+        if states.env.daytime:
             add "characters/genie/chibis/drinking/01_day.webp" xpos 435 ypos 200 zoom 0.5 # Different shadow.
         else:
             add "characters/genie/chibis/drinking/01.webp" xpos 435 ypos 200 zoom 0.5
diff --git a/game/scripts/characters/snape/events/hangouts.rpy b/game/scripts/characters/snape/events/hangouts.rpy
index 913234ee..3f75a27c 100644
--- a/game/scripts/characters/snape/events/hangouts.rpy
+++ b/game/scripts/characters/snape/events/hangouts.rpy
@@ -93,7 +93,7 @@ label snape_hangout:
 
     hide screen with_snape
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
diff --git a/game/scripts/characters/snape/summon.rpy b/game/scripts/characters/snape/summon.rpy
index e67fa4a5..1acdc728 100644
--- a/game/scripts/characters/snape/summon.rpy
+++ b/game/scripts/characters/snape/summon.rpy
@@ -33,7 +33,7 @@ label summon_snape:
                     jump astoria_intro_E2_snape
 
                 "-Try solving the Quidditch Quarrel-" (icon="interface/icons/small/quidditch.webp") if states.cho.tier == 2 and states.cho.ev.quidditch.e6_complete and not states.cho.ev.quidditch.e9_complete and not states.cho.ev.quidditch.e8_complete:
-                    if game.daytime:
+                    if states.env.daytime:
                         gen "I wanted to talk to you about the upcoming Quidditch game." ("base", xpos="far_left", ypos="head")
                         sna "I don't really have time right now..." ("snape_05")
                         if wine_ITEM.owned >= 1:
@@ -81,11 +81,11 @@ label summon_snape:
 
 
         # Fireplace Chats
-        "-Let's hang-" (icon="interface/icons/small/toast.webp") if wine_ITEM.owned >= 1 and not game.daytime:
+        "-Let's hang-" (icon="interface/icons/small/toast.webp") if wine_ITEM.owned >= 1 and not states.env.daytime:
             jump snape_hangout
 
-        "-Let's hang-" (icon="interface/icons/small/toast.webp", style="disabled") if wine_ITEM.owned < 1 or game.daytime:
-            if game.daytime:
+        "-Let's hang-" (icon="interface/icons/small/toast.webp", style="disabled") if wine_ITEM.owned < 1 or states.env.daytime:
+            if states.env.daytime:
                 gen "(I'm not sharing my booze with Snape while he still has to teach classes...)" ("base", xpos="far_left", ypos="head")
                 gen "(I better ask him during the evening to get drunk...)" ("base", xpos="far_left", ypos="head")
             elif wine_ITEM.owned < 1:
@@ -100,7 +100,7 @@ label summon_snape:
         "-Never mind-":
             stop music fadeout 1.0
 
-            if game.daytime:
+            if states.env.daytime:
                 sna "Alright, back to work then..."
             else:
                 sna "Goodnight then."
diff --git a/game/scripts/characters/susan/events/intro.rpy b/game/scripts/characters/susan/events/intro.rpy
index 5dd1e75f..d7f8503a 100644
--- a/game/scripts/characters/susan/events/intro.rpy
+++ b/game/scripts/characters/susan/events/intro.rpy
@@ -163,7 +163,7 @@ label susan_intro_E1:
     gen "No miss Bones... You're not in any trouble."
     sus "Very well..." ("soft", "closed", "low", "mid")
 
-    if game.daytime:
+    if states.env.daytime:
         sus "I shall return to class then." ("open", "happy", "base", "right")
         sus "Good--{w=0.4} Good day, sir." ("open", "happyCl", "base", "mid")
     else:
diff --git a/game/scripts/characters/susan/summon.rpy b/game/scripts/characters/susan/summon.rpy
index da182a4a..a23cbf38 100644
--- a/game/scripts/characters/susan/summon.rpy
+++ b/game/scripts/characters/susan/summon.rpy
@@ -57,7 +57,7 @@ label summon_susan:
 
         # Dismiss
         "-Dismiss her-":
-            if game.daytime:
+            if states.env.daytime:
                 sus "I will go back to classes then, [name_genie_susan]." ("base", "base", "shocked", "mid")
             else:
                 sus "*Ehm*... Good night then, [name_genie_susan]." ("base", "base", "base", "mid")
diff --git a/game/scripts/characters/tonks/chibi.rpy b/game/scripts/characters/tonks/chibi.rpy
index e86c9a66..159a76ad 100644
--- a/game/scripts/characters/tonks/chibi.rpy
+++ b/game/scripts/characters/tonks/chibi.rpy
@@ -92,7 +92,7 @@ screen with_tonks_animated():
     tag ton_chibi
     zorder tonks_chibi.zorder
 
-    if game.daytime:
+    if states.env.daytime:
         add "ch_gen toast_goblet_daytime" xpos 435 ypos 200
     else:
         add "ch_gen toast_goblet" xpos 435 ypos 200
diff --git a/game/scripts/characters/tonks/events/hangout.rpy b/game/scripts/characters/tonks/events/hangout.rpy
index 14101edc..f1b57084 100644
--- a/game/scripts/characters/tonks/events/hangout.rpy
+++ b/game/scripts/characters/tonks/events/hangout.rpy
@@ -51,7 +51,7 @@ label tonks_hangout:
 
     label end_tonks_hangout:
 
-    $ d_flag_01 = "afternoon" if game.daytime else "evening"
+    $ d_flag_01 = "afternoon" if states.env.daytime else "evening"
 
     if states.ton.level < 100:
         call notes
@@ -83,7 +83,7 @@ label tonks_hangout:
 
     hide screen with_tonks_animated
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
@@ -151,7 +151,7 @@ label nt_he_firewhisky_E1:
     ton "That's it, cheers." ("base", "base", "base", "mid")
 
     if not _event_completed:
-        if game.daytime:
+        if states.env.daytime:
             gen "Boring lessons ahead?" ("base", xpos="far_left", ypos="head")
             ton "Not particularly, why?" ("open", "base", "base", "mid")
             gen "You might regret going back to classes after drinking this much." ("base", xpos="far_left", ypos="head")
@@ -182,7 +182,7 @@ label nt_he_firewhisky_E3:
     gen "Want to get drunk?" ("base", xpos="far_left", ypos="head")
 
     ton "Of course." ("base", "narrow", "shocked", "down", ypos="head", flip=False)
-    if game.daytime:
+    if states.env.daytime:
         ton "I'm not going to regret this, am I?" ("clench", "base", "raised", "downR")
         ton "Hopefully my students won't notice..." ("grin", "narrow", "base", "downR")
     else:
@@ -284,7 +284,7 @@ label nt_he_story_intro_E1:
     ton "And I'm not talking about my intellectual abilities..." ("horny", "base", "base", "down")
     gen "I'm a well for all kinds of knowledge!" ("grin", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         ton "Anyway, I have to go prepare for classes." ("open", "base", "base", "R")
     else:
         ton "Anyway, I think I'm gonna go hit the sack." ("open", "base", "base", "R")
diff --git a/game/scripts/characters/tonks/requests.rpy b/game/scripts/characters/tonks/requests.rpy
index c248814d..928907ed 100644
--- a/game/scripts/characters/tonks/requests.rpy
+++ b/game/scripts/characters/tonks/requests.rpy
@@ -1,7 +1,7 @@
-default ton_ev_detention_t1_e1 = Event(id="ton_ev_detention_t1_e1", label="nt_pr_teach_T1_E1", req="game.daytime==False")
-default ton_ev_detention_t1_e2 = Event(id="ton_ev_detention_t1_e2", label="nt_pr_teach_T1_E2", req="game.daytime==False")
-default ton_ev_detention_t1_e3 = Event(id="ton_ev_detention_t1_e3", label="nt_pr_teach_T1_E3", req="game.daytime==False")
-default ton_ev_detention_t1_e4 = Event(id="ton_ev_detention_t1_e4", label="nt_pr_teach_T1_E4", req="game.daytime==False")
+default ton_ev_detention_t1_e1 = Event(id="ton_ev_detention_t1_e1", label="nt_pr_teach_T1_E1", req="states.env.daytime==False")
+default ton_ev_detention_t1_e2 = Event(id="ton_ev_detention_t1_e2", label="nt_pr_teach_T1_E2", req="states.env.daytime==False")
+default ton_ev_detention_t1_e3 = Event(id="ton_ev_detention_t1_e3", label="nt_pr_teach_T1_E3", req="states.env.daytime==False")
+default ton_ev_detention_t1_e4 = Event(id="ton_ev_detention_t1_e4", label="nt_pr_teach_T1_E4", req="states.env.daytime==False")
 
 default ton_eventqueue_detention = EventQueue("ton_eventqueue_detention")
 default ton_ev_detention_t1_e1_hub = Event(id="ton_ev_detention_t1_e1_hub", label="nt_pr_teach_start", req="states.ton.tier==1", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t1_e1"])
@@ -9,20 +9,20 @@ default ton_ev_detention_t1_e2_hub = Event(id="ton_ev_detention_t1_e2_hub", labe
 default ton_ev_detention_t1_e3_hub = Event(id="ton_ev_detention_t1_e3_hub", label="nt_pr_teach_start", req="states.ton.tier==1", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t1_e3"])
 default ton_ev_detention_t1_e4_hub = Event(id="ton_ev_detention_t1_e4_hub", label="nt_pr_teach_start", req="states.ton.tier==1", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t1_e4"])
 
-default ton_ev_detention_t2_e1 = Event(id="ton_ev_detention_t2_e1", label="nt_pr_teach_T2_E1", req="game.daytime==False")
-default ton_ev_detention_t2_e2 = Event(id="ton_ev_detention_t2_e2", label="nt_pr_teach_T2_E2", req="game.daytime==False")
-default ton_ev_detention_t2_e3 = Event(id="ton_ev_detention_t2_e3", label="nt_pr_teach_T2_E3", req="game.daytime==False")
-default ton_ev_detention_t2_e4 = Event(id="ton_ev_detention_t2_e4", label="nt_pr_teach_T2_E4", req="game.daytime==False")
+default ton_ev_detention_t2_e1 = Event(id="ton_ev_detention_t2_e1", label="nt_pr_teach_T2_E1", req="states.env.daytime==False")
+default ton_ev_detention_t2_e2 = Event(id="ton_ev_detention_t2_e2", label="nt_pr_teach_T2_E2", req="states.env.daytime==False")
+default ton_ev_detention_t2_e3 = Event(id="ton_ev_detention_t2_e3", label="nt_pr_teach_T2_E3", req="states.env.daytime==False")
+default ton_ev_detention_t2_e4 = Event(id="ton_ev_detention_t2_e4", label="nt_pr_teach_T2_E4", req="states.env.daytime==False")
 
 default ton_ev_detention_t2_e1_hub = Event(id="ton_ev_detention_t2_e1_hub", label="nt_pr_teach_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t2_e1"])
 default ton_ev_detention_t2_e2_hub = Event(id="ton_ev_detention_t2_e2_hub", label="nt_pr_teach_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t2_e2"])
 default ton_ev_detention_t2_e3_hub = Event(id="ton_ev_detention_t2_e3_hub", label="nt_pr_teach_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t2_e3"])
 default ton_ev_detention_t2_e4_hub = Event(id="ton_ev_detention_t2_e4_hub", label="nt_pr_teach_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t2_e4"])
 
-default ton_ev_grope_t2_e1 = Event(id="ton_ev_grope_t2_e1", label="nt_pr_grope_T2_E1", req="game.daytime==False")
-default ton_ev_grope_t2_e2 = Event(id="ton_ev_grope_t2_e2", label="nt_pr_grope_T2_E2", req="game.daytime==False")
-default ton_ev_grope_t2_e3 = Event(id="ton_ev_grope_t2_e3", label="nt_pr_grope_T2_E3", req="game.daytime==False")
-default ton_ev_grope_t2_e4 = Event(id="ton_ev_grope_t2_e4", label="nt_pr_grope_T2_E4", req="game.daytime==False")
+default ton_ev_grope_t2_e1 = Event(id="ton_ev_grope_t2_e1", label="nt_pr_grope_T2_E1", req="states.env.daytime==False")
+default ton_ev_grope_t2_e2 = Event(id="ton_ev_grope_t2_e2", label="nt_pr_grope_T2_E2", req="states.env.daytime==False")
+default ton_ev_grope_t2_e3 = Event(id="ton_ev_grope_t2_e3", label="nt_pr_grope_T2_E3", req="states.env.daytime==False")
+default ton_ev_grope_t2_e4 = Event(id="ton_ev_grope_t2_e4", label="nt_pr_grope_T2_E4", req="states.env.daytime==False")
 
 default ton_eventqueue_grope = EventQueue("ton_eventqueue_grope")
 default ton_ev_grope_t2_e1_hub = Event(id="ton_ev_grope_t2_e1_hub", label="nt_pr_grope_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_grope", subevents=["ton_ev_grope_t2_e1"])
@@ -30,10 +30,10 @@ default ton_ev_grope_t2_e2_hub = Event(id="ton_ev_grope_t2_e2_hub", label="nt_pr
 default ton_ev_grope_t2_e3_hub = Event(id="ton_ev_grope_t2_e3_hub", label="nt_pr_grope_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_grope", subevents=["ton_ev_grope_t2_e3"])
 default ton_ev_grope_t2_e4_hub = Event(id="ton_ev_grope_t2_e4_hub", label="nt_pr_grope_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_grope", subevents=["ton_ev_grope_t2_e4"])
 
-default ton_ev_oral_t2_e1 = Event(id="ton_ev_oral_t2_e1", label="nt_pr_kiss_T2_intro_E1", req="game.daytime==False")
-default ton_ev_oral_t2_e2 = Event(id="ton_ev_oral_t2_e2", label="nt_pr_kiss_T2_E2", req="game.daytime==False")
-default ton_ev_oral_t2_e3 = Event(id="ton_ev_oral_t2_e3", label="nt_pr_kiss_T2_E3", req="game.daytime==False")
-default ton_ev_oral_t2_e4 = Event(id="ton_ev_oral_t2_e4", label="nt_pr_kiss_T2_E4", req="game.daytime==False")
+default ton_ev_oral_t2_e1 = Event(id="ton_ev_oral_t2_e1", label="nt_pr_kiss_T2_intro_E1", req="states.env.daytime==False")
+default ton_ev_oral_t2_e2 = Event(id="ton_ev_oral_t2_e2", label="nt_pr_kiss_T2_E2", req="states.env.daytime==False")
+default ton_ev_oral_t2_e3 = Event(id="ton_ev_oral_t2_e3", label="nt_pr_kiss_T2_E3", req="states.env.daytime==False")
+default ton_ev_oral_t2_e4 = Event(id="ton_ev_oral_t2_e4", label="nt_pr_kiss_T2_E4", req="states.env.daytime==False")
 
 default ton_eventqueue_oral = EventQueue("ton_eventqueue_oral")
 default ton_ev_oral_t2_e1_hub = Event(id="ton_ev_oral_t2_e1_hub", label="nt_pr_kiss_start", req="states.ton.tier>=2", repeat=False, autoenqueue=True, autodequeue=False, queue="ton_eventqueue_oral", subevents=["ton_ev_oral_t2_e1"])
diff --git a/game/scripts/characters/tonks/summon.rpy b/game/scripts/characters/tonks/summon.rpy
index 965745e1..11ad4db9 100644
--- a/game/scripts/characters/tonks/summon.rpy
+++ b/game/scripts/characters/tonks/summon.rpy
@@ -70,7 +70,7 @@ label summon_tonks:
         "-Never mind-":
             stop music fadeout 3.0
 
-            if game.daytime:
+            if states.env.daytime:
                 ton "Alright, back to work then..."
             else:
                 ton "Sweet dreams, [name_genie_tonks]."
@@ -119,7 +119,7 @@ label tonks_favor_menu:
             call not_available
             jump tonks_favor_menu
 
-        "-Public Requests-" (icon="interface/icons/small/star_yellow.webp") if game.daytime and states.ton.requests_unlocked:
+        "-Public Requests-" (icon="interface/icons/small/star_yellow.webp") if states.env.daytime and states.ton.requests_unlocked:
             label .requests:
 
             $ result = show_events_menu(tonks_requests)
@@ -132,10 +132,10 @@ label tonks_favor_menu:
             else:
                 $ result.start()
 
-        "-Public Requests-" (icon="interface/icons/small/star_yellow.webp", style="disabled") if not game.daytime or not states.ton.requests_unlocked:
+        "-Public Requests-" (icon="interface/icons/small/star_yellow.webp", style="disabled") if not states.env.daytime or not states.ton.requests_unlocked:
             if not states.ton.requests_unlocked:
                 nar "You haven't unlocked this feature yet."
-            elif not game.daytime:
+            elif not states.env.daytime:
                 nar "Public requests are available during the day only."
 
             jump tonks_favor_menu
diff --git a/game/scripts/doll/main.rpy b/game/scripts/doll/main.rpy
index b200f6ad..cc47c9a6 100644
--- a/game/scripts/doll/main.rpy
+++ b/game/scripts/doll/main.rpy
@@ -585,7 +585,7 @@ init python:
             schedule = []
 
             for o in self.outfits:
-                if o.unlocked and o.schedule["day" if game.daytime else "night"]:
+                if o.unlocked and o.schedule["day" if states.env.daytime else "night"]:
                     if game.weather == "overcast" and o.schedule["cloudy"]:
                         schedule.append(o)
                     elif game.weather in {"storm", "rain"} and o.schedule["rainy"]:
diff --git a/game/scripts/events/DayNight.rpy b/game/scripts/events/DayNight.rpy
index 807e282a..5fa3c5fc 100644
--- a/game/scripts/events/DayNight.rpy
+++ b/game/scripts/events/DayNight.rpy
@@ -82,7 +82,7 @@ label day_start:
         # Game flags
         game.day += 1
         game.weather = "random"
-        game.daytime = True
+        states.env.daytime = True
 
         cupboard_OBJ.foreground = Transform(Text(str((game.day % 30) + 1), color="#fff", outlines=[(1, "#000", 0, 0)]), pos=(40, 100))
 
@@ -194,7 +194,7 @@ label night_start:
 
         # Game flags
         game.weather = "random"
-        game.daytime = False
+        states.env.daytime = False
 
         # Randomisers
         random_gold = renpy.random.randint(8, 40)
diff --git a/game/scripts/events/Start.rpy b/game/scripts/events/Start.rpy
index d446b748..b5b4c397 100644
--- a/game/scripts/events/Start.rpy
+++ b/game/scripts/events/Start.rpy
@@ -48,7 +48,7 @@ label start_wt:
 
 label genie_intro_E1:
     $ game.weather = "clear"
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.day = 0
     call send_letters
 
@@ -87,7 +87,7 @@ label genie_intro_E1:
     dum2 "*Yawn*...{w=0.4} Well... It begins to dawn."
 
     # Swap to day seamlessly
-    $ game.daytime = True
+    $ states.env.daytime = True
     $ game.day = 1
     $ mailbox.tick()
     with d9
diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy
index 7b6a4f1d..5e555dc8 100644
--- a/game/scripts/events/ending.rpy
+++ b/game/scripts/events/ending.rpy
@@ -1,6 +1,6 @@
 ### Yule Ball Ending ###
 
-default her_ev_yule_ball_ending_e1 = Event(id="her_ev_yule_ball_ending_e1", wait=2, label="ball_ending_E1", priority=0, req="game.daytime", repeat=False)
+default her_ev_yule_ball_ending_e1 = Event(id="her_ev_yule_ball_ending_e1", wait=2, label="ball_ending_E1", priority=0, req="states.env.daytime", repeat=False)
 
 label ball_ending_start:
     gen "[name_hermione_genie], that ball you've mentioned..." ("base", xpos="far_left", ypos="head")
@@ -395,7 +395,7 @@ label ball_ending_E2:
     centered "{size=+7}{color=#cbcbcb}The Annual Hogwarts Autumn Ball{/color}{/size}"
 
     # Scene Setup
-    $ game.daytime = True
+    $ states.env.daytime = True
 
     hide screen bld1
     hide screen blktone
@@ -2644,7 +2644,7 @@ label ball_ending_E2:
 
     centered "{size=+7}{color=#cbcbcb}Outskirts of Hogwarts{/color}{/size}"
 
-    $ game.daytime = False
+    $ states.env.daytime = False
 
     hide cg
     pause.3
@@ -2714,7 +2714,7 @@ label ball_ending_E2:
     # Dumbledore is back at Hogwarts
     centered "{size=+7}{color=#cbcbcb}The next morning...{/color}{/size}"
 
-    $ game.daytime = True
+    $ states.env.daytime = True
 
     $ hermione.equip(her_outfit_default)
 
diff --git a/game/scripts/events/ending_after.rpy b/game/scripts/events/ending_after.rpy
index 6bad670f..288d90b0 100644
--- a/game/scripts/events/ending_after.rpy
+++ b/game/scripts/events/ending_after.rpy
@@ -4,7 +4,7 @@
 
 # Genie gets stuck in the cosmos not being able to go anywhere
 label ending_after:
-    $ game.daytime = False
+    $ states.env.daytime = False
 
     call blkfade
 
@@ -190,7 +190,7 @@ label ending_after:
                 call blkfade
 
                 # Next day
-                $ game.daytime = True
+                $ states.env.daytime = True
                 call music_block
 
                 centered "{size=+7}{color=#cbcbcb}The next morning...{/color}{/size}"
diff --git a/game/scripts/events/final_events.rpy b/game/scripts/events/final_events.rpy
index 50b828d1..ef26fa08 100644
--- a/game/scripts/events/final_events.rpy
+++ b/game/scripts/events/final_events.rpy
@@ -1,8 +1,8 @@
 
-default her_ev_yule_ball_e4 = Event(id="her_ev_yule_ball_e4", wait=2, label="ball_quest_E4", priority=15, req="game.daytime", repeat=False)
-default her_ev_yule_ball_e3 = Event(id="her_ev_yule_ball_e3", wait=4, label="ball_quest_E3", priority=15, req="game.daytime", repeat=False, subevents=["her_ev_yule_ball_e4"])
-default her_ev_yule_ball_e2 = Event(id="her_ev_yule_ball_e2", wait=1, label="ball_quest_E2", priority=15, req="game.daytime", repeat=False, subevents=["her_ev_yule_ball_e3"])
-default her_ev_yule_ball_e1 = Event(id="her_ev_yule_ball_e1", label="ball_quest_E1", priority=15, req="states.her.tier >= 6 and game.daytime and not states.her.busy and not states.her.ev.yule_ball.e1_complete", autoenqueue=True, repeat=False, subevents=["her_ev_yule_ball_e2"])
+default her_ev_yule_ball_e4 = Event(id="her_ev_yule_ball_e4", wait=2, label="ball_quest_E4", priority=15, req="states.env.daytime", repeat=False)
+default her_ev_yule_ball_e3 = Event(id="her_ev_yule_ball_e3", wait=4, label="ball_quest_E3", priority=15, req="states.env.daytime", repeat=False, subevents=["her_ev_yule_ball_e4"])
+default her_ev_yule_ball_e2 = Event(id="her_ev_yule_ball_e2", wait=1, label="ball_quest_E2", priority=15, req="states.env.daytime", repeat=False, subevents=["her_ev_yule_ball_e3"])
+default her_ev_yule_ball_e1 = Event(id="her_ev_yule_ball_e1", label="ball_quest_E1", priority=15, req="states.her.tier >= 6 and states.env.daytime and not states.her.busy and not states.her.ev.yule_ball.e1_complete", autoenqueue=True, repeat=False, subevents=["her_ev_yule_ball_e2"])
 
 #hermione asks genie about who will be in-charge of the ball
 label ball_quest_E1:
diff --git a/game/scripts/events/labels.rpy b/game/scripts/events/labels.rpy
index 9db557a6..9e740fd7 100644
--- a/game/scripts/events/labels.rpy
+++ b/game/scripts/events/labels.rpy
@@ -1,6 +1,6 @@
 label setup_fireplace_hangout(char=None):
 
-    if not game.daytime: # Night time
+    if not states.env.daytime: # Night time
         show screen blkfade
 
         $ states.fireplace_started = True
@@ -11,7 +11,7 @@ label setup_fireplace_hangout(char=None):
         call sna_chibi("hide")
         call ton_chibi("hide")
 
-    else: # game.daytime
+    else: # states.env.daytime
         stop background
         show screen blkfade
 
diff --git a/game/scripts/events/map.rpy b/game/scripts/events/map.rpy
index 42697ef3..71863eab 100644
--- a/game/scripts/events/map.rpy
+++ b/game/scripts/events/map.rpy
@@ -63,7 +63,7 @@ label map_attic:
         menu:
             gen "(Question is... Should I use it now, or save it for later?)" ("base", xpos="far_left", ypos="head")
             "-Use it now-":
-                if game.daytime:
+                if states.env.daytime:
                     if not states.her.busy:
                         gen "Yes, there's no time like the present..." ("grin", xpos="far_left", ypos="head")
                         gen "I'll just grab a seat first." ("base", xpos="far_left", ypos="head")
@@ -89,7 +89,7 @@ label map_attic:
         jump main_room_menu
 
 label map_forest:
-    if game.daytime:
+    if states.env.daytime:
         gen "I shouldn't be leaving the castle during the day. It's too risky..." ("base", xpos="far_left", ypos="head")
         jump desk
 
@@ -128,7 +128,7 @@ label map_forest:
 
 
 label map_lake:
-    if game.daytime:
+    if states.env.daytime:
         gen "I shouldn't be leaving the castle during the day. It's too risky..." ("base", xpos="far_left", ypos="head")
         jump desk
 
diff --git a/game/scripts/events/potions/intro.rpy b/game/scripts/events/potions/intro.rpy
index 0c25586f..7c9d095a 100644
--- a/game/scripts/events/potions/intro.rpy
+++ b/game/scripts/events/potions/intro.rpy
@@ -199,7 +199,7 @@ label potions_intro_E1:
 
         call popup("You can now brew potions when Snape's not around!", "Congratulations!", "interface/icons/head/snape.webp")
 
-        $ game.daytime = False
+        $ states.env.daytime = False
         $ states.map.snape_office.intro_e2 = True
         $ states.map.snape_office.intro_e2_stage = 2
 
diff --git a/game/scripts/events/quests.rpy b/game/scripts/events/quests.rpy
index 44f1123d..4eb9d2fa 100644
--- a/game/scripts/events/quests.rpy
+++ b/game/scripts/events/quests.rpy
@@ -15,7 +15,7 @@ label quests:
         #
 
         if game.day >= 1:
-            if game.daytime:
+            if states.env.daytime:
                 if not states.gen.ev.intro.e2_complete and states.gen.ev.intro.bird_examined and states.gen.ev.intro.desk_examined and states.gen.ev.intro.cupboard_examined and states.gen.ev.intro.door_examined and states.gen.ev.intro.fireplace_examined:
                     jump genie_intro_E2
             else:
@@ -23,7 +23,7 @@ label quests:
                     jump snape_intro_E1
 
         if game.day >= 2:
-            if game.daytime:
+            if states.env.daytime:
                 if not states.gen.ev.intro.e3_complete:
                     jump genie_intro_E3
             else:
@@ -32,7 +32,7 @@ label quests:
                     jump snape_intro_E2
 
         if game.day >= 3:
-            if game.daytime:
+            if states.env.daytime:
                 if not states.gen.ev.intro.e4_complete:
                     jump genie_intro_E4
             else:
@@ -42,7 +42,7 @@ label quests:
 
 
         if game.day >= 4:
-            if game.daytime:
+            if states.env.daytime:
                 pass
             else:
                 if ss_event_pause == 0 and not states.sna.ev.intro.e5_complete:
@@ -50,13 +50,13 @@ label quests:
                     jump snape_intro_E5
 
         if game.day >= 5:
-            if game.daytime:
+            if states.env.daytime:
                 if hg_event_pause == 0 and not states.her.ev.intro.e1_complete:
                     # Hermione shows up for the first time.
                     jump hermione_intro_E1
 
         if game.day >= 6:
-            if game.daytime:
+            if states.env.daytime:
                 if hg_event_pause == 0 and states.sna.ev.hangouts.hermione_e1 and not states.her.ev.intro.e2_complete:
                     # Second visit from Hermione. Says she sent a letter to the Ministry.
                     jump hermione_intro_E2
@@ -64,7 +64,7 @@ label quests:
                 pass
 
         if game.day >= 7:
-            if game.daytime:
+            if states.env.daytime:
                 pass
             else:
                 if hg_event_pause == 0 and states.sna.ev.hangouts.hermione_e2 and not states.her.ev.intro.e3_complete:
@@ -73,7 +73,7 @@ label quests:
                     jump hermione_intro_E3
 
         if game.day >= 8:
-            if game.daytime:
+            if states.env.daytime:
                 pass
             else:
                 if hg_event_pause == 0 and states.her.ev.intro.e3_complete and not states.her.ev.intro.e4_complete:
@@ -81,13 +81,13 @@ label quests:
                     jump hermione_intro_E4
 
         if game.day >= 9:
-            if game.daytime:
+            if states.env.daytime:
                 if hg_event_pause == 0 and states.her.ev.intro.e4_complete and not states.her.ev.intro.e5_complete:
                     # Hermione asks to be tutored. Summon unlocked!
                     jump hermione_intro_E5
 
         if game.day >= 10:
-            if game.daytime:
+            if states.env.daytime:
                 if nt_event_pause == 0 and states.her.ev.intro.e5_complete and not states.ton.ev.intro.e1_complete:
                     # Tonks visits for the first time.
                     jump tonks_intro_E1
@@ -97,7 +97,7 @@ label quests:
                     jump tonks_intro_E2
 
         if game.day >= 11:
-            if game.daytime:
+            if states.env.daytime:
                 pass
             else:
                 if nt_event_pause == 0 and states.sna.ev.hangouts.tonks_e1 and not states.ton.ev.intro.e3_complete:
@@ -105,7 +105,7 @@ label quests:
                     jump tonks_intro_E3
 
         if game.day >= 13:
-            if game.daytime:
+            if states.env.daytime:
                 if hg_event_pause == 0 and states.her.ev.intro.e5_complete and states.sna.ev.hangouts.tonks_e1 and states.her.ev.intro.convinced and not states.her.ev.intro.e6_complete:
                     # Hermione wants to buy favours. Favours unlocked!
                     jump hermione_intro_E6
@@ -121,7 +121,7 @@ label quests:
         #
 
         if geniecard_level < 2 and states.sna.ev.cardgame.stage >= 3 and states.her.ev.cardgame.stage >= 3 and states.twi.ev.cardgame.stage >= 2:
-            if not game.daytime:
+            if not states.env.daytime:
                 $ letter_cards_tier2.send()
 
         #
@@ -129,7 +129,7 @@ label quests:
         #
 
         if cc_event_pause == 0:
-            if game.daytime:
+            if states.env.daytime:
 
                 if not states.cho.ev.intro.e1_complete and states.her.tier >= 2:
                     # Cho intro
@@ -198,7 +198,7 @@ label quests:
         #
 
         if sb_event_pause == 0:
-            if game.daytime:
+            if states.env.daytime:
                 # Introduction
                 if states.ton.ev.hangouts.susan_e1 and not states.sus.ev.intro.e1_complete:
                     jump susan_intro_E1
@@ -211,7 +211,7 @@ label quests:
 
         # Astoria events not triggered by a date.
         if ag_event_pause == 0:
-            if game.daytime:
+            if states.env.daytime:
                 # Introduction
                 if states.ast.ev.intro.e2_ask_hermione and states.ast.ev.intro.e2_ask_snape and not states.ast.ev.intro.e3_complete:
                     $ states.ast.ev.intro.e2_complete = True
@@ -248,22 +248,22 @@ label quests:
 
         if ll_event_pause == 0:
             if not states.lun.ev.intro.e1_complete and states.her.tier >= 3:
-                if not game.daytime:
+                if not states.env.daytime:
                     # Luna barges into your office sleepwalking.
                     jump luna_intro_E1
 
             if states.lun.ev.intro.e1_complete and not states.lun.ev.intro.e2_complete:
-                if game.daytime:
+                if states.env.daytime:
                     jump luna_intro_E2
 
             if states.lun.ev.spectrespecs.e1_complete and not states.lun.ev.quibbler.stocked:
-                if game.daytime:
+                if states.env.daytime:
                     jump spectrespecs_E2_reminder
 
             $ play_potion_return("luna")
     elif states.room == "snape_office":
 
-        if game.daytime:
+        if states.env.daytime:
             if not states.map.snape_office.intro_e2:
                 # Genie searches the office
                 jump potions_intro_E1
diff --git a/game/scripts/gui/_gui_.rpy b/game/scripts/gui/_gui_.rpy
index 11ea40a9..fca11efb 100644
--- a/game/scripts/gui/_gui_.rpy
+++ b/game/scripts/gui/_gui_.rpy
@@ -14,7 +14,7 @@ init python in gui:
         theme = settings.get("theme")
 
         if theme == "auto":
-            return not renpy.store.game.daytime
+            return not renpy.store.states.env.daytime
         return (theme == "dark")
 
     def is_light():
diff --git a/game/scripts/interface/calendar.rpy b/game/scripts/interface/calendar.rpy
index bd5a436a..48337496 100644
--- a/game/scripts/interface/calendar.rpy
+++ b/game/scripts/interface/calendar.rpy
@@ -43,7 +43,6 @@ init python:
                 if (day := game.day+i.wait) < span+1:
                     contents[day] += "📦"
 
-
             return contents
 
         @staticmethod
diff --git a/game/scripts/interface/door.rpy b/game/scripts/interface/door.rpy
index 9a2d7f41..34b5728e 100644
--- a/game/scripts/interface/door.rpy
+++ b/game/scripts/interface/door.rpy
@@ -101,7 +101,7 @@ label .summon(char):
     return
 
 label .summon_busy(char):
-    if game.daytime or char in ["Tonks", "Snape"]:
+    if states.env.daytime or char in ["Tonks", "Snape"]:
         nar "[char] is currently busy. Try again later."
     else:
         nar "[char] is currently asleep. Try again tomorrow."
diff --git a/game/scripts/interface/hotkeys.rpy b/game/scripts/interface/hotkeys.rpy
index 52e334a7..39fa509a 100644
--- a/game/scripts/interface/hotkeys.rpy
+++ b/game/scripts/interface/hotkeys.rpy
@@ -172,6 +172,6 @@ screen hotkeys_main():
         key "inventory" action Jump("inventory")
         key "fap" action Jump("jerk_off")
         key "summon" action Jump("door")
-        key "sleep" action If(game.daytime, Jump("night_start"), Jump("day_start"))
+        key "sleep" action If(states.env.daytime, Jump("night_start"), Jump("day_start"))
 
     key "K_SPACE" action RoomHighlightToggle
diff --git a/game/scripts/interface/inventory.rpy b/game/scripts/interface/inventory.rpy
index 44c23305..4f17bcd8 100644
--- a/game/scripts/interface/inventory.rpy
+++ b/game/scripts/interface/inventory.rpy
@@ -146,7 +146,7 @@ label inventory_menu(xx=150, yy=90):
                 nar "Perhaps in the future..."
                 hide screen blktone
                 with d3
-            elif not game.daytime:
+            elif not states.env.daytime:
                 show screen blktone
                 with d3
                 gen "(Some grander force tells me I should give it to her during daytime only.)" ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/interface/map.rpy b/game/scripts/interface/map.rpy
index 3750550e..4f8fff8e 100644
--- a/game/scripts/interface/map.rpy
+++ b/game/scripts/interface/map.rpy
@@ -238,7 +238,7 @@ label set_her_map_location(location=""):
         if states.her.level < 11:
             $ states.her.map_location = __choice(("library", "library", "great_hall", "room_g", "room_g"))
         else:
-            if states.her.status.blowjob == True and game.weather in ("clear", "cloudy") and not game.daytime and not states.her.busy:
+            if states.her.status.blowjob == True and game.weather in ("clear", "cloudy") and not states.env.daytime and not states.her.busy:
                 $ states.her.map_location = "forest"
 
             elif states.her.public_level < 12:
@@ -379,7 +379,7 @@ label update_character_map_locations:
     $ ton_map_ypos = 156
 
     #Snape
-    if game.daytime:
+    if states.env.daytime:
         $ sna_map_xpos = 365
         $ sna_map_ypos = 270
     else:
diff --git a/game/scripts/interface/topbar.rpy b/game/scripts/interface/topbar.rpy
index a7881376..9e7b84bd 100644
--- a/game/scripts/interface/topbar.rpy
+++ b/game/scripts/interface/topbar.rpy
@@ -62,7 +62,7 @@ screen ui_top_bar():
             idle gui.format("interface/topbar/buttons/{}/ui_sleep.webp")
             if room_menu_active:
                 hover image_hover(gui.format("interface/topbar/buttons/{}/ui_sleep.webp"))
-                if game.daytime:
+                if states.env.daytime:
                     action Jump("night_start")
                     tooltip "Doze Off (s)"
                 else:
diff --git a/game/scripts/inventory/books.rpy b/game/scripts/inventory/books.rpy
index 53f7c467..3e4874d5 100644
--- a/game/scripts/inventory/books.rpy
+++ b/game/scripts/inventory/books.rpy
@@ -60,7 +60,7 @@ label galadriel1_book:
 
     gen "What the fuck did I just read?" ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
@@ -94,7 +94,7 @@ label galadriel2_book:
 
     gen "..." ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
@@ -229,7 +229,7 @@ label game_of_chairs1_book:
     gen "The author of this book has some serious issues." ("base", xpos="far_left", ypos="head")
     gen "I wonder if it's even worth picking up the continuation..." ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
@@ -377,7 +377,7 @@ label game_of_chairs2_book:
     gen "There's so much going on I don't even know how to describe it all." ("base", xpos="far_left", ypos="head")
     gen "I doubt that's the last book in the series though." ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
@@ -505,7 +505,7 @@ label game_of_chairs3_book:
 
     gen "I don't know what's with the frequent mentions of balls removal, tortures, and death but colour me morbidly curious." ("base", xpos="far_left", ypos="head")
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
@@ -533,7 +533,7 @@ label quidditch_guide_book:
         gen "This is even more stupid than I imagined." ("base", xpos="far_left", ypos="head")
 
     $ quidditchguide_ITEM.used = True
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
diff --git a/game/scripts/inventory/books_waifu.rpy b/game/scripts/inventory/books_waifu.rpy
index 64923f6c..1676089d 100644
--- a/game/scripts/inventory/books_waifu.rpy
+++ b/game/scripts/inventory/books_waifu.rpy
@@ -338,7 +338,7 @@ label waifu_book:
         seen_endings = ["Ending 0"+str(i+1)+" {unicode}✔{/unicode}" if waifu_progression[j] is True else "Ending 0"+str(i+1)+" {unicode}✘{/unicode}" for i, j in enumerate(endings)]
         my_dear_waifu_ITEM.desc = "Relive the glory of your high school days and find your ultimate \"waifu\".{size=-3}\n\n" + "\n".join(seen_endings) + "{/size}"
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
diff --git a/game/scripts/inventory/potions/_potions_.txt b/game/scripts/inventory/potions/_potions_.txt
index 62a529af..b87e0092 100644
--- a/game/scripts/inventory/potions/_potions_.txt
+++ b/game/scripts/inventory/potions/_potions_.txt
@@ -225,7 +225,7 @@ default p_inv = {} # this stores the id and quantity of items the player has per
 screen potions_room():
     tag room_screen
 
-    if game.daytime:
+    if states.env.daytime:
         add "images/rooms/_bg_/corridor.webp" #Need day image.
     else:
         add "images/rooms/_bg_/corridor.webp"
diff --git a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy
index cbef02d0..fa89f2f8 100644
--- a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy
+++ b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy
@@ -12,7 +12,7 @@ label a_bad_time_to_disrobe:
 
     # Setup
     $ hermione.equip(her_outfit_default)
-    $ game.daytime = True
+    $ states.env.daytime = True
     $ game.weather = "clear"
     stop weather
     call room("main_room")
@@ -73,7 +73,7 @@ label a_bad_time_to_disrobe_part_1:
     show screen blkfade
     with d5
 
-    $ game.daytime = False
+    $ states.env.daytime = False
     call music_block
 
     call her_chibi("stand","desk","base")
@@ -125,7 +125,7 @@ label a_bad_time_to_disrobe_part_1:
 
     nar "Hermione returns the next morning, looking nervous but more determined than yesterday."
 
-    $ game.daytime = True
+    $ states.env.daytime = True
     call music_block
 
     hide qmark
@@ -143,7 +143,7 @@ label a_bad_time_to_disrobe_part_1:
     show screen blkfade
     with d5
 
-    $ game.daytime = False
+    $ states.env.daytime = False
     call music_block
 
     nar "Later that evening, a distraught-looking Hermione enters the office."
@@ -270,7 +270,7 @@ label a_bad_time_to_disrobe_part_2:
     show screen blkfade
     with d3
 
-    $ game.daytime = False
+    $ states.env.daytime = False
     call music_block
 
     nar "Later that evening."
diff --git a/game/scripts/minigames/mirror/events/a_christmas_tale.rpy b/game/scripts/minigames/mirror/events/a_christmas_tale.rpy
index f7bcf67c..b508135a 100644
--- a/game/scripts/minigames/mirror/events/a_christmas_tale.rpy
+++ b/game/scripts/minigames/mirror/events/a_christmas_tale.rpy
@@ -23,7 +23,7 @@ label a_christmas_tale:
     $ owl_OBJ.decoration = xmas_owl_ITEM
     $ fireplace_OBJ.decoration = xmas_fireplace_ITEM
     stop weather
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.weather = "snow"
     call room("main_room")
     stop music fadeout 1
diff --git a/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy b/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy
index c610b9b8..81d51617 100644
--- a/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy
+++ b/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy
@@ -33,7 +33,7 @@ label a_christmas_tale2():
     $ hermione.equip(her_outfit_ribbon)
     $ hermione_chibi.zorder = 4
     stop weather
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.weather = "snow"
     call room("main_room")
     stop music fadeout 1
diff --git a/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt b/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt
index 666e9f0b..8fd495bb 100644
--- a/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt
+++ b/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt
@@ -24,9 +24,9 @@ label start_dark_room_game:
     show screen blkfade
     with d9
 
-    $ temp_time = game.daytime
+    $ temp_time = states.env.daytime
 
-    $ game.daytime = False
+    $ states.env.daytime = False
     call update_interface_color
 
     call hide_screens
diff --git a/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy b/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy
index 8f081567..e1a27ab8 100644
--- a/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy
+++ b/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy
@@ -2,7 +2,7 @@ label a_spaced_out_conversation:
 
     # Setup
     $ fireplace_OBJ.foreground = "fireplace_fire"
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.weather = "clear"
     $ chair_OBJ.hidden = True
     stop weather
diff --git a/game/scripts/minigames/mirror/events/a_white_christmas.rpy b/game/scripts/minigames/mirror/events/a_white_christmas.rpy
index 23f42ef7..2dd46b73 100644
--- a/game/scripts/minigames/mirror/events/a_white_christmas.rpy
+++ b/game/scripts/minigames/mirror/events/a_white_christmas.rpy
@@ -37,7 +37,7 @@ label a_white_christmas:
     $ tonks.equip(ton_outfit_wrestling_coach)
     $ hermione.equip(her_outfit_wrestling)
     stop weather
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.weather = "snow"
     call room("main_room")
     call gen_chibi("sit_behind_desk")
diff --git a/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy b/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy
index cc85a9a8..71de218d 100644
--- a/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy
+++ b/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy
@@ -11,7 +11,7 @@ image dark_overlay:
 label an_odd_circumstance:
 
     stop weather
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.weather = "clear"
     $ game.day = 69
     $ game.gold = 420
diff --git a/game/scripts/minigames/mirror/events/anal_pirate_event.rpy b/game/scripts/minigames/mirror/events/anal_pirate_event.rpy
index 6a0c87c3..2392c5fc 100644
--- a/game/scripts/minigames/mirror/events/anal_pirate_event.rpy
+++ b/game/scripts/minigames/mirror/events/anal_pirate_event.rpy
@@ -18,7 +18,7 @@ label anal_pirate_event:
 
     # Setup
     $ hermione.equip(her_outfit_default)
-    $ game.daytime = True
+    $ states.env.daytime = True
     $ game.weather = "clear"
     stop weather
     call room("main_room")
diff --git a/game/scripts/minigames/mirror/events/biggus_dickus.rpy b/game/scripts/minigames/mirror/events/biggus_dickus.rpy
index 70103374..7bf36086 100644
--- a/game/scripts/minigames/mirror/events/biggus_dickus.rpy
+++ b/game/scripts/minigames/mirror/events/biggus_dickus.rpy
@@ -3,7 +3,7 @@ label biggus_dickus:
 
     # Setup
     $ hermione.equip(her_outfit_default)
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.weather = "clear"
     stop weather
     call room("main_room")
diff --git a/game/scripts/minigames/mirror/events/blueballing_bad.rpy b/game/scripts/minigames/mirror/events/blueballing_bad.rpy
index 720499ed..40904272 100644
--- a/game/scripts/minigames/mirror/events/blueballing_bad.rpy
+++ b/game/scripts/minigames/mirror/events/blueballing_bad.rpy
@@ -5,7 +5,7 @@ label blueballing_bad:
     # Setup
     $ hermione.equip(her_outfit_default)
     $ tonks.equip(ton_outfit_default)
-    $ game.daytime = True
+    $ states.env.daytime = True
     $ game.weather = "clear"
     stop weather
     stop music fadeout 1
diff --git a/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy b/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy
index b72edd6e..9abeb373 100644
--- a/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy
+++ b/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy
@@ -6,7 +6,7 @@ label eating_for_pleasure:
 
     # Setup
     $ hermione.equip(her_outfit_default)
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.weather = "clear"
     stop weather
     call room("main_room")
diff --git a/game/scripts/minigames/mirror/events/genie_house_elf.rpy b/game/scripts/minigames/mirror/events/genie_house_elf.rpy
index 37fd962b..59383747 100644
--- a/game/scripts/minigames/mirror/events/genie_house_elf.rpy
+++ b/game/scripts/minigames/mirror/events/genie_house_elf.rpy
@@ -3,7 +3,7 @@
 label genie_house_elf:
 
     # Setup
-    $ game.daytime = True
+    $ states.env.daytime = True
     $ game.weather = "clear"
     stop weather
     call room("main_room")
diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
index efd3b73c..3abf9a8f 100644
--- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
+++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
@@ -31,7 +31,7 @@ label genies_christmas_wish:
     $ tonks.equip(ton_outfit_santa)
 
     stop weather
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.weather = "snow"
     call room("main_room")
     stop music fadeout 1
diff --git a/game/scripts/minigames/mirror/events/not_so_great_escape.rpy b/game/scripts/minigames/mirror/events/not_so_great_escape.rpy
index 8e9de292..2fd85df0 100644
--- a/game/scripts/minigames/mirror/events/not_so_great_escape.rpy
+++ b/game/scripts/minigames/mirror/events/not_so_great_escape.rpy
@@ -27,7 +27,7 @@ label not_so_great_escape:
     $ tonks.equip(ton_outfit_police)
     $ cho.equip(cho_outfit_police)
     $ luna.equip(lun_outfit_police)
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.weather = "clear"
     stop weather
     call room("main_room")
@@ -358,7 +358,7 @@ label not_so_great_escape:
     call gameover(fake=True)
 
     stop music fadeout 1
-    $ game.daytime = True
+    $ states.env.daytime = True
 
     play sound "sounds/knocking.ogg"
     "*knock-knock-knock*"
diff --git a/game/scripts/minigames/mirror/events/panty_raid.rpy b/game/scripts/minigames/mirror/events/panty_raid.rpy
index 070b15db..eaa6b315 100644
--- a/game/scripts/minigames/mirror/events/panty_raid.rpy
+++ b/game/scripts/minigames/mirror/events/panty_raid.rpy
@@ -9,7 +9,7 @@ label panty_raid:
 
     # Setup
     $ hermione.equip(her_outfit_default)
-    $ game.daytime = True
+    $ states.env.daytime = True
     $ game.weather = "clear"
     stop weather
     call room("main_room")
@@ -120,7 +120,7 @@ label panty_raid:
         stop music fadeout 1.0
         centered "{size=+7}{color=#cbcbcb}Three hours later...{/color}{/size}"
 
-        $ game.daytime = False
+        $ states.env.daytime = False
         call music_block
 
         pause 1.0
@@ -293,7 +293,7 @@ label panty_raid:
         with d3
         stop music fadeout 1.0
         centered "{size=+7}{color=#cbcbcb}Four hours later...{/color}{/size}"
-        $ game.daytime = False
+        $ states.env.daytime = False
         call music_block
 
         pause 1.0
@@ -427,7 +427,7 @@ label panty_raid:
 
         stop music fadeout 1.0
         centered "{size=+7}{color=#cbcbcb}A few hours later...{/color}{/size}"
-        $ game.daytime = False
+        $ states.env.daytime = False
         call music_block
 
         pause 1.0
@@ -670,7 +670,7 @@ label panty_raid:
 
         stop music fadeout 1.0
         centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}"
-        $ game.daytime = False
+        $ states.env.daytime = False
         call music_block
 
         pause 1.0
diff --git a/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy b/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy
index d6f46655..c78cbd21 100644
--- a/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy
+++ b/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy
@@ -3,7 +3,7 @@ label prev_at_hogwarts:
 
     # Setup
     $ hermione.equip(her_outfit_default)
-    $ game.daytime = True
+    $ states.env.daytime = True
     $ game.weather = "clear"
     $ game.day = 1
     $ game.gold = 0
diff --git a/game/scripts/minigames/mirror/events/suck_and_run.rpy b/game/scripts/minigames/mirror/events/suck_and_run.rpy
index a47f6ec0..16f60ef8 100644
--- a/game/scripts/minigames/mirror/events/suck_and_run.rpy
+++ b/game/scripts/minigames/mirror/events/suck_and_run.rpy
@@ -14,7 +14,7 @@ label suck_and_run:
 
     # Setup
     $ tonks.equip(ton_outfit_default)
-    $ game.daytime = False
+    $ states.env.daytime = False
     $ game.weather = "clear"
     stop weather
     call room("main_room")
diff --git a/game/scripts/minigames/mirror/events/whose_points.rpy b/game/scripts/minigames/mirror/events/whose_points.rpy
index be026cf0..279fe4c5 100644
--- a/game/scripts/minigames/mirror/events/whose_points.rpy
+++ b/game/scripts/minigames/mirror/events/whose_points.rpy
@@ -6,7 +6,7 @@ label whose_points:
     $ hermione.equip(her_outfit_default)
     $ astoria.equip(ast_outfit_default)
     $ luna.equip(lun_outfit_default)
-    $ game.daytime = True
+    $ states.env.daytime = True
     $ game.weather = "clear"
     stop weather
     call room("main_room")
diff --git a/game/scripts/minigames/puzzle.rpy b/game/scripts/minigames/puzzle.rpy
index bb622af4..a2376c47 100644
--- a/game/scripts/minigames/puzzle.rpy
+++ b/game/scripts/minigames/puzzle.rpy
@@ -156,7 +156,7 @@ label puzzle_minigame:
 
     $ chair_OBJ.hidden = False
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
diff --git a/game/scripts/rooms/boxing_ring/init.rpy b/game/scripts/rooms/boxing_ring/init.rpy
index 5d6e7629..706d0699 100644
--- a/game/scripts/rooms/boxing_ring/init.rpy
+++ b/game/scripts/rooms/boxing_ring/init.rpy
@@ -50,7 +50,7 @@ screen boxing_ring_overlay():
 #     call room("snape_office")
 #     play music "music/the-other-side-of-the-door-by-kevin-macleod-from-filmmusic-io.ogg" fadein 1 if_changed
 
-#     if game.daytime:
+#     if states.env.daytime:
 #         $ snape_office_desk_OBJ.set_image("snape_office_desk")
 #         $ snape_office_brewing_station_OBJ.set_image("snape_office_brewing_station_off")
 #         $ snape_office_brewing_station_OBJ.foreground = None
diff --git a/game/scripts/rooms/main_room/init.rpy b/game/scripts/rooms/main_room/init.rpy
index e39ba1d7..93ac4902 100644
--- a/game/scripts/rooms/main_room/init.rpy
+++ b/game/scripts/rooms/main_room/init.rpy
@@ -53,7 +53,7 @@ default desk_OBJ = RoomObject(
     hover="ch_gen sit_behind_desk_hover",
     focus_mask="ch_gen sit_behind_desk",
     action={
-        "Sleep": (Text("💤", align=(0.5, 0.5)), IfExpr("game.daytime", Jump("night_start"), Jump("day_start")), "True"),
+        "Sleep": (Text("💤", align=(0.5, 0.5)), IfExpr("states.env.daytime", Jump("night_start"), Jump("day_start")), "True"),
         "Jerk Off": (Text("🍆", align=(0.5, 0.5)), Jump("jerk_off"), "True"),
         "Do Paperwork": (Text("📝", align=(0.5, 0.5)), Jump("paperwork"), "states.paperwork_unlocked"),
         "Open Deck Builder": (Text("🃏", align=(0.5, 0.5)), Jump("deck_builder"), "states.cardgame.unlocked"),
@@ -95,7 +95,7 @@ screen main_room():
     add "weather [game.weather]" xycenter (430, 218)
 
     # Walls
-    if game.daytime:
+    if states.env.daytime:
         add "main_room_idle_day"
     else:
         add "main_room_idle_night"
@@ -120,7 +120,7 @@ label main_room:
     call gen_chibi("sit_behind_desk")
     with d3
 
-    if game.daytime:
+    if states.env.daytime:
         jump day_resume
     else:
         jump night_resume
@@ -131,7 +131,7 @@ label main_room_menu:
     hide screen bld1
     with d3
 
-    if game.daytime:
+    if states.env.daytime:
         jump day_resume
     else:
         jump night_resume
diff --git a/game/scripts/rooms/main_room/objects/cupboard.rpy b/game/scripts/rooms/main_room/objects/cupboard.rpy
index c265d9b0..3c968672 100644
--- a/game/scripts/rooms/main_room/objects/cupboard.rpy
+++ b/game/scripts/rooms/main_room/objects/cupboard.rpy
@@ -1,7 +1,7 @@
 
 label cupboard:
     if states.cupboard_rummaged:
-        if game.daytime:
+        if states.env.daytime:
             nar "You have already searched the cupboard today."
         else:
             nar "You have already searched the cupboard tonight."
diff --git a/game/scripts/rooms/main_room/objects/desk.rpy b/game/scripts/rooms/main_room/objects/desk.rpy
index 18f21111..49f7ffaf 100644
--- a/game/scripts/rooms/main_room/objects/desk.rpy
+++ b/game/scripts/rooms/main_room/objects/desk.rpy
@@ -49,7 +49,7 @@ label desk:
     #Hermione
     if __choice == "hermione":
         if states.her.busy:
-            if game.daytime:
+            if states.env.daytime:
                 nar "Hermione is taking classes."
             else:
                 nar "Hermione is already asleep."
@@ -68,7 +68,7 @@ label desk:
     #Luna
     elif states.lun.unlocked and __choice == "luna":
         if states.lun.busy:
-            if game.daytime:
+            if states.env.daytime:
                 nar "Luna is taking classes."
             else:
                 nar "Luna is already asleep."
@@ -79,7 +79,7 @@ label desk:
     #Astoria
     elif __choice == "astoria":
         if states.ast.busy:
-            if game.daytime:
+            if states.env.daytime:
                 nar "Astoria is taking classes."
             else:
                 nar "Astoria is already asleep."
@@ -90,7 +90,7 @@ label desk:
     #Susan
     elif __choice == "susan":
         if states.sus.busy:
-            if game.daytime:
+            if states.env.daytime:
                 nar "Susan is taking classes."
             else:
                 nar "Susan is already asleep."
@@ -101,7 +101,7 @@ label desk:
     #Cho
     elif __choice == "cho":
         if states.cho.busy:
-            if game.daytime:
+            if states.env.daytime:
                 nar "Cho is taking classes."
             else:
                 nar "Cho is already asleep."
@@ -216,7 +216,7 @@ screen desk_menu():
         action Return("Close")
 
     #Night Overlay
-    if not game.daytime:
+    if not states.env.daytime:
         add "interface/desk/_night_overlay_.webp"
 
     use close_button
@@ -242,8 +242,8 @@ screen watch():
         hover "interface/desk/watch_hover.webp"
         unhovered SetScreenVariable("ball_hint", None)
         keysym "sleep"
-        hovered If(game.daytime, SetScreenVariable("ball_hint", "doze_off"), SetScreenVariable("ball_hint", "sleep"))
-        action If(game.daytime, Return("night_start"), Return("day_start"))
+        hovered If(states.env.daytime, SetScreenVariable("ball_hint", "doze_off"), SetScreenVariable("ball_hint", "sleep"))
+        action If(states.env.daytime, Return("night_start"), Return("day_start"))
 
     $ watch_x = 603 +67
     $ watch_y = 35
@@ -255,12 +255,12 @@ screen watch():
     elif game.weather == "storm":
         add "interface/desk/watch/storm.webp" xpos watch_x ypos watch_y
     else:
-        if game.daytime:
+        if states.env.daytime:
             add "interface/desk/watch/sun.webp" xpos watch_x ypos watch_y
         else:
             add "interface/desk/watch/moon.webp" xpos watch_x ypos watch_y
 
-    if game.daytime:
+    if states.env.daytime:
         add "interface/desk/watch/day.webp" xpos watch_x+40 ypos watch_y+6 xanchor 0.5
     else:
         add "interface/desk/watch/night.webp" xpos watch_x+40 ypos watch_y+6 xanchor 0.5
@@ -315,15 +315,15 @@ label paperwork:
 
     call paperwork_progress_chapter
 
-    if not game.daytime and (game.day % 7 == 0):
+    if not states.env.daytime and (game.day % 7 == 0):
         call paperwork_progress_chapter("The Full moon makes you feel vastly more productive.\n", bonus=2)
 
-    if not game.daytime and (game.day % 7 == 3):
+    if not states.env.daytime and (game.day % 7 == 3):
         call paperwork_progress_chapter("The half moon makes you feel more productive.\n")
 
     call gen_chibi("sit_behind_desk")
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
diff --git a/game/scripts/rooms/main_room/objects/fireplace.rpy b/game/scripts/rooms/main_room/objects/fireplace.rpy
index 5ceaa61c..d2bf594c 100644
--- a/game/scripts/rooms/main_room/objects/fireplace.rpy
+++ b/game/scripts/rooms/main_room/objects/fireplace.rpy
@@ -55,4 +55,4 @@ label examine_fireplace:
 
 init python:
     def is_puzzle_box_in_fireplace():
-        return game.day >= 25 and not game.daytime and game.moon and not puzzle_box_ITEM.unlocked and not states.map.seventh_floor.unlocked
+        return game.day >= 25 and not states.env.daytime and game.moon and not puzzle_box_ITEM.unlocked and not states.map.seventh_floor.unlocked
diff --git a/game/scripts/rooms/main_room/objects/jerk_off.rpy b/game/scripts/rooms/main_room/objects/jerk_off.rpy
index 630772d6..c3fc59ef 100644
--- a/game/scripts/rooms/main_room/objects/jerk_off.rpy
+++ b/game/scripts/rooms/main_room/objects/jerk_off.rpy
@@ -76,7 +76,7 @@ label jerk_off:
 
     call gen_chibi("sit_behind_desk")
 
-    if game.daytime:
+    if states.env.daytime:
         jump night_start
     else:
         jump day_start
diff --git a/game/scripts/rooms/main_room/objects/weather.rpy b/game/scripts/rooms/main_room/objects/weather.rpy
index cb5aa46e..d9e7e5b4 100644
--- a/game/scripts/rooms/main_room/objects/weather.rpy
+++ b/game/scripts/rooms/main_room/objects/weather.rpy
@@ -29,13 +29,13 @@ transform cloud_move:
     repeat
 
 image weather clear = ConditionSwitch( # final
-    "game.daytime", "images/rooms/main_room/weather/sky.webp",
+    "states.env.daytime", "images/rooms/main_room/weather/sky.webp",
     "game.moon", "images/rooms/main_room/weather/night_sky_moon.webp",
     "True", "images/rooms/main_room/weather/night_sky.webp",
     )
 
 image weather overcast = ConditionSwitch( # final
-    "game.daytime", "images/rooms/main_room/weather/sky_overcast.webp",
+    "states.env.daytime", "images/rooms/main_room/weather/sky_overcast.webp",
     "game.moon", "images/rooms/main_room/weather/night_sky_moon_overcast.webp",
     "True", "images/rooms/main_room/weather/night_sky_overcast.webp",
     )
@@ -82,7 +82,7 @@ transform weather_cloudy_clouds(tim):
         cloud_move
 
 image weather_cloudy_clouds = ConditionSwitch(
-    "game.daytime", weather_cloudy_clouds("day"),
+    "states.env.daytime", weather_cloudy_clouds("day"),
     "True", weather_cloudy_clouds("night"),
 )
 
diff --git a/game/scripts/rooms/snape_office/init.rpy b/game/scripts/rooms/snape_office/init.rpy
index 3c7c5b8a..86df7270 100644
--- a/game/scripts/rooms/snape_office/init.rpy
+++ b/game/scripts/rooms/snape_office/init.rpy
@@ -41,7 +41,7 @@ label snape_office:
     call room("snape_office")
     play music "music/the-other-side-of-the-door-by-kevin-macleod-from-filmmusic-io.ogg" fadein 1 if_changed
 
-    if game.daytime:
+    if states.env.daytime:
         $ snape_office_desk_OBJ.set_image("snape_office_desk")
         $ snape_office_brewing_station_OBJ.set_image("snape_office_brewing_station_off")
         $ snape_office_brewing_station_OBJ.foreground = None
diff --git a/game/scripts/rooms/snape_office/objects/brewing_station.rpy b/game/scripts/rooms/snape_office/objects/brewing_station.rpy
index 7333f4c7..5f4a0efb 100644
--- a/game/scripts/rooms/snape_office/objects/brewing_station.rpy
+++ b/game/scripts/rooms/snape_office/objects/brewing_station.rpy
@@ -1,7 +1,7 @@
 
 label brewing_station:
 
-    if game.daytime:
+    if states.env.daytime:
         if not states.map.snape_office.station_examined:
             $ states.map.snape_office.station_examined = True
             $ snape_office_brewing_station_OBJ.set_image("snape_office_brewing_station_off")
diff --git a/game/scripts/rooms/snape_office/objects/candelabra.rpy b/game/scripts/rooms/snape_office/objects/candelabra.rpy
index b0f0298e..3a266fc7 100644
--- a/game/scripts/rooms/snape_office/objects/candelabra.rpy
+++ b/game/scripts/rooms/snape_office/objects/candelabra.rpy
@@ -1,7 +1,7 @@
 
 label candelabra:
 
-    if game.daytime:
+    if states.env.daytime:
 
         if not states.map.snape_office.candelabra_examined:
             $ states.map.snape_office.candelabra_examined = True
diff --git a/game/scripts/rooms/snape_office/objects/desk.rpy b/game/scripts/rooms/snape_office/objects/desk.rpy
index 1bd72e9b..278c5f41 100644
--- a/game/scripts/rooms/snape_office/objects/desk.rpy
+++ b/game/scripts/rooms/snape_office/objects/desk.rpy
@@ -1,7 +1,7 @@
 
 label snape_at_desk:
 
-    if game.daytime:
+    if states.env.daytime:
         if not states.map.snape_office.desk_examined:
             $ states.map.snape_office.desk_examined = True
             $ snape_office_desk_OBJ.set_image("snape_office_desk")
diff --git a/game/scripts/rooms/snape_office/objects/picture.rpy b/game/scripts/rooms/snape_office/objects/picture.rpy
index fa70a918..9d994fe9 100644
--- a/game/scripts/rooms/snape_office/objects/picture.rpy
+++ b/game/scripts/rooms/snape_office/objects/picture.rpy
@@ -1,7 +1,7 @@
 
 label snape_picture:
 
-    if game.daytime:
+    if states.env.daytime:
 
         if not states.map.snape_office.picture_examined:
             $ states.map.snape_office.picture_examined = True
diff --git a/game/scripts/rooms/snape_office/objects/shelves.rpy b/game/scripts/rooms/snape_office/objects/shelves.rpy
index 69ced31a..1fecfc4e 100644
--- a/game/scripts/rooms/snape_office/objects/shelves.rpy
+++ b/game/scripts/rooms/snape_office/objects/shelves.rpy
@@ -1,7 +1,7 @@
 
 label shelves:
 
-    if game.daytime:
+    if states.env.daytime:
 
         if not states.map.snape_office.shelves_examined:
             $ states.map.snape_office.shelves_examined = True
diff --git a/game/scripts/rooms/snape_office/objects/statue.rpy b/game/scripts/rooms/snape_office/objects/statue.rpy
index 42e3a37b..bf2d955e 100644
--- a/game/scripts/rooms/snape_office/objects/statue.rpy
+++ b/game/scripts/rooms/snape_office/objects/statue.rpy
@@ -1,7 +1,7 @@
 
 label snake_statue:
 
-    if game.daytime:
+    if states.env.daytime:
 
         if not states.map.snape_office.statue_examined:
             $ states.map.snape_office.statue_examined = True
diff --git a/game/scripts/shops/dress/room.rpy b/game/scripts/shops/dress/room.rpy
index 45e45ccf..41fc94d1 100644
--- a/game/scripts/shops/dress/room.rpy
+++ b/game/scripts/shops/dress/room.rpy
@@ -41,7 +41,7 @@ screen clothing_store():
     tag room_screen
     zorder 0
 
-    if game.daytime:
+    if states.env.daytime:
         add "images/rooms/_bg_/corridor.webp" #Need day image.
     else:
         add "images/rooms/_bg_/corridor.webp"
diff --git a/game/scripts/shops/item/room.rpy b/game/scripts/shops/item/room.rpy
index 9654e4dc..726064cd 100644
--- a/game/scripts/shops/item/room.rpy
+++ b/game/scripts/shops/item/room.rpy
@@ -1,7 +1,7 @@
 screen weasley_store_room():
     tag room_screen
 
-    if game.daytime:
+    if states.env.daytime:
         add "images/rooms/weasley_store/store_day.webp"
     else:
         add "images/rooms/weasley_store/store_night.webp"
diff --git a/game/scripts/utility/common_functions.rpy b/game/scripts/utility/common_functions.rpy
index 52d579e1..cfd0e91b 100644
--- a/game/scripts/utility/common_functions.rpy
+++ b/game/scripts/utility/common_functions.rpy
@@ -169,7 +169,7 @@ init python early:
         return (house == max(gryffindor, slytherin, ravenclaw, hufflepuff))
 
     def play_potion_return(who):
-        if game.daytime:
+        if states.env.daytime:
             return
 
         for i in inventory.get_instances_of_type("potion"):
diff --git a/game/scripts/utility/common_labels.rpy b/game/scripts/utility/common_labels.rpy
index ca15a815..484e499d 100644
--- a/game/scripts/utility/common_labels.rpy
+++ b/game/scripts/utility/common_labels.rpy
@@ -73,7 +73,7 @@ label ctc:
 # Play day/night theme
 label music_block:
     if states.room == "main_room":
-        if game.daytime:
+        if states.env.daytime:
             play music "music/Brittle Rille.ogg" fadein 1 if_changed
         else:
             play music "music/Music for Manatees.ogg" fadein 1 if_changed
diff --git a/game/scripts/variables.rpy b/game/scripts/variables.rpy
index 6459dcbd..e5107f12 100644
--- a/game/scripts/variables.rpy
+++ b/game/scripts/variables.rpy
@@ -28,3 +28,54 @@ default sb_summon_pause = 0
 # Sprite positioning
 default nxpos = 0
 default nypos = 0
+
+init python:
+    class Environment(object):
+        """Encapsulation for special variables and flags."""
+
+        def __init__(self):
+            # Protected values
+            self._gold = 0
+            self._day = 0
+            self._gryf = 0
+            self._slyt = 0
+            self._rave = 0
+            self._huff = 0
+            self._weather = "clear"
+
+            # Normal values
+            self.daytime = True
+            self.difficulty = 2
+            self.cheats = False
+            self.moon = True
+
+        @property
+        def gold(self):
+            return self._gold
+
+        @gold.setter
+        def gold(self, value):
+            old = self._gold
+            self._gold = max(0, min(value, 99999))
+
+            if not renpy.in_rollback() and not _in_replay:
+                renpy.hide_screen("gold")
+                renpy.show_screen("gold", old, self._gold)
+
+        @property
+        def day(self):
+            return self._day
+
+        @day.setter
+        def day(self, value):
+            self._day = max(0, value)
+
+        @property
+        def weather(self):
+            return Weather.get_weather()
+
+        @weather.setter
+        def weather(self, value):
+            Weather.set_weather(value)
+
+default states.env = Environment()
diff --git a/game/scripts/wardrobe/color_picker.rpy b/game/scripts/wardrobe/color_picker.rpy
index 5063d038..ee277012 100644
--- a/game/scripts/wardrobe/color_picker.rpy
+++ b/game/scripts/wardrobe/color_picker.rpy
@@ -563,26 +563,26 @@ style colorpicker_hbox:
     spacing 22
 
 image cp_frame = ConditionSwitch(
-    "not game.daytime", Frame("gui/dark_frame.png", 8, 8),
+    "not states.env.daytime", Frame("gui/dark_frame.png", 8, 8),
     "True", Frame("gui/light_frame.png", 8, 8)
     )
 
 image cp_borders = ConditionSwitch(
-    "not game.daytime", Frame("interface/color_picker/gray/cursor_sq.webp", 3, 3),
+    "not states.env.daytime", Frame("interface/color_picker/gray/cursor_sq.webp", 3, 3),
     "True", Frame("interface/color_picker/gold/cursor_sq.webp", 3, 3)
     )
 
 image cph_cursor = ConditionSwitch(
-    "not game.daytime", "interface/color_picker/gray/cursor_h.webp",
+    "not states.env.daytime", "interface/color_picker/gray/cursor_h.webp",
     "True", "interface/color_picker/gold/cursor_h.webp"
     )
 
 image cpa_cursor = ConditionSwitch(
-    "not game.daytime", "interface/color_picker/gray/cursor_v.webp",
+    "not states.env.daytime", "interface/color_picker/gray/cursor_v.webp",
     "True", "interface/color_picker/gold/cursor_v.webp"
     )
 
 image cpsv_cursor = ConditionSwitch(
-    "not game.daytime", "interface/color_picker/gray/cursor_sq.webp",
+    "not states.env.daytime", "interface/color_picker/gray/cursor_sq.webp",
     "True", "interface/color_picker/gold/cursor_sq.webp"
     )