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

4ward Nanotrasen Acquired Location Station #1188

Merged
merged 50 commits into from
Oct 24, 2024
Merged

4ward Nanotrasen Acquired Location Station #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
4fb3eac
Add files via upload
Jul 28, 2024
1286514
Rename 4nalstation.dm to _maps/4nalstation.dm
Jul 28, 2024
01fa2c5
Update and rename 4NaL Station.dmm to _maps/splurt_maps/map_files/4Na…
Jul 28, 2024
844f44e
Rename arrival_4nal.dmm to _maps/shuttles/arrival_4nal.dmm
Jul 28, 2024
fcbbffa
Rename 4nalstation.json to _maps/4nalstation.json
Jul 28, 2024
b8a5423
Delete shuttles.dm
Jul 28, 2024
22555e0
Update shuttles.dm
Jul 28, 2024
69ae23d
Update 4NaL Station.dmm
Jul 28, 2024
f22d5d7
Map
Jul 28, 2024
54eb982
Update _basemap.dm
Jul 28, 2024
b9a1b78
Update 4NaL Station.dmm
Jul 28, 2024
f469776
Initial finish
Aug 8, 2024
6de17e6
Merge branch 'SPLURT-Station:master' into 4nal
Aug 8, 2024
826d67b
Cameras and holopads
Aug 8, 2024
1973acf
Bugfixes from @Satile
Aug 9, 2024
aec582e
Changes requested
Aug 9, 2024
76601ed
basemap fix
Aug 9, 2024
ade2bcc
Naming consistency
Aug 9, 2024
51f32da
Domino effect
Aug 9, 2024
71471bd
Appease the Linter gods, reformatting
Aug 9, 2024
287e280
Spawn fix
Aug 12, 2024
b9a40ac
Bug fixing
Aug 15, 2024
d966fd5
bug/tweaks
Aug 16, 2024
d1a9413
Bug+ruins
Aug 19, 2024
aae79d6
true to 1
Aug 19, 2024
2f3cc7e
I forgor the chube fix
Aug 19, 2024
80e8058
AHHH, NOT THE BEES
Aug 19, 2024
3dceaba
wallmed to "wallmed"
Aug 19, 2024
98dae24
Ruins/Maints
Aug 19, 2024
c041536
Spawns/wire fix
Aug 22, 2024
7951175
Cha-cha-cha-changes
Aug 23, 2024
b74032b
Forgor
Aug 23, 2024
7c9852b
Merge branch 'SPLURT-Station:master' into 4nal
SaraSayomi Aug 25, 2024
07ee784
Merge branch 'SPLURT-Station:master' into 4nal
SaraSayomi Aug 25, 2024
3cfe372
Upstream fixes plus nicer floors
Aug 25, 2024
f7e5930
More tiny fans
Sep 6, 2024
6c02bca
Update 4NaL_Station.dmm
Sep 6, 2024
9bf3c33
Merge branch 'SPLURT-Station:master' into 4nal
SaraSayomi Sep 6, 2024
6fd36dd
Merge branch 'SPLURT-Station:master' into 4nal
SaraSayomi Sep 11, 2024
baee76b
I am the lore
SaraSayomi Sep 11, 2024
e735d84
Changing powernet
SaraSayomi Sep 14, 2024
24f394e
Merge branch 'SPLURT-Station:master' into 4nal
SaraSayomi Sep 19, 2024
9ffebc7
Post test fixing
SaraSayomi Sep 20, 2024
d1bcba2
Merge branch 'SPLURT-Station:master' into 4nal
SaraSayomi Sep 21, 2024
e18e61d
Merge branch 'SPLURT-Station:master' into 4nal
SaraSayomi Oct 6, 2024
299b92f
Penis station merge graphics update and fixes
SaraSayomi Oct 7, 2024
4d2ef19
Forgor
SaraSayomi Oct 7, 2024
7f2b04d
Merge branch 'SPLURT-Station:master' into 4nal
SaraSayomi Oct 11, 2024
60a3582
Update 4NaL_Station.dmm
SaraSayomi Oct 18, 2024
f0b5108
Merge branch 'SPLURT-Station:master' into 4nal
SaraSayomi Oct 18, 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
1 change: 1 addition & 0 deletions _maps/4nalstation.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define FORCE_MAP "_maps/4nalstation.json"
30 changes: 30 additions & 0 deletions _maps/4nalstation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"map_name": "4Nal Station",
"map_path": "splurt_maps/map_files/4Nalstation",
"map_file": "4NaL_Station.dmm",
"shuttles": {
"cargo": "cargo_box",
"ferry": "ferry_fancy",
"whiteship": "whiteship_fournal",
"emergency": "emergency_fournal"
},
"traits": [
{
"Up": 1,
"Baseturf": "/turf/open/openspace",
"Linkage": "Cross"
},
{
"Up": 1,
"Down": -1,
"Baseturf": "/turf/open/openspace",
"Linkage": "Cross"
},
{
"Down": -1,
"Baseturf": "/turf/open/openspace",
"Linkage": "Cross"
}
]
}
1 change: 1 addition & 0 deletions _maps/_basemap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "map_files\SyndicateStation\SyndicateBoxStation.dmm"
#include "splurt_maps\map_files\Smexistation\Snaxi_Splurt.dmm"
#include "map_files\BoxedInStation\BoxedInStation.dmm"
#include "splurt_maps\map_files\4Nalstation\4Nal_station.dmm"

#ifdef CIBUILDING
#include "templates.dm"
Expand Down
Loading
Loading