Abandoned Propellant Depot (#17825)

* a

* a

* x

* propellant

* aa

* a

* k

* y

* 54

* 57

* wires and pipes 😩

* a

* 978

* 8641

* 5484685648956795679467

* aalarms

* areas

* 7595768957957

* a

* a

* yyyyyyyyyyyyyyyyyyy

* 55555555555555555

* aaaaaaaaaaaaa

* 3

* h

* 1

* a

* 426246247

* 1356

* 7452

* 73

* bbbbbbbbbbbbb

* hh432y35aye

* 4362623757346

* cc

* h568sr5tu

* 4

* b

* tests rerun please

---------

Co-authored-by: DreamySkrell <>

aurorastation.dme

@@ -3579,6 +3579,9 @@
 #include "maps\away\away_site\abandoned_industrial\abandoned_industrial_station_areas.dm"
 #include "maps\away\away_site\abandoned_industrial\abandoned_industrial_station_items.dm"
 #include "maps\away\away_site\abandoned_mining\cursed.dm"
+#include "maps\away\away_site\abandoned_propellant_depot\abandoned_propellant_depot_.dm"
+#include "maps\away\away_site\abandoned_propellant_depot\abandoned_propellant_depot_areas.dm"
+#include "maps\away\away_site\abandoned_propellant_depot\abandoned_propellant_depot_landmarks.dm"
 #include "maps\away\away_site\big_derelict\bigderelict.dm"
 #include "maps\away\away_site\blueriver\blueriver.dm"
 #include "maps\away\away_site\blueriver\blueriver_areas.dm"

code/modules/atmospherics/pipes.dm

@@ -714,7 +714,7 @@
 	desc = "A manifold composed of auxiliary piping."
 	desc_info = "This is a special 'aux' pipe, which does not connect to 'normal' pipes.  If you want to connect it, use \
 	a Universal Adapter pipe."
-	icon_state = "intact-aux"
+	icon_state = "map-aux"
 	connect_types = CONNECT_TYPE_AUX
 	layer = 2.41
 	icon_connect_type = "-aux"

code/modules/power/lights/fixtures.dm

@@ -8,7 +8,7 @@
 	name = "light fixture"
 	icon = 'icons/obj/machinery/light.dmi'
 	var/base_state = "tube"		// base description and icon_state
-	icon_state = "tube_empty"
+	icon_state = "tube_preview"
 	desc = "A lighting fixture."
 	desc_info = "Use grab intent when interacting with a working light to take it out of its fixture."
 	anchored = TRUE
@@ -83,7 +83,7 @@
 // the smaller bulb light fixture
 
 /obj/machinery/light/small
-	icon_state = "bulb_empty"
+	icon_state = "bulb_preview"
 	base_state = "bulb"
 	fitting = "bulb"
 	brightness_range = 5
@@ -104,6 +104,7 @@
 	fitting_is_on_floor = TRUE
 
 /obj/machinery/light/small/emergency
+	icon_state = "bulb_emergency_preview"
 	brightness_range = 6
 	brightness_power = 0.45
 	brightness_color = LIGHT_COLOR_EMERGENCY_SOFT
@@ -122,17 +123,21 @@
 /obj/machinery/light/colored/red
 	brightness_color = LIGHT_COLOR_RED
 	randomize_color = FALSE
+	icon_state = "tube_red_preview"
 
 /obj/machinery/light/colored/decayed
 	brightness_color = LIGHT_COLOR_DECAYED
 	randomize_color = FALSE
+	icon_state = "tube_decayed_preview"
 
 /obj/machinery/light/colored/dying
 	brightness_color = LIGHT_COLOR_DYING
 	randomize_color = FALSE
+	icon_state = "tube_decayed_preview"
 
 /obj/machinery/light/broken
 	status = LIGHT_BROKEN
+	icon_state = "tube_broken_preview"
 
 /obj/machinery/light/spot
 	name = "spotlight fixture"

html/changelogs/DreamySkrell-abandoned-propellant-depot.yml

@@ -0,0 +1,9 @@
+
+author: DreamySkrell
+
+delete-after: True
+
+changes:
+  - rscadd: "Adds the Abandoned Propellant Depot away site."
+  - rscadd: "Adds map previews for lights."
+  - bugfix: "Fixes invisible damaged grates."

maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_.dm

@@ -0,0 +1,52 @@
+/datum/map_template/ruin/away_site/abandoned_propellant_depot
+	name = "Abandoned Propellant Depot"
+	description = "Abandoned Propellant Depot."
+	id = "abandoned_propellant_depot"
+	suffixes = list("away_site/abandoned_propellant_depot/abandoned_propellant_depot.dmm")
+	spawn_cost = 1
+	spawn_weight = 1
+	sectors = list(ALL_POSSIBLE_SECTORS)
+	unit_test_groups = list(1)
+
+/singleton/submap_archetype/abandoned_propellant_depot//Arbitrary duplicates of the above name/desc
+	map = "Abandoned Propellant Depot"
+	descriptor = "Abandoned Propellant Depot."
+
+/obj/effect/overmap/visitable/sector/abandoned_propellant_depot
+	name = "Abandoned Propellant Depot"
+	desc = "Industrial propellant depot of unknown designation or origin. Scanners detect it to be mostly cold, likely no movement or life inside, although appears to be pressurized."
+	icon_state = "outpost"
+	static_vessel = TRUE
+	generic_object = FALSE
+	icon = 'icons/obj/overmap/overmap_stationary.dmi'
+	icon_state = "outpost2"
+	color = "#bbb186"
+	designer = "Unknown"
+	volume = "92 meters length, 99 meters beam/width, 27 meters vertical height"
+	weapons = "Not apparent"
+	sizeclass = "Industrial Station"
+
+	initial_generic_waypoints = list(
+		// docks
+		"nav_abandoned_propellant_depot_dock_north_east",
+		"nav_abandoned_propellant_depot_dock_north_west",
+		"nav_abandoned_propellant_depot_dock_west",
+		"nav_abandoned_propellant_depot_dock_east_north",
+		"nav_abandoned_propellant_depot_dock_east_south",
+		"nav_abandoned_propellant_depot_dock_south_east",
+		"nav_abandoned_propellant_depot_dock_south_mid",
+		"nav_abandoned_propellant_depot_dock_south_west",
+		// catwalks
+		"nav_abandoned_propellant_depot_catwalk_north",
+		"nav_abandoned_propellant_depot_catwalk_west",
+		"nav_abandoned_propellant_depot_catwalk_south_1",
+		"nav_abandoned_propellant_depot_catwalk_south_2",
+		"nav_abandoned_propellant_depot_catwalk_south_3",
+		"nav_abandoned_propellant_depot_catwalk_south_4",
+		// space
+		"nav_abandoned_propellant_depot_space_south_west",
+		"nav_abandoned_propellant_depot_space_south_east",
+		"nav_abandoned_propellant_depot_space_north_west",
+		"nav_abandoned_propellant_depot_space_north_east",
+	)
+

maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_areas.dm

@@ -0,0 +1,125 @@
+
+// --- base area
+
+/area/abandoned_propellant_depot
+	name = "Abandoned Propellant Depot (base/abstract)"
+
+// --- docks
+
+/area/abandoned_propellant_depot/docks_north_east
+	name = "Abandoned Propellant Depot Docks North-East"
+	icon_state = "arrivals_dock"
+
+/area/abandoned_propellant_depot/docks_north_west
+	name = "Abandoned Propellant Depot Docks North-West"
+	icon_state = "arrivals_dock"
+
+/area/abandoned_propellant_depot/docks_south_east
+	name = "Abandoned Propellant Depot Docks South-East"
+	icon_state = "arrivals_dock"
+
+/area/abandoned_propellant_depot/docks_south_west
+	name = "Abandoned Propellant Depot Docks South-West"
+	icon_state = "arrivals_dock"
+
+// --- hallways
+
+/area/abandoned_propellant_depot/hallways_north
+	name = "Abandoned Propellant Depot Hallways North"
+	icon_state = "hallC"
+
+/area/abandoned_propellant_depot/hallways_south
+	name = "Abandoned Propellant Depot Hallways South"
+	icon_state = "hallC"
+
+/area/abandoned_propellant_depot/hallways_east
+	name = "Abandoned Propellant Depot Hallways East"
+	icon_state = "hallC"
+
+/area/abandoned_propellant_depot/hallways_west
+	name = "Abandoned Propellant Depot Hallways West"
+	icon_state = "hallC"
+
+
+// --- living
+
+/area/abandoned_propellant_depot/crew_quarters
+	name = "Abandoned Propellant Depot Crew Quarters"
+	icon_state = "crew_quarters"
+
+/area/abandoned_propellant_depot/chiefs_quarters
+	name = "Abandoned Propellant Depot Chief's Quarters"
+	icon_state = "crew_quarters"
+
+/area/abandoned_propellant_depot/gym
+	name = "Abandoned Propellant Depot Gym"
+	icon_state = "fitness_gym"
+
+/area/abandoned_propellant_depot/medbay
+	name = "Abandoned Propellant Depot Medbay"
+	icon_state = "medbay"
+
+/area/abandoned_propellant_depot/kitchen
+	name = "Abandoned Propellant Depot Kitchen"
+	icon_state = "kitchen"
+
+/area/abandoned_propellant_depot/mess
+	name = "Abandoned Propellant Depot Mess"
+	icon_state = "courtroom"
+
+// --- engineering
+
+/area/abandoned_propellant_depot/engineering
+	name = "Abandoned Propellant Depot Engineering"
+	icon_state = "engineering"
+
+/area/abandoned_propellant_depot/reactor
+	name = "Abandoned Propellant Depot Reactor"
+	icon_state = "engine"
+
+/area/abandoned_propellant_depot/atmos_air
+	name = "Abandoned Propellant Depot Atmos/Air"
+	icon_state = "atmos"
+
+/area/abandoned_propellant_depot/atmos_propellant
+	name = "Abandoned Propellant Depot Atmos/Propellant"
+	icon_state = "atmos"
+
+/area/abandoned_propellant_depot/propellant_tanks
+	name = "Abandoned Propellant Depot Exterior Propellant Tanks"
+	icon_state = "exterior"
+
+/area/abandoned_propellant_depot/atmos_air_aux_fill
+	name = "Abandoned Propellant Depot Atmos/Air Aux Fill"
+	icon_state = "atmos"
+
+// --- other
+
+/area/abandoned_propellant_depot/maint
+	name = "Abandoned Propellant Depot Maintenance"
+	icon_state = "maintenance"
+
+/area/abandoned_propellant_depot/bridge
+	name = "Abandoned Propellant Depot Bridge"
+	icon_state = "bridge"
+
+/area/abandoned_propellant_depot/maint_storage
+	name = "Abandoned Propellant Depot Maint Storage"
+	icon_state = "storage"
+
+/area/abandoned_propellant_depot/security
+	name = "Abandoned Propellant Depot Security"
+	icon_state = "security"
+
+/area/abandoned_propellant_depot/eva
+	name = "Abandoned Propellant Depot EVA Storage"
+	icon_state = "eva"
+
+/area/abandoned_propellant_depot/exterior_catwalks
+	name = "Abandoned Propellant Depot Exterior/Catwalks"
+	icon_state = "exterior"
+
+// -------------------------
+
+
+

maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot_landmarks.dm

@@ -0,0 +1,106 @@
+
+// --------------------- base type
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot
+	base_area = /area/space
+	base_turf = /turf/space
+
+// --------------------- docks
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/north_east
+	name = "Dock, North, East"
+	landmark_tag = "nav_abandoned_propellant_depot_dock_north_east"
+	docking_controller = "airlock_abandoned_propellant_depot_dock_north_east"
+	dir = SOUTH
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/north_west
+	name = "Dock, North, West"
+	landmark_tag = "nav_abandoned_propellant_depot_dock_north_west"
+	docking_controller = "airlock_abandoned_propellant_depot_dock_north_west"
+	dir = SOUTH
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/west
+	name = "Dock, West"
+	landmark_tag = "nav_abandoned_propellant_depot_dock_west"
+	docking_controller = "airlock_abandoned_propellant_depot_dock_west"
+	dir = EAST
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/east_north
+	name = "Dock, East, North"
+	landmark_tag = "nav_abandoned_propellant_depot_dock_east_north"
+	docking_controller = "airlock_abandoned_propellant_depot_dock_east_north"
+	dir = WEST
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/east_south
+	name = "Dock, East, South"
+	landmark_tag = "nav_abandoned_propellant_depot_dock_east_south"
+	docking_controller = "airlock_abandoned_propellant_depot_dock_east_south"
+	dir = WEST
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/south_east
+	name = "Dock, South, East"
+	landmark_tag = "nav_abandoned_propellant_depot_dock_south_east"
+	docking_controller = "airlock_abandoned_propellant_depot_dock_south_east"
+	dir = NORTH
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/south_mid
+	name = "Dock, South, Mid"
+	landmark_tag = "nav_abandoned_propellant_depot_dock_south_mid"
+	docking_controller = "airlock_abandoned_propellant_depot_dock_south_mid"
+	dir = NORTH
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/dock/south_west
+	name = "Dock, South, West"
+	landmark_tag = "nav_abandoned_propellant_depot_dock_south_west"
+	docking_controller = "airlock_abandoned_propellant_depot_dock_south_west"
+	dir = NORTH
+
+// --------------------- catwalk
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/catwalk/north
+	name = "Catwalk, North"
+	landmark_tag = "nav_abandoned_propellant_depot_catwalk_north"
+	dir = SOUTH
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/catwalk/west
+	name = "Catwalk, West"
+	landmark_tag = "nav_abandoned_propellant_depot_catwalk_west"
+	dir = EAST
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/catwalk/south_1
+	name = "Catwalk, South 1"
+	landmark_tag = "nav_abandoned_propellant_depot_catwalk_south_1"
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/catwalk/south_2
+	name = "Catwalk, South 2"
+	landmark_tag = "nav_abandoned_propellant_depot_catwalk_south_2"
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/catwalk/south_3
+	name = "Catwalk, South 3"
+	landmark_tag = "nav_abandoned_propellant_depot_catwalk_south_3"
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/catwalk/south_4
+	name = "Catwalk, South 4"
+	landmark_tag = "nav_abandoned_propellant_depot_catwalk_south_4"
+
+// --------------------- space
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/space/south_west
+	name = "Space, South West"
+	landmark_tag = "nav_abandoned_propellant_depot_space_south_west"
+	dir = NORTH
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/space/south_east
+	name = "Space, South East"
+	landmark_tag = "nav_abandoned_propellant_depot_space_south_east"
+	dir = NORTH
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/space/north_west
+	name = "Space, North West"
+	landmark_tag = "nav_abandoned_propellant_depot_space_north_west"
+	dir = SOUTH
+
+/obj/effect/shuttle_landmark/abandoned_propellant_depot/space/north_east
+	name = "Space, North East"
+	landmark_tag = "nav_abandoned_propellant_depot_space_north_east"
+	dir = SOUTH