mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-28 22:48:38 +01:00
Simultaneous map definitions (#16924)
* initial * Update file pathing * Fix dup vars * Move shuttle datums around * Why am I fixing pdas --------- Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Drathek
co-authored by
Cameron Lennox
Cameron Lennox
parent
592bbd1a1e
commit
3e46e16e8c
@@ -1,20 +1,10 @@
|
||||
// Supply shuttle
|
||||
/datum/shuttle/autodock/ferry/supply/cargo/New(_name)
|
||||
..()
|
||||
move_direction = WEST
|
||||
ceiling_type = /turf/simulated/floor/reinforced/virgo3c
|
||||
|
||||
/////EXPLOSHUTTL/////
|
||||
// The shuttle's 'shuttle' computer
|
||||
/obj/machinery/computer/shuttle_control/explore/gbexplo
|
||||
name = "short jump console"
|
||||
shuttle_tag = "Exploration Shuttle"
|
||||
req_one_access = list(access_pilot)
|
||||
|
||||
/obj/effect/overmap/visitable/ship/landable/gbexplo
|
||||
name = "Exploration Shuttle"
|
||||
desc = "A small shuttle from Rascal's Pass."
|
||||
vessel_mass = 2500
|
||||
vessel_size = SHIP_SIZE_TINY
|
||||
shuttle = "Exploration Shuttle"
|
||||
known = TRUE
|
||||
|
||||
// A shuttle lateloader landmark
|
||||
|
||||
/datum/shuttle/autodock/overmap/gbexplo
|
||||
name = "Exploration Shuttle"
|
||||
current_location = "gb_excursion_pad"
|
||||
@@ -23,55 +13,28 @@
|
||||
fuel_consumption = 1
|
||||
move_direction = NORTH
|
||||
|
||||
/area/shuttle/groundbase/exploration
|
||||
icon = 'icons/turf/areas_vr.dmi'
|
||||
icon_state = "yelwhitri"
|
||||
name = "Exploration Shuttle"
|
||||
requires_power = 1
|
||||
//AXOLOTL
|
||||
/datum/shuttle/autodock/overmap/axolotl
|
||||
name = "Axolotl"
|
||||
current_location = "omship_axolotl"
|
||||
docking_controller_tag = "axolotl_docking"
|
||||
shuttle_area = list(/area/shuttle/axolotl,/area/shuttle/axolotl_cockpit,/area/shuttle/axolotl_engineering,/area/shuttle/axolotl_q1,/area/shuttle/axolotl_q2,/area/shuttle/axolotl_galley,/area/shuttle/axolotl_head)
|
||||
defer_initialisation = TRUE //We're not loaded until an admin does it
|
||||
fuel_consumption = 5
|
||||
ceiling_type = /turf/simulated/floor/reinforced/airless
|
||||
|
||||
//////////////////////////////////////////////
|
||||
|
||||
// Supply shuttle
|
||||
/datum/shuttle/autodock/ferry/supply/cargo
|
||||
name = "Supply"
|
||||
location = FERRY_LOCATION_OFFSITE
|
||||
shuttle_area = /area/shuttle/supply
|
||||
warmup_time = 10
|
||||
landmark_offsite = "supply_cc"
|
||||
landmark_station = "supply_station"
|
||||
docking_controller_tag = "supply_shuttle"
|
||||
flags = SHUTTLE_FLAGS_PROCESS|SHUTTLE_FLAGS_SUPPLY
|
||||
move_direction = WEST
|
||||
ceiling_type = /turf/simulated/floor/reinforced/virgo3c
|
||||
|
||||
////////////////////////////////////////////////
|
||||
|
||||
/obj/effect/shuttle_landmark/premade/groundbase
|
||||
name = "Rascal's Pass"
|
||||
landmark_tag = "groundbase"
|
||||
|
||||
///////////////////////////////////////////////
|
||||
/obj/effect/shuttle_landmark/shuttle_initializer/axolotl/New(loc, ...)
|
||||
shuttle_type = /datum/shuttle/autodock/overmap/axolotl
|
||||
..()
|
||||
|
||||
// Escape shuttle
|
||||
/datum/shuttle/autodock/ferry/emergency/escape
|
||||
name = "Escape"
|
||||
location = FERRY_LOCATION_OFFSITE
|
||||
shuttle_area = /area/shuttle/escape
|
||||
warmup_time = 10
|
||||
landmark_offsite = "escape_cc"
|
||||
landmark_station = "escape_station"
|
||||
landmark_transition = "escape_transit"
|
||||
move_time = SHUTTLE_TRANSIT_DURATION_RETURN
|
||||
move_direction = EAST
|
||||
|
||||
/datum/shuttle/autodock/ferry/emergency
|
||||
var/frequency = 1380 // Why this frequency? BECAUSE! Thats what someone decided once.
|
||||
var/datum/radio_frequency/radio_connection
|
||||
/datum/shuttle/autodock/ferry/emergency/escape/New()
|
||||
..()
|
||||
move_direction = EAST
|
||||
|
||||
/datum/shuttle/autodock/ferry/emergency/New()
|
||||
radio_connection = radio_controller.add_object(src, frequency, null)
|
||||
..()
|
||||
move_direction = EAST
|
||||
|
||||
/datum/shuttle/autodock/ferry/emergency/dock()
|
||||
..()
|
||||
@@ -95,130 +58,3 @@
|
||||
return radio_connection.post_signal(src, signal, filter)
|
||||
else
|
||||
qdel(signal)
|
||||
|
||||
//////////////////////////////////////////////
|
||||
|
||||
/////Virgo Flyer/////
|
||||
// The shuttle's 'shuttle' computer
|
||||
/obj/machinery/computer/shuttle_control/explore/ccboat
|
||||
name = "Virgo Flyer control console"
|
||||
shuttle_tag = "Virgo Flyer"
|
||||
req_one_access = list(access_pilot)
|
||||
|
||||
/obj/effect/overmap/visitable/ship/landable/ccboat
|
||||
name = "NTV Virgo Flyer"
|
||||
desc = "A small shuttle from Central Command."
|
||||
vessel_mass = 1000
|
||||
vessel_size = SHIP_SIZE_TINY
|
||||
shuttle = "Virgo Flyer"
|
||||
known = TRUE
|
||||
|
||||
// A shuttle lateloader landmark
|
||||
/obj/effect/shuttle_landmark/shuttle_initializer/ccboat
|
||||
name = "Central Command Shuttlepad"
|
||||
base_area = /area/shuttle/centcom/ccbay
|
||||
base_turf = /turf/simulated/floor/reinforced
|
||||
landmark_tag = "cc_shuttlepad"
|
||||
docking_controller = "cc_landing_pad"
|
||||
shuttle_type = /datum/shuttle/autodock/overmap/ccboat
|
||||
|
||||
/datum/shuttle/autodock/overmap/ccboat
|
||||
name = "Virgo Flyer"
|
||||
current_location = "cc_shuttlepad"
|
||||
docking_controller_tag = "ccboat"
|
||||
shuttle_area = /area/shuttle/ccboat
|
||||
fuel_consumption = 0
|
||||
defer_initialisation = TRUE
|
||||
|
||||
/area/shuttle/ccboat
|
||||
icon = 'icons/turf/areas_vr.dmi'
|
||||
icon_state = "yelwhitri"
|
||||
name = "Virgo Flyer"
|
||||
requires_power = 0
|
||||
|
||||
/area/shuttle/centcom/ccbay
|
||||
icon = 'icons/turf/areas_vr.dmi'
|
||||
icon_state = "bluwhisqu"
|
||||
name = "Central Command Shuttle Bay"
|
||||
requires_power = 0
|
||||
dynamic_lighting = 0
|
||||
|
||||
//AXOLOTL
|
||||
|
||||
// The shuttle's 'shuttle' computer
|
||||
/obj/machinery/computer/shuttle_control/explore/axolotl
|
||||
name = "short jump console"
|
||||
shuttle_tag = "Axolotl"
|
||||
|
||||
// The 'shuttle'
|
||||
/datum/shuttle/autodock/overmap/axolotl
|
||||
name = "Axolotl"
|
||||
current_location = "omship_axolotl"
|
||||
docking_controller_tag = "axolotl_docking"
|
||||
shuttle_area = list(/area/shuttle/axolotl,/area/shuttle/axolotl_cockpit,/area/shuttle/axolotl_engineering,/area/shuttle/axolotl_q1,/area/shuttle/axolotl_q2,/area/shuttle/axolotl_galley,/area/shuttle/axolotl_head)
|
||||
defer_initialisation = TRUE //We're not loaded until an admin does it
|
||||
fuel_consumption = 5
|
||||
ceiling_type = /turf/simulated/floor/reinforced/airless
|
||||
|
||||
// A shuttle lateloader landmark
|
||||
/obj/effect/shuttle_landmark/shuttle_initializer/axolotl
|
||||
name = "ITV Axolotl"
|
||||
base_area = /area/submap/groundbase/wilderness/west
|
||||
base_turf = /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c
|
||||
landmark_tag = "omship_axolotl"
|
||||
shuttle_type = /datum/shuttle/autodock/overmap/axolotl
|
||||
|
||||
// The 'ship'
|
||||
/obj/effect/overmap/visitable/ship/landable/axolotl
|
||||
name = "ITV Axolotl"
|
||||
scanner_desc = @{"[i]Registration[/i]: ITV Axolotl
|
||||
[i]Class[/i]: Corvette
|
||||
[i]Transponder[/i]: Transmitting (CIV), non-hostile
|
||||
[b]Notice[/b]: Multirole independent vessel"}
|
||||
vessel_mass = 4500
|
||||
vessel_size = SHIP_SIZE_LARGE
|
||||
fore_dir = EAST
|
||||
shuttle = "Axolotl"
|
||||
known = TRUE
|
||||
|
||||
/area/shuttle/axolotl
|
||||
name = "\improper Axolotl Cabin"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "gray"
|
||||
requires_power = 1
|
||||
|
||||
/area/shuttle/axolotl_engineering
|
||||
name = "\improper Axolotl Engineering"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "yellow"
|
||||
requires_power = 1
|
||||
|
||||
/area/shuttle/axolotl_cockpit
|
||||
name = "\improper Axolotl Cockpit"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "blue"
|
||||
requires_power = 1
|
||||
|
||||
/area/shuttle/axolotl_q1
|
||||
name = "\improper Axolotl Quarters 1"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "gray-p"
|
||||
requires_power = 1
|
||||
|
||||
/area/shuttle/axolotl_q2
|
||||
name = "\improper Axolotl Quarters 2"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "gray-s"
|
||||
requires_power = 1
|
||||
|
||||
/area/shuttle/axolotl_galley
|
||||
name = "\improper Axolotl Galley"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "dark-s"
|
||||
requires_power = 1
|
||||
|
||||
/area/shuttle/axolotl_head
|
||||
name = "\improper Axolotl Head"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "dark-p"
|
||||
requires_power = 1
|
||||
|
||||
Reference in New Issue
Block a user