mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
Some tweaks for the runtime map (#22755)
## About PR - Adds a latejoin landmark, this was causing a runtime when `LateSpawn()` weren't able to find any (somehow missed this after the remap, oops) - Adds some sections for kitchen and disposal testing, among a few other qol changes - Removes some ancient area definitions (most of it unused) from the code. Some of these were used in the old runtime map and `vault_unique.dmm`, which is also removed in this pr since it no longer spawns
This commit is contained in:
Kano
+37
-131
@@ -63,8 +63,8 @@
|
||||
/datum/shuttle/autodock/ferry/supply/horizon,
|
||||
)
|
||||
|
||||
warehouse_basearea = /area/storage/supply
|
||||
warehouse_packagearea = /area/storage/supply/package
|
||||
warehouse_basearea = /area/runtime/floor_one/warehouse
|
||||
warehouse_packagearea = /area/runtime/floor_one/warehouse/package
|
||||
|
||||
/**
|
||||
* This file is the only location in which runtime map areas should be defined.
|
||||
@@ -88,72 +88,52 @@
|
||||
* * Update the groupings list if anything is added/removed.
|
||||
*/
|
||||
|
||||
/// CIVILIAN_AREAS
|
||||
// Hallways
|
||||
/area/hallway
|
||||
sound_environment = SOUND_AREA_LARGE_ENCLOSED
|
||||
// ---- Base type
|
||||
/area/runtime
|
||||
allow_nightmode = TRUE
|
||||
station_area = TRUE
|
||||
lightswitch = TRUE
|
||||
holomap_color = HOLOMAP_AREACOLOR_HALLWAYS
|
||||
emergency_lights = TRUE
|
||||
area_lighting = LIGHT_COLOR_HALOGEN
|
||||
|
||||
/area/hallway/primary/aft
|
||||
name = "Aft Primary Hallway"
|
||||
icon_state = "hallA"
|
||||
|
||||
/area/hallway/primary/central_one
|
||||
name = "Central Primary Hallway"
|
||||
// ---- Floor one
|
||||
/area/runtime/floor_one/main
|
||||
name = "Runtime - Main Area"
|
||||
icon_state = "hallC1"
|
||||
|
||||
/area/hallway/primary/central_two
|
||||
name = "Central Primary Hallway"
|
||||
/area/runtime/floor_one/construction
|
||||
name = "Runtime - Construction Area"
|
||||
icon_state = "yellow"
|
||||
|
||||
/area/runtime/floor_one/atmospherics
|
||||
name = "Runtime - Atmoshperics"
|
||||
icon_state = "yellow"
|
||||
|
||||
/area/runtime/floor_one/warehouse
|
||||
name = "Runtime - Warehouse"
|
||||
icon_state = "dark128"
|
||||
|
||||
/area/runtime/floor_one/warehouse/package
|
||||
name = "Runtime - Package Area"
|
||||
icon_state = "dark160"
|
||||
requires_power = FALSE
|
||||
|
||||
// ---- Floor two
|
||||
/area/runtime/floor_two/main
|
||||
name = "Runtime - Second Floor"
|
||||
icon_state = "hallC2"
|
||||
|
||||
/// COMMAND_AREAS
|
||||
/area/bridge
|
||||
name = "Bridge"
|
||||
/area/runtime/floor_two/comms
|
||||
name = "Runtime - Telecommunications"
|
||||
icon_state = "ai_chamber"
|
||||
|
||||
/area/runtime/floor_two/bridge
|
||||
name = "Runtime - Bridge"
|
||||
icon_state = "bridge"
|
||||
no_light_control = 1
|
||||
station_area = TRUE
|
||||
holomap_color = HOLOMAP_AREACOLOR_COMMAND
|
||||
area_blurb = "The sound here seems to carry more than others, every click of a shoe or clearing of a throat amplified. The smell of ink, written and printed, wafts notably through the air."
|
||||
|
||||
/// ENGINEERING_AREAS
|
||||
/area/engineering
|
||||
name = "Engineering"
|
||||
icon_state = "engineering"
|
||||
ambience = AMBIENCE_ENGINEERING
|
||||
station_area = TRUE
|
||||
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
|
||||
|
||||
/area/engineering/atmos
|
||||
name = "Engineering - Atmospherics"
|
||||
icon_state = "atmos"
|
||||
sound_environment = SOUND_AREA_LARGE_ENCLOSED
|
||||
no_light_control = 1
|
||||
ambience = list(AMBIENCE_ENGINEERING, AMBIENCE_ATMOS)
|
||||
area_blurb = "Many volume tanks filled with gas reside here, some providing vital gases for the vessel's life support systems."
|
||||
|
||||
/area/engineering/gravity_gen
|
||||
name = "Engineering - Gravity Generator"
|
||||
icon_state = "engine"
|
||||
|
||||
/// MAINTENANCE_AREAS
|
||||
/area/maintenance
|
||||
station_area = TRUE
|
||||
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_HIDE_FROM_HOLOMAP
|
||||
sound_environment = SOUND_AREA_TUNNEL_ENCLOSED
|
||||
turf_initializer = new /datum/turf_initializer/maintenance()
|
||||
ambience = AMBIENCE_MAINTENANCE
|
||||
area_blurb = "Scarcely lit, cramped, and filled with stale, dusty air. Around you hisses compressed air through the pipes, a buzz of electrical charge through the wires, and muffled rumbles of the hull settling. This place may feel alien compared to the interior of the ship and is a place where one could get lost or badly hurt, but some may find the isolation comforting."
|
||||
|
||||
/area/maintenance/maintcentral
|
||||
name = "Bridge Maintenance"
|
||||
icon_state = "maintcentral"
|
||||
|
||||
// Exterior
|
||||
/area/exterior
|
||||
// ---- Exterior
|
||||
/area/runtime/exterior
|
||||
name = "Exterior"
|
||||
icon_state = "exterior"
|
||||
needs_starlight = TRUE
|
||||
@@ -162,81 +142,7 @@
|
||||
requires_power = FALSE
|
||||
ambience = AMBIENCE_SPACE
|
||||
|
||||
/// MEDICAL_AREAS
|
||||
/// OPERATIONS_AREAS
|
||||
|
||||
// Smalls
|
||||
/area/outpost
|
||||
ambience = AMBIENCE_EXPOUTPOST
|
||||
|
||||
// Main mining
|
||||
/area/outpost/mining_main
|
||||
icon_state = "outpost_mine_main"
|
||||
station_area = TRUE
|
||||
holomap_color = HOLOMAP_AREACOLOR_OPERATIONS
|
||||
|
||||
/area/outpost/mining_main/eva
|
||||
name = "Mining EVA storage"
|
||||
|
||||
/// SCIENCE_AREAS
|
||||
/// SECURITY_AREAS
|
||||
/area/security
|
||||
no_light_control = 1
|
||||
station_area = FALSE
|
||||
holomap_color = HOLOMAP_AREACOLOR_SECURITY
|
||||
|
||||
/// SERVICE_AREAS
|
||||
/// STORAGE_AREAS
|
||||
//Storage
|
||||
/area/storage
|
||||
station_area = TRUE
|
||||
|
||||
/area/storage/primary
|
||||
name = "Primary Tool Storage"
|
||||
icon_state = "primarystorage"
|
||||
allow_nightmode = 1
|
||||
|
||||
/area/storage/supply
|
||||
name = "Supply Storage"
|
||||
icon_state = "dark128"
|
||||
|
||||
/area/storage/supply/package
|
||||
name = "Package Storage"
|
||||
icon_state = "dark160"
|
||||
requires_power = FALSE
|
||||
|
||||
/// TCOMMS_AREAS
|
||||
/area/tcommsat
|
||||
ambience = AMBIENCE_ENGINEERING
|
||||
no_light_control = 1
|
||||
station_area = TRUE
|
||||
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
|
||||
|
||||
/area/tcommsat/chamber
|
||||
name = "Telecoms Central Compartment"
|
||||
icon_state = "tcomsatcham"
|
||||
area_blurb = "Countless machines sit here, an unfathomably complicated network that runs every radio and computer connection. The air lacks any notable scent, having been filtered of dust and pollutants before being allowed into the room and all the sensitive machinery."
|
||||
|
||||
/area/tcommsat/computer
|
||||
name = "Telecoms Control Room"
|
||||
icon_state = "tcomsatcomp"
|
||||
|
||||
/area/turbolift/main_station
|
||||
name = "Civilian Lift - Main"
|
||||
lift_announce_str = "Arriving at the Main Level. Facilities on this floor include: Engineering, Medical, Security, Science, Command departments, Cargo Office, Chapel, Bar, Kitchen."
|
||||
|
||||
lift_floor_label = "Main Lvl."
|
||||
lift_floor_name = "Main Lvl."
|
||||
|
||||
base_turf = /turf/simulated/floor/plating
|
||||
|
||||
/area/turbolift/main_mid
|
||||
name = "Civilian Lift - Mid Level"
|
||||
lift_announce_str = "Arriving at (Unknown). Facilities on this floor include: (Unknown)."
|
||||
|
||||
lift_floor_label = "Under construction"
|
||||
lift_floor_name = "Under construction"
|
||||
|
||||
// ---- Papers
|
||||
ABSTRACT_TYPE(/obj/item/paper/fluff/runtime)
|
||||
|
||||
/obj/item/paper/fluff/runtime/dontforgetuseovermap
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
/obj/turbolift_map_holder/runtime
|
||||
name = "Runtime Lift Placeholder"
|
||||
dir = WEST
|
||||
depth = 2
|
||||
lift_size_x = 4
|
||||
lift_size_y = 4
|
||||
no_first_z_level = FALSE
|
||||
|
||||
areas_to_use = list(
|
||||
/area/turbolift/main_station,
|
||||
/area/turbolift/main_mid
|
||||
)
|
||||
@@ -1,29 +1,34 @@
|
||||
/datum/map/runtime
|
||||
ut_environ_exempt_areas = list(
|
||||
/area/space,
|
||||
/area/exterior
|
||||
/area/runtime/exterior
|
||||
)
|
||||
|
||||
ut_apc_exempt_areas = list(
|
||||
/area/storage/supply/package,
|
||||
/area/runtime/floor_one/warehouse/package,
|
||||
/area/supply/dock,
|
||||
/area/centcom,
|
||||
/area/horizon/hangar/operations, // yes, this exists in the runtime map. Cargo elevator is a shuttle and it'll replace the area of where it lands
|
||||
/area/centcom, // yes, this is annoying
|
||||
)
|
||||
|
||||
ut_atmos_exempt_areas = list(/area)
|
||||
|
||||
ut_fire_exempt_areas = list(
|
||||
/area/maintenance/maintcentral,
|
||||
/area/runtime/floor_one/main,
|
||||
/area/runtime/floor_one/construction,
|
||||
/area/runtime/floor_one/atmospherics,
|
||||
/area/runtime/floor_one/warehouse,
|
||||
/area/runtime/floor_one/warehouse/package,
|
||||
/area/runtime/floor_two/main,
|
||||
/area/runtime/floor_two/comms,
|
||||
/area/runtime/floor_two/bridge,
|
||||
/area/runtime/exterior,
|
||||
/area/shuttle/runtime,
|
||||
/area/space,
|
||||
/area/turbolift,
|
||||
/area/construction/storage,
|
||||
/area/turret_protected,
|
||||
/area/tcommsat,
|
||||
/area/construction/hallway,
|
||||
/area/storage/supply/package,
|
||||
/area/supply/dock,
|
||||
/area/centcom,
|
||||
/area/horizon/hangar/operations,
|
||||
/area/centcom
|
||||
)
|
||||
|
||||
excluded_test_types = list(
|
||||
|
||||
Reference in New Issue
Block a user