Ren shipmaps

code/__DEFINES/shuttles.dm

@@ -158,3 +158,6 @@
 #define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_ONE "garrow_vehicle_elevator_one"
 #define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO "garrow_vehicle_elevator_two"
 #define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO "garrow_cargo_elevator"
+
+#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_SOUTH "EclipseElevatorS"
+#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_NORTH "EclipseElevatorN"

code/datums/shuttles.dm

@@ -140,3 +140,16 @@
 	elevator_network = "garrow_cargo"
 	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO
 	elevator_network = "ArrowCargo"
+
+/datum/map_template/shuttle/trijent_elevator/eclipse
+	shuttle_id = "unused"
+
+/datum/map_template/shuttle/trijent_elevator/eclipse/south
+	name = "Vehicle Elevator Starboard"
+	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_SOUTH
+	elevator_network = "EclipseElevatorS"
+
+/datum/map_template/shuttle/trijent_elevator/eclipse/north
+	name = "Vehicle Elevator Port"
+	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_NORTH
+	elevator_network = "EclipseElevatorN"

code/game/area/eclipse.dm

@@ -0,0 +1,294 @@
+/area/eclipse
+	icon = 'icons/turf/area_almayer.dmi'
+	icon_state = "almayer"
+	ceiling = CEILING_METAL
+	powernet_name = "eclipse"
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+	soundscape_interval = 30
+	ambience_exterior = AMBIENCE_SHIP
+	ceiling_muffle = FALSE
+
+/area/eclipse/command_deck
+	name = "Command Deck"
+
+/area/eclipse/command_deck/commanders_quarters
+	name = "Command Deck - Commanding Officer's Quarters"
+	icon_state = "livingspace"
+
+/area/eclipse/command_deck/xo_quarters
+	name = "Command Deck - Executive Officer's Quarters"
+	icon_state = "livingspace"
+
+/area/eclipse/command_deck/bridge
+	name = "Command Deck - Bridge"
+	icon_state = "cic"
+
+/area/eclipse/command_deck/command
+	name = "Command Deck - Tactical Command"
+	icon_state = "sensor"
+
+/area/eclipse/command_deck/weapons
+	name = "Command Deck - Weapons Command"
+	icon_state = "weaponroom"
+
+/area/eclipse/command_deck/command_hall
+	name = "Command Deck - Command Hallway"
+	icon_state = "almayer"
+
+/area/eclipse/command_deck/officer_mess
+	name = "Command Deck - Officer Mess"
+	icon_state = "food"
+
+/area/eclipse/command_deck/officer_bunks
+	name = "Command Deck - Officer Bunks"
+	icon_state = "livingspace"
+
+/area/eclipse/command_deck/officer_bathroom
+	name = "Command Deck - Officer Bathroom"
+	icon_state = "officernr"
+
+/area/eclipse/command_deck/officer_offices
+	name = "Command Deck - Officer Offices"
+	icon_state = "officerstudy"
+
+/area/eclipse/command_deck/center_hall
+	name = "Command Deck - Center Hallway"
+	icon_state = "almayer"
+
+/area/eclipse/command_deck/east_hall
+	name = "Command Deck - East Hallway"
+	icon_state = "almayer"
+
+/area/eclipse/command_deck/west_hall
+	name = "Command Deck - West Hallway"
+	icon_state = "almayer"
+
+/area/eclipse/command_deck/brig
+	name = "Command Deck - Brig"
+	icon_state = "brig"
+
+/area/eclipse/command_deck/executive_suite
+	name = "Command Deck - Executive Suite"
+	icon_state = "corporatespace"
+
+/area/eclipse/command_deck/ai
+	name = "Human AI Interface"
+	icon_state = "airoom"
+	soundscape_playlist = SCAPE_PL_AICORE
+	soundscape_interval = 7
+	ambience_exterior = AMBIENCE_AICORE
+
+/area/eclipse/command_deck/maintenance
+	name = "Command Deck - Maintenance"
+	icon_state = "lowerhull"
+// --------------------------------------------------- //
+/area/eclipse/crew_deck
+	name = "Crew Deck"
+
+/area/eclipse/crew_deck/engineering
+	name = "Crew Deck -  Engineering"
+	icon_state = "upperengineering"
+
+/area/eclipse/crew_deck/chapel
+	name = "Crew Deck - Chapel"
+	icon_state = "port"
+
+/area/eclipse/crew_deck/galley
+	name = "Crew Deck - Galley"
+	icon_state = "food"
+
+/area/eclipse/crew_deck/mess
+	name = "Crew Deck - Mess Hall"
+	icon_state = "food"
+
+/area/eclipse/crew_deck/section_1_hypersleep
+	name = "Crew Deck - Section 1 Hypersleep"
+	icon_state = "cryo"
+
+/area/eclipse/crew_deck/section_1_lockers
+	name = "Crew Deck - Section 1 Lockers"
+	icon_state = "gruntrnr"
+
+/area/eclipse/crew_deck/section_2_hypersleep
+	name = "Crew Deck - Section 2 Hypersleep"
+	icon_state = "cryo"
+
+/area/eclipse/crew_deck/section_2_lockers
+	name = "Crew Deck - Section 2 Lockers"
+	icon_state = "gruntrnr"
+
+/area/eclipse/crew_deck/senior_nco_1
+	name = "Crew Deck - Senior NCO Quarters 1"
+	icon_state = "livingspace"
+
+/area/eclipse/crew_deck/senior_nco_2
+	name = "Crew Deck - Senior NCO Quarters 2"
+	icon_state = "livingspace"
+
+/area/eclipse/crew_deck/platoon_bunks
+	name = "Crew Deck - Platoon Bunks"
+	icon_state = "gruntrnr"
+
+/area/eclipse/crew_deck/briefing
+	name = "Crew Deck - Briefing Room"
+	icon_state = "briefing"
+
+/area/eclipse/crew_deck/center_hall
+	name = "Crew Deck - Center Hallway"
+	icon_state = "almayer"
+
+/area/eclipse/crew_deck/east_hall
+	name = "Crew Deck - East Hallway"
+	icon_state = "almayer"
+
+/area/eclipse/crew_deck/west_hall
+	name = "Crew Deck - West Hallway"
+	icon_state = "almayer"
+
+/area/eclipse/crew_deck/fitness_room
+	name = "Crew Deck - Fitness Room"
+	icon_state = "basketball"
+
+/area/eclipse/crew_deck/medbay
+	name = "\improper Medical Bay"
+	icon_state = "medical"
+
+/area/eclipse/crew_deck/auxillary_storage
+	name = "Crew Deck - Auxillary Storage"
+	icon_state = "port"
+
+/area/eclipse/crew_deck/auxillary_hypersleep
+	name = "Crew Deck - Auxillary Hypersleep"
+	icon_state = "cryo"
+
+/area/eclipse/crew_deck/sensors
+	name = "Crew Deck - Sensor Array"
+	icon_state = "sensor"
+
+/area/eclipse/crew_deck/maintenance
+	name = "Crew Deck - Maintenance"
+	icon_state = "lowerhull"
+// --------------------------------------------------- //
+/area/eclipse/hangar_deck
+	name = "Hangar Deck"
+
+/area/eclipse/hangar_deck/engineering
+	name = "Hangar Deck -  Engineering"
+	icon_state = "upperengineering"
+
+/area/eclipse/hangar_deck/west_hall
+	name = "Hangar Deck - West Hallway "
+	icon_state = "almayer"
+
+/area/eclipse/hangar_deck/center_hall
+	name = "Hangar Deck - Center Hallway"
+	icon_state = "almayer"
+
+
+/area/eclipse/hangar_deck/section_1_armory
+	name = "Hangar Deck - Section 1 Armory"
+	icon_state = "delta"
+
+/area/eclipse/hangar_deck/section_2_armory
+	name = "Hangar Deck - Section 2 Armory "
+	icon_state = "delta"
+
+/area/eclipse/hangar_deck/hangar_bay
+	name = "Hangar Deck -  Hangar"
+	icon_state = "hangar"
+	soundscape_playlist = SCAPE_PL_HANGAR
+	soundscape_interval = 50
+
+/area/eclipse/hangar_deck/disposals
+	name = "Hangar Deck - Disposals"
+	icon_state = "port"
+
+/area/eclipse/hangar_deck/pilot_weapons
+	name = "Hangar Deck - Dropship Ordnance"
+	icon_state = "dropshiprepair"
+
+/area/eclipse/hangar_deck/loader_storage
+	name = "Hangar Deck - Powerloader Storage"
+	icon_state = "exoarmor"
+
+/area/eclipse/hangar_deck/cargo
+	name = "Hangar Deck - Cargo Bay"
+	icon_state = "req"
+
+/area/eclipse/hangar_deck/maintenance
+	name = "Hangar Deck - Maintenance"
+	icon_state = "lowerhull"
+
+// --------------------------------------------------- //
+
+/area/eclipse/cargo_deck
+	name = "Cargo Deck"
+
+/area/eclipse/cargo_deck/center_hall
+	name = "Cargo Deck - Center Hallway"
+	icon_state = "almayer"
+
+/area/eclipse/cargo_deck/motor_pool
+	name = "Cargo Deck - Motor Pool"
+	icon_state = "blue-red"
+
+/area/eclipse/cargo_deck/west_hall
+	name = "Cargo Deck - West Hallway"
+	icon_state = "almayer"
+
+/area/eclipse/cargo_deck/cargo
+	name = "Cargo Deck - Cargo Bay"
+	icon_state = "req"
+
+/area/eclipse/cargo_deck/maintenance
+	name = "Cargo Deck - Maintenance"
+	icon_state = "lowerhull"
+
+
+/area/eclipse/synthcloset
+	name = "\improper Synthetic Storage Closet"
+	icon_state = "livingspace"
+
+/area/eclipse/cargo_shuttle/elevator
+	name = "\improper Cargo Elevator"
+	unlimited_power = TRUE
+	requires_power = FALSE
+
+/area/eclipse/cargo_shuttle/lower
+	name = "\improper Cargo Elevator Lower Level"
+
+/area/eclipse/cargo_shuttle/upper
+	name = "\improper Cargo Elevator Upper Level"
+
+/area/eclipse/vehicle_shuttle
+	name = "\improper Generic Elevator"
+
+/area/eclipse/vehicle_shuttle/south
+	name = "\improper Starboard Elevator"
+
+/area/eclipse/vehicle_shuttle/south/one
+	name = "\improper Starboard Elevator Storage Deck"
+
+/area/eclipse/vehicle_shuttle/south/two
+	name = "\improper Starboard Elevator Hangar Deck"
+
+/area/eclipse/vehicle_shuttle/south/three
+	name = "\improper Starboard Elevator Crew Deck"
+
+/area/eclipse/vehicle_shuttle/south/four
+	name = "\improper Starboard Elevator Command Deck"
+
+/area/eclipse/vehicle_shuttle/north
+	name = "\improper Port Vehicle Elevator"
+
+/area/eclipse/vehicle_shuttle/north/one
+	name = "\improper Port Elevator Storage Deck"
+
+/area/eclipse/vehicle_shuttle/north/two
+	name = "\improper Port Elevator Hangar Deck"
+
+/area/eclipse/vehicle_shuttle/north/three
+	name = "\improper Port Elevator Crew Deck"
+
+/area/eclipse/vehicle_shuttle/north/four
+	name = "\improper Port Elevator Command Deck"

