[READY TO MERGE] Exploration Carrier Phase One, Phase Weapon Improvements and new Humvee Vehicle (#6360)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>

code/game/sound.dm

@@ -290,8 +290,8 @@
 			// CHOMPedit start - Sounds for mech footsteps.
 			if ("powerloaderstep")
 				soundin = pick(
-					'modular_chomp/sound/effects/powerloader_step.ogg',
-					'modular_chomp/sound/effects/powerloader_step2.ogg')
+					'modular_chomp/sound/effects/mech/powerloader_step.ogg',
+					'modular_chomp/sound/effects/mech/powerloader_step2.ogg')
 			// CHOMPedit end.
 	return soundin
 

code/modules/projectiles/guns/energy/phase.dm

@@ -2,8 +2,8 @@
 //CHOMP Edit: Each phase gun now has the same safety lock as frontier phasers. Every pathname now has "locked" and "unlocked", basically. This code comes from /code/modules/projectiles/guns/energy/laser_vr.dm.
 
 /obj/item/weapon/gun/energy/locked/phasegun
-	name = "phase carbine"
-	desc = "The RayZar EW26 Artemis is a downsized energy weapon, specifically designed for use against wildlife. This one has a safety interlock that prevents firing while in proximity to the facility."
+	name = "EW26 Artemis" //ChompEDIT
+	desc = "The RayZar EW26 Artemis, also known as the 'phase carbine', is a downsized energy-based weapon specifically designed for use against wildlife. This one has a safety interlock that prevents firing while in proximity to the facility." //ChompEDIT
 	description_fluff = "RayZar is Ward-Takahashi’s main consumer weapons brand, known for producing and licensing a wide variety of specialist energy weapons of various types and quality primarily for the civilian market."
 	icon = 'icons/obj/gun.dmi' // CHOMPEdit: Gun Sprites
 	icon_state = "phasecarbine"
@@ -16,7 +16,7 @@
 	recoil_mode = 0 //CHOMP Addition: Removes recoil for micros.
 
 /obj/item/weapon/gun/energy/locked/phasegun/unlocked
-	desc = "The RayZar EW26 Artemis is a downsized energy weapon, specifically designed for use against wildlife."
+	desc = "The RayZar EW26 Artemis, also known as the 'phase carbine', is a downsized energy-based weapon specifically designed for use against wildlife." //ChompEDIT
 	req_access = newlist() //for toggling safety
 	locked = 0
 	lockable = 0
@@ -31,8 +31,8 @@
 	recharge_time = 16  //ChompEdit  set up to 16 due to lower charge cost
 
 /obj/item/weapon/gun/energy/locked/phasegun/pistol
-	name = "phase pistol"
-	desc = "The RayZar EW15 Apollo is an energy handgun, specifically designed for self-defense against aggressive wildlife. This one has a safety interlock that prevents firing while in proximity to the facility."
+	name = "EW15 Apollo" //ChompEDIT
+	desc = "The RayZar EW15 Apollo, also known as the 'phase pistol', is an energy-based handgun specifically designed for self-defense against aggressive wildlife. This one has a safety interlock that prevents firing while in proximity to the facility." //ChompEDIT
 	icon_state = "phase"
 	item_state = "taser"	//I don't have an in-hand sprite, taser will be fine
 	w_class = ITEMSIZE_NORMAL
@@ -43,7 +43,7 @@
 	move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
 
 /obj/item/weapon/gun/energy/locked/phasegun/pistol/unlocked
-	desc = "The RayZar EW15 Apollo is an energy handgun, specifically designed for self-defense against aggressive wildlife."
+	desc = "The RayZar EW15 Apollo, also known as the 'phase pistol', is an energy-based handgun specifically designed for self-defense against aggressive wildlife." //ChompEDIT
 	req_access = newlist() //for toggling safety
 	locked = 0
 	lockable = 0
@@ -59,8 +59,8 @@
 
 
 /obj/item/weapon/gun/energy/locked/phasegun/rifle
-	name = "phase rifle"
-	desc = "The RayZar EW31 Orion is a specialist energy weapon, intended for use against hostile wildlife. This one has a safety interlock that prevents firing while in proximity to the facility."
+	name = "EW31 Orion" //ChompEDIT
+	desc = "The RayZar EW31 Orion, also known as the 'phase rifle', is a specialist energy-based weapon intended for use against hostile wildlife. This one has a safety interlock that prevents firing while in proximity to the facility." //ChompEDIT
 	icon_state = "phaserifle"
 	item_state = "phaserifle" 
 	wielded_item_state = "phaserifle-wielded"
