Merge remote-tracking branch 'upstream/master' into Voidraptor-nanites

Monkestation · Sep 30, 2024 · 54c3dd9 · 54c3dd9
2 parents 4f57cba + 179df07
commit 54c3dd9
Show file tree

Hide file tree

Showing 19 changed files with 147,566 additions and 20 deletions.
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -100820,9 +100820,6 @@
 "yba" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/window/left/directional/west{
-	name = "Hydroponics Center"
-	},
 /obj/machinery/door/window/left/directional/west{
 	name = "Hydroponics Center"
 	},