Skip to content

Commit

Permalink
TGS Test Merge (#6217)
Browse files Browse the repository at this point in the history
  • Loading branch information
cm13-github committed May 7, 2024
2 parents ff844d8 + fecf0a0 commit 14aa9eb
Show file tree
Hide file tree
Showing 15 changed files with 26,203 additions and 47,880 deletions.
81 changes: 61 additions & 20 deletions code/game/area/Corsat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,29 @@
icon_state = "corsat_hull"
ceiling = CEILING_REINFORCED_METAL

/area/corsat/comms
name = "CORSAT Auxiliary Comms Relay"
icon_state = "corsat_hull"
ceiling = CEILING_REINFORCED_METAL

/area/corsat/comms/flight_control
name = "CORSAT Auxiliary Comms Relay (Flight Control)"

/area/corsat/comms/gamma_halls
name = "CORSAT Auxiliary Comms Relay (Gamma Halls)"

/area/corsat/comms/gamma_cargo
name = "CORSAT Auxiliary Comms Relay (Gamma Cargo)"

/area/corsat/comms/sigma_cargo
name = "CORSAT Auxiliary Comms Relay (Sigma Cargo)"

/area/corsat/comms/sigma_residential
name = "CORSAT Auxiliary Comms Relay (Sigma Residential)"

/area/corsat/comms/sigma_biodome
name = "CORSAT Auxiliary Comms Relay (Sigma Biodome)"

//SIGMA SECTOR

/area/corsat/sigma
Expand All @@ -32,6 +55,18 @@
icon_state = "sigma_hallway_north"
is_resin_allowed = FALSE

/area/corsat/sigma/north/engineering
name = "\improper Primary Engineering"
icon_state = "gamma_engineering"

/area/corsat/sigma/north/engineering/lobby
name = "\improper Primary Engineering Lobby"
icon_state = "gamma_engineering"

/area/corsat/sigma/north/engineering/core
name = "\improper CORSAT Generator Core"
icon_state = "corsat_core"

/area/corsat/sigma/hangar
name = "\improper Landing Bay Sigma"
icon_state = "sigma_hangar"
Expand Down Expand Up @@ -250,20 +285,20 @@
icon_state = "flight_center"

/area/corsat/gamma/hangar/security
name = "\improper Gamma Hangar Security"
name = "\improper Gamma Cargo Security"
icon_state = "gamma_hangar_security"

/area/corsat/gamma/hangar/arrivals
name = "\improper Gamma Arrivals"
icon_state = "gamma_arrivals"

/area/corsat/gamma/foyer
name = "\improper Gamma Foyer"
name = "\improper Gamma Sector North Hallways"
icon_state = "gamma_foyer"
is_resin_allowed = FALSE

/area/corsat/gamma/hallwaymain
name = "\improper Gamma Sector West Hallway"
name = "\improper Gamma Sector South-West Hallway"
icon_state = "gamma_hallway_main"

/area/corsat/gamma/hallwaysouth
Expand All @@ -274,16 +309,21 @@
name = "\improper Gamma Residential Hallway"
icon_state = "gamma_hallway_main"

/area/corsat/gamma/residential/west
/area/corsat/gamma/residential/generator
name = "\improper CORSAT Emergency Generators"
icon_state = "secondary_core"
ceiling = CEILING_METAL

/area/corsat/gamma/residential/academy
name = "\improper CORSAT Academy"
icon_state = "gamma_residential_west"

/area/corsat/gamma/residential/east
name = "\improper Gamma North Residential"
/area/corsat/gamma/residential/north
name = "\improper CORSAT Residential Module"
icon_state = "gamma_residential_east"

/area/corsat/gamma/residential/maint
name = "\improper Gamma Residential Maintenance"
name = "\improper CORSAT Academy Maintenance"
icon_state = "gamma_residential_maint"

/area/corsat/gamma/residential/researcher
Expand Down Expand Up @@ -389,32 +429,27 @@
name = "\improper CORSAT Library"
icon_state = "corsat_library"

/area/corsat/gamma/engineering
name = "\improper Gamma Engineering"
icon_state = "gamma_engineering"

/area/corsat/gamma/engineering/lobby
name = "\improper Gamma Engineering Lobby"
icon_state = "gamma_engineering"

/area/corsat/gamma/engineering/atmos
/area/corsat/gamma/atmos
name = "\improper CORSAT Atmospherics"
icon_state = "gamma_atmos"

/area/corsat/gamma/engineering/core
name = "\improper CORSAT Generator Core"
icon_state = "corsat_core"

/area/corsat/gamma/sigmaremote
name = "\improper Sigma Remote Complex"
icon_state = "sigma_complex_remote"

/area/corsat/gamma/sigmaremote/residential
name = "\improper Auxiliary Teleporter Complex"

/area/corsat/gamma/sigmaremote/teleporter
name = "\improper Sigma Remote Teleporter"
icon = 'icons/turf/areas.dmi'
icon_state = "shuttle"
ceiling = CEILING_METAL

/area/corsat/gamma/sigmaremote/teleporter/residential
name = "\improper Auxiliary Teleporter"

/area/corsat/gamma/airlock/north
name = "\improper Gamma Dome North Airlock"
icon_state = "gamma_airlock_north"
Expand Down Expand Up @@ -514,11 +549,12 @@
/area/corsat/omega
name = "\improper Sector Omega"
icon_state = "corsat_hull"
ceiling = CEILING_REINFORCED_METAL
ceiling = CEILING_GLASS

/area/corsat/omega/biodome
name = "\improper Biodome Omega"
icon_state = "omega_biodome"
ceiling = CEILING_REINFORCED_METAL

/area/corsat/omega/hangar
name = "\improper Landing Bay Omega"
Expand All @@ -540,10 +576,12 @@
/area/corsat/omega/complex
name = "\improper Omega Research Complex"
icon_state = "omega_complex"
ceiling = CEILING_REINFORCED_METAL

/area/corsat/omega/containment
name = "\improper Omega Research Containment"
icon_state = "omega_containment"
ceiling = CEILING_REINFORCED_METAL

/area/corsat/omega/security
name = "\improper Omega Security Hub"
Expand All @@ -568,14 +606,17 @@
/area/corsat/omega/airlocknorth
name = "\improper Omega Dome North Airlock"
icon_state = "omega_airlock"
ceiling = CEILING_REINFORCED_METAL

/area/corsat/omega/airlocknorth/id
name = "\improper Omega North ID Checkpoint"
icon_state = "corsat_id"
ceiling = CEILING_REINFORCED_METAL

/area/corsat/omega/control
name = "\improper Omega Dome Control Module"
icon_state = "omega_control"
ceiling = CEILING_REINFORCED_METAL

//INACCESSIBLE

Expand Down
4 changes: 4 additions & 0 deletions code/modules/teleporters/teleporter_landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,7 @@
/obj/effect/landmark/teleporter_loc/corsat_sigma_remote
location_id = "Sigma Remote"
linked_teleporter = "Corsat_Teleporter"

/obj/effect/landmark/teleporter_loc/corsat_auxiliary
location_id = "Cargo Auxiliary"
linked_teleporter = "Corsat_Teleporter"
4 changes: 1 addition & 3 deletions map_config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ map fiorina_sciannex
endmap

map corsat
minplayers 130
voteweight 0
disabled
minplayers 100
endmap

map desert_dam
Expand Down
38 changes: 1 addition & 37 deletions maps/Nightmare/maps/CORSAT/nightmare.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,3 @@
[
{ "type": "map_sprinkle", "path": "sprinkles/" },
{
"type": "map_insert",
"landmark": "lockdown-gamma-north",
"path": "standalone/lockdown_gammanorth.dmm",
"when": { "corsat-path": "gamma-north" }
},
{
"type": "map_insert",
"landmark": "lockdown-gamma-control",
"path": "standalone/lockdown_gammacontrol.dmm",
"when": { "corsat-path": "gamma-control" }
},
{
"type": "map_insert",
"landmark": "lockdown-theta-east",
"path": "standalone/lockdown_thetaeast.dmm",
"when": { "corsat-path": "theta-east" }
},
{
"type": "map_insert",
"landmark": "lockdown-theta-control",
"path": "standalone/lockdown_thetacontrol.dmm",
"when": { "corsat-path": "theta-control" }
},
{
"type": "map_insert",
"landmark": "lockdown-highsec",
"path": "standalone/lockdown_highsec.dmm",
"when": { "corsat-path": "highsec" }
},
{
"type": "map_insert",
"landmark": "dome-sigma",
"path": "standalone/sigma_ice.dmm",
"when": { "dome-sigma": "ice" }
}
{ "type": "map_sprinkle", "path": "sprinkles/" }
]
21 changes: 1 addition & 20 deletions maps/Nightmare/maps/CORSAT/scenario.json
Original file line number Diff line number Diff line change
@@ -1,20 +1 @@
[
{
"type": "pick", "name": "CORSAT Lockdown Pathing",
"choices": [
{ "weight": 3, "type": "def", "values": { "corsat-path": "none" } },
{ "weight": 4, "type": "def", "values": { "corsat-path": "gamma-north" } },
{ "weight": 4, "type": "def", "values": { "corsat-path": "gamma-control" } },
{ "weight": 4, "type": "def", "values": { "corsat-path": "theta-east" } },
{ "weight": 4, "type": "def", "values": { "corsat-path": "theta-control" } },
{ "weight": 1, "type": "def", "values": { "corsat-path": "highsec" } }
]
},
{
"type": "pick", "name": "Sigma Major Variation",
"choices": [
{ "type": "def", "values": { "dome-sigma": "regular" } },
{ "type": "def", "values": { "dome-sigma": "ice" } }
]
}
]
[]
39 changes: 39 additions & 0 deletions maps/Nightmare/maps/CORSAT_Legacy/nightmare.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[
{ "type": "map_sprinkle", "path": "sprinkles/" },
{
"type": "map_insert",
"landmark": "lockdown-gamma-north",
"path": "standalone/lockdown_gammanorth.dmm",
"when": { "corsat-path": "gamma-north" }
},
{
"type": "map_insert",
"landmark": "lockdown-gamma-control",
"path": "standalone/lockdown_gammacontrol.dmm",
"when": { "corsat-path": "gamma-control" }
},
{
"type": "map_insert",
"landmark": "lockdown-theta-east",
"path": "standalone/lockdown_thetaeast.dmm",
"when": { "corsat-path": "theta-east" }
},
{
"type": "map_insert",
"landmark": "lockdown-theta-control",
"path": "standalone/lockdown_thetacontrol.dmm",
"when": { "corsat-path": "theta-control" }
},
{
"type": "map_insert",
"landmark": "lockdown-highsec",
"path": "standalone/lockdown_highsec.dmm",
"when": { "corsat-path": "highsec" }
},
{
"type": "map_insert",
"landmark": "dome-sigma",
"path": "standalone/sigma_ice.dmm",
"when": { "dome-sigma": "ice" }
}
]
20 changes: 20 additions & 0 deletions maps/Nightmare/maps/CORSAT_Legacy/scenario.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[
{
"type": "pick", "name": "CORSAT Lockdown Pathing",
"choices": [
{ "weight": 3, "type": "def", "values": { "corsat-path": "none" } },
{ "weight": 4, "type": "def", "values": { "corsat-path": "gamma-north" } },
{ "weight": 4, "type": "def", "values": { "corsat-path": "gamma-control" } },
{ "weight": 4, "type": "def", "values": { "corsat-path": "theta-east" } },
{ "weight": 4, "type": "def", "values": { "corsat-path": "theta-control" } },
{ "weight": 1, "type": "def", "values": { "corsat-path": "highsec" } }
]
},
{
"type": "pick", "name": "Sigma Major Variation",
"choices": [
{ "type": "def", "values": { "dome-sigma": "regular" } },
{ "type": "def", "values": { "dome-sigma": "ice" } }
]
}
]
3 changes: 1 addition & 2 deletions maps/corsat.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"map_file": "Corsat.dmm",
"environment_traits": {
"Lockdown": true,
"COLD": true,
"InSpace": true
},
"survivor_types": [
Expand Down Expand Up @@ -43,7 +42,7 @@
"xeno_hive_charlie": 0,
"xeno_hive_delta": 0
},
"camouflage": "snow",
"camouflage": "classic",
"gamemodes": [
"Distress Signal",
"Hunter Games",
Expand Down
Loading

0 comments on commit 14aa9eb

Please sign in to comment.