Skip to content

Commit 224c7e6

Browse files
authored
Starmap V and a visit from an old friend! (#2085)
* Sprote * Sprote2 * Extend * shipped and tested * Don't delete the Hammerhead dumbass Like that's literally the whole point of this branch * m * o * g * Starmap V * Misc stuff * Just some more things * A * B * WOOOO YEAH BABY * rocinante * use the map! * Left the palette in lol * icon fixes * M * some more fixes * Guns and misc * Deck guns * Disposal pipes * Code fixes * A little bit of railgun, as a treat + some fixes * Missed one thing * Floor update * Fixes a thing that got deleted apparently * Bot fix * Mining console * Tweaks and fixes * Pipe update (BeeBase compatibility) * Don't explode * Linter fixes! * A * Adjust conquest times, spawn more enemies, make map funnier * Makes systems not generate off the map * If this fixes it that would be very dumb But also, weirdly, make a lot of sense
1 parent 464a76f commit 224c7e6

File tree

25 files changed

+123279
-130
lines changed

25 files changed

+123279
-130
lines changed

_maps/aetherwhisp.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
"emergency": "emergency_donut"},
1313
"mine_disable": 1,
1414
"ship_type": "/obj/structure/overmap/nanotrasen/solgov/aetherwhisp/starter",
15-
"faction": "solgov"
15+
"faction": "solgov",
16+
"starmap_path": "config/starmap/starmap.json"
1617
}

_maps/atlas.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
"emergency": "emergency_atlas"
2626
},
2727
"mine_disable": 1,
28-
"ship_type": "/obj/structure/overmap/nanotrasen/missile_cruiser/starter"
28+
"ship_type": "/obj/structure/overmap/nanotrasen/missile_cruiser/starter",
29+
"starmap_path": "config/starmap/starmap.json"
2930
}

_maps/eclipse.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
"ferry": "ferry_fancy",
1212
"emergency": "emergency_donut"},
1313
"mine_disable": 1,
14-
"ship_type": "/obj/structure/overmap/nanotrasen/light_cruiser/starter"
14+
"ship_type": "/obj/structure/overmap/nanotrasen/light_cruiser/starter",
15+
"starmap_path": "config/starmap/starmap.json"
1516
}

_maps/galactica.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727
"mine_file": "Rocinante.dmm",
2828
"mine_path": "map_files/Mining/nsv13",
2929
"ship_type": "/obj/structure/overmap/nanotrasen/battleship/starter",
30-
"mining_ship_type": "/obj/structure/overmap/nanotrasen/mining_cruiser/rocinante"
30+
"mining_ship_type": "/obj/structure/overmap/nanotrasen/mining_cruiser/rocinante",
31+
"starmap_path": "config/starmap/starmap.json"
3132
}

_maps/gladius.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222
"mine_file": "Rocinante.dmm",
2323
"mine_path": "map_files/Mining/nsv13",
2424
"ship_type": "/obj/structure/overmap/nanotrasen/battlecruiser/starter",
25-
"mining_ship_type": "/obj/structure/overmap/nanotrasen/mining_cruiser/rocinante"
25+
"mining_ship_type": "/obj/structure/overmap/nanotrasen/mining_cruiser/rocinante",
26+
"starmap_path": "config/starmap/starmap.json"
2627
}

_maps/hammerhead.dm

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#define FORCE_MAP "_maps/hammerhead.json"

_maps/hammerhead.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"map_name": "NSV Hammerhead",
3+
"map_link": "Hammerhead",
4+
"map_path": "map_files/Hammerhead",
5+
"map_file": ["Hammerhead.dmm"],
6+
"traits": [{"Linkage": "Self"}],
7+
"space_ruin_levels": -1,
8+
"shuttles": {
9+
"cargo": "cargo_hammerhead",
10+
"ferry": "ferry_fancy",
11+
"emergency": "emergency_donut"},
12+
"mine_file": "Rocinante.dmm",
13+
"mine_path": "map_files/Mining/nsv13",
14+
"ship_type": "/obj/structure/overmap/nanotrasen/heavy_cruiser/starter",
15+
"mining_ship_type": "/obj/structure/overmap/nanotrasen/mining_cruiser/rocinante",
16+
"mine_disable": 0
17+
}

0 commit comments

Comments
 (0)