Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overmap Surt and Surt Base rework [WIP] #6660

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3241,6 +3241,7 @@
#include "code\modules\maps\overmap\planets\classh.dm"
#include "code\modules\maps\overmap\planets\classm.dm"
#include "code\modules\maps\overmap\planets\classp.dm"
#include "code\modules\maps\overmap\planets\lavaland.dm"
#include "code\modules\maps\overmap\planets\miaphus.dm"
#include "code\modules\maps\overmap\planets\virgo2.dm"
#include "code\modules\maps\overmap\planets\virgo4.dm"
Expand Down
93 changes: 64 additions & 29 deletions code/game/area/Off Station Areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -764,132 +764,167 @@
icon_state = "shuttle"
dynamic_lighting = 0


/* Disabled here since they are used elsewhere
// Lavaland
/area/shuttle/excursion/lavaland
name = "Shuttle Landing Point"
area_flags = AREA_RAD_SHIELDED

/area/lavaland
name = "Lava Land"
name = "Surt"
icon_state = "away"
requires_power = 1
dynamic_lighting = 1

/area/lavaland/horrors
name = "Lava Land - Horrors"
name = "Surt - Horrors"

/area/lavaland/dogs
name = "Lava Land - Dogs"
name = "Surt - Dogs"

/area/lavaland/idleruins
name = "Lava Land - Idle Ruins"
name = "Surt - Idle Ruins"

/area/lavaland/ashlander_camp
name = "Lava Land - Ashlander Camp"
name = "Surt - Ashlander Camp"

/area/lavaland/bosses
name = "Lava Land - Boss"
name = "Surt - Boss"
requires_power = 0

/area/lavaland/central/base
name = "Lava Land (Center) - Mining Base"
name = "Surt Outpost"
icon_state = "green"

/area/lavaland/central/base/common
name = "Lava Land (Center) - Mining Base"
name = "Surt Outpost - Common Areas"
icon_state = "blue"

/area/lavaland/central/base/airlock
name = "Surt Outpost - Airlock"
icon_state = "blue"

/area/lavaland/central/base/pads
name = "Surt Outpost - Landing Pads"
icon_state = "blue"

/area/lavaland/central/base/teleporter
name = "Surt Outpost - Teleporter"
icon_state = "blue"


/area/lavaland/central/base/mining_storage
name = "Surt Outpost - Mining Storage"
icon_state = "blue"

/area/lavaland/central/base/engine
name = "Surt Outpost - Engine Room"
icon_state = "blue"

/area/lavaland/central/base/dorms
name = "Surt Outpost - Engine Dorms"
icon_state = "blue"

/area/lavaland/central/base/teleporter
name = "Surt Outpost - Teleporter"
icon_state = "blue"

/area/lavaland/central/base/exterior
name = "Surt Outpost - Exterior Scaffold"
icon_state = "blue"

/area/lavaland/central/explored
name = "Lava Land (Center) - Thoroughfare"
name = "Surt (Center) - Thoroughfare"
icon_state = "red"
ambience = AMBIENCE_LAVA

/area/lavaland/central/unexplored
name = "Lava Land (Center) - Unknown"
name = "Surt (Center) - Unknown"
icon_state = "yellow"
ambience = AMBIENCE_LAVA

/area/lavaland/central/transit
name = "Lava Land (Center) - Transit"
name = "Surt (Center) - Transit"
icon_state = "blue"

/area/lavaland/north/explored
name = "Lava Land (North) - Thoroughfare"
name = "Surt (North) - Thoroughfare"
icon_state = "red"
ambience = AMBIENCE_LAVA

/area/lavaland/north/unexplored
name = "Lava Land (North) - Unknown"
name = "Surt (North) - Unknown"
icon_state = "yellow"
ambience = AMBIENCE_LAVA

/area/lavaland/south/explored
name = "Lava Land (South) - Thoroughfare"
name = "Surt (South) - Thoroughfare"
icon_state = "red"
ambience = AMBIENCE_LAVA

/area/lavaland/south/unexplored
name = "Lava Land (South) - Unknown"
name = "Surt (South) - Unknown"
icon_state = "yellow"
ambience = AMBIENCE_LAVA

/area/lavaland/east/explored
name = "Lava Land (East) - Thoroughfare"
name = "Surt (East) - Thoroughfare"
icon_state = "red"
ambience = AMBIENCE_LAVA

/area/lavaland/east/unexplored
name = "Lava Land (East) - Unknown"
name = "Surt (East) - Unknown"
icon_state = "yellow"
ambience = AMBIENCE_LAVA

/area/lavaland/east/transit
name = "Lava Land (East) - Transit"
name = "Surt (East) - Transit"
icon_state = "blue"

/area/lavaland/east/ashlander_village
name = "Lava Land (East) - Ashlander Village"
name = "Surt (East) - Ashlander Village"
icon_state = "blue"

/area/lavaland/west/explored
name = "Lava Land (West) - Thoroughfare"
name = "Surt (West) - Thoroughfare"
icon_state = "red"
ambience = AMBIENCE_LAVA

*/

