Dominian Corvette Remap

aurorastation.dme

@@ -4001,7 +4001,10 @@
 #include "maps\away\ships\coc\gadpathur_patrol\gadpathur_patrol_doors.dm"
 #include "maps\away\ships\coc\gadpathur_patrol\gadpathur_patrol_ghostroles.dm"
 #include "maps\away\ships\dominia\dominian_corvette\dominian_corvette.dm"
+#include "maps\away\ships\dominia\dominian_corvette\dominian_corvette_areas.dm"
 #include "maps\away\ships\dominia\dominian_corvette\dominian_corvette_ghostroles.dm"
+#include "maps\away\ships\dominia\dominian_corvette\dominian_corvette_landmarks.dm"
+#include "maps\away\ships\dominia\dominian_corvette\dominian_corvette_shuttle.dm"
 #include "maps\away\ships\dominia\dominian_science_vessel\dominian_science_vessel.dm"
 #include "maps\away\ships\dominia\dominian_science_vessel\dominian_science_vessel_areas.dm"
 #include "maps\away\ships\dominia\dominian_science_vessel\dominian_science_vessel_ghostroles.dm"

html/changelogs/notagonk-changelog_dominia_remap.yml

@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: notagonk
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Dominian Corvette has been remapped."

maps/away/ships/dominia/dominian_corvette/dominian_corvette.dm

@@ -1,137 +1,49 @@
 /datum/map_template/ruin/away_site/dominian_corvette
 	name = "Dominian Corvette"
-	description = "One of the most common ships in the Imperial Fleet, Lammergeier-class corvettes are often used as the vanguard of battlefleets entering a system marked for annexation into the glorious Empire as it is tasked to find and scout routes for the larger fleet. Though intended for scouting and screening work the Lammergeier is, like its larger counterparts, quite heavily armed and armored for a typical corvette. Any frontier savages who attempt to meet one with force of arms will soon find themselves staring down the barrels of Zhurong’s finest weaponry, and the Fleet-trained Ma’zals entrusted to operate it. The heavy armament and sensors of the Lammergeier-class come at a cost: it lacks a shield generator and is much larger than a typical Solarian corvette, thus requiring a larger crew. Lammergeier-class captains are generally loyal Ma’zals, such as the citizens of Novi Jadran, and are authorized to take whatever measures are necessary to ensure their crew remains loyal to both Empire and Goddess. This one’s transponder marks it as belonging to the Empire’s First Battlefleet – a battle-hardened formation responsible for patrolling the region of the northern Sparring Sea between the Empire, Hegemony, and Republic of dominia."
+	description = "One of the most common ships in the Imperial Fleet, Lammergeier-class corvettes are often used as the vanguard of battlefleets entering a system marked for annexation into the glorious Empire as it is tasked to find and scout routes for the larger fleet. Though intended for scouting and screening work the Lammergeier is, like its larger counterparts, quite heavily armed and armored for a typical corvette. Any frontier savages who attempt to meet one with force of arms will soon find themselves staring down the barrels of Zhurong’s finest weaponry, and the Fleet-trained Ma’zals entrusted to operate it. The heavy armament and sensors of the Lammergeier-class come at a cost: it lacks a shield generator and is much larger than a typical Solarian corvette, thus requiring a larger crew. Lammergeier-class captains are generally loyal Ma’zals, such as the citizens of Novi Jadran, and are authorized to take whatever measures are necessary to ensure their crew remains loyal to both Empire and Goddess. This one’s transponder marks it as belonging to the Empire’s First Battlefleet – a battle-hardened formation responsible for patrolling the region of the northern Sparring Sea between the Empire, Izweski Hegemony, and Republic of Elyra."
 
 	prefix = "ships/dominia/dominian_corvette/"
 	suffix = "dominian_corvette.dmm"
 
+	traits = list(
+		// Deck one
+		list(ZTRAIT_AWAY = TRUE, ZTRAIT_UP = TRUE, ZTRAIT_DOWN = FALSE),
+		// Deck two
+		list(ZTRAIT_AWAY = TRUE, ZTRAIT_UP = FALSE, ZTRAIT_DOWN = TRUE),
+	)
+
 	sectors = list(SECTOR_BADLANDS)
 	spawn_weight = 1
 	ship_cost = 1
 	id = "dominian_corvette"
-	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/dominian_shuttle)
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/dominian_shuttle, /datum/shuttle/autodock/multi/lift/dominia)
 
 	unit_test_groups = list(2)
 
 /singleton/submap_archetype/dominian_corvette
 	map = "Dominian Corvette"
