Merge branch 'master' into mapsyncs43293845982

2018-01-07 20:30:41 +00:00
parent 3e937fcecf 57d79640f4
commit 85aa297923
14 changed files with 71 additions and 69 deletions
@@ -55,7 +55,7 @@
 	var/timeofdeath = 0//Living
 	var/cpr_time = 1//Carbon

-	var/bodytemperature = 310.055	//98.7 F
+	var/bodytemperature = BODYTEMP_NORMAL	//310.15K / 98.6F
 	var/drowsyness = 0//Carbon
 	var/dizziness = 0//Carbon
 	var/jitteriness = 0//Carbon