//These were from the Colony Event. Just holding onto them for now.
/*
/area/lavaland/east/colony
name = "Lava Land (East) - Colony"
name = "Surt (East) - Colony"
icon_state = "blue"

/area/lavaland/east/lab
name = "Lava Land (East) - S4"
name = "Surt (East) - S4"

/area/lavaland/east/lab/core
name = "Lava Land (East) - S4"
name = "Surt (East) - S4"
icon_state = "blue"

/area/lavaland/east/lab/containment
name = "Lava Land (East) - S4 Containment"
name = "Surt (East) - S4 Containment"
icon_state = "blue"

/area/lavaland/east/lab/bunker
name = "Lava Land (East) - S4 Bunker"
name = "Surt (East) - S4 Bunker"
icon_state = "blue"
*/

/area/lavaland/west/unexplored
name = "Lava Land (West) - Unknown"
name = "Surt (West) - Unknown"
icon_state = "yellow"
ambience = AMBIENCE_LAVA

/area/lavaland/dungeon/exterior
name = "Lava Land (Dungeon) - Unknown"
name = "Surt (Dungeon) - Unknown"
icon_state = "yellow"

/area/lavaland/dungeon/facility
name = "Lava Land (Dungeon) - Pump Facility"
name = "Surt (Dungeon) - Pump Facility"
icon_state = "blue"

// Aerostat
Expand Down
156 changes: 156 additions & 0 deletions code/modules/maps/overmap/planets/lavaland.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
// -- Datums -- //

