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

2021-03-08 14:46:46 -08:00
parent f07a9c13fb 457077770e
commit cc360288bd
760 changed files with 31912 additions and 23386 deletions
@@ -294,7 +294,7 @@
 /turf/template_noop,
 /area/space/nearstation)
 "N" = (
-/obj/item/book/random/triple,
+/obj/item/book/random,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/powered/ancient_shuttle)
 "O" = (
@@ -1651,7 +1651,7 @@
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav/ancientstation/rnd)
 "eD" = (
-/obj/machinery/mecha_part_fabricator/offstation,
+/obj/machinery/mecha_part_fabricator,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav/ancientstation/rnd)
@@ -2010,12 +2010,12 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/ancientstation/deltacorridor)
 "fu" = (
-/obj/machinery/rnd/production/protolathe/offstation,
+/obj/machinery/rnd/production/protolathe,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav/ancientstation/rnd)
 "fv" = (
-/obj/machinery/rnd/production/circuit_imprinter/offstation,
+/obj/machinery/rnd/production/circuit_imprinter,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/reagent_containers/dropper,
 /turf/open/floor/plasteel/white,
@@ -42885,7 +42885,7 @@
 /area/science/xenobiology)
 "bPd" = (
 /obj/structure/table/reinforced,
-/obj/item/book/random/triple,
+/obj/item/book/random,
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "bPe" = (