-	descriptor = "One of the most common ships in the Imperial Fleet, Lammergeier-class corvettes are often used as the vanguard of battlefleets entering a system marked for annexation into the glorious Empire as it is tasked to find and scout routes for the larger fleet. Though intended for scouting and screening work the Lammergeier is, like its larger counterparts, quite heavily armed and armored for a typical corvette. Any frontier savages who attempt to meet one with force of arms will soon find themselves staring down the barrels of Zhurong’s finest weaponry, and the Fleet-trained Ma’zals entrusted to operate it. The heavy armament and sensors of the Lammergeier-class come at a cost: it lacks a shield generator and is much larger than a typical Solarian corvette, thus requiring a larger crew. Lammergeier-class captains are generally loyal Ma’zals, such as the citizens of Novi Jadran, and are authorized to take whatever measures are necessary to ensure their crew remains loyal to both Empire and Goddess. This one’s transponder marks it as belonging to the Empire’s First Battlefleet – a battle-hardened formation responsible for patrolling the region of the northern Sparring Sea between the Empire, Hegemony, and Republic of dominia."
-
-//areas
-/area/ship/dominian_corvette
-	name = "Dominian Corvette"
-	requires_power = TRUE
-
-/area/ship/dominian_corvette/janitor
-	name = "Dominian Corvette Custodial Closet"
-	sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/ship/dominian_corvette/hangar
-	name = "Dominian Corvette Hangar"
-	ambience = AMBIENCE_HANGAR
-
-/area/ship/dominian_corvette/eva
-	name = "Dominian Corvette EVA Preparation"
-
-/area/ship/dominian_corvette/infirmary
-	name = "Dominian Corvette Infirmary"
-	icon_state = "medbay"
-
-/area/ship/dominian_corvette/quarters
-	name = "Dominian Corvette Crew Quarters"
-	icon_state = "Sleep"
-
-/area/ship/dominian_corvette/head
-	name = "Dominian Corvette Head"
-	icon_state = "washroom"
-
-/area/ship/dominian_corvette/recroom
-	name = "Dominian Corvette Recreation Room"
-	icon_state = "lounge"
-
-/area/ship/dominian_corvette/cic
-	name = "Dominian Corvette CIC"
-
-/area/ship/dominian_corvette/bridge
-	name = "Dominian Corvette Bridge"
-
-/area/ship/dominian_corvette/franny
-	name = "Dominian Corvette Francisca Compartment"
-	sound_environment = SOUND_AREA_SMALL_ENCLOSED
-	ambience = AMBIENCE_HIGHSEC
-
-/area/ship/dominian_corvette/officer
-	name = "Dominian Corvette Officer Quarters"
-	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
-
-/area/ship/dominian_corvette/armory
-	name = "Dominian Corvette Armory"
-	icon_state = "security"
-	sound_environment = SOUND_AREA_SMALL_ENCLOSED
-	ambience = AMBIENCE_HIGHSEC
-
-/area/ship/dominian_corvette/temple
-	name = "Dominian Corvette Temple"
-	icon_state = "chapel"
-	ambience = AMBIENCE_CHAPEL
-
-/area/ship/dominian_corvette/engineering
-	name = "Dominian Corvette Engineering"
-	ambience = AMBIENCE_ENGINEERING
-
-/area/ship/dominian_corvette/engineering/reactor
-	name = "Dominian Corvette Reactor Room"
-	ambience = AMBIENCE_SINGULARITY
-
-/area/ship/dominian_corvette/engineering/atmos
-	name = "Dominian Corvette Atmospherics"
-	icon_state = "atmos"
-
-/area/ship/dominian_corvette/propulsion
-	name = "Dominian Corvette Starboard Propulsion"
-
-/area/ship/dominian_corvette/propulsion/port
-	name = "Dominian Corvette Port Propulsion"
-
-/area/ship/dominian_corvette/docking
-	name = "Dominian Corvette Starboard Docking Arm"
-
-/area/ship/dominian_corvette/docking/port
-	name = "Dominian Corvette Port Docking Arm"
-
-/area/ship/dominian_corvette/cannon
-	name = "Dominian Corvette Cannon Compartment"
-	sound_environment = SOUND_AREA_LARGE_ENCLOSED
-	ambience = AMBIENCE_HIGHSEC
-
-/area/ship/dominian_corvette/exterior
-	name = "Dominian Corvette Exterior"
-
-/area/shuttle/dominian_shuttle
-	name = "Dominian Shuttle"
-	icon_state = "shuttle2"
-
-//ship stuff
+	descriptor = "One of the most common ships in the Imperial Fleet, Lammergeier-class corvettes are often used as the vanguard of battlefleets entering a system marked for annexation into the glorious Empire as it is tasked to find and scout routes for the larger fleet. Though intended for scouting and screening work the Lammergeier is, like its larger counterparts, quite heavily armed and armored for a typical corvette. Any frontier savages who attempt to meet one with force of arms will soon find themselves staring down the barrels of Zhurong’s finest weaponry, and the Fleet-trained Ma’zals entrusted to operate it. The heavy armament and sensors of the Lammergeier-class come at a cost: it lacks a shield generator and is much larger than a typical Solarian corvette, thus requiring a larger crew. Lammergeier-class captains are generally loyal Ma’zals, such as the citizens of Novi Jadran, and are authorized to take whatever measures are necessary to ensure their crew remains loyal to both Empire and Goddess. This one’s transponder marks it as belonging to the Empire’s First Battlefleet – a battle-hardened formation responsible for patrolling the region of the northern Sparring Sea between the Empire, Izweski Hegemony, and Republic of Elyra."
 
 /obj/effect/overmap/visitable/ship/dominian_corvette
 	name = "Dominian Corvette"
 	class = "HIMS"
