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

2020-05-12 20:06:59 +02:00
parent b2a20d5438 0b03958136
commit 7fb96ab0cf
557 changed files with 283936 additions and 4436 deletions
@@ -58598,7 +58598,7 @@
 /turf/open/space,
 /area/space/nearstation)
 "cgJ" = (
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "cgK" = (