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

Bunched Station #12030

Draft
wants to merge 48 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
df910be
Basic Functional station + floor decal fixes
BarteG44 Dec 8, 2024
ee50850
Merge remote-tracking branch 'upstream/master' into bunched
BarteG44 Dec 8, 2024
d5af5b1
small changes
BarteG44 Dec 8, 2024
9f519bd
random grilles
BarteG44 Dec 8, 2024
f65174b
oil vat
BarteG44 Dec 8, 2024
167a255
bridge ubertable holening
BarteG44 Dec 8, 2024
1da5e89
Adds a multicolor font decal for mappers to use
BarteG44 Dec 9, 2024
463d2fa
Merge branch 'Font_decals' into bunched
BarteG44 Dec 9, 2024
61bfca9
adds slight shading to the big letters
BarteG44 Dec 9, 2024
7970fe0
Merge branch 'Font_decals' into bunched
BarteG44 Dec 9, 2024
9bbd3be
atmos, kitchen, medical booth, bar and shuttle changes
BarteG44 Dec 9, 2024
2b2bf4d
misaligned cardinal sprites
BarteG44 Dec 9, 2024
25f65a9
Merge branch 'Font_decals' into bunched
BarteG44 Dec 9, 2024
3c89b97
small stuff
BarteG44 Dec 9, 2024
bfed6a9
changes paths to fit naming conventions
BarteG44 Dec 10, 2024
37a5458
Merge branch 'Font_decals' into bunched
BarteG44 Dec 10, 2024
4f77b7b
Update bunched5.dmm
BarteG44 Dec 10, 2024
4be1e9e
numbers and symbols too
BarteG44 Dec 10, 2024
7ad60e8
Merge branch 'Font_decals' into bunched
BarteG44 Dec 10, 2024
653af5d
path changes
BarteG44 Dec 10, 2024
c3e5891
Merge remote-tracking branch 'upstream/master' into bunched
BarteG44 Dec 10, 2024
06c28fc
Update _basemap.dm
BarteG44 Dec 10, 2024
ad90971
allows mappers to place crate shelves and crates on the same time to …
BarteG44 Dec 11, 2024
611fe2f
makes the crate shelf sprite a bit less eye-burningly bright
BarteG44 Dec 11, 2024
9d5be36
Merge branch 'crate-shelp-mapload' into bunched
BarteG44 Dec 11, 2024
f5f9359
adds big potted plants and the disposals piping
BarteG44 Dec 12, 2024
0ebba01
moar plant matter
BarteG44 Dec 12, 2024
9156a6f
more detail work and shuttle engines
BarteG44 Dec 13, 2024
a3cd074
Merge remote-tracking branch 'upstream/master' into bunched
BarteG44 Dec 13, 2024
c044afb
details
BarteG44 Dec 14, 2024
91315a2
more small stuff
BarteG44 Dec 15, 2024
fdcf690
some more config whoopsies
BarteG44 Dec 15, 2024
d9b742c
maintenance layout changes
BarteG44 Dec 15, 2024
5630113
Merge remote-tracking branch 'upstream/master' into bunched
BarteG44 Dec 15, 2024
bea734a
more maintenance and vilorlogy layout changes
BarteG44 Dec 15, 2024
ca71108
botany layout change
BarteG44 Dec 15, 2024
66ebb6e
lints
BarteG44 Dec 15, 2024
21ab6b2
last of the lints i can do and missing disposals pipes
BarteG44 Dec 15, 2024
0ce297d
door capitalization
BarteG44 Dec 15, 2024
e6db345
more capitalization
BarteG44 Dec 15, 2024
7b43c03
brute forcing the wack pixel offset
BarteG44 Dec 15, 2024
b99f294
changes the festivus' default layer and fixes last few missing dispos…
BarteG44 Dec 15, 2024
33acfda
Atmospherics layout change
BarteG44 Dec 15, 2024
beebe47
Tcomms and small things
BarteG44 Dec 18, 2024
f2e979d
Changes the behavior from picking up crates from the shelf's tile to …
BarteG44 Dec 19, 2024
4c5c763
Merge branch 'crate-shelp-mapload' into bunched
BarteG44 Dec 19, 2024
f4b0393
crate shelfs done with helpers
BarteG44 Dec 19, 2024
3243cce
adds the robot waypoint beacons around the main corridors
BarteG44 Dec 24, 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
6 changes: 4 additions & 2 deletions _maps/_basemap.dm
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
//#define QUICKSTART // uncomment this to start the round immidiately when ready and automatically spawn players with debug outfit
// #define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
// #define QUICKSTART // uncomment this to start the round immidiately when ready and automatically spawn players with debug outfit

// uncomment this for a map you need to use
// #define FORCE_MAP "corgstation"
// #define FORCE_MAP "boxstation"
// #define FORCE_MAP "bunchedstation"
// #define FORCE_MAP "metastation"
// #define FORCE_MAP "deltastation"
// #define FORCE_MAP "kilostation"
Expand All @@ -27,6 +28,7 @@
#include "map_files\flandstation\flandstation.dmm"
#include "map_files\RadStation\RadStation.dmm"
#include "map_files\EchoStation\EchoStation.dmm"
#include "map_files\BunchedStation\bunched5.dmm"

#ifdef CIBUILDING
#include "templates.dm"
Expand Down
12 changes: 12 additions & 0 deletions _maps/bunchedstation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"map_name": "Bunched Station",
"map_link": "bunchedstation",
"map_path": "map_files/BunchedStation",
"map_file": "bunched5.dmm",
"shuttles": {
"cargo": "cargo_bunched",
"ferry": "ferry_standard",
"whiteship": "whiteship_box",
"emergency": "emergency_bunched"
}
}
Loading
Loading