Merge branch 'master' into upstream-merge-26131

2017-05-02 09:19:49 -05:00
parent c6e0c95f42 3b8484b52b
commit fd6df15f93
422 changed files with 16923 additions and 9597 deletions
@@ -991,7 +991,7 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
 		SET_SECONDARY_FLAG(src, FROZEN)

 //Assumes already frozed
-obj/proc/make_unfrozen()
+/obj/proc/make_unfrozen()
 	icon = initial(icon)
 	name = replacetext(name, "frozen ", "")
 	CLEAR_SECONDARY_FLAG(src, FROZEN)
@@ -582,7 +582,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
 		return 0

 //Repopulates sortedAreas list
-/proc/SortAreas()
+/proc/repopulate_sorted_areas()
 	GLOB.sortedAreas = list()

 	for(var/area/A in world)