a85c49399d
Merge pull request #13746 from keronshb/boxchanges
...
Reworks Northwest Box Station Maint and adds a bridge between Atmos and the Turbine
2020-12-13 23:09:54 -07:00
c2727ca278
Merge pull request #13743 from Linzolle/thunderdome
...
thunderdome entertainment monitors fix + stuff
2020-12-12 01:55:53 -07:00
2a35a23509
Add files via upload
2020-12-10 13:35:47 -08:00
d94c9a5d43
Fixes the paper
...
oops should've caught this
2020-12-10 15:26:34 -05:00
bb78b98d6c
Box Maint (+1) changes
...
Changes the northwest box maint and adds a bridge between atmos and the turbine.
2020-12-09 23:02:51 -05:00
c15f946104
Update DeltaStation2.dmm
2020-12-09 10:35:45 -08:00
0ddc053a8b
what if mapmerge worked
2020-12-08 17:35:21 -06:00
3e951d334c
fix entertainment monitors
2020-12-08 17:21:14 -06:00
00337392c7
Sneaky opposum
2020-11-26 00:58:48 -05:00
75d807df4e
Merge pull request #13694 from TheObserver-sys/PublicMiningRevival
...
Local Assistant man can now bash rock again!*
2020-11-21 18:25:13 -07:00
56b6a42bb8
Tweaks, making sure code is right. Pain is infinite.
...
Tin
2020-11-20 03:54:28 -05:00
d3b0ac882f
HERE WE GOOOOOOOOOO!
...
New maps, new meme.
2020-11-20 03:05:44 -05:00
9d300ade35
Merge pull request #13677 from silicons/newlines
...
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
330da48518
Add files via upload
2020-11-14 15:38:33 -08:00
00398cb45a
Add files via upload
2020-11-14 15:14:53 -08:00
993ac9b52d
Add files via upload
2020-11-14 13:32:34 -08:00
81c9bfecdc
Update CogStation.dmm
2020-11-14 10:37:05 -08:00
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
be9e5acc19
A few fixes to kilo
2020-11-01 21:02:18 -05:00
44eb62b388
a ( #13647 )
2020-11-01 22:00:20 +01:00
453d5081a7
Merge pull request #13628 from MrJWhit/messing-with-boxstations-maint
...
Adjusting Boxstation's Southeast Maint (three new rooms)
2020-10-28 07:54:04 -07:00
5806ea8f50
Even cooler.jpg
2020-10-26 20:39:20 -04:00
5da37ddeb2
Minor fix
2020-10-26 18:57:06 -04:00
65f82daa44
Update BoxStation.dmm
2020-10-25 17:59:53 -04:00
1e65afda9d
Update BoxStation.dmm
2020-10-25 17:58:00 -04:00
c540bcd0f2
Secret botany
2020-10-25 17:54:02 -04:00
33cfcc72be
Making box maint cooler, bot party room and maint rage cage part 1
2020-10-25 14:31:43 -04:00
f49f72338f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841
2020-10-25 15:01:57 +01:00
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
c860cc78df
Giving science a space loop on every map ( #13611 )
...
* Boxstation Fix
* DeltaStation and Boxstation Update
* Kilo fix and minor omegastation fix
* Lambda fixing
* Metastation update
* Second to last update
* Pubby and final touches
2020-10-25 14:15:01 +01:00
0c3020d4b8
Merge pull request #13349 from LetterN/git-updates
...
Updates git, travis, and build tests
2020-10-11 01:24:09 -07:00
bf7d68884b
Merge pull request #13510 from silicons/google
...
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
2020-10-11 18:39:10 +13:00
2bd7280fb1
Merge remote-tracking branch 'citadel/master' into lettern-git-updates
2020-10-03 20:52:49 -07:00
21d3d8fcd9
sigh
2020-10-03 14:17:13 -07:00
dee73e234b
updatestuff
2020-10-03 11:01:23 +08:00
57132d0b32
Merge remote-tracking branch 'upstream/master' into clothing
2020-10-01 14:06:21 -05:00
75d4cc5f66
Merge pull request #13391 from dapnee/let's-change-lambda
...
Lambda Mk.II
2020-10-01 02:33:43 -07:00
c4480afc09
Adds a bunch of RP clothes and ports the detvendor
2020-09-30 20:50:00 -05:00
28e2e1c652
more fixes
...
adresses issues that were brought up, will update changelog later
2020-09-26 19:31:27 -06:00
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
60106253e3
Merge pull request #13356 from EmeraldSundisk/omegasci
...
Adds the RD's office to OmegaStation.
2020-09-15 17:30:24 -07:00
e65acb7b97
aaaaaa
...
aaa
2020-09-14 17:01:01 -06:00
1d0e5a9b23
whoops
...
small stuff, but important either way
2020-09-14 16:42:45 -06:00
fd94cc73ad
Lambda Is Now Multi-Z
2020-09-14 15:43:56 -06:00
fe7a21ebc7
Coggers Fixes + Mass Driver Things
2020-09-07 22:33:54 -05:00
047a7c0fc0
nammed areas moment
2020-09-06 09:37:54 +08:00
79f246c5ae
Add files via upload
2020-09-05 17:35:26 -07:00
218d8a0504
Update OmegaStation.dmm
2020-09-05 16:31:07 -07:00
7b8a8232a6
Update OmegaStation.dmm
2020-09-02 19:26:23 -07:00
281d829fe6
Revert "uh what?"
...
This reverts commit 0efa9eb5e5
2020-09-02 14:07:59 -07:00
silicons