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

Adds a new shipmap, the USS Heyst #229

Merged
merged 13 commits into from
Apr 14, 2024
Merged

Adds a new shipmap, the USS Heyst #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1e13c7c
adds heyst
DexterDude Apr 10, 2024
927fe7b
fuck you linters
DexterDude Apr 10, 2024
0ab626e
fuck you linters (the sequel)
DexterDude Apr 10, 2024
a985a7a
update map
DexterDude Apr 10, 2024
e941b0f
vibing up + fixing
DexterDude Apr 11, 2024
978fbb3
REMOVES SPIDER WEBS BECAUSE THEY SUCK DIE
DexterDude Apr 11, 2024
e54cb9e
fixes mechanic mat
DexterDude Apr 11, 2024
d3d8c45
updates....again.........
DexterDude Apr 11, 2024
3266c8f
fixes things
DexterDude Apr 12, 2024
4f824be
fixes another blast door because i forgot to save.......
DexterDude Apr 12, 2024
2c2afb2
REMOVES A RANDOM MECHANICS MAT????????
DexterDude Apr 12, 2024
9bff2aa
adds sidings to the landing pad for the tripoli so it looks less sudd…
DexterDude Apr 12, 2024
7bd3c08
die
DexterDude Apr 12, 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
12 changes: 12 additions & 0 deletions code/game/area/golden_arrow.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
name = "\improper Platoon Sergeant Office"
icon_state = "alpha"

/area/golden_arrow/shared_office
name = "\improper Shared Office"
icon_state = "alpha"

/area/golden_arrow/squad_one
name = "\improper Squad One Prep"
icon_state = "charlie"
Expand All @@ -69,3 +73,11 @@
/area/golden_arrow/firingrange
name = "\improper Firing Range"
icon_state = "firingrange"

/area/golden_arrow/platoonprep
name = "\improper Platoon Prep"
icon_state = "bravo"

/area/golden_arrow/platoonarmory
name = "\improper Platoon Armory"
icon_state = "alpha"
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")
#define SHIP_MAP_NAMES list("USS Almayer", "USS Golden Arrow", "SSV Chapaev", "USS Rover", "USS Heyst")

#define MAIN_SHIP_PLATOON text2path(SSmapping.get_main_ship_platoon())
#define MAIN_SHIP_DEFAULT_PLATOON "/datum/squad/marine/alpha"
Expand Down
3 changes: 3 additions & 0 deletions map_config/shipmaps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,7 @@ map chapaev
endmap

map rover
endmap

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