-	desc = "One of the most common ships in the Imperial Fleet, Lammergeier-class corvettes are often used as the vanguard of battlefleets entering a system marked for annexation into the glorious Empire as it is tasked to find and scout routes for the larger fleet. Though intended for scouting and screening work the Lammergeier is, like its larger counterparts, quite heavily armed and armored for a typical corvette. Any frontier savages who attempt to meet one with force of arms will soon find themselves staring down the barrels of Zhurong’s finest weaponry, and the Fleet-trained Ma’zals entrusted to operate it. The heavy armament and sensors of the Lammergeier-class come at a cost: it lacks a shield generator and is much larger than a typical Solarian corvette, thus requiring a larger crew. Lammergeier-class captains are generally loyal Ma’zals, such as the citizens of Novi Jadran, and are authorized to take whatever measures are necessary to ensure their crew remains loyal to both Empire and Goddess. This one’s transponder marks it as belonging to the Empire’s First Battlefleet – a battle-hardened formation responsible for patrolling the region of the northern Sparring Sea between the Empire, Hegemony, and Republic of dominia."
+	desc = "One of the most common ships in the Imperial Fleet, Lammergeier-class corvettes are often used as the vanguard of battlefleets entering a system marked for annexation into the glorious Empire as it is tasked to find and scout routes for the larger fleet. Though intended for scouting and screening work the Lammergeier is, like its larger counterparts, quite heavily armed and armored for a typical corvette. Any frontier savages who attempt to meet one with force of arms will soon find themselves staring down the barrels of Zhurong’s finest weaponry, and the Fleet-trained Ma’zals entrusted to operate it. The heavy armament and sensors of the Lammergeier-class come at a cost: it lacks a shield generator and is much larger than a typical Solarian corvette, thus requiring a larger crew. Lammergeier-class captains are generally loyal Ma’zals, such as the citizens of Novi Jadran, and are authorized to take whatever measures are necessary to ensure their crew remains loyal to both Empire and Goddess. This one’s transponder marks it as belonging to the Empire’s First Battlefleet – a battle-hardened formation responsible for patrolling the region of the northern Sparring Sea between the Empire, Izweski Hegemony, and Republic of Elyra."
 	icon_state = "lammergeier"
 	moving_state = "lammergeier_moving"
 	colors = list("#df1032", "#d4296b")
+	max_speed = 1/(2 SECONDS)
+	burn_delay = 1 SECONDS
+	vessel_mass = 5000
+	fore_dir = SOUTH
+	vessel_size = SHIP_SIZE_SMALL
 	scanimage = "dominian_corvette.png"
 	designer = "Zhurong Naval Arsenal, Empire of Dominia"
 	volume = "42 meters length, 75 meters beam/width, 18 meters vertical height"
 	drive = "Low-Speed Warp Acceleration FTL Drive"
-	weapons = "Dual wingtip-mounted extruding medium-caliber ballistic armament, aft obscured flight craft bay"
+	weapons = "Dual wingtip-mounted extruding medium-caliber naval batteries, fore low-caliber rotary cannon"
 	sizeclass = "Lammergeier-class Corvette"
 	shiptype = "Military patrol and combat utility"