@@ -72,14 +72,14 @@
 	one_handed_penalty = 30
 
 /obj/item/weapon/gun/energy/locked/phasegun/rifle/unlocked
-	desc = "The RayZar EW31 Orion is a specialist energy weapon, intended for use against hostile wildlife."
+	desc = "The RayZar EW31 Orion, also known as the 'phase rifle', is a specialist energy-based weapon intended for use against hostile wildlife." //ChompEDIT
 	req_access = newlist() //for toggling safety
 	locked = 0
 	lockable = 0
 
 /obj/item/weapon/gun/energy/locked/phasegun/cannon
-	name = "phase cannon"
-	desc = "The RayZar EW50 Gaia is a massive energy weapon, purpose-built for clearing land. You feel dirty just looking at it. This one has a safety interlock that prevents firing while in proximity to the facility."
+	name = "EW50 Gaia" //ChompEDIT
+	desc = "The RayZar EW50 Gaia, also known as the 'phase cannon', is a massive energy weapon purpose-built for clearing land. You feel dirty just looking at it. This one has a safety interlock that prevents firing while in proximity to the facility." //ChompEDIT
 	icon_state = "phasecannon"
 	item_state = "phasecannon"
 	wielded_item_state = "phasecannon-wielded"	//TODO: New Sprites
@@ -91,7 +91,7 @@
 	one_handed_penalty = 65
 
 /obj/item/weapon/gun/energy/locked/phasegun/cannon/unlocked
-	desc = "The RayZar EW50 Gaia is a massive energy weapon, purpose-built for clearing land. You feel dirty just looking at it."
+	desc = "The RayZar EW50 Gaia, also known as the 'phase cannon', is a massive energy weapon purpose-built for clearing land. You feel dirty just looking at it." //ChompEDIT
 	req_access = newlist() //for toggling safety
 	locked = 0
 	lockable = 0

code/modules/projectiles/projectile/energy_ch.dm

@@ -27,6 +27,7 @@
 /obj/item/projectile/energy/phase
 	name = "phase wave"
 	icon_state = "phase"
+	fire_sound = 'modular_chomp/sound/weapons/phase_new/phasecarbine.ogg' //CHOMPedit - New sounds.
 	range = 13
 	damage = 5
 	SA_bonus_damage = 45
@@ -35,12 +36,14 @@
 	hud_state = "laser_heat"
 
 /obj/item/projectile/energy/phase/light
+	fire_sound = 'modular_chomp/sound/weapons/phase_new/phasepistol.ogg' //CHOMPedit - New sounds.
 	range = 11
 	SA_bonus_damage = 35
 	armor_penetration = -50
 	hud_state = "laser_heat"
 
 /obj/item/projectile/energy/phase/heavy
+	fire_sound = 'modular_chomp/sound/weapons/phase_new/phaserifle.ogg' //CHOMPedit - New sounds.
 	range = 16 //Chompedit This range was not great
 	damage = 10
 	SA_bonus_damage = 50
@@ -48,6 +51,7 @@
 	hud_state = "laser_heat"
 
 /obj/item/projectile/energy/phase/heavy/cannon
+	fire_sound = 'modular_chomp/sound/weapons/phase_new/phasecannon.ogg' //CHOMPedit - New sounds.
 	range = 20 //Chompedit This range was mediocre, but not worth a cannon.
 	damage = 15
 	SA_bonus_damage = 60

code/modules/vehicles/quad.dm

@@ -21,7 +21,7 @@
 	var/frame_state = "quad" //Custom-item proofing!
 	var/paint_base = 'icons/obj/vehicles_64x64.dmi'
 	var/custom_frame = FALSE
-	var/datum/looping_sound/vehicle_engine/soundloop
+	//var/datum/looping_sound/vehicle_engine/soundloop //Chomp REMOVE
 
 	paint_color = "#ffffff"
 

code/modules/vehicles/rover_vr.dm

@@ -2,18 +2,21 @@
 //I don't know what the hell I'm doing right now. Please help. Especially with the update_icons stuff. -Joan Risu
 
 /obj/vehicle/train/rover/engine
