mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 08:29:57 +01:00
SCCV Quark - new xenoarch/science shuttle (#20127)
feedback thread: - https://forums.aurorastation.org/topic/21275-sccv-quark-new-xenoarch-shuttle-feedback-thread/#comment-178259 changes: - rscadd: "Adds SCCV Quark, new shuttle for xenoarch/science, on Horizon." - rscadd: "Small remap of the aux hangar on Horizon, adding some expedition supplies there." reasoning and explanation: - The idea is that xenoarchs/science use this if they want to go on a solo adventure for whatever reason (and die to random simplemobs), without stealing the intrepid (that could be used to go to the odyssey scenario site). - Xenoarchs would still be allowed to use the intrepid, if it's not used for odyssey or whatever and they want to organize a bigger expedition with more crew (or at least I hope so, I don't make the rules). - It's a small shuttle, but it has more than enough seating and some cargo space. I think, at least, it is fine for a xenoarch or two and a few passengers. - We need a xenoarch/science shuttle like yesterday, and no one's really shown any interest in mapping it in the past few months, so I made this. - If anyone has a different idea and wants to map their own shuttle, it's fine ofc. This is just my PR, anyone is free to open their own, and the best shuttle will be merged      (explanation on top of description) --------- Co-authored-by: DreamySkrell <>
This commit is contained in:
DreamySkrell
co-authored by
DreamySkrell <>
DreamySkrell <>
parent
c143e02c04
commit
5c344e36a3
@@ -79,8 +79,9 @@
|
||||
#define NETWORK_FIRST_DECK "First Deck"
|
||||
#define NETWORK_SECOND_DECK "Second Deck"
|
||||
#define NETWORK_THIRD_DECK "Third Deck"
|
||||
#define NETWORK_INTREPID "Intrepid"
|
||||
#define NETWORK_CANARY "Canary"
|
||||
#define NETWORK_INTREPID "Intrepid" // horizon shuttle, expedition/transport
|
||||
#define NETWORK_CANARY "Canary" // horizon shuttle, scout/fighter
|
||||
#define NETWORK_QUARK "Quark" // horizon shuttle, xenoarch/science
|
||||
#define NETWORK_NEWS "News"
|
||||
|
||||
|
||||
|
||||
@@ -145,6 +145,9 @@ var/global/list/engineering_networks = list(
|
||||
/obj/machinery/camera/network/canary
|
||||
network = list(NETWORK_CANARY)
|
||||
|
||||
/obj/machinery/camera/network/quark
|
||||
network = list(NETWORK_QUARK)
|
||||
|
||||
// AUTONAME
|
||||
/obj/machinery/camera/autoname
|
||||
var/number = 0 //camera number in area
|
||||
|
||||
@@ -165,11 +165,16 @@
|
||||
shuttle_name = "Canary"
|
||||
shuttle_type = /obj/effect/overmap/visitable/ship/landable/canary
|
||||
|
||||
/obj/item/blueprints/shuttle/quark
|
||||
shuttle_name = "Quark"
|
||||
shuttle_type = /obj/effect/overmap/visitable/ship/landable/quark
|
||||
|
||||
/obj/item/storage/lockbox/shuttle_blueprints //Blueprints for modifying the Horizon's shuttles.
|
||||
name = "shuttle blueprints lockbox"
|
||||
req_access = list(ACCESS_CE)
|
||||
starts_with = list(
|
||||
/obj/item/blueprints/shuttle/intrepid = 1,
|
||||
/obj/item/blueprints/shuttle/mining_shuttle = 1,
|
||||
/obj/item/blueprints/shuttle/canary = 1
|
||||
/obj/item/blueprints/shuttle/canary = 1,
|
||||
/obj/item/blueprints/shuttle/quark = 1,
|
||||
)
|
||||
|
||||
@@ -158,3 +158,17 @@
|
||||
|
||||
/obj/machinery/atmospherics/unary/outlet_injector/hide(var/i)
|
||||
update_underlays()
|
||||
|
||||
// ---------- subtypes
|
||||
|
||||
/obj/machinery/atmospherics/unary/outlet_injector/supply
|
||||
connect_types = CONNECT_TYPE_SUPPLY
|
||||
|
||||
/obj/machinery/atmospherics/unary/outlet_injector/scrubber
|
||||
connect_types = CONNECT_TYPE_SCRUBBER
|
||||
|
||||
/obj/machinery/atmospherics/unary/outlet_injector/fuel
|
||||
connect_types = CONNECT_TYPE_FUEL
|
||||
|
||||
/obj/machinery/atmospherics/unary/outlet_injector/aux
|
||||
connect_types = CONNECT_TYPE_AUX
|
||||
|
||||
@@ -1536,6 +1536,27 @@ ABSTRACT_TYPE(/obj/machinery/power/apc)
|
||||
dir = SOUTH
|
||||
pixel_y = -4
|
||||
|
||||
ABSTRACT_TYPE(/obj/machinery/power/apc/quark)
|
||||
cell_type = /obj/item/cell/high
|
||||
req_access = null
|
||||
req_one_access = list(ACCESS_XENOARCH, ACCESS_RESEARCH, ACCESS_BRIDGE_CREW)
|
||||
|
||||
/obj/machinery/power/apc/quark/north
|
||||
dir = NORTH
|
||||
pixel_y = 22
|
||||
|
||||
/obj/machinery/power/apc/quark/east
|
||||
dir = EAST
|
||||
pixel_x = 12
|
||||
|
||||
/obj/machinery/power/apc/quark/west
|
||||
dir = WEST
|
||||
pixel_x = -12
|
||||
|
||||
/obj/machinery/power/apc/quark/south
|
||||
dir = SOUTH
|
||||
pixel_y = -4
|
||||
|
||||
/obj/machinery/power/apc/mining_shuttle
|
||||
cell_type = /obj/item/cell/high
|
||||
req_access = null
|
||||
|
||||
@@ -382,4 +382,13 @@ GLOBAL_LIST_EMPTY(gps_list)
|
||||
gps_prefix = "COM"
|
||||
compass_color = "#57c5e0"
|
||||
gpstag = "CANARY"
|
||||
|
||||
/obj/item/device/gps/stationary/sccv_quark
|
||||
name = "static GPS (SCCV Quark)"
|
||||
desc = "A static global positioning system helpful for finding your way back to the SCCV Quark."
|
||||
icon_state = "gps-sci"
|
||||
gps_prefix = "SCI"
|
||||
compass_color = "#d691ce"
|
||||
gpstag = "QUARK"
|
||||
|
||||
/********** Static GPS End **********/
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
|
||||
author: DreamySkrell
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- rscadd: "Adds SCCV Quark, new shuttle for xenoarch/science, on Horizon."
|
||||
- rscadd: "Small remap of the aux hangar on Horizon, adding some expedition supplies there."
|
||||
@@ -129,6 +129,7 @@
|
||||
/datum/shuttle/autodock/overmap/intrepid,
|
||||
/datum/shuttle/autodock/overmap/mining,
|
||||
/datum/shuttle/autodock/overmap/canary,
|
||||
/datum/shuttle/autodock/overmap/quark,
|
||||
/datum/shuttle/autodock/ferry/merchant_aurora,
|
||||
/datum/shuttle/autodock/ferry/autoreturn/ccia,
|
||||
/datum/shuttle/autodock/overmap/orion_express_shuttle,
|
||||
@@ -153,8 +154,10 @@
|
||||
|
||||
shuttle_manifests = list(
|
||||
"SCCV Canary" = list("color" = "blue", "icon" = "binoculars"),
|
||||
"SCCV Intrepid" = list("color" = "purple", "icon" = "compass"),
|
||||
"SCCV Spark" = list("color" = "brown", "icon" = "gem"))
|
||||
"SCCV Intrepid" = list("color" = "blue", "icon" = "compass"),
|
||||
"SCCV Spark" = list("color" = "brown", "icon" = "gem"),
|
||||
"SCCV Quark" = list("color" = "purple", "icon" = "microscope"),
|
||||
)
|
||||
shuttle_missions = list("Exploration", "Research", "Prospecting", "Transport", "Combat", "Rescue", "Training")
|
||||
|
||||
/datum/map/sccv_horizon/send_welcome()
|
||||
|
||||
@@ -151,9 +151,6 @@
|
||||
/area/maintenance/substation/hangar
|
||||
name = "Hangar Substation"
|
||||
|
||||
/area/hangar/canary
|
||||
name = "Canary Hangar"
|
||||
|
||||
//Operations
|
||||
|
||||
/area/operations
|
||||
@@ -321,22 +318,37 @@
|
||||
name = "Intrepid"
|
||||
icon_state = "intrepid"
|
||||
requires_power = TRUE
|
||||
|
||||
/area/shuttle/intrepid/crew_compartment
|
||||
name = "Intrepid Crew Compartment"
|
||||
|
||||
/area/shuttle/intrepid/cargo_bay
|
||||
name = "Intrepid Cargo Bay"
|
||||
|
||||
/area/shuttle/intrepid/engine_compartment
|
||||
name = "Engine Compartment"
|
||||
|
||||
/area/shuttle/intrepid/atmos_compartment
|
||||
name = "Atmos Compartment"
|
||||
|
||||
/area/shuttle/intrepid/cockpit
|
||||
name = "Cockpit"
|
||||
|
||||
/area/shuttle/intrepid/quarters
|
||||
name = "Intrepid Crew Quarters"
|
||||
|
||||
/area/shuttle/canary
|
||||
name = "Canary"
|
||||
requires_power = TRUE
|
||||
|
||||
/area/shuttle/quark/cockpit
|
||||
name = "Quark Cockpit"
|
||||
requires_power = TRUE
|
||||
|
||||
/area/shuttle/quark/cargo_hold
|
||||
name = "Quark Cargo Hold"
|
||||
requires_power = TRUE
|
||||
|
||||
//
|
||||
// SCCV Horizon Areas
|
||||
//
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
|
||||
//
|
||||
// ------------------------------------------- horizon
|
||||
//
|
||||
|
||||
/obj/effect/overmap/visitable/ship/sccv_horizon
|
||||
class = "SCCV"
|
||||
designation = "Horizon"
|
||||
@@ -22,7 +27,8 @@
|
||||
initial_restricted_waypoints = list(
|
||||
"Spark" = list("nav_hangar_mining"), //can't have random shuttles popping inside the ship
|
||||
"Intrepid" = list("nav_hangar_intrepid"),
|
||||
"Canary" = list("nav_hangar_canary")
|
||||
"Canary" = list("nav_hangar_canary"),
|
||||
"Quark" = list("nav_hangar_quark"),
|
||||
)
|
||||
|
||||
initial_generic_waypoints = list(
|
||||
@@ -36,6 +42,7 @@
|
||||
"nav_hangar_mining",
|
||||
"nav_hangar_intrepid",
|
||||
"nav_hangar_canary",
|
||||
"nav_hangar_quark",
|
||||
"nav_cargo_shuttle_dock",
|
||||
"nav_horizon_hangar_1",
|
||||
"nav_burglar_hangar",
|
||||
@@ -52,6 +59,10 @@
|
||||
skybox_image.pixel_y = rand(128,256)
|
||||
return skybox_image
|
||||
|
||||
//
|
||||
// ------------------------------------------- intrepid
|
||||
//
|
||||
|
||||
/obj/effect/overmap/visitable/ship/landable/intrepid
|
||||
name = "Intrepid"
|
||||
class = "SCCV"
|
||||
@@ -89,6 +100,10 @@
|
||||
icon_keyboard = null
|
||||
circuit = null
|
||||
|
||||
//
|
||||
// ------------------------------------------- spark
|
||||
//
|
||||
|
||||
/obj/effect/overmap/visitable/ship/landable/mining_shuttle
|
||||
name = "Spark"
|
||||
class = "SCCV"
|
||||
@@ -126,6 +141,10 @@
|
||||
icon_keyboard = null
|
||||
circuit = null
|
||||
|
||||
//
|
||||
// ------------------------------------------- canary
|
||||
//
|
||||
|
||||
/obj/effect/overmap/visitable/ship/landable/canary
|
||||
name = "Canary"
|
||||
class = "SCCV"
|
||||
@@ -175,3 +194,41 @@
|
||||
icon_keyboard = null
|
||||
circuit = null
|
||||
|
||||
//
|
||||
// ------------------------------------------- quark
|
||||
//
|
||||
|
||||
/obj/effect/overmap/visitable/ship/landable/quark
|
||||
name = "Quark"
|
||||
class = "SCCV"
|
||||
designation = "Quark"
|
||||
desc = "\
|
||||
A small-sized exploration shuttle manufactured by Hephaestus, the Celeste-class is commonly used by the corporations of the SCC. \
|
||||
Designed for short-term expeditions, it is entirely reliant on a bigger ship for supply and support. \
|
||||
This one's transponder identifies it as the SCCV Quark. \
|
||||
"
|
||||
shuttle = "Quark"
|
||||
icon_state = "pod" // <-------------- temporary, hopefully someone sprites it some day
|
||||
moving_state = "pod_moving"
|
||||
colors = list("#cfd4ff", "#78adf8")
|
||||
// scanimage = "quark.png" // <-------------- hopefully someone sprites it some day
|
||||
designer = "Hephaestus Industries"
|
||||
volume = "15 meters length, 9 meters beam/width, 6 meters vertical height"
|
||||
sizeclass = "Celeste-type Exploration Shuttlecraft"
|
||||
shiptype = "Exploratory survey and scouting"
|
||||
max_speed = 1/(3 SECONDS)
|
||||
burn_delay = 2 SECONDS
|
||||
vessel_mass = 3000
|
||||
fore_dir = SOUTH
|
||||
vessel_size = SHIP_SIZE_TINY
|
||||
|
||||
// /obj/effect/overmap/visitable/ship/landable/quark/get_skybox_representation()
|
||||
// var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "quark")
|
||||
// skybox_image.pixel_x = rand(0,64)
|
||||
// skybox_image.pixel_y = rand(128,256) // <---------- hopefully someone sprites it some day
|
||||
// return skybox_image
|
||||
|
||||
/obj/machinery/computer/shuttle_control/explore/terminal/quark
|
||||
name = "\improper Quark control console"
|
||||
shuttle_tag = "Quark"
|
||||
req_access = list(ACCESS_XENOARCH, ACCESS_RESEARCH)
|
||||
|
||||
@@ -142,7 +142,7 @@
|
||||
name = "First Deck Canary Hangar Bay"
|
||||
landmark_tag = "nav_hangar_canary"
|
||||
docking_controller = "canary_dock"
|
||||
base_area = /area/hangar/canary
|
||||
base_area = /area/hangar/auxiliary
|
||||
base_turf = /turf/simulated/floor/plating
|
||||
|
||||
/obj/effect/shuttle_landmark/canary/transit
|
||||
@@ -150,6 +150,30 @@
|
||||
landmark_tag = "nav_transit_canary"
|
||||
base_turf = /turf/space/transit/north
|
||||
|
||||
// Quark
|
||||
/datum/shuttle/autodock/overmap/quark
|
||||
name = "Quark"
|
||||
move_time = 20
|
||||
shuttle_area = list(/area/shuttle/quark/cockpit, /area/shuttle/quark/cargo_hold)
|
||||
dock_target = "airlock_shuttle_quark"
|
||||
current_location = "nav_hangar_quark"
|
||||
landmark_transition = "nav_transit_quark"
|
||||
range = 1
|
||||
fuel_consumption = 3
|
||||
logging_home_tag = "nav_hangar_quark"
|
||||
|
||||
/obj/effect/shuttle_landmark/quark/hangar
|
||||
name = "First Deck Quark Hangar Bay"
|
||||
landmark_tag = "nav_hangar_quark"
|
||||
docking_controller = "quark_dock"
|
||||
base_area = /area/hangar/auxiliary
|
||||
base_turf = /turf/simulated/floor/plating
|
||||
|
||||
/obj/effect/shuttle_landmark/quark/transit
|
||||
name = "In transit"
|
||||
landmark_tag = "nav_transit_quark"
|
||||
base_turf = /turf/space/transit/north
|
||||
|
||||
// Mining Shuttle
|
||||
/datum/shuttle/autodock/overmap/mining
|
||||
name = "Spark"
|
||||
|
||||
+3590
-2609
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user