Merge branch 'master' into are-those-horns-are-are-you-just-retarded

2019-09-15 23:25:22 -05:00
parent bf3d30c0e4 5a58ac6875
commit 6668630649
56 changed files with 2809 additions and 2725 deletions
@@ -81,3 +81,6 @@ GLOBAL_VAR_INIT(cmp_field, "name")

 /proc/cmp_advdisease_resistance_asc(datum/disease/advance/A, datum/disease/advance/B)
 	return A.totalResistance() - B.totalResistance()
+
+/proc/cmp_job_display_asc(datum/job/A, datum/job/B)
+	return A.display_order - B.display_order