-	name = "NT Humvee"
-	desc = "The NT version of the UF T-41LV, a Federation recon vehicle used as a personal transport. Can be latched to a trolly to transport equipment. "
+	name = "\improper NT T-41LV Humvee" //ChompEDIT
+	desc = "The corporate market model of the UF T-41LV, a SolGov reconnaissance and exploration vehicle, painted in Nanotrasen blue. Trailers can be latched for transporting heavy equipment, though its performance will noticeably degrade with more than one." //ChompEDIT
 	icon = 'icons/vore/rover_vr.dmi'
 	icon_state = "rover"
+	light_power = 2 // CHOMPedit: 1 to 2, more light range.
+	light_range = 6 // CHOMPedit: 3 to 6, more light range.
 	on = 0
 	powered = 1
 	locked = 0
-	move_delay = 0.5
+	move_delay = 0.2	//CHOMPedit: Move delay reduced from 0.5 to 0.2.
+	charge_use = 2.5	//CHOMPedit: Reduced from 5 to 2.5 for more fuel efficiency, being a dedicated transport vehicle.
 
 	//Health stuff
-	health = 100
-	maxhealth = 100
+	health = 250	// CHOMPedit: 100 to 250. Cars are usually just a bit tougher than humans.
+	maxhealth = 250	// CHOMPedit: Cars are usually just a bit tougher than humans.
 	fire_dam_coeff = 0.6
 	brute_dam_coeff = 0.5
 
@@ -22,8 +25,8 @@
 	pixel_x = -8
 	pixel_y = -8
 
-
-	var/car_limit = 0	//how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching.
+	var/car_limit = 1	//how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching.
+						//CHOMPedit: Set to 1 because the thing slows down to a crawl with even one trailer. Unhitching doesn't occur at regular movement speeds, or even at faster speeds than base.
 	active_engines = 1
 	var/obj/item/weapon/key/rover/key
 	var/siren = 0 //This is for eventually getting the siren sprite to work.
@@ -35,8 +38,8 @@
 	icon_state = "dunebug"
 
 /obj/item/weapon/key/rover
-	name = "The Rover key"
-	desc = "The Rover key used to start it."
+	name = "\improper ignition key" //CHOMPedit: Name update
+	desc = "A universal electronic tri-key for starting most Nanotrasen vehicles." //CHOMPedit: Desc update
 	icon = 'icons/obj/vehicles_vr.dmi'
 	icon_state = "securikey"
 	w_class = ITEMSIZE_TINY
@@ -389,7 +392,7 @@
 	else
 		move_delay = max(0, (-car_limit * active_engines) + train_length - active_engines)	//limits base overweight so you cant overspeed trains
 		move_delay *= (1 / max(1, active_engines)) * 2 										//overweight penalty (scaled by the number of engines)
-		move_delay += config.run_speed 														//base reference speed
+		move_delay += 1 														//base reference speed //CHOMPedit: Move-delay from server config (2) to 1.
 		move_delay *= 1.1																	//makes cargo trains 10% slower than running when not overweight
 
 /obj/vehicle/train/rover/trolley/update_car(var/train_length, var/active_engines)

code/modules/vehicles/vehicle.dm

@@ -42,15 +42,25 @@
 	var/load_offset_y = 0		//pixel_y offset for item overlay
 	var/mob_offset_y = 0		//pixel_y offset for mob overlay
 
+	var/datum/looping_sound/idle_carengine/soundloop //CHOMPedit: Looping engine audio.
+
 //-------------------------------------------
 // Standard procs
 //-------------------------------------------
-/obj/vehicle/New()
-	..()
-	//spawn the cell you want in each vehicle
+//ChompADD START
+/obj/vehicle/Initialize()
+	.=..()
+	soundloop = new(list(src), FALSE)
+	return
+//ChompADD END
+
+///obj/vehicle/New()
+//	..()
+//	//spawn the cell you want in each vehicle // CHOMPedit: Commented out in favour of initialize.
 
 /obj/vehicle/Destroy()
 	QDEL_NULL(riding_datum)
+	QDEL_NULL(soundloop) //ChompADD
 	return ..()
 
 //BUCKLE HOOKS
@@ -200,7 +210,8 @@
 	if(on)
 		return FALSE
 	on = 1
-	playsound(src, 'sound/machines/vehicle/ignition.ogg', 50, 1, -3)
+	playsound(src, 'modular_chomp/sound/effects/vehicle/ignition_car.ogg', 60, 2, -2) //CHOMPedit: New sound effects.
+	soundloop.start()
 	set_light(initial(light_range))
 	update_icon()
 	return TRUE
@@ -211,6 +222,8 @@
 	if(!mechanical)
 		return FALSE
 	on = 0
