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

Adds a new ruin, The Cave Crew! #1898

Merged
merged 29 commits into from
Oct 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a0533e2
a
spockye Mar 5, 2023
029d494
a
spockye Mar 15, 2023
b6ff86d
Merge remote-tracking branch 'upstream/master' into moonpool-ruin-1
spockye Apr 13, 2023
983169b
main files
spockye Apr 14, 2023
35e6391
finishing touches
spockye Apr 14, 2023
92a0ac0
misc last-minute changes
spockye Apr 14, 2023
020ed27
fixes fails
spockye Apr 14, 2023
b22ceb6
fixes template name
spockye Apr 24, 2023
8f05901
Merge branch 'master' into pr/1898
spockye Apr 24, 2023
7aa5c66
Merge branch 'master' into moonpool-ruin-1
Erikafox Apr 26, 2023
f4a0946
Merge branch 'master' into moonpool-ruin-1
Erikafox Apr 26, 2023
663d6bd
Merge branch 'master' into moonpool-ruin-1
spockye May 20, 2023
7f75b74
misc changes
spockye May 20, 2023
58a4db0
Merge branch 'moonpool-ruin-1' of https://github.com/spockye/Shiptest…
spockye May 20, 2023
73f4d83
fixes indent
spockye May 20, 2023
523dc88
Merge remote-tracking branch 'upstream/master' into moonpool-ruin-1
spockye May 25, 2023
9c622d6
Merge remote-tracking branch 'upstream/master' into moonpool-ruin-1
spockye Aug 28, 2023
3007791
total fix.... mabye
spockye Aug 28, 2023
e97234e
kills the subshuttle dock / adds APC's
spockye Aug 28, 2023
3ddf212
Merge branch 'master' into moonpool-ruin-1
spockye Sep 4, 2023
3f27908
Merge branch 'master' into moonpool-ruin-1
spockye Sep 7, 2023
2e63e68
Merge remote-tracking branch 'upstream/master' into moonpool-ruin-1
spockye Sep 20, 2023
9fc5fd5
misc review fixes
spockye Sep 20, 2023
a90e54a
removes a extra area
spockye Sep 20, 2023
1748294
adds some more threats/decals
spockye Sep 20, 2023
251144a
Merge remote-tracking branch 'upstream/master' into moonpool-ruin-1
spockye Oct 3, 2023
34c406b
one less area, light switches
spockye Oct 3, 2023
971cb25
Merge remote-tracking branch 'upstream/master' into moonpool-ruin-1
spockye Oct 20, 2023
80a195d
Update shuttles.dm
spockye Oct 20, 2023
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
7,124 changes: 7,124 additions & 0 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions _maps/map_catalogue.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
Size = (x = 100)(y = 75)(z = 1)
Tags = "Medium Combat Challenge", "Major Loot", "Hazardous", "Liveable"

File Name "_maps\RandomRuins\JungleRuins\jungle_cavecrew
Size = (x = 43)(y = 63)(z = 1)
Tags = "Medium Combat Challenge", "Hazardous", "Liveable", "Major Loot"

File Name "_maps\RandomRuins\JungleRuins\jungle_abandoned_library
Size = (x = 36)(y = 35)(z = 1)
Tags = "Medium Combat Challenge", "Medium Loot", "Antag Gear", "Necropolis Loot", "Liveable"
Expand Down
5 changes: 5 additions & 0 deletions _maps/shuttles/subshuttles/Subshuttle Catalog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ Size = "1x3"
Purpose = "Showing people how to fill this document in"
File Path = "_maps\shuttles\subshuttles\example.dmm"

Name = "Gut Combat Freighter"
Size = "7x15"
Purpose = "Transporting goods, while fending for itself"
File Path = "_maps\shuttles\subshuttles\frontiersmen_gut"

Name = "Kunai Dropship"
Size = "12x7"
Purpose = "A multi-role dropship used by almost every group faring space. Its ease of manufacture and high mobility makes it ideal for transport."
Expand Down
Loading