Merge branch 'master' into species-refactor

2020-10-02 17:19:48 -05:00
parent bdd121cd81 824cb8c118
commit 1620e3887c
262 changed files with 169039 additions and 84967 deletions
@@ -32,7 +32,7 @@ Bonus
 		"Stage Speed 10" = "Further increases cooling speed."
 	)

-/datum/symptom/fever/Start(datum/disease/advance/A)
+/datum/symptom/shivering/Start(datum/disease/advance/A)
 	if(!..())
 		return
 	if(A.properties["stage_rate"] >= 5) //dangerous cold
@@ -58,4 +58,4 @@ Bonus
 	if(unsafe)
 		limit = 0
 	M.adjust_bodytemperature(-get_cold * A.stage, limit)
-	return 1
+	return 1