+	playsound(src, 'modular_chomp/sound/effects/vehicle/engine_off.ogg', 60, 2, -2) //CHOMPedit: New sound effects.
+	soundloop.stop()
 	set_light(0)
 	update_icon()
 
@@ -227,6 +240,7 @@
 
 /obj/vehicle/proc/explode()
 	src.visible_message("<font color='red'><B>[src] blows apart!</B></font>", 1)
+	playsound(src, 'modular_chomp/sound/effects/explosions/vehicleexplosion.ogg', 100, 8, 3) //CHOMPedit: New sound effects.
 	var/turf/Tsec = get_turf(src)
 
 	//stuns people who are thrown off a train that has been blown up
@@ -418,3 +432,18 @@
 		new /obj/effect/decal/cleanable/blood/oil(src.loc)
 	spawn(1) healthcheck()
 	return 1
+
+//ChompADD START
+//----------------------------
+// Engine sounds datum
+//----------------------------
+
+/datum/looping_sound/idle_carengine
+	mid_sounds = 'modular_chomp/sound/effects/vehicle/engine_loop.ogg'
+	mid_length = 2.60 SECONDS
+	chance = 100
+	volume = 10
+	exclusive = TRUE
+	volume_chan = VOLUME_CHANNEL_AMBIENCE
+
+//ChompADD END

maps/southern_cross/overmap/sectors.dm

@@ -77,7 +77,11 @@
 		"d2_near_sw",
 		"d3_near_w",
 		"d3_near_se",
-		"baby_mammoth_dock"
+		"baby_mammoth_dock",
+		"ursula_dock",
+		"stargazer_dock",
+		"needle_dock",
+		"echidna_dock"
 		)
 
 /obj/effect/overmap/visitable/sector/Southern_Cross/get_space_zlevels() //These are the primary levels that our space station resides in. This also indicates what levels astronauts can drift into.

maps/southern_cross/southern_cross_areas.dm

@@ -1928,43 +1928,213 @@ End Chompstation Edit*/
 	icon_state = "shuttle2"
 	base_turf = /turf/simulated/floor/reinforced/airless
 
-//CHOMPedit: Exploration Carrier areas
-
-/area/expoutpost
-	name = "\improper Exploration Carrier"
-	icon_state = "purple"
-
-/area/expoutpost/shuttle
-	name = "\improper Exploration Carrier shuttle"
+//CHOMPedit: New Explo Carrier Areas.
 
 /area/expoutpost/stationshuttle
 	name = "\improper Station Shuttle to Exploration Carrier"
 
-/area/expoutpost/debriefing
-	name = "\improper Exploration Carrier Debriefing"
-	ambience = AMBIENCE_EXPOUTPOST
+// Bow
 
-/area/expoutpost/prep
-	name = "\improper Exploration Carrier Prep Room"
+/area/expoutpost/portbowairlock
+	name = "\improper Port Bow Airlock"
 
-/area/expoutpost/prep/recovery
-	name = "\improper Exploration Carrier Recovery"
-	icon_state = "exam_room"
+/area/expoutpost/starboardbowairlock
+	name = "\improper Starboard Bow Airlock"
 
-/area/expoutpost/pathfinder
-	name = "\improper Exploration Carrier Pathfinder Office"
+/area/expoutpost/eva
+	name = "\improper EVA"
 
-/area/expoutpost/hallwayaftport
-	name = "\improper Exploration Carrier Aft Port Hallway"
+/area/expoutpost/botany
+	name = "\improper Botany Lab"
 
-/area/expoutpost/bathroom
-	name = "\improper Exploration Carrier Bathroom"
+/area/expoutpost/washroom
+	name = "\improper Washroom"
 
-/area/expoutpost/aftdock
-	name = "\improper Exploration Carrier Backup Shuttle Docks"
+/area/expoutpost/civaccesshallway
+	name = "\improper Civilian Access Hallway"
 
