Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cargo

This commit is contained in:
Yoshax
2016-07-10 03:49:46 +01:00
129 changed files with 8448 additions and 3017 deletions
-3
View File
@@ -120,9 +120,6 @@
/obj/proc/interact(mob/user)
return
/obj/proc/update_icon()
return
/mob/proc/unset_machine()
src.machine = null