code/global.dm

@@ -1,7 +1,7 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 #define MAIN_SHIP_NAME SSmapping.get_main_ship_name()
 #define MAIN_SHIP_DEFAULT_NAME "USS Golden Arrow"
-#define SHIP_MAP_NAMES list("USS Almayer", "USS Golden Arrow",  "USS Golden Arrow (Classic)", "SSV Chapaev", "USS Rover", "USCSS Firefly", "USCSS Obsidian Falk", "USCSS Onyx Karain", "HMS Brynhild")
+#define SHIP_MAP_NAMES list("USS Almayer", "USS Golden Arrow",  "USS Golden Arrow (Classic)", "SSV Chapaev", "USS Rover", "USCSS Firefly", "USCSS Obsidian Falk", "USCSS Onyx Karain", "HMS Brynhild", "USS Eclipse")
 
 #define MAIN_SHIP_PLATOON text2path(SSmapping.get_main_ship_platoon())
 #define MAIN_SHIP_DEFAULT_PLATOON "/datum/squad/marine/alpha"

code/modules/shuttle/shuttles/shipmap_elevator.dm

@@ -74,3 +74,19 @@
 	name = "Cargo Elevator"
 	height = 6
 	width = 8
+
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/eclipse
+	dir = NORTH
+	height = 5
+	width = 5
+	rechargeTime = 15 SECONDS
+
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/eclipse/south
+	name = "Vehicle Elevator Starboard"
+	id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_SOUTH
+	area_type = /area/eclipse/vehicle_shuttle/south
+
+/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/eclipse/north
+	name = "Vehicle Elevator Port"
+	id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_NORTH
+	area_type = /area/eclipse/vehicle_shuttle/north

colonialmarines.dme

@@ -813,6 +813,7 @@
 #include "code\game\area\chinook.dm"
 #include "code\game\area\Corsat.dm"
 #include "code\game\area\DesertDam.dm"
+#include "code\game\area\eclipse.dm"
 #include "code\game\area\golden_arrow.dm"
 #include "code\game\area\hms_brynhild.dm"
 #include "code\game\area\IceColony.dm"

map_config/shipmaps.txt

@@ -33,6 +33,9 @@ endmap
 map golden_arrow_classic
 endmap
 
+map uss_eclipse
+endmap
+
 map uscss_obsidian_falk
 endmap