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.

Sign up for GitHub

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

Jump to bottom

Conestogafication of the Golden Arrow #241

Merged
merged 4 commits into from
Apr 18, 2024
Merged

Conestogafication of the Golden Arrow #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f90b4b
Conestogafication
DexterDude Apr 17, 2024
04684e5
fixes some random ass computer in space
DexterDude Apr 17, 2024
aa27754
fixes evil neighbors (windows on hulls oops)
DexterDude Apr 17, 2024
4638495
Re-adds the APC portion of the map.
DexterDude Apr 17, 2024
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
2 changes: 1 addition & 1 deletion code/global.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
#define MAIN_SHIP_NAME SSmapping.get_main_ship_name()
#define MAIN_SHIP_DEFAULT_NAME "USS Golden Arrow"
#define SHIP_MAP_NAMES list("USS Almayer", "USS Golden Arrow", "SSV Chapaev", "USS Rover", "USS Heyst")
#define SHIP_MAP_NAMES list("USS Almayer", "USS Golden Arrow", "USS Golden Arrow (Classic)", "SSV Chapaev", "USS Rover")

#define MAIN_SHIP_PLATOON text2path(SSmapping.get_main_ship_platoon())
#define MAIN_SHIP_DEFAULT_PLATOON "/datum/squad/marine/alpha"
Expand Down
2 changes: 1 addition & 1 deletion map_config/shipmaps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ endmap
map rover
endmap

map heyst
map golden_arrow_classic
endmap
9 changes: 9 additions & 0 deletions maps/golden_arrow_classic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"map_name": "USS Golden Arrow (Classic)",
"map_path": "map_files/golden_arrow_classic",
"map_file": "golden_arrow_classic.dmm",
"webmap_url": "GoldenArrow",
"traits": [{"Marine Main Ship": true}],
"nightmare_path": "maps/Nightmare/maps/golden_arrow_classic/",
"platoon": "/datum/squad/marine/alpha"
}
9 changes: 0 additions & 9 deletions maps/heyst.json
View file
Open in desktop

This file was deleted.

Loading
Loading