Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup

2020-01-27 08:33:38 +08:00
parent 0d1e458e9c 27cd7745ed
commit e45cc4933c
296 changed files with 16424 additions and 11376 deletions
@@ -26,7 +26,7 @@

 	var/computer_id = null
 	var/list/logging = list()
-	var/obj/machinery/machine = null
+	var/atom/machine = null

 	var/next_move = null
 	var/create_area_cooldown