Shuttle fixes part one.

This commit is contained in:
Neerti
2021-06-25 23:27:48 -04:00
parent b407514535
commit fc4431afe4
2 changed files with 85 additions and 3 deletions
+2 -1
View File
@@ -8438,11 +8438,11 @@
/turf/simulated/wall/r_wall,
/area/surface/station/maintenance/substation/cargo/gnd)
"dYO" = (
/obj/structure/table/reinforced,
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 21
},
/obj/machinery/computer/shuttle_control/explore/explorer_shuttle,
/turf/simulated/floor/tiled/old_cargo/gray,
/area/shuttle/exploration/cockpit)
"dYT" = (
@@ -27147,6 +27147,7 @@
},
/obj/effect/map_helper/airlock/atmos/pump_out_internal,
/obj/effect/shuttle_landmark/cynosure/pads/pad4,
/obj/effect/overmap/visitable/ship/landable/explorer_shuttle,
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/exploration/cargo)
"mCa" = (
+83 -2
View File
@@ -191,13 +191,13 @@ ESCAPE_POD(1)
//Cynosure Station Docks
/obj/effect/shuttle_landmark/cynosure/pads/pad3/
/obj/effect/shuttle_landmark/cynosure/pads/pad3
name = "Shuttle Pad Three"
landmark_tag = "nav_pad3_cynosure"
base_area = /area/surface/outside/station/shuttle/pad3
base_turf = /turf/simulated/floor/plating/sif/planetuse
/obj/effect/shuttle_landmark/cynosure/pads/pad4/
/obj/effect/shuttle_landmark/cynosure/pads/pad4
name = "Shuttle Pad Four"
landmark_tag = "nav_pad4_cynosure"
base_area = /area/surface/outside/station/shuttle/pad4
@@ -210,3 +210,84 @@ ESCAPE_POD(1)
landmark_tag = "nav_telecomm_dockarm"
base_area = /area/space
base_turf = /turf/space
// Explorer Shuttle
/datum/shuttle/autodock/overmap/explorer_shuttle
name = "Exploration Shuttle"
warmup_time = 0
current_location = "nav_pad4_cynosure"
// docking_controller_tag = "expshuttle_docker"
shuttle_area = list(/area/shuttle/exploration/general, /area/shuttle/exploration/cockpit, /area/shuttle/exploration/cargo)
fuel_consumption = 3
/obj/effect/overmap/visitable/ship/landable/explorer_shuttle
name = "Exploration Shuttle"
desc = "The exploration team's shuttle."
vessel_mass = 2000
vessel_size = SHIP_SIZE_SMALL
shuttle = "Exploration Shuttle"
/obj/machinery/computer/shuttle_control/explore/explorer_shuttle
name = "takeoff and landing console"
shuttle_tag = "Exploration Shuttle"
req_one_access = list(access_explorer)
/*
// Compile in the map for CI testing if we're testing compileability of all the maps
#if MAP_TEST
#include "generic_shuttle.dmm"
#endif
// Map template for spawning the shuttle
/datum/map_template/om_ships/hybrid
name = "OM Ship - Generic Shuttle"
desc = "A small privately-owned vessel."
mappath = 'generic_shuttle.dmm'
annihilate = TRUE
// The shuttle's area(s)
/area/shuttle/generic_shuttle/eng
name = "\improper Private Vessel - Engineering"
icon_state = "shuttle2"
requires_power = 1
/area/shuttle/generic_shuttle/gen
name = "\improper Private Vessel - General"
icon_state = "shuttle2"
requires_power = 1
// The shuttle's 'shuttle' computer
/obj/machinery/computer/shuttle_control/explore/generic_shuttle
name = "short jump console"
shuttle_tag = "Private Vessel"
req_one_access = list(access_pilot)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/generic_shuttle
name = "Origin - Private Vessel"
base_area = /area/space
base_turf = /turf/space
landmark_tag = "omship_spawn_generic_shuttle"
shuttle_type = /datum/shuttle/autodock/overmap/generic_shuttle
// The 'shuttle'
/datum/shuttle/autodock/overmap/generic_shuttle
name = "Private Vessel"
current_location = "omship_spawn_generic_shuttle"
docking_controller_tag = "generic_shuttle_docker"
shuttle_area = list(/area/shuttle/generic_shuttle/eng, /area/shuttle/generic_shuttle/gen)
defer_initialisation = TRUE //We're not loaded until an admin does it
// The 'ship'
/obj/effect/overmap/visitable/ship/landable/generic_shuttle
scanner_name = "Private Vessel"
scanner_desc = @{"[i]Registration[/i]: PRIVATE
[i]Class[/i]: Small Shuttle
[i]Transponder[/i]: Transmitting (CIV), non-hostile
[b]Notice[/b]: Small private vessel"}
vessel_mass = 1000
vessel_size = SHIP_SIZE_TINY
shuttle = "Private Vessel"
*/