TGS Test Merge (#6806)

Citadel-Station-13 · Oct 26, 2024 · 697e587 · 697e587
2 parents 7c0e1b8 + 3041ad5
commit 697e587
Show file tree

Hide file tree

Showing 7 changed files with 14,124 additions and 8,799 deletions.
diff --git a/code/game/area/endeavour_areas.dm b/code/game/area/endeavour_areas.dm
@@ -23,10 +23,34 @@
 	name = "\improper Deck 4 Port Hallway"
 	icon_state = "hallP"
 
+/area/endeavour/hallway/d4portforhall
+	name = "\improper Deck 4 Port Forward Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d4portamidhall
+	name = "\improper Deck 4 Port Amidships Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d4portafthall
+	name = "\improper Deck 4 Port Aft Hallway"
+	icon_state = "hallP"
+
 /area/endeavour/hallway/d4starboardhall
 	name = "\improper Deck 4 Starboard Hallway"
 	icon_state = "hallS"
 
+/area/endeavour/hallway/d4starboardforhall
+	name = "\improper Deck 4 Starboard Forward Hallway"
+	icon_state = "hallS"
+
+/area/endeavour/hallway/d4starboardamidhall
+	name = "\improper Deck 4 Starboard Amidships Hallway"
+	icon_state = "hallS"
+
+/area/endeavour/hallway/d4starboardafthall
+	name = "\improper Deck 4 Starboard Aft Hallway"
+	icon_state = "hallS"
+
 /** Deck 3
  */
 /area/endeavour/hallway/d3aftmaint
@@ -49,10 +73,34 @@
 	name = "\improper Deck 3 Port Hallway"
 	icon_state = "hallP"
 
+/area/endeavour/hallway/d3portforhall
+	name = "\improper Deck 3 Port Forward Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d3portamidhall
+	name = "\improper Deck 3 Port Amidships Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d3portafthall
+	name = "\improper Deck 3 Port Aft Hallway"
+	icon_state = "hallP"
+
 /area/endeavour/hallway/d3starboardhall
 	name = "\improper Deck 3 Starboard Hallway"
 	icon_state = "hallS"
 
+/area/endeavour/hallway/d3starboardforhall
+	name = "\improper Deck 3 Starboard Forward Hallway"
+	icon_state = "hallS"
+
+/area/endeavour/hallway/d3starboardamidhall
+	name = "\improper Deck 3 Starboard Amidships Hallway"
+	icon_state = "hallS"
+
+/area/endeavour/hallway/d3starboardafthall
+	name = "\improper Deck 3 Starboard Aft Hallway"
+	icon_state = "hallS"
+
 /** Deck 2
  */
 /area/endeavour/hallway/d2aftmaint
@@ -75,10 +123,34 @@
 	name = "\improper Deck 2 Port Hallway"
 	icon_state = "hallP"
 
+/area/endeavour/hallway/d2portforhall
+	name = "\improper Deck 2 Port Forward Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d2portamidhall
+	name = "\improper Deck 2 Port Amidships Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d2portafthall
+	name = "\improper Deck 2 Port Aft Hallway"
+	icon_state = "hallP"
+
 /area/endeavour/hallway/d2starboardhall
 	name = "\improper Deck 2 Starboard Hallway"
 	icon_state = "hallS"
 
+/area/endeavour/hallway/d2starboardforhall
+	name = "\improper Deck 2 Starboard Forward Hallway"
+	icon_state = "hallS"
+
+/area/endeavour/hallway/d1starboardamidhall
+	name = "\improper Deck 2 Starboard Amidships Hallway"
+	icon_state = "hallS"
+
+/area/endeavour/hallway/d2starboardafthall
+	name = "\improper Deck 2 Starboard Aft Hallway"
+	icon_state = "hallS"
+
 /** Deck 1
  */
 /area/endeavour/hallway/d1aftmaint
@@ -101,10 +173,34 @@
 	name = "\improper Deck 1 Port Hallway"
 	icon_state = "hallP"
 
+/area/endeavour/hallway/d1portforhall
+	name = "\improper Deck 1 Port Forward Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d1portamidhall
+	name = "\improper Deck 1 Port Amidships Hallway"
+	icon_state = "hallP"
+
+/area/endeavour/hallway/d1portafthall
+	name = "\improper Deck 1 Port Aft Hallway"
+	icon_state = "hallP"
+
 /area/endeavour/hallway/d1starboardhall
 	name = "\improper Deck 1 Starboard Hallway"
 	icon_state = "hallS"
 
+/area/endeavour/hallway/d1starboardforhall
+	name = "\improper Deck 1 Starboard Forward Hallway"
+	icon_state = "hallS"
+
+/area/endeavour/hallway/d1starboardamidhall
+	name = "\improper Deck 1 Starboard Amidships Hallway"
+	icon_state = "hallS"
+
+/area/endeavour/hallway/d1starboardafthall
+	name = "\improper Deck 1 Starboard Aft Hallway"
+	icon_state = "hallS"
+
 /** Command
  */
 /area/endeavour/command/turrets

diff --git a/maps/endeavour/engines/rust.dmm b/maps/endeavour/engines/rust.dmm
@@ -1098,7 +1098,7 @@
 	},
 /obj/map_helper/access_helper/airlock/station/engineering/department,
 /obj/machinery/door/firedoor,
-/turf/space/basic,
+/turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/engine_room)
 "Mh" = (
 /obj/structure/window/phoronreinforced/full{