From 0d487e3eb90171b2139387ea10e4eff1cf772e15 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sat, 20 Mar 2021 19:16:50 +0000
Subject: [PATCH] Proper fixes and returning to monkey.

---
 code/controllers/subsystem/mobs.dm                | 1 -
 code/modules/mob/living/carbon/human/examine.dm   | 4 ++--
 code/modules/mob/living/carbon/life.dm            | 2 +-
 html/statbrowser.html                             | 4 +++-
 modular_citadel/code/modules/mob/living/living.dm | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm
index efc24629..1e8efff0 100644
--- a/code/controllers/subsystem/mobs.dm
+++ b/code/controllers/subsystem/mobs.dm
@@ -3,7 +3,6 @@ SUBSYSTEM_DEF(mobs)
 	priority = FIRE_PRIORITY_MOBS
 	flags = SS_KEEP_TIMING | SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
-	wait = 5
 
 	var/list/currentrun = list()
 	var/static/list/clients_by_zlevel[][]
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index ab583c70..dc89f8b6 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -427,10 +427,10 @@
 			output += "<br>...?"
 		else
 			. += "[print_flavor_text()]"
-			output += "<br>[replacetext(sanitize(html_decode(flavor_text)), "#", "<p>")]"
+			output += "<br>[url_encode(json_encode(flavor_text))]"
 			if(ooc_text)
 				output += "<br><br><i><b>OOC</b>"
-				output += "<br>[replacetext(sanitize(html_decode(ooc_text)), "#", "<p>")]"
+				output += "<br>[url_encode(json_encode(ooc_text))]"
 
 	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, msg)
 	. += "*---------*</span>"
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 04ea03c0..d9493d6f 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -541,7 +541,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 /mob/living/carbon/handle_status_effects()
 	..()
 	if(getStaminaLoss() && !combatmode)//CIT CHANGE - prevents stamina regen while combat mode is active
-		adjustStaminaLoss(resting ? (recoveringstam ? -3 : -2) : -1.5)//CIT CHANGE - decreases adjuststaminaloss to stop stamina damage from being such a joke
+		adjustStaminaLoss(resting ? (recoveringstam ? -7.5 : -3) : -1.5)
 
 	if(!recoveringstam && incomingstammult != 1)
 		incomingstammult = max(0.01, incomingstammult)
diff --git a/html/statbrowser.html b/html/statbrowser.html
index 8430f9a8..c9856acc 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -275,6 +275,8 @@ var status_tab_parts = ["loading..."];
 var current_tab = null;
 var mc_tab_parts = [["loading...", ""]];
 var examine_tab_parts = ["<b>Mob Examine Text</b>"];
+var examine_flavour = [];
+var examine_ooc = [];
 var href_token = null;
 var spells = [];
 var spell_tabs = [];
@@ -689,7 +691,7 @@ function draw_mc() {
 }
 
 
-function update_examine(html) {
+function update_examine(html,flavour,ooc) {
 	examine_tab_parts = html
 	}
 
diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm
index 1da32245..5ec2ab8c 100644
--- a/modular_citadel/code/modules/mob/living/living.dm
+++ b/modular_citadel/code/modules/mob/living/living.dm
@@ -19,7 +19,7 @@
 /mob/living/movement_delay(ignorewalk = 0)
 	. = ..()
 	if(resting)
-		. += 3
+		. += 6
 
 /atom
 	var/pseudo_z_axis