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
113 commits
Select commit Hold shift + click to select a range
94bd4b3
moving donut to yogs branch (#20139)
ToasterBiome Aug 28, 2023
5446b59
bugger
neeshacark Aug 28, 2023
923a31e
telecomms hall
neeshacark Aug 28, 2023
a263e44
THE phones
neeshacark Aug 28, 2023
d726d7b
hm
neeshacark Aug 29, 2023
768918d
e
neeshacark Aug 29, 2023
4c278f3
fix arrivals + no sunglasses
ToasterBiome Aug 30, 2023
2fc94b3
reinforced walls
ToasterBiome Aug 30, 2023
04843f5
garden and tool storage
ToasterBiome Aug 30, 2023
e91bf1d
pets
ToasterBiome Aug 30, 2023
b0d723e
check again idiote clarke
ToasterBiome Aug 31, 2023
70b7c16
moves us back to alpha because biome moved us off it
neeshacark Aug 31, 2023
5be01e9
moves gravity gen somewhere infinitely more cringe but without redesi…
neeshacark Sep 1, 2023
1f1e485
areas are important
neeshacark Sep 1, 2023
01d4e23
very important change
neeshacark Sep 1, 2023
78cd564
blahaj is in danger
neeshacark Sep 1, 2023
a031dca
flavor
neeshacark Sep 1, 2023
39683e0
ocnriiclakes
ToasterBiome Sep 4, 2023
f8e4892
50 now
neeshacark Sep 6, 2023
1f67f9c
fixes a wire and a table
neeshacark Sep 9, 2023
bce724b
cuts off sec atmos
neeshacark Sep 9, 2023
44f8f38
light
neeshacark Sep 9, 2023
6b895d9
begins medbay overhaul
neeshacark Sep 9, 2023
3eafd26
medbay 2
neeshacark Sep 9, 2023
af1df33
medbay 2
neeshacark Sep 9, 2023
912a92f
this is taking longer than i thought it would
neeshacark Sep 9, 2023
b878afc
finished
neeshacark Sep 9, 2023
cf26bb5
couple decals i missed
neeshacark Sep 9, 2023
ab96d35
access
neeshacark Sep 9, 2023
ee61b13
fixes a typo preventing donut from being voted for
neeshacark Sep 11, 2023
e479726
fixes medbay cameras
neeshacark Sep 11, 2023
5dc1c64
electrolyzer
neeshacark Sep 11, 2023
e2998e8
service fixes
neeshacark Sep 11, 2023
32f1742
gas masks?
neeshacark Sep 11, 2023
0ac3401
v important
neeshacark Sep 11, 2023
143bdc1
fix
neeshacark Sep 11, 2023
560495b
mats 4 butch
neeshacark Sep 11, 2023
7d60238
moves orm a bit
neeshacark Sep 11, 2023
91437a3
a few more of these isnt a bad idea
neeshacark Sep 11, 2023
634d6b0
fixes a light
neeshacark Sep 11, 2023
d3ad47e
nukes a hidden button
neeshacark Sep 11, 2023
3ef4114
makes one of the maints less straight
neeshacark Sep 11, 2023
b5c1858
better
neeshacark Sep 11, 2023
e399e6c
weh
neeshacark Sep 11, 2023
40976ac
rogue catwalk
neeshacark Sep 11, 2023
cff8b5a
catwalk
neeshacark Sep 11, 2023
e5b30ba
slight improvement
neeshacark Sep 11, 2023
4de4b45
betterer?
neeshacark Sep 11, 2023
efa913f
catwalk :)
neeshacark Sep 12, 2023
16555f9
there
neeshacark Sep 12, 2023
9243140
mssing pets
neeshacark Sep 12, 2023
eaa6042
flips these
ToasterBiome Sep 12, 2023
236d129
access + light
ToasterBiome Sep 12, 2023
242107d
airlocks here
ToasterBiome Sep 12, 2023
3e45aa1
axolotls and det shutters
neeshacark Sep 14, 2023
a131077
cargo windows
neeshacark Sep 14, 2023
3feeaad
-1 axolotl
neeshacark Sep 14, 2023
8e438ea
woops
neeshacark Sep 14, 2023
84479ec
1
neeshacark Sep 14, 2023
9b1cafb
finished
neeshacark Sep 14, 2023
2d5f1cd
kills space library
neeshacark Sep 14, 2023
ec3f02d
fuckup
neeshacark Sep 14, 2023
d4e8b4f
minor changes to maint
neeshacark Sep 15, 2023
73b2082
bartender no longer gets 2x the gun
neeshacark Sep 17, 2023
a40cc9e
OH GOD THE HORROR
neeshacark Sep 17, 2023
29f8a60
oh god what am i doing
neeshacark Sep 17, 2023
e7ad7a2
god...
neeshacark Sep 17, 2023
bf9e30f
e
neeshacark Sep 17, 2023
6b2c4f5
e
neeshacark Sep 17, 2023
fb2ac1e
qwedrftghyjmk,l.;/
neeshacark Sep 17, 2023
88cf3ee
update atmos/incinerator
GenericDM Sep 17, 2023
6e43afa
some firelocks and stuff too
GenericDM Sep 17, 2023
905cae1
oopsie that's not supposed to be there
GenericDM Sep 18, 2023
d8e1b30
why does this PR even touch yogstation.dmm?
GenericDM Sep 18, 2023
54a7fc7
mapping erorrs
neeshacark Sep 18, 2023
c5477d8
showers
neeshacark Sep 18, 2023
41f9384
cam
neeshacark Sep 18, 2023
e8510c3
should be good
neeshacark Sep 18, 2023
bfd6c89
woops
neeshacark Sep 18, 2023
77da75c
who did this
neeshacark Sep 18, 2023
4318cb8
clerk exists now
neeshacark Sep 18, 2023
6751249
there
neeshacark Sep 18, 2023
6bed507
fix a single misplaced camera
GenericDM Sep 18, 2023
d23ea56
E
neeshacark Sep 20, 2023
d455a12
e
neeshacark Sep 26, 2023
cffb42c
con
neeshacark Sep 26, 2023
9f76045
how tf did that happen
neeshacark Sep 27, 2023
2bfdf89
fucking cargo
neeshacark Sep 27, 2023
b012988
fax and logic
neeshacark Sep 27, 2023
8d0c19d
sink
neeshacark Sep 27, 2023
411d949
e
neeshacark Sep 27, 2023
b588eed
ffs
neeshacark Sep 27, 2023
71065ca
WATCH AS I FIX THE COMPILE ERROR BY MOVING A LIGHTSWITCH BEHOLD MY MA…
neeshacark Sep 29, 2023
539452d
belts bags and huds
neeshacark Sep 30, 2023
91f0538
steals from kilo
neeshacark Oct 1, 2023
1cd4150
changes
neeshacark Oct 2, 2023
9996169
done
neeshacark Oct 2, 2023
f524fcf
e
neeshacark Oct 2, 2023
ef4911b
done
neeshacark Oct 2, 2023
ee1a92f
meme big fuckin moron
neeshacark Oct 2, 2023
ec98749
e
neeshacark Oct 2, 2023
bca5c58
flashes +toolbelt
ToasterBiome Oct 3, 2023
9e03a67
minor adjustments
ToasterBiome Oct 3, 2023
8c6a32e
e
neeshacark Oct 3, 2023
02a29ac
wire
neeshacark Oct 3, 2023
f4e52f1
w
neeshacark Oct 3, 2023
5d30f2e
e
neeshacark Oct 4, 2023
2247c67
e
neeshacark Oct 4, 2023
9415352
asterrrr
neeshacark Oct 4, 2023
e9e456d
mineralz
neeshacark Oct 4, 2023
9337949
asteroid cull
neeshacark Oct 4, 2023
0173eb5
doors
neeshacark Oct 7, 2023
6542c6a
firalam,
neeshacark Oct 7, 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": "[ALPHA] DonutStation",
"map_path": "map_files/DonutStation",
"map_file": "DonutStation.dmm",
"shuttles": {
"emergency": "emergency_box",
"ferry": "ferry_fancy",
"cargo": "cargo_box",
"whiteship": "whiteship_box"
}
}
Loading