Runtime fix

RepoStash · Jul 25, 2024 · 33b566a · 33b566a
1 parent 7e47b81
commit 33b566a
Show file tree

Hide file tree

Showing 4 changed files with 489 additions and 8 deletions.
diff --git a/maps/torch_fd/fd_torch.dm b/maps/torch_fd/fd_torch.dm
@@ -27,7 +27,7 @@
 	#include "torch_ranks.dm"
 	#include "../torch/torch_security_state.dm"
 	#include "../torch/torch_setup.dm"
-	#include "../torch/torch_shuttles.dm"
+	#include "torch_shuttles.dm"
 	#include "../torch/torch_submaps.dm"
 	#include "../torch/torch_turfs.dm"
 	#include "../torch/torch_unit_testing.dm"

diff --git a/maps/torch_fd/torch2_deck4.dmm b/maps/torch_fd/torch2_deck4.dmm
@@ -120,7 +120,7 @@
 "ct" = (/obj/floor_decal/industrial/warning{dir = 1; icon_state = "warning"},/obj/machinery/door/blast/regular/escape_pod,/turf/simulated/floor/reinforced,/area/maintenance/fourthdeck/aft)
 "cu" = (/turf/simulated/wall/r_wall/prepainted,/area/maintenance/fourthdeck/aft)
 "cv" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/fourthdeck/aft)
-"cw" = (/obj/shuttle_landmark/merchant/out,/turf/space,/area/space)
+"cw" = (/turf/space,/area/space)
 "cx" = (/obj/structure/railing/mapped,/turf/simulated/floor/reinforced{map_airless = 1; name = "vacuum reinforced floor"},/area/space)
 "cy" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/canister/air/airlock,/turf/simulated/floor/tiled/monotile,/area/maintenance/fourthdeck/forestarboard)
 "cz" = (/obj/catwalk_plated,/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fourthdeck/forestarboard)