Commit Graph

1740 Commits

Author SHA1 Message Date
Lin
0f07c8fca6 Merge pull request #12962 from dapnee/morechangestokilo
Another Pass Over Kilo
2020-07-31 14:25:56 -05:00
dapnee
3fdd1654ad aaaaaaa
I missed a SINGLE SINK
2020-07-30 16:44:24 -06:00
dapnee
5a58cd6da0 Another pass over kilo
Added an air alarm to science near the bepis, fixed the active tiles around the arrivals shuttle, and fixed the commissary APC being only renamed and not area stringed correctly
2020-07-29 14:35:17 -06:00
dapnee
f53280c9b7 adds another atmos tech spawn
treading on justin's pr by accident, oops
2020-07-28 13:46:10 -06:00
dapnee
170afed3bc oops
forgot the sinks in the locker room
2020-07-28 12:16:31 -06:00
dapnee
1540d66e88 Minor Fixes to Box
backwards sinks and such
2020-07-28 12:00:35 -06:00
silicons
785c2b6e0b Merge pull request #12934 from dapnee/a-fan
Miscellaneous fixes to Kilo Station and a Fan for the Listening Outpost
2020-07-26 23:01:08 -07:00
silicons
e083689b4b Merge pull request #12923 from EmeraldSundisk/snaxattack
Adds more toilets, among other things to Snow Taxi.
2020-07-26 23:00:16 -07:00
silicons
d9f9b2e974 Merge pull request #12916 from MrJWhit/meta-station-atmos-and-toxins-update
Metastation atmos and toxins map update
2020-07-26 22:57:36 -07:00
dapnee
940d4c4d72 kilostation fixes
haha, why did this get through?
2020-07-26 19:30:55 -06:00
dapnee
8fbdc6257c Update listeningstation.dmm
it's a fan
2020-07-26 18:26:52 -06:00
EmeraldSundisk
29a3050209 Add files via upload 2020-07-26 11:30:24 -07:00
MrJWhit
d14256e8a9 Minor map adjustments to meta 2020-07-26 01:10:56 -04:00
MrJWhit
503d39e8bc Update MetaStation.dmm 2020-07-26 00:51:58 -04:00
EmeraldSundisk
40b956c1ba Update Snaxi.dmm 2020-07-25 19:31:21 -07:00
dapnee
6f0860d1d3 What if Meta Arrivals Weren't An Eye Sore?
Whack of you to assume this is kosher to make arrivals look like shit like that.
2020-07-23 16:36:54 -06:00
silicons
3c5aa67eef Merge pull request #12867 from EmeraldSundisk/omega717
Expands OmegaStation's medical wing.
2020-07-23 10:29:29 -07:00
silicons
9392eb3bb1 Merge pull request #12866 from Sneakyrat6/snaxiTypo
Fixes Snaxi DMM Typos
2020-07-23 10:29:19 -07:00
EmeraldSundisk
29023f9522 Add files via upload 2020-07-22 16:49:40 -07:00
EmeraldSundisk
f422ffb998 Update OmegaStation.dmm 2020-07-22 15:24:20 -07:00
Sneakyrat6
1a641231a9 Fixes Snaxi DMM Typos 2020-07-22 16:20:32 -05:00
EmeraldSundisk
bcec131eff Update OmegaStation.dmm 2020-07-20 22:06:00 -07:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
EmeraldSundisk
166ad02d6b Update OmegaStation.dmm 2020-07-19 22:26:35 -07:00
EmeraldSundisk
f9222485bf Update OmegaStation.dmm 2020-07-18 22:56:27 -07:00
silicons
f8ad4d3186 Merge pull request #12761 from EmeraldSundisk/deltadive
A pool and lighting fixes for Delta Station.
2020-07-17 17:11:22 -07:00
silicons
b22848b3f7 Merge pull request #12758 from MrJWhit/pubby-extra-light
Adds another light to pubby next to the kitchen
2020-07-17 17:09:25 -07:00
EmeraldSundisk
4febb24dcf Add files via upload 2020-07-13 08:38:22 -07:00
Artur
732a1ca438 Fixes linter and conflict shit 2020-07-13 16:35:12 +03:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
MrJWhit
d13eb1868c Adds another light to pubby 2020-07-13 02:05:29 -04:00
EmeraldSundisk
4cd7670eaf Update DeltaStation2.dmm 2020-07-12 21:03:09 -07:00
silicons
f5974ab531 Merge pull request #12713 from MrJWhit/popping-the-monastery-tunnel
Popping the north monastery tunnel on Pubby
2020-07-11 00:48:22 -07:00
silicons
e4612a7c32 Merge pull request #12726 from Detective-Google/lambda
lambda now has a center gateway and (should) works
2020-07-11 00:46:50 -07:00
Detective Google
1faa8915f8 gateway center 2020-07-09 23:28:45 -05:00
EmeraldSundisk
bf97828e5e Add files via upload 2020-07-09 21:06:27 -07:00
EmeraldSundisk
4f17e7ab1d Update CogStation.dmm 2020-07-09 18:34:29 -07:00
EmeraldSundisk
b22f73e27f Update CogStation.dmm 2020-07-09 18:17:42 -07:00
EmeraldSundisk
e0428e946e Update CogStation.dmm 2020-07-09 12:46:29 -07:00
Artur
9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
silicons
af9348c443 Merge pull request #12708 from EmeraldSundisk/poolby
Adds a pool to PubbyStation.
2020-07-09 02:26:39 -07:00
MrJWhit
886b196863 Lost decal 2020-07-08 13:49:10 -04:00
MrJWhit
22505097ec plz final update 2020-07-08 13:44:08 -04:00
MrJWhit
bbc9b47eee Update PubbyStation.dmm 2020-07-08 13:41:45 -04:00
MrJWhit
27abb80953 Removing the ugly pubby monastery hallway 2020-07-08 13:34:31 -04:00
Artur
7dd37cad34 Kilo fix 2020-07-07 23:29:21 +03:00
Lin
33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833
mowing down experimental cloner copypasta.
2020-07-07 13:23:25 -05:00
Artur
f230e2bb06 fIXES KILO 2020-07-07 20:29:21 +03:00
EmeraldSundisk
e0a0d0bed8 Add files via upload 2020-07-07 09:05:31 -07:00
Artur
2158278a6f Fixes cog 2020-07-07 18:44:54 +03:00