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 Apr 30, 2024
2 parents edae09e + 2565d35 commit 6cdf99a
Show file tree
Hide file tree
Showing 13 changed files with 11,672 additions and 32,937 deletions.
2 changes: 1 addition & 1 deletion code/game/area/Corsat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
can_build_special = TRUE

/area/corsat/landing/console
name = "\improper LZ1 'Gamma'"
name = "\improper LZ1 'NON FUNCTIONAL'"//Temp
icon_state = "corsat_telecomms"
requires_power = 0

Expand Down
1 change: 0 additions & 1 deletion map_config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ endmap
map corsat
minplayers 130
voteweight 0
disabled
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" } }
]
}
]
Loading

0 comments on commit 6cdf99a

Please sign in to comment.