Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
2d6d12d
Adds DonutStation
neeshacark Aug 3, 2023
6de57aa
donut :)
neeshacark Aug 3, 2023
9d061fd
wtf
neeshacark Aug 3, 2023
53ea387
e
neeshacark Aug 3, 2023
f9a111d
fix
neeshacark Aug 3, 2023
3e19709
Update shuttles.dm
neeshacark Aug 3, 2023
2346540
Update _basemap.dm
neeshacark Aug 3, 2023
a0267c1
Update maps.txt
neeshacark Aug 3, 2023
e72fe99
typo
neeshacark Aug 3, 2023
b367b1d
mapmerge
neeshacark Aug 4, 2023
39e2c96
I SAID MAPMERGE
neeshacark Aug 4, 2023
41106b8
E
neeshacark Aug 6, 2023
80856b3
dorms
neeshacark Aug 6, 2023
cd21abc
break time
neeshacark Aug 6, 2023
90a0495
maints start
neeshacark Aug 7, 2023
ff175c7
Fix atmos
GenericDM Aug 7, 2023
7359e61
add cooling to telecomms
GenericDM Aug 7, 2023
1e6dc51
pixelshift i forgor
GenericDM Aug 7, 2023
5fbb638
oops
GenericDM Aug 7, 2023
ce936cc
re-atmos atmos again
GenericDM Aug 7, 2023
dbb4e22
fixes toxins piping
GenericDM Aug 7, 2023
af67863
fixes incinerator i hope
GenericDM Aug 7, 2023
3ca94bb
i didnt save
GenericDM Aug 7, 2023
b393424
cark forgot some cyclelinks
GenericDM Aug 7, 2023
99e3ece
xenobio had some borked pipes too
GenericDM Aug 7, 2023
3f1f558
haha oopsie that caused compile failures
GenericDM Aug 8, 2023
ca4e56e
singulo
neeshacark Aug 8, 2023
5e1244b
woops
neeshacark Aug 8, 2023
76cc1c6
yay
neeshacark Aug 8, 2023
a7d4de9
woops x2
neeshacark Aug 8, 2023
c3f0fa8
frfr
neeshacark Aug 8, 2023
e468918
finished up dorms
neeshacark Aug 8, 2023
5fa6110
gotta move solars GRRR
neeshacark Aug 8, 2023
bb75d68
BREAKTIME
neeshacark Aug 8, 2023
dab0600
removes dumb shit
neeshacark Aug 8, 2023
9ef4957
i said REMOVES DUMB SHIT
neeshacark Aug 8, 2023
edf8fb3
STG
neeshacark Aug 8, 2023
d90c4c4
transfer centre
neeshacark Aug 8, 2023
e2b3f15
o e o a a
neeshacark Aug 8, 2023
7de0fb7
SW maints
neeshacark Aug 8, 2023
b39b263
port quarter finished
neeshacark Aug 8, 2023
042fa73
west and northwest maints
neeshacark Aug 8, 2023
a8c807c
nearly done
neeshacark Aug 8, 2023
d31c156
e
neeshacark Aug 8, 2023
ecac3f0
solar areas
neeshacark Aug 8, 2023
1600921
l
neeshacark Aug 8, 2023
1c922e3
cameras
neeshacark Aug 8, 2023
5886e85
cameras!
neeshacark Aug 8, 2023
3d5cbbe
time for DECALS
neeshacark Aug 8, 2023
8bbf6dd
but actually breaktime
neeshacark Aug 8, 2023
d198acc
keel it
neeshacark Aug 8, 2023
bbe2755
solar panels
neeshacark Aug 8, 2023
a482327
woops
neeshacark Aug 8, 2023
4280c58
bridge decals begin
neeshacark Aug 9, 2023
402d72d
sec decals
neeshacark Aug 9, 2023
cf14f64
engi decals
neeshacark Aug 9, 2023
61ed8d0
atmos decals
neeshacark Aug 9, 2023
279c407
i love decals :)
neeshacark Aug 9, 2023
b9c2fc3
so many trims
neeshacark Aug 9, 2023
839b04e
medical decals
neeshacark Aug 9, 2023
9e677b2
medical decals!!!!!!!!
neeshacark Aug 9, 2023
c7168ad
desk bells because i forgor
neeshacark Aug 9, 2023
67321b5
sci decals
neeshacark Aug 9, 2023
67e27e8
door fixes
neeshacark Aug 9, 2023
f6c2f89
fixes messed up sec post trims
neeshacark Aug 9, 2023
d1d6cca
its done...
neeshacark Aug 9, 2023
2c0bf94
maint polish (im bored ok?)
neeshacark Aug 11, 2023
08c1811
ok a lil maint inflation as a treat
neeshacark Aug 11, 2023
bc40412
ITS BAAACK
neeshacark Aug 11, 2023
f3678ba
yay!
neeshacark Aug 11, 2023
e839c6b
pass 1
neeshacark Aug 11, 2023
6919bd8
dun
neeshacark Aug 11, 2023
1749cdc
unsquare
neeshacark Aug 11, 2023
7192327
atmos stuff
neeshacark Aug 11, 2023
4c1ff59
dun?
neeshacark Aug 11, 2023
ae931fb
e
neeshacark Aug 11, 2023
026b393
disposals
ToasterBiome Aug 11, 2023
76703f1
remove templates lol
ToasterBiome Aug 11, 2023
1fa9596
area
ToasterBiome Aug 11, 2023
f85cd80
fixed
neeshacark Aug 11, 2023
c9eb963
there
neeshacark Aug 11, 2023
322209b
e
neeshacark Aug 11, 2023
eb7d6a6
fixes pods + broken airlock
neeshacark Aug 11, 2023
b305e42
floating lighjt
neeshacark Aug 11, 2023
e0cad52
podbay
neeshacark Aug 11, 2023
46a0ce2
we
neeshacark Aug 11, 2023
dfbef31
k
neeshacark Aug 11, 2023
d3affd3
ferry dock
neeshacark Aug 14, 2023
6561e6b
fixes
neeshacark Aug 15, 2023
94420ea
wiire
neeshacark Aug 15, 2023
85c01b2
fixing disposls
ToasterBiome Aug 15, 2023
7fcaebc
dun
neeshacark Aug 15, 2023
5fb4685
cark realizes that he makes dumb choices when hes been mapping for ho…
neeshacark Aug 15, 2023
03c4065
charg
neeshacark Aug 15, 2023
ab602c3
hoh boy that was a catastrophic fuckup to forget thank fuck it came t…
neeshacark Aug 15, 2023
6bccd6c
ezhan loves this, i think this looks more cursed but whatever makes m…
neeshacark Aug 15, 2023
d904a34
on god
neeshacark Aug 17, 2023
ec1c873
bitch
neeshacark Aug 17, 2023
b3c18f6
b i t c h
neeshacark Aug 17, 2023
02e0924
stray rwall
neeshacark Aug 17, 2023
4b5c220
e o o a a
neeshacark Aug 17, 2023
0d6ebe1
security flaws i missed
neeshacark Aug 17, 2023
1e1db12
carp spawns
neeshacark Aug 17, 2023
3ae49d1
fixes tiime
neeshacark Aug 22, 2023
baca0be
fixy fixy
neeshacark Aug 22, 2023
9dabbac
mmmm fixes
neeshacark Aug 22, 2023
410d14e
eeeee
neeshacark Aug 22, 2023
41ca237
FIXXXXXXXX
neeshacark Aug 22, 2023
4b28763
that was much harder than it shouldve been
neeshacark Aug 22, 2023
dee6561
almost done...
neeshacark Aug 22, 2023
e772086
done
neeshacark Aug 22, 2023
c934eae
forgor to door
neeshacark Aug 22, 2023
dfa9835
AAAAAAAAAAAA
neeshacark Aug 23, 2023
330cc35
OOPSIE
neeshacark Aug 23, 2023
38f8368
OOPS X2
neeshacark Aug 23, 2023
fd247ab
2 fixes
neeshacark Aug 23, 2023
6176b01
dark!!!
neeshacark Aug 23, 2023
d46e43c
catwalk
neeshacark Aug 23, 2023
d049378
lights
neeshacark Aug 23, 2023
f75b148
fixes a tube
neeshacark Aug 23, 2023
dd53da4
should fix the other tube
neeshacark Aug 23, 2023
6ecac16
fixes smes i think
neeshacark Aug 23, 2023
f437158
fucky wucky
neeshacark Aug 23, 2023
5787345
fixes engine?
neeshacark Aug 23, 2023
2ff05f7
cycle
neeshacark Aug 23, 2023
39585f6
DOOORS
neeshacark Aug 23, 2023
b3cf6b2
fixes
neeshacark Aug 23, 2023
468a954
some more fixes
neeshacark Aug 23, 2023
70132f3
e
neeshacark Aug 23, 2023
15d069a
woops
neeshacark Aug 23, 2023
01d6d73
woops
neeshacark Aug 23, 2023
9d7ad71
sec alert terminal
neeshacark Aug 24, 2023
1f1bd48
dorms rework
ToasterBiome Aug 24, 2023
cd760bb
lights for cryo
ToasterBiome Aug 24, 2023
4c4aebc
Merge branch 'pr/19982' into donutstation
ToasterBiome Aug 28, 2023
845d0af
maybe up to date?
ToasterBiome Aug 28, 2023
9325381
Update DonutStation.dmm
ToasterBiome Aug 28, 2023
c652905
Revert "Update DonutStation.dmm"
ToasterBiome Aug 28, 2023
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/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "map_files\IceMeta\IceMeta.dmm"
#include "map_files\GaxStation\GaxStation.dmm"
#include "map_files\AsteroidStation\AsteroidStation.dmm"
#include "map_files\DonutStation\DonutStation.dmm"
#ifdef TRAVISBUILDING
#include "templates.dm"
#endif
Expand Down
1 change: 1 addition & 0 deletions _maps/donutstation.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define FORCE_MAP "_maps/donutstation.json"
11 changes: 11 additions & 0 deletions _maps/donutstation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"map_name": "DonutStation",
"map_path": "map_files/DonutStation",
"map_file": "DonutStation.dmm",
"shuttles": {
"emergency": "emergency_box",
"ferry": "ferry_fancy",
"cargo": "cargo_box",
"whiteship": "whiteship_box"
}
}
Loading