/obj/overmap/entity/visitable/sector/lavaland
name = "Surt"
desc = "A volcanic planet home to the bronze age Scori civilization."
scanner_desc = @{"[i]Stellar Body[/i]: Surt
[i]Class[/i]: Regressed F-Class Planet
[i]Habitability[/i]: Extremely Low (Extremely High Temperature, Toxic Atmosphere, High Volcanic Activity)
[i]Population[/i]: (Native Scori Population Unknown: Estimates Range from 20-100 Million)
[i]Controlling Goverment[/i]: Early Fuedal Realms
[b]Relationship with NT[/b]: Nanotrasen Protectorate (Unofficial).
[b]Notice[/b]: Native population protected under the Primitive Species Preservation Act."}

icon_state = "globe"
color = "#d62000" //Lava Red
in_space = 0
initial_generic_waypoints = list(
"surt_pad_1a",
"surt_pad_1b",
"surt_pad_1c",
"surt_pad_1d",
"surt_pad_2a",
"surt_pad_2b",
"surt_pad_2c",
"surt_pad_2d"
)

start_x = 40
start_y = 10

/obj/machinery/telecomms/relay/preset/surt //Surt T-Comms info is kept here to be used on multiple maps
id = "Surt Relay"
autolinkers = list("surt_relay")

/area/shuttle/excursion/lavaland
name = "Shuttle Landing Point"
area_flags = AREA_RAD_SHIELDED

/area/lavaland
name = "Surt"
icon_state = "away"
requires_power = 1
dynamic_lighting = 1

/area/lavaland/horrors
name = "Surt - Horrors"

/area/lavaland/dogs
name = "Surt - Dogs"

/area/lavaland/idleruins
name = "Surt - Idle Ruins"

/area/lavaland/ashlander_camp
name = "Surt - Ashlander Camp"

/area/lavaland/bosses
name = "Surt - Boss"
requires_power = 0

/area/lavaland/central/base
name = "Surt Outpost"
icon_state = "green"

/area/lavaland/central/base/common
name = "Surt Outpost - Common Areas"
icon_state = "blue"

/area/lavaland/central/base/airlock
name = "Surt Outpost - Airlock"
icon_state = "blue"

/area/lavaland/central/base/pads
name = "Surt Outpost - Landing Pads"
icon_state = "blue"

/area/lavaland/central/base/teleporter
name = "Surt Outpost - Teleporter"
icon_state = "blue"

/area/lavaland/central/base/mining_storage
name = "Surt Outpost - Mining Storage"
icon_state = "blue"

/area/lavaland/central/base/engine
name = "Surt Outpost - Engine Room"
icon_state = "blue"

/area/lavaland/central/base/dorms
name = "Surt Outpost - Engine Dorms"
icon_state = "blue"

/area/lavaland/central/base/teleporter
name = "Surt Outpost - Teleporter"
icon_state = "blue"

/area/lavaland/central/base/exterior
name = "Surt Outpost - Exterior Scaffold"
icon_state = "blue"

/area/lavaland/central/explored
name = "Surt (Center) - Thoroughfare"
icon_state = "red"
ambience = AMBIENCE_LAVA

/area/lavaland/central/unexplored
name = "Surt (Center) - Unknown"
icon_state = "yellow"
ambience = AMBIENCE_LAVA

/area/lavaland/central/transit
name = "Surt (Center) - Transit"
icon_state = "blue"

/area/lavaland/north/explored
name = "Surt (North) - Thoroughfare"
icon_state = "red"
ambience = AMBIENCE_LAVA

/area/lavaland/north/unexplored
name = "Surt (North) - Unknown"
icon_state = "yellow"
ambience = AMBIENCE_LAVA

/area/lavaland/south/explored
name = "Surt (South) - Thoroughfare"
icon_state = "red"
ambience = AMBIENCE_LAVA

/area/lavaland/south/unexplored
name = "Surt (South) - Unknown"
icon_state = "yellow"
ambience = AMBIENCE_LAVA

/area/lavaland/east/explored
name = "Surt (East) - Thoroughfare"
icon_state = "red"
ambience = AMBIENCE_LAVA

/area/lavaland/east/unexplored
name = "Surt (East) - Unknown"
icon_state = "yellow"
ambience = AMBIENCE_LAVA

/area/lavaland/east/transit
name = "Surt (East) - Transit"
icon_state = "blue"

/area/lavaland/east/ashlander_village
name = "Surt (East) - Ashlander Village"
icon_state = "blue"

/area/lavaland/west/explored
name = "Surt (West) - Thoroughfare"
icon_state = "red"
ambience = AMBIENCE_LAVA
4 changes: 2 additions & 2 deletions code/modules/maps/weather/lavaland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
seconds_in_day = 2 HOURS

/datum/planet/lavaland
name = "Lava Land"
desc = "The fabled."
name = "Surt"
desc = "The volcanic homeworld home to the Bronze Age Scori and NT mining operations."
current_time = new /datum/time/lavaland()
weather_holder = /datum/weather_holder/lavaland

Expand Down
2 changes: 1 addition & 1 deletion maps/rift/telecomms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"rus_relay", "rud_relay", "rbl_relay", "rbm_relay", "rbh_relay",
"c_relay", "m_relay", "r_relay", "sci_o_relay", "ud_relay",
"science", "medical", "supply", "service", "common", "command", "engineering", "security", "explorer", "unused",
"hb_relay", "receiverA", "broadcasterA"
"hb_relay", "receiverA", "broadcasterA", "surt_relay"
)

/obj/machinery/telecomms/receiver/preset_right/rift
Expand Down
Loading
Loading