Merge branch 'master' into xantholne-cowboy02

2020-01-08 20:36:22 -07:00
parent afc0ca44f2 0b9d566076
commit 8a8d0bf6da
56 changed files with 623 additions and 279 deletions
@@ -29,6 +29,7 @@
 	var/obj/machinery/machine = null

 	var/next_move = null
+	var/create_area_cooldown
 	var/notransform = null	//Carbon
 	var/eye_blind = 0		//Carbon
 	var/eye_blurry = 0		//Carbon