-/area/expoutpost/hangerhall
-	name = "\improper Exploration Carrier Hangar Hallway"
+/area/expoutpost/janitorial
+	name = "\improper Janitorial Closet"
+
+/area/expoutpost/kitchen
+	name = "\improper Kitchen"
+
+/area/expoutpost/restrooms
+	name = "\improper Restrooms"
+
+/area/expoutpost/portbowhallway
+	name = "\improper Port Bow Hallway"
+
+/area/expoutpost/bar
+	name = "\improper Bar"
+	flags = RAD_SHIELDED
+
+/area/expoutpost/starbowhallway
+	name = "\improper Starboard Bow Hallway"
+
+/area/expoutpost/suite1
+	name = "\improper Suite One"
+	flags = RAD_SHIELDED
+
+/area/expoutpost/suite2
+	name = "\improper Suite Two"
+	flags = RAD_SHIELDED
+
+/area/expoutpost/pathfinderroom
+	name = "\improper Pathfinder's Ready-Room"
+	flags = RAD_SHIELDED
+
+/area/expoutpost/commanderroom
+	name = "\improper Security Commander's Ready-Room"
+	flags = RAD_SHIELDED
+
+/area/expoutpost/portqpadjunction
+	name = "\improper Port Q-Pad Junction"
+
+/area/expoutpost/starqpadjunction
+	name = "\improper Starboard Q-Pad Junction"
+
+/area/expoutpost/slingcarrierdock
+	name = "\improper Sling Carrier Dock"
+
+/area/expoutpost/stationqpad
+	name ="\improper Station Q-Pad Junction"
+
+/area/expoutpost/secbowcheckpoint
+	name = "\improper Security Bow Checkpoint"
+
+// Midship
+
+/area/expoutpost/staginghangar
+	name = "\improper Staging Hangar"
+
+// Stern
+
+/area/expoutpost/uppersternhallway
+	name = "\improper Upper Stern Hallway"
+
+/area/expoutpost/medbaylobby
+	name = "\improper Medbay Lobby"
+
+/area/expoutpost/medicalbay
+	name = "\improper Medical Bay"
+
+/area/expoutpost/surgical1
+	name = "\improper Surgical Theatre One"
+
+/area/expoutpost/midsternhallway
+	name = "\improper Middle Stern Hallway"
+
+/area/expoutpost/exploarmory
+	name = "\improper Exploration Armory"
+
+/area/expoutpost/explobriefroom
+	name = "\improper Exploration Briefing Room"
+
+/area/expoutpost/explodorm1
+	name = "\improper Exploration Dorm One"
+	flags = RAD_SHIELDED
+
+/area/expoutpost/explodorm2
+	name = "\improper Exploration Dorm Two"
+	flags = RAD_SHIELDED
+
+/area/expoutpost/breakroom
+	name = "\improper Public Breakroom"
+
+/area/expoutpost/cic
+	name = "\improper Combat Information Center"
+
+/area/expoutpost/secoffice
+	name = "\improper Security Office"
+
+/area/expoutpost/gatewayeva
+	name = "\improper Gateway EVA"
+
+/area/expoutpost/gateway
+	name = "\improper Gateway"
+
+/area/expoutpost/secarmory
+	name = "\improper Security Armory"
+
+/area/expoutpost/miningfoyer
+	name = "\improper Mining Foyer"
+
+/area/expoutpost/reactoraccess
+	name = "\improper Reactor Access"
+
+/area/expoutpost/reactorcr
+	name = "\improper Reactor Control Room"
+
+/area/expoutpost/reactorroom
+	name = "\improper Fusion Reactor"
+
+/area/expoutpost/rndlobby
+	name = "\improper R&D Lobby"
+
+/area/expoutpost/rnd
+	name = "\improper Research and Development"
+
+/area/expoutpost/engoffice
+	name = "\improper Engineering Office"
+
+/area/expoutpost/engstorage
+	name = "\improper Engineering Equipment Room"
+
+/area/expoutpost/atmospherics
+	name = "\improper Atmospherics"
+
+/area/expoutpost/secureaccess
+	name = "\improper Secure Access Corridor"
+
+/area/expoutpost/techstorage
+	name = "\improper Technical Storage"
+
+/area/expoutpost/aicore
+	name = "\improper Auxiliary AI Core"
+
+/area/expoutpost/telecomms
+	name = "\improper Ship Telecomms"
+
+/area/expoutpost/disposals
+	name = "\improper Disposals Sorting"
+
+/area/expoutpost/lowersternhallway
+	name = "\improper Lower Stern Hallway"
+
+/area/expoutpost/portfuelstorage
+	name = "\improper Port Fuel Storage"
+
+/area/expoutpost/starfuelstorage
+	name = "\improper Starboard Fuel Storage"
+
+// Maints
+
+/area/expoutpost/portuppermaint
+	name = "\improper Port Upper Maintenance"
+
+/area/expoutpost/staruppermaint
+	name = "\improper Starboard Upper Maintenance"
+
+/area/expoutpost/portexplomaint
+	name = "\improper Port Exploration Maintenance"
+
+/area/expoutpost/starsciencemaint
+	name = "\improper Starboard Science Maintenance"
+
+/area/expoutpost/portlowermaint
+	name = "\improper Port Lower Maintenance"
+
+/area/expoutpost/starlowermaint
+	name = "\improper Starboard Lower Maintenance"
+
+/area/expoutpost/portsternairlock
+	name = "\improper Port Stern Airlock"
+
+/area/expoutpost/starsternairlock
+	name = "\improper Starboard Stern Airlock"
+
+// Hangars
 
 /area/expoutpost/hangarone
 	name = "\improper Exploration Carrier Hangar One"
@@ -1990,68 +2160,6 @@ End Chompstation Edit*/
 	name = "\improper Exploration Carrier Hangar Six"
 	icon_state = "hangar"
 
-/area/expoutpost/hangaroneprep
-	name = "\improper Exploration Carrier Hangar One Prep"
-
-/area/expoutpost/nukestorage //Yes this is a joke
-	name = "\improper Exploration Carrier Secure Storage"
-	icon_state = "nuke_storage"
-
-/area/expoutpost/teleporter
-	name = "\improper Exploration Carrier Teleporter"
-	icon_state = "teleporter"
-
-/area/expoutpost/gateway
-	name = "\improper Exploration Carrier Gateway"
-	icon_state = "teleporter"
-
-/area/expoutpost/displayroom
-	name = "\improper Exploration Carrier Display Room"
-
-/area/solar/expstarboardsolar
-	name = "\improper Exploration Carrier Starbound Solars"
-	icon_state = "panelsS"
-
-/area/solar/expportsolar
-	name = "\improper Exploration Carrier Port Solars"
-	icon_state = "panelsP"
-
-/area/maintenance/solars/expstarboardsolar
-	name = "\improper Exploration Carrier Starbound Solar Control"
-	icon_state = "SolarcontrolS"
-
-/area/maintenance/solars/expportsolar
-	name = "\improper Exploration Carrier Port Solar Control"
-	icon_state = "SolarcontrolP"
-
-/area/maintenance/expoutpost/atmospherics
-	name = "\improper Exploration Carrier Atmospherics"
-	icon_state = "smaint"
-
-/area/maintenance/expoutpost/portmaint
-	name = "\improper Exploration Carrier Port Maintenance"
-	icon_state = "pmaint"
-
-/area/maintenance/expoutpost/telecomms
-	name = "\improper Exploration Carrier Telecomms"
-	icon_state = "pmaint"
-
-/area/maintenance/expoutpost/innerstarboardmaint
-	name = "\improper Exploration Starboard Carrier Maintenance"
-	icon_state = "smaint"
-
-/area/maintenance/expoutpost/outerstarboardmaint
-	name = "\improper Exploration Starboard Carrier Maintenance"
-	icon_state = "smaint"
-
-/area/maintenance/expoutpost/outerportmaint
-	name = "\improper Exploration Carrier Port Maintenance"
-	icon_state = "pmaint"
-
-/area/maintenance/expoutpost/innerportmaint
-	name = "\improper Exploration Carrier Port Maintenance"
-	icon_state = "pmaint"
-
 //CHOMPedit: Exploration backup shuttle. For now this is a placeholder for future expedition content.
 
 /area/shuttle/shuttlebackup

modular_chomp/maps/overmap/aegis_carrier/aegis_objs.dm

@@ -0,0 +1,6 @@
+/obj/structure/railing/overhang/waterless/grey
+	name = "steel ledge"
+	desc = "A metallic overhang that supports an elevated platform."
+	icon = 'modular_chomp/maps/overmap/aegis_carrier/aegis_icons/greyledge.dmi'
+	icon_modifier = "grey_"
+	icon_state = "grey_railing0"

vorestation.dme

@@ -4771,6 +4771,7 @@
 #include "modular_chomp\code\modules\vore\resizing\resize.dm"
 #include "modular_chomp\code\modules\weapons\melee.dm"
 #include "modular_chomp\code\modules\xenobio\machinery\monkey_processor.dm"
+#include "modular_chomp\maps\overmap\aegis_carrier\aegis_objs.dm"
 #include "modular_chomp\game\objects\effects\spiders.dm"
 #include "modular_chomp\maps\overmap\space_pois\space_areas.dm"
 #include "modular_chomp\maps\overmap\space_pois\space_pois.dm"