From 9cf0ca814bc1a87f8f1fe7a56980d95ba597e1c3 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sat, 20 Mar 2021 19:01:30 +0000
Subject: [PATCH] Revert "some fixes!"

This reverts commit 0c5effbc7bb176218bfad75ce8ab1a1918903a8a.
---
 code/__DEFINES/mobs.dm                                | 4 ++--
 code/game/objects/items/melee/misc.dm                 | 2 +-
 code/modules/mob/living/carbon/human/examine.dm       | 4 ++--
 code/modules/projectiles/ammunition/energy/stun.dm    | 2 +-
 code/modules/projectiles/projectile/beams.dm          | 2 +-
 html/statbrowser.html                                 | 4 +---
 modular_citadel/code/game/objects/items/melee/misc.dm | 2 +-
 modular_citadel/code/modules/mob/living/living.dm     | 2 +-
 8 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index a4de5572..3e46a1e8 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -259,8 +259,8 @@
 #define POCKET_STRIP_DELAY			40	//time taken (in deciseconds) to search somebody's pockets
 #define DOOR_CRUSH_DAMAGE	15	//the amount of damage that airlocks deal when they crush you
 
-#define	HUNGER_FACTOR		0.03	//factor at which mob nutrition decreases
-#define	THIRST_FACTOR		0.03	//factor at which mob thirst decreases
+#define	HUNGER_FACTOR		0.08	//factor at which mob nutrition decreases
+#define	THIRST_FACTOR		0.08	//factor at which mob thirst decreases
 #define	REAGENTS_METABOLISM 0.4	//How many units of reagent are consumed per tick, by default.
 #define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4)	// By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism
 
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index aa1f49a0..1f0c1c49 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -273,7 +273,7 @@
 		icon_state = "telebaton_1"
 		item_state = "nullrod"
 		w_class = WEIGHT_CLASS_BULKY //doesnt fit in backpack when its on for balance
-		force = 50 //stunbaton damage
+		force = 10 //stunbaton damage
 		attack_verb = list("smacked", "struck", "cracked", "beaten")
 	else
 		to_chat(user, "<span class ='notice'>You collapse the baton.</span>")
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index dc89f8b6..ab583c70 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>[url_encode(json_encode(flavor_text))]"
+			output += "<br>[replacetext(sanitize(html_decode(flavor_text)), "#", "<p>")]"
 			if(ooc_text)
 				output += "<br><br><i><b>OOC</b>"
-				output += "<br>[url_encode(json_encode(ooc_text))]"
+				output += "<br>[replacetext(sanitize(html_decode(ooc_text)), "#", "<p>")]"
 
 	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, msg)
 	. += "*---------*</span>"
diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm
index 261cefcd..fcf69c32 100644
--- a/code/modules/projectiles/ammunition/energy/stun.dm
+++ b/code/modules/projectiles/ammunition/energy/stun.dm
@@ -24,4 +24,4 @@
 	e_cost = 40
 	fire_sound = 'sound/weapons/taser2.ogg'
 	harmful = FALSE
-	click_cooldown_override = 4
+	click_cooldown_override = 3.5
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 12c7dd36..5065eed6 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -69,7 +69,7 @@
 /obj/item/projectile/beam/disabler
 	name = "disabler beam"
 	icon_state = "omnilaser"
-	damage = 35 // Citadel change for balance from 36
+	damage = 24 // Citadel change for balance from 36
 	damage_type = STAMINA
 	flag = "energy"
 	hitsound = 'sound/weapons/tap.ogg'
diff --git a/html/statbrowser.html b/html/statbrowser.html
index c9856acc..8430f9a8 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -275,8 +275,6 @@ 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 = [];
@@ -691,7 +689,7 @@ function draw_mc() {
 }
 
 
-function update_examine(html,flavour,ooc) {
+function update_examine(html) {
 	examine_tab_parts = html
 	}
 
diff --git a/modular_citadel/code/game/objects/items/melee/misc.dm b/modular_citadel/code/game/objects/items/melee/misc.dm
index d922a00e..6a53adcc 100644
--- a/modular_citadel/code/game/objects/items/melee/misc.dm
+++ b/modular_citadel/code/game/objects/items/melee/misc.dm
@@ -3,7 +3,7 @@
 	var/stun_stam_cost_coeff = 1.25
 	var/hardstun_ds = 1
 	var/softstun_ds = 0
-	var/stam_dmg = 50
+	var/stam_dmg = 30
 	cooldown = 20
 	total_mass = 3.75
 
diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm
index 5ec2ab8c..1da32245 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)
-		. += 6
+		. += 3
 
 /atom
 	var/pseudo_z_axis