-
Notifications
You must be signed in to change notification settings - Fork 270
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ast-roid-rage! Asteroid Mining Improvements (#3234)
* Push for Draft I didnt even test this I just wanna show its being worked on * Restore Metastation.dmm Because bar is S a c r e d * Working Prototype...Maybe Now containing asteroids. * Linter Moment But actually why does it HAVE to be +-25? * Lint and one more rock The Mutually Assured Destruction rock * Fix 'Mining Dock' oops. Didn't see that there * Where. Why. Why 2 door there. How do I run linters clientside. * Bomb-defuser Begone storage, you are now book! * Re-garys' gary Gary?Garry? No idea. * Requested Changes Moves maps to _maps, renames single letter var spacing. * Convert maps to TGM new : _maps/~monkestation/asteroid_maps/rockbar.dmm new : _maps/~monkestation/asteroid_maps/geode.dmm new : _maps/~monkestation/asteroid_maps/test_rock.dmm new : _maps/~monkestation/asteroid_maps/smol_rock.dmm new : _maps/~monkestation/asteroid_maps/binary.dmm new : _maps/~monkestation/asteroid_maps/rock.dmm new : _maps/~monkestation/asteroid_maps/sealed_danger.dmm new : _maps/~monkestation/asteroid_maps/test_rock_boogaloo.dmm new : _maps/~monkestation/asteroid_maps/medium_rock.dmm new : _maps/~monkestation/asteroid_maps/strong_rock.dmm new : _maps/~monkestation/asteroid_maps/weak_rock.dmm new : _maps/~monkestation/asteroid_maps/mad_rock.dmm Automatically commited by: tools\mapmerge2\fixup.py * Spacing, more 'Asteroids' Yea I called em asteroids, deal with it. --------- Co-authored-by: Lucy <[email protected]>
- Loading branch information
1 parent
34c3057
commit ea4524f
Showing
28 changed files
with
6,716 additions
and
4,256 deletions.
There are no files selected for viewing
2,822 changes: 1,420 additions & 1,402 deletions
2,822
_maps/map_files/Deltastation/DeltaStation2.dmm
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,203 @@ | ||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE | ||
"a" = ( | ||
/turf/open/space/basic, | ||
/area/space) | ||
"w" = ( | ||
/turf/closed/mineral/random/asteroid/tospace, | ||
/area/space) | ||
|
||
(1,1,1) = {" | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
"} | ||
(2,1,1) = {" | ||
a | ||
a | ||
a | ||
w | ||
w | ||
w | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
"} | ||
(3,1,1) = {" | ||
a | ||
w | ||
w | ||
w | ||
w | ||
w | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
"} | ||
(4,1,1) = {" | ||
a | ||
w | ||
w | ||
w | ||
w | ||
w | ||
w | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
"} | ||
(5,1,1) = {" | ||
a | ||
w | ||
w | ||
w | ||
w | ||
w | ||
w | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
"} | ||
(6,1,1) = {" | ||
a | ||
a | ||
w | ||
w | ||
w | ||
w | ||
w | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
"} | ||
(7,1,1) = {" | ||
a | ||
a | ||
w | ||
w | ||
w | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
"} | ||
(8,1,1) = {" | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
w | ||
w | ||
a | ||
a | ||
"} | ||
(9,1,1) = {" | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
w | ||
w | ||
w | ||
w | ||
"} | ||
(10,1,1) = {" | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
w | ||
w | ||
w | ||
w | ||
w | ||
"} | ||
(11,1,1) = {" | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
w | ||
w | ||
w | ||
w | ||
a | ||
"} | ||
(12,1,1) = {" | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
w | ||
w | ||
a | ||
"} | ||
(13,1,1) = {" | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE | ||
"a" = ( | ||
/turf/closed/wall/r_wall, | ||
/area/space) | ||
"n" = ( | ||
/obj/effect/artifact_spawner, | ||
/turf/open/floor/plating/reinforced, | ||
/area/space) | ||
|
||
(1,1,1) = {" | ||
a | ||
a | ||
a | ||
"} | ||
(2,1,1) = {" | ||
a | ||
n | ||
a | ||
"} | ||
(3,1,1) = {" | ||
a | ||
a | ||
a | ||
"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE | ||
"a" = ( | ||
/turf/closed/wall/r_wall, | ||
/area/space) | ||
"g" = ( | ||
/obj/structure/sign/warning/directional/west, | ||
/turf/open/space/basic, | ||
/area/space) | ||
"o" = ( | ||
/obj/effect/artifact_spawner, | ||
/turf/open/floor/iron/airless, | ||
/area/space) | ||
"u" = ( | ||
/obj/machinery/door/poddoor/shutters, | ||
/turf/open/floor/iron/airless, | ||
/area/space) | ||
"y" = ( | ||
/obj/structure/sign/warning/directional/east, | ||
/turf/open/space/basic, | ||
/area/space) | ||
"B" = ( | ||
/obj/item/stock_parts/cell/artifact, | ||
/obj/structure/table, | ||
/turf/open/floor/iron/airless, | ||
/area/space) | ||
"D" = ( | ||
/turf/open/floor/iron/airless, | ||
/area/space) | ||
"Z" = ( | ||
/turf/open/space/basic, | ||
/area/space) | ||
|
||
(1,1,1) = {" | ||
Z | ||
Z | ||
Z | ||
y | ||
Z | ||
Z | ||
Z | ||
"} | ||
(2,1,1) = {" | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
"} | ||
(3,1,1) = {" | ||
a | ||
o | ||
D | ||
o | ||
D | ||
o | ||
u | ||
"} | ||
(4,1,1) = {" | ||
a | ||
B | ||
D | ||
D | ||
D | ||
D | ||
u | ||
"} | ||
(5,1,1) = {" | ||
a | ||
o | ||
D | ||
o | ||
D | ||
o | ||
u | ||
"} | ||
(6,1,1) = {" | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
a | ||
"} | ||
(7,1,1) = {" | ||
Z | ||
Z | ||
Z | ||
g | ||
Z | ||
Z | ||
Z | ||
"} |
Oops, something went wrong.