From 6da319481bc484ec823ec75ab433fde9d76861b5 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sat, 11 Jan 2020 22:23:37 -0800
Subject: [PATCH] woops forgot those

---
 code/datums/components/mood.dm                | 19 +++----------------
 code/game/objects/effects/mines.dm            |  5 -----
 code/modules/mob/living/carbon/carbon.dm      |  4 ----
 .../modules/movespeed/modifiers/components.dm | 13 +++++++++++++
 code/modules/movespeed/modifiers/misc.dm      |  5 +++++
 code/modules/movespeed/modifiers/mobs.dm      |  4 ++++
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index f9f2914ed52..63976bd3abc 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -208,15 +208,15 @@
 	switch(sanity)
 		if(SANITY_INSANE to SANITY_CRAZY)
 			setInsanityEffect(MAJOR_INSANITY_PEN)
-			master.add_movespeed_modifier(/datum/movespeed_modifier/sanity/insane, override = TRUE)
+			master.add_movespeed_modifier(/datum/movespeed_modifier/sanity/insane)
 			sanity_level = 6
 		if(SANITY_CRAZY to SANITY_UNSTABLE)
 			setInsanityEffect(MINOR_INSANITY_PEN)
-			master.add_movespeed_modifier(/datum/movespeed_modifier/sanity/crazy, override = TRUE)
+			master.add_movespeed_modifier(/datum/movespeed_modifier/sanity/crazy)
 			sanity_level = 5
 		if(SANITY_UNSTABLE to SANITY_DISTURBED)
 			setInsanityEffect(0)
-			master.add_movespeed_modifier(/datum/movespeed_modifier/sanity/disturbed, override = TRUE)
+			master.add_movespeed_modifier(/datum/movespeed_modifier/sanity/disturbed)
 			sanity_level = 4
 		if(SANITY_DISTURBED to SANITY_NEUTRAL)
 			setInsanityEffect(0)
@@ -232,19 +232,6 @@
 			sanity_level = 1
 	update_mood_icon()
 
-/datum/movespeed_modifier/sanity
-	id = MOVESPEED_ID_SANITY
-	movetypes = (~FLYING)
-
-/datum/movespeed_modifier/sanity/insane
-	multiplicative_slowdown = 1
-
-/datum/movespeed_modifier/sanity/crazy
-	multiplicative_slowdown = 0.5
-
-/datum/movespeed_modifier/sanity/disturbed
-	multiplicative_slowdown = 0.25
-
 /datum/component/mood/proc/setInsanityEffect(newval)
 	if(newval == insanity_effect)
 		return
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index f31e849b67b..cdb06ba00ba 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -176,8 +176,3 @@
 	sleep(duration)
 	victim.remove_movespeed_modifier(/datum/movespeed_modifier/yellow_orb)
 	to_chat(victim, "<span class='notice'>You slow down.</span>")
-
-/datum/movespeed_modifier/yellow_orb
-	id = MOVESPEED_ID_YELLOW_ORB
-	multiplicative_slowdown = -2
-	blacklisted_movetypes = (FLYING|FLOATING)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index d4e7509d97c..dda46b08455 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -501,10 +501,6 @@
 	else
 		remove_movespeed_modifier(/datum/movespeed_modifier/carbon_crawling)
 
-/datum/movespeed_modifier/carbon_crawling
-	id = MOVESPEED_ID_CARBON_CRAWLING
-	multiplicative_slowdown = CRAWLING_ADD_SLOWDOWN
-
 //Updates the mob's health from bodyparts and mob damage variables
 /mob/living/carbon/updatehealth()
 	if(status_flags & GODMODE)
diff --git a/code/modules/movespeed/modifiers/components.dm b/code/modules/movespeed/modifiers/components.dm
index 040a7950fac..ec4c4e11973 100644
--- a/code/modules/movespeed/modifiers/components.dm
+++ b/code/modules/movespeed/modifiers/components.dm
@@ -7,3 +7,16 @@
 	id = MOVESPEED_ID_SNAIL_CRAWL
 	multiplicative_slowdown = -7
 	movetypes = GROUND
+
+/datum/movespeed_modifier/sanity
+	id = MOVESPEED_ID_SANITY
+	movetypes = (~FLYING)
+
+/datum/movespeed_modifier/sanity/insane
+	multiplicative_slowdown = 1
+
+/datum/movespeed_modifier/sanity/crazy
+	multiplicative_slowdown = 0.5
+
+/datum/movespeed_modifier/sanity/disturbed
+	multiplicative_slowdown = 0.25
diff --git a/code/modules/movespeed/modifiers/misc.dm b/code/modules/movespeed/modifiers/misc.dm
index 548b35708a7..7e606e3f1e9 100644
--- a/code/modules/movespeed/modifiers/misc.dm
+++ b/code/modules/movespeed/modifiers/misc.dm
@@ -1,3 +1,8 @@
 /datum/movespeed_modifier/admin_varedit
 	variable = TRUE
 	id = MOVESPEED_ID_ADMIN_VAREDIT
+
+/datum/movespeed_modifier/yellow_orb
+	id = MOVESPEED_ID_YELLOW_ORB
+	multiplicative_slowdown = -2
+	blacklisted_movetypes = (FLYING|FLOATING)
diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm
index 42fc0409433..50f44a96ccc 100644
--- a/code/modules/movespeed/modifiers/mobs.dm
+++ b/code/modules/movespeed/modifiers/mobs.dm
@@ -118,3 +118,7 @@
 /datum/movespeed_modifier/slime_tempmod
 	id = MOVESPEED_ID_SLIME_TEMPMOD
 	variable = TRUE
+
+/datum/movespeed_modifier/carbon_crawling
+	id = MOVESPEED_ID_CARBON_CRAWLING
+	multiplicative_slowdown = CRAWLING_ADD_SLOWDOWN