Talos hangar tweaks. (#513)

* coins * Update landmarks.dmi * Update door_control.dm * Update cable.dm * Update TGS_Talos.dmm * Update railing.dm * vehicle button and shutters * no varedit floortypes * Update TGS_Talos.dmm * Update TGS_Talos.dmm * Update airlock_types.dm * Update TGS_Talos.dmm * Update TGS_Talos.dmm * Update mainship.dm * Update TGS_Talos.dmm * Update TGS_Talos.dmm * Update TGS_Talos.dmm * Update shuttles.dm
PMC-Unga-Marines · Oct 7, 2024 · 1247c61 · 1247c61
1 parent 99810e3
commit 1247c61
Show file tree

Hide file tree

Showing 12 changed files with 1,823 additions and 2,306 deletions.
diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm
diff --git a/_maps/map_files/generic/Admin_Level.dmm b/_maps/map_files/generic/Admin_Level.dmm
@@ -498,9 +498,7 @@
 /turf/open/floor/iron/dark/textured,
 /area/centcom/valhalla)
 "gzY" = (
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "gAO" = (
 /obj/effect/landmark/valhalla/xeno_spawn_landmark{
@@ -517,9 +515,7 @@
 "gCD" = (
 /obj/structure/table/black,
 /obj/machinery/microwave,
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "gEX" = (
 /obj/machinery/button/valhalla/xeno_button{
@@ -540,9 +536,7 @@
 /obj/item/reagent_containers/glass/beaker/bluespace,
 /obj/item/reagent_containers/glass/beaker/bluespace,
 /obj/item/reagent_containers/glass/beaker/bluespace,
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "gUR" = (
 /obj/machinery/door/airlock/mainship/generic{
@@ -602,9 +596,7 @@
 /area/centcom/valhalla)
 "iot" = (
 /obj/machinery/vending/boozeomat/nopower,
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "itM" = (
 /turf/open/floor/carpet/side{
@@ -628,9 +620,7 @@
 /obj/structure/bed/chair/office/light{
 	dir = 4
 	},
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "iZT" = (
 /obj/machinery/computer/security/telescreen,
@@ -678,9 +668,7 @@
 "jWH" = (
 /obj/structure/table/reinforced,
 /obj/machinery/computer/operating/valhalla,
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "jWX" = (
 /obj/structure/sign/securearea{
@@ -732,9 +720,7 @@
 /obj/machinery/reagentgrinder/nopower/valhalla{
 	pixel_y = 7
 	},
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "knX" = (
 /obj/effect/landmark/valhalla/marine_spawner_landmark{
@@ -1143,9 +1129,7 @@
 /obj/machinery/button/valhalla/xeno_button{
 	link = "marinesurgery"
 	},
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "pwk" = (
 /obj/effect/turf_decal/tile/metal/medical{
@@ -1197,9 +1181,7 @@
 /area/centcom/valhalla)
 "qhT" = (
 /obj/structure/table/reinforced,
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "qlP" = (
 /obj/effect/turf_decal/tile/metal/medical,
@@ -1412,9 +1394,7 @@
 /obj/item/tank/anesthetic,
 /obj/item/clothing/mask/breath/medical,
 /obj/machinery/optable/valhalla,
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "tkX" = (
 /obj/structure/table,
@@ -1606,9 +1586,7 @@
 /obj/structure/bed/chair/office/light{
 	dir = 8
 	},
-/turf/open/floor/mainship/metal/white{
-	color = "#E2E0DC"
-	},
+/turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "vFf" = (
 /obj/structure/table/reinforced,

diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm
@@ -104,6 +104,7 @@
 
 /area/shuttle/vehicle_supply
 	name = "Vehicle Supply Shuttle"
+	requires_power = TRUE
 
 /*
 /area/shuttle/escape

diff --git a/code/game/area/mainship.dm b/code/game/area/mainship.dm
@@ -151,6 +151,10 @@
 	icon_state = "hangar"
 	minimap_color = MINIMAP_AREA_COMMAND
 
+/area/mainship/living/mechbunks
+	name = "Mech Pilot Bunks"
+	icon_state = "livingspace"
+	minimap_color = MINIMAP_AREA_COMMAND
 
 /area/mainship/living/tankerbunks
 	name = "Vehicle Crew Bunks"

diff --git a/code/game/objects/machinery/door_control.dm b/code/game/objects/machinery/door_control.dm
@@ -145,7 +145,6 @@
 /obj/machinery/door_control/mainship/droppod
 	name = "Droppod bay"
 	id = "droppod"
-	req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_LEADER, ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP)
 
 /obj/machinery/door_control/mainship/engineering
 	req_access = list(ACCESS_MARINE_ENGINEERING)
@@ -203,6 +202,11 @@
 	id = "mech_shutters"
 	req_one_access = list(ACCESS_MARINE_MECH)
 
+/obj/machinery/door_control/mainship/vehicle
+	name = "Armored Vehicle Shutter"
+	id = "vehicle_armored"
+	req_one_access = list(ACCESS_MARINE_ARMORED)
+
 /obj/machinery/door_control/mainship/tcomms
 	name = "Telecommunications Entrance"
 	id = "tcomms"
@@ -213,7 +217,6 @@
 	id = "engi_armory"
 	req_one_access = list(ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_BRIDGE)
 
-
 /obj/machinery/door_control/mainship/corporate
 	name = "Privacy Shutters"
 	id = "cl_shutters"

diff --git a/code/game/objects/machinery/doors/airlock_types.dm b/code/game/objects/machinery/doors/airlock_types.dm
@@ -566,6 +566,10 @@
 /obj/machinery/door/airlock/mainship/generic/mech_pilot/bunk
 	name = "\improper Mech Pilot's Bunks"
 
+/obj/machinery/door/airlock/mainship/generic/vehicle_crew
+	name = "\improper Vehicle Crewman Office"
+	req_access = list(ACCESS_MARINE_ARMORED)
+
 /obj/machinery/door/airlock/mainship/generic/ert
 	name = "\improper Airlock"
 	icon = 'icons/obj/doors/mainship/personaldoor.dmi'

diff --git a/code/game/objects/machinery/doors/poddoor.dm b/code/game/objects/machinery/doors/poddoor.dm
@@ -228,11 +228,15 @@
 	id = "mech_shutters"
 	resistance_flags = PLASMACUTTER_IMMUNE
 
+/obj/machinery/door/poddoor/mainship/vehicle
+	name = "\improper Armored Vehicle Shutters"
+	id = "vehicle_armored"
+	resistance_flags = PLASMACUTTER_IMMUNE
+
 /obj/machinery/door/poddoor/mainship/umbilical
 	name = "Umbilical Airlock"
 	resistance_flags = RESIST_ALL
 
-
 /obj/machinery/door/poddoor/mainship/umbilical/north
 	id = "n_umbilical"
 

diff --git a/code/game/objects/machinery/doors/railing.dm b/code/game/objects/machinery/doors/railing.dm
@@ -8,6 +8,7 @@
 	opacity = FALSE
 	open_layer = CATWALK_LAYER
 	closed_layer = WINDOW_LAYER
+	smoothing_groups = null
 
 	resistance_flags = RESIST_ALL
 
@@ -24,7 +25,6 @@
 	icon_state = "railing0"
 	density = FALSE
 
-
 /obj/machinery/door/poddoor/railing/Initialize(mapload)
 	. = ..()
 	if(dir == SOUTH)

diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm
@@ -273,6 +273,12 @@
 /turf/open/floor/mainship/metal/white
 	icon_state = "white"
 
+/turf/open/floor/mainship/metal/gray
+	icon_state = "metal_gray"
+
+/turf/open/floor/mainship/metal/green
+	icon_state = "metal_green"
+
 //Outerhull
 
 /turf/open/floor/mainship_hull

diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
@@ -761,7 +761,3 @@ GLOBAL_LIST(hub_radial_layer_list)
 
 /obj/structure/cable/multilayer/layer23
 	cable_layer = CABLE_LAYER_2 | CABLE_LAYER_3
-
-//Cable subtype for cases when you need to path it under cas
-/obj/structure/cable/shuttle_immune
-	flags_atom = SHUTTLE_IMMUNE
diff --git a/icons/mob/landmarks.dmi b/icons/mob/landmarks.dmi
diff --git a/icons/turf/mainship.dmi b/icons/turf/mainship.dmi