Merge pull request #3419 from comma/pain

Pain

code/modules/mob/living/carbon/human/life.dm

@@ -1228,18 +1228,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)

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"))

html/changelog.html

@@ -56,6 +56,16 @@ 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">
 <div class="commit sansserif">
 	<h2 class="date">2013/08/01</h2>
 	<h3 class="author">Chinsky updated:</h3>

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