Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00
parent 63122795f9 8223692c32
commit dac6cc56e4
173 changed files with 8361 additions and 5643 deletions
@@ -49,6 +49,10 @@
 	open_machine()


+/obj/machinery/vr_sleeper/container_resist(mob/living/user)
+	open_machine()
+
+
 /obj/machinery/vr_sleeper/Destroy()
 	open_machine()
 	cleanup_vr_human()