-	max_speed = 1/(2 SECONDS)
-	burn_delay = 1 SECONDS
-	vessel_mass = 5000
-	fore_dir = SOUTH
-	vessel_size = SHIP_SIZE_SMALL
+
 	initial_restricted_waypoints = list(
 		"Dominian Shuttle" = list("nav_hangar_dominia")
 	)
@@ -142,7 +54,9 @@
 		"nav_dominian_corvette_3",
 		"nav_dominian_corvette_4",
 		"nav_dominian_corvette_starboard_dock",
-		"nav_dominian_corvette_dock_port"
+		"nav_dominian_corvette_port_dock",
+		"nav_dominian_corvette_aft_dock",
+		"nav_dominian_corvette_fore_dock"
 	)
 
 	invisible_until_ghostrole_spawn = TRUE
@@ -156,92 +70,3 @@
 	skybox_image.pixel_x = rand(0,64)
 	skybox_image.pixel_y = rand(128,256)
 	return skybox_image
-
-/obj/effect/shuttle_landmark/dominian_corvette/nav1
-	name = "Dominian Corvette - Fore"
-	landmark_tag = "nav_dominian_corvette_1"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/dominian_corvette/nav2
-	name = "Dominian Corvette - Aft"
-	landmark_tag = "nav_dominian_corvette_2"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/dominian_corvette/nav3
-	name = "Dominian Corvette - Starboard"
-	landmark_tag = "nav_dominian_corvette_3"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/dominian_corvette/nav4
-	name = "Dominian Corvette - Port"
-	landmark_tag = "nav_dominian_corvette_4"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/dominian_corvette/dock
-	name = "Dominian Corvette Starboard Dock"
-	landmark_tag = "nav_dominian_corvette_starboard_dock"
-	docking_controller = "airlock_dominian_corvette_starboard_dock"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/dominian_corvette/dock/port
-	name = "Dominian Corvette Port Dock"
-	landmark_tag = "nav_dominian_corvette_dock_port"
-	docking_controller = "airlock_dominian_corvette_dock_port"
-	base_turf = /turf/space
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/dominian_corvette/transit
-	name = "In transit"
-	landmark_tag = "nav_transit_dominian_corvette"
-	base_turf = /turf/space/transit/north
-
-//shuttle stuff
-/obj/effect/overmap/visitable/ship/landable/dominian_shuttle
-	name = "Dominian Shuttle"
-	class = "HIMS"
-	designation = "Chariot"
-	desc = "A light shuttle used by the Imperial Fleet to move small amounts of cargo or personnel between vessels, the Yupmi-class shuttle is a dependable utility craft. Like most Dominian vessels it is relatively well armored for its size but is not a combat vessel by any means. A short operational range means a Yupmi should never stray too far from its vessel of origin as it will soon run out of fuel."
-	shuttle = "Dominian Shuttle"
-	icon_state = "shuttle"
-	moving_state = "shuttle_moving"
-	colors = list("#df1032", "#d4296b")
-	max_speed = 1/(3 SECONDS)
-	burn_delay = 2 SECONDS
-	vessel_mass = 3000 //very inefficient pod
-	fore_dir = NORTH
-	vessel_size = SHIP_SIZE_SMALL
-
-/obj/machinery/computer/shuttle_control/explore/dominian_shuttle
-	name = "shuttle control console"
-	shuttle_tag = "Dominian Shuttle"
-	req_access = list(ACCESS_IMPERIAL_FLEET_VOIDSMAN_SHIP)
-
-/datum/shuttle/autodock/overmap/dominian_shuttle
-	name = "Dominian Shuttle"
-	move_time = 20
-	shuttle_area = list(/area/shuttle/dominian_shuttle)
-	current_location = "nav_hangar_dominia"
-	landmark_transition = "nav_transit_dominian_shuttle"
-	dock_target = "airlock_dominian_shuttle"
-	range = 1
-	fuel_consumption = 2
-	logging_home_tag = "nav_hangar_dominia"
-	defer_initialisation = TRUE
-
-/obj/effect/shuttle_landmark/dominian_shuttle/hangar
-	name = "Dominian Shuttle Hangar"
-	landmark_tag = "nav_hangar_dominia"
-	docking_controller = "dominian_shuttle_dock"
-	base_area = /area/ship/dominian_corvette
-	base_turf = /turf/space/dynamic
-	movable_flags = MOVABLE_FLAG_EFFECTMOVE
-
-/obj/effect/shuttle_landmark/dominian_shuttle/transit
-	name = "In transit"
-	landmark_tag = "nav_transit_dominian_shuttle"
-	base_turf = /turf/space/transit/north