Merge branch 'psyonics' of https://github.com/Microvolnovka19/FluffySTG…

… into psyonics

_maps/_basemap.dm

@@ -13,6 +13,7 @@
 		#include "map_files\Mining\Lavaland.dmm"
 		#include "map_files\NorthStar\north_star.dmm"
 		#include "map_files\tramstation\tramstation.dmm"
+		#include "map_files\NebulaStation\NebulaStation.dmm"
 		#include "map_files\wawastation\wawastation.dmm"
 		// NOVA EDIT ADDITON START - Compiling our modular maps too!
 		#include "map_files\VoidRaptor\VoidRaptor.dmm"

_maps/map_files/NSSJourney/NSSJourney.dmm

@@ -879,12 +879,6 @@
 	dir = 1
 	},
 /area/station/engineering/main)
-"ajw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/station/maintenance/port/fore)
 "ajx" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -1176,6 +1170,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable,
 /turf/open/floor/iron/dark{
 	icon_state = "textured_dark_large"
 	},
@@ -23491,6 +23486,7 @@
 /obj/machinery/door/airlock/service{
 	name = "Bar Entrance"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/dark/smooth_large{
 	icon_state = "textured_dark_half"
 	},
@@ -31127,7 +31123,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/unres,
 /obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
@@ -44180,7 +44175,7 @@
 /area/station/hallway/secondary/exit)
 "mHQ" = (
 /obj/machinery/door/airlock/bathroom{
-	name = "Cabin 2"
+	name = "Restrooms"
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
@@ -48236,6 +48231,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
 /obj/effect/turf_decal/siding/wideplating/dark,
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/wood/large{
 	icon_state = "wood_parquet"
 	},
@@ -53800,7 +53796,7 @@
 /area/station/security/prison)
 "sHg" = (
 /obj/machinery/door/airlock/bathroom{
-	name = "Cabin 2"
+	name = "Restrooms"
 	},
 /obj/structure/cable,
 /turf/open/floor/iron/dark/herringbone,
@@ -59797,6 +59793,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/landmark/start/hangover,
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/dark/smooth_large{
 	icon_state = "textured_dark_half"
 	},
@@ -79086,7 +79083,7 @@ alR
 aoj
 hKJ
 apP
-ajw
+aiR
 alU
 uWN
 iEe