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

Garrow 3 up-arming #654

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Garrow 3 up-arming #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddc5439
Womp womp
BonniePandora Jan 7, 2025
9fabec1
Made into alt ship-map
BonniePandora Jan 7, 2025
0f0314e
Forgor a comma
BonniePandora Jan 7, 2025
b4d1cfc
Forgot this too, oops
BonniePandora Jan 7, 2025
9705258
Helmet NVG optics & another R2 added to two new lockers
BonniePandora Jan 10, 2025
4fb6ab0
Merge branch 'master' into Garrow-3-up-arming
BonniePandora Jan 10, 2025
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", "USS Golden Arrow (Classic)", "SSV Chapaev", "USS Rover")
#define SHIP_MAP_NAMES list("USS Almayer", "USS Golden Arrow", "USS Golden Arrow (Classic)", "USS Golden Arrow (Up-Armed)", "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
5 changes: 4 additions & 1 deletion map_config/shipmaps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@ map rover
endmap

map golden_arrow_classic
endmap
endmap

map golden_arrow_uparmed
endmap
9 changes: 9 additions & 0 deletions maps/golden_arrow_uparmed.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 (Up-Armed)",
"map_path": "map_files/golden_arrow_uparmed",
"map_file": "golden_arrow_uparmed.dmm",
"webmap_url": "GoldenArrow",
"traits": [{"Marine Main Ship": true}],
"nightmare_path": "maps/Nightmare/maps/golden_arrow_uparmed/",
"platoon": "/datum/squad/marine/alpha"
}
Loading
Loading