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
@@ -178,7 +178,7 @@
 		machine = null

 //called when the user unsets the machine.
-/atom/movable/proc/on_unset_machine(mob/user)
+/atom/proc/on_unset_machine(mob/user)
 	return

 /mob/proc/set_machine(obj/O)