From 1bca7c7454d72bad7d6911329a93477ee262a565 Mon Sep 17 00:00:00 2001
From: comma <krauchinsky@gmail.com>
Date: Sun, 4 Aug 2013 00:12:38 +0400
Subject: [PATCH 1/2] Made character HUD show pain level instead of actual
 health.

Pain are calculated based on health, but all damages contribute differently, for example 50u burn will feel like 100u, but 50u poisoning would only feel like 25u.
---
 code/modules/mob/living/carbon/human/life.dm | 28 +++++++++++---------
 code/modules/mob/living/carbon/shock.dm      |  9 ++++++-
 maps/RandomZLevels/fileList.txt              | 13 ---------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 7e41d6936d0..2028cb20492 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1230,18 +1230,22 @@
 				see_invisible = SEE_INVISIBLE_LIVING
 
 			if(healths)
-				switch(hal_screwyhud)
-					if(1)	healths.icon_state = "health6"
-					if(2)	healths.icon_state = "health7"
-					else
-						switch(health - halloss)
-							if(100 to INFINITY)		healths.icon_state = "health0"
-							if(80 to 100)			healths.icon_state = "health1"
-							if(60 to 80)			healths.icon_state = "health2"
-							if(40 to 60)			healths.icon_state = "health3"
-							if(20 to 40)			healths.icon_state = "health4"
-							if(0 to 20)				healths.icon_state = "health5"
-							else					healths.icon_state = "health6"
+				if (analgesic)
+					healths.icon_state = "health_health_numb"
+				else
+					switch(hal_screwyhud)
+						if(1)	healths.icon_state = "health6"
+						if(2)	healths.icon_state = "health7"
+						else
+							//switch(health - halloss)
+							switch(100 - traumatic_shock)
+								if(100 to INFINITY)		healths.icon_state = "health0"
+								if(80 to 100)			healths.icon_state = "health1"
+								if(60 to 80)			healths.icon_state = "health2"
+								if(40 to 60)			healths.icon_state = "health3"
+								if(20 to 40)			healths.icon_state = "health4"
+								if(0 to 20)				healths.icon_state = "health5"
+								else					healths.icon_state = "health6"
 
 			if(nutrition_icon)
 				switch(nutrition)
diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm
index f6cc59cd15c..fd2356be26d 100644
--- a/code/modules/mob/living/carbon/shock.dm
+++ b/code/modules/mob/living/carbon/shock.dm
@@ -3,7 +3,14 @@
 
 // proc to find out in how much pain the mob is at the moment
 /mob/living/carbon/proc/updateshock()
-	src.traumatic_shock = src.getOxyLoss() + src.getToxLoss() + src.getFireLoss() + 1.2*src.getBruteLoss() + 2*src.getCloneLoss() + src.halloss
+	src.traumatic_shock = 			\
+	1	* src.getOxyLoss() + 		\
+	0.5	* src.getToxLoss() + 		\
+	2.5	* src.getFireLoss() + 		\
+	1.5	* src.getBruteLoss() + 		\
+	2	* src.getCloneLoss() + 		\
+	1	* src.halloss
+
 	if(reagents.has_reagent("alkysine"))
 		src.traumatic_shock -= 10
 	if(reagents.has_reagent("inaprovaline"))
diff --git a/maps/RandomZLevels/fileList.txt b/maps/RandomZLevels/fileList.txt
index 6e6847dbdaf..10fbb9562ff 100644
--- a/maps/RandomZLevels/fileList.txt
+++ b/maps/RandomZLevels/fileList.txt
@@ -2,16 +2,3 @@
 #Maps must be the full path to them
 #Maps should be 255x255 or smaller and be bounded.  Falling off the edge of the map will result in undefined behavior. 
 #SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
-
-maps/RandomZLevels/example.dmm
-maps/RandomZLevels/blackmarketpackers.dmm
-#maps/RandomZLevels/stationCollision.dmm
-#maps/RandomZLevels/spacebattle.dmm
-maps/RandomZLevels/beach.dmm
-#maps/RandomZLevels/Academy.dmm
-#maps/RandomZLevels/wildwest.dmm
-#maps/RandomZLevels/challenge.dmm
-maps/RandomZLevels/listeningpost.dmm
-#maps/RandomZLevels/zresearchlabs.dmm
-maps/RandomZLevels/jungle.dmm
-maps/RandomZLevels/arcticwaste.dmm
\ No newline at end of file

From 61812b96683d3656bc72fd0990d89e1150259fc5 Mon Sep 17 00:00:00 2001
From: comma <krauchinsky@gmail.com>
Date: Sun, 4 Aug 2013 00:15:03 +0400
Subject: [PATCH 2/2] changelog.html

---
 html/changelog.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/html/changelog.html b/html/changelog.html
index 4fdd8620290..8e5f1506ce9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,14 @@ Changelog Section
 Stuff which is in development and not yet visible to players or just code related 
 (ie. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit though. Thanks. -->
+<div class="commit sansserif">
+	<h2 class="date">2013/08/4</h2>
+	<h3 class="author">Chinsky updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">Health HUD indicator replaced with Pain  indicator. Now health indicator shows pain level instead of actual vitals level. Some types of damage contribute more to pain, some less, usually feeling worse than they really are.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">2013-11-07</h2>
 	<h3 class="author">Chinsky updated:</h3>