Commit Graph

1298 Commits

Author SHA1 Message Date
silicons 0c3020d4b8 Merge pull request #13349 from LetterN/git-updates
Updates git, travis, and build tests
2020-10-11 01:24:09 -07:00
BlackMajor 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
silicons 2bd7280fb1 Merge remote-tracking branch 'citadel/master' into lettern-git-updates 2020-10-03 20:52:49 -07:00
silicons 21d3d8fcd9 sigh 2020-10-03 14:17:13 -07:00
Letter N dee73e234b updatestuff 2020-10-03 11:01:23 +08:00
Detective Google 57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
silicons 75d4cc5f66 Merge pull request #13391 from dapnee/let's-change-lambda
Lambda Mk.II
2020-10-01 02:33:43 -07:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
dapnee 28e2e1c652 more fixes
adresses issues that were brought up, will update changelog later
2020-09-26 19:31:27 -06:00
Artur 435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons 60106253e3 Merge pull request #13356 from EmeraldSundisk/omegasci
Adds the RD's office to OmegaStation.
2020-09-15 17:30:24 -07:00
dapnee e65acb7b97 aaaaaa
aaa
2020-09-14 17:01:01 -06:00
dapnee 1d0e5a9b23 whoops
small stuff, but important either way
2020-09-14 16:42:45 -06:00
dapnee fd94cc73ad Lambda Is Now Multi-Z 2020-09-14 15:43:56 -06:00
Tupinambis fe7a21ebc7 Coggers Fixes + Mass Driver Things 2020-09-07 22:33:54 -05:00
Letter N 047a7c0fc0 nammed areas moment 2020-09-06 09:37:54 +08:00
EmeraldSundisk 79f246c5ae Add files via upload 2020-09-05 17:35:26 -07:00
EmeraldSundisk 218d8a0504 Update OmegaStation.dmm 2020-09-05 16:31:07 -07:00
EmeraldSundisk 7b8a8232a6 Update OmegaStation.dmm 2020-09-02 19:26:23 -07:00
EmeraldSundisk 281d829fe6 Revert "uh what?"
This reverts commit 0efa9eb5e5.
2020-09-02 14:07:59 -07:00
EmeraldSundisk 0efa9eb5e5 uh what? 2020-09-02 14:07:09 -07:00
Artur 2f6791d004 Why are pixel_y = 0 and pixel_x = 0 motherfucking appearing 2020-09-02 22:07:30 +03:00
silicons cce4c944ad Merge pull request #13297 from Detective-Google/more-snaxi-changes
another batch of snaxi improvements
2020-08-29 21:40:39 -07:00
silicons 1e83a30f9e Merge pull request #13269 from EmeraldSundisk/poolmeta
Adds a pool to MetaStation(?).
2020-08-29 21:21:35 -07:00
Detective Google 9dff898afe improvements 2020-08-29 14:13:24 -05:00
EmeraldSundisk b89e8bed9c Add files via upload 2020-08-26 16:05:19 -07:00
EmeraldSundisk da76209681 Update MetaStation.dmm 2020-08-26 15:28:24 -07:00
EmeraldSundisk 01c3f70235 Add files via upload 2020-08-24 18:58:13 -07:00
EmeraldSundisk 70c1dc0238 Update CogStation.dmm 2020-08-24 18:21:18 -07:00
MrJWhit 9db6941dad Fuck 2020-08-23 00:48:58 -04:00
silicons 4a52580c89 Merge pull request #13205 from EmeraldSundisk/cogfeex
Small fixes for CogStation.
2020-08-22 15:20:50 -07:00
MrJWhit ff54b29e72 Haha terfs 2020-08-20 20:19:51 -04:00
MrJWhit 5bf32e1de8 Pubbystation Update 2020-08-20 01:58:00 -04:00
MrJWhit 4700aa5c16 OmegaStation Update 2020-08-20 01:25:31 -04:00
MrJWhit a6ed6a6928 Kilo station update 2020-08-20 01:21:07 -04:00
MrJWhit 5897c2f3e0 Delta station update 2020-08-20 01:09:55 -04:00
MrJWhit 4829c51f3a Metatstation update 2020-08-20 00:31:52 -04:00
MrJWhit 63e17875ac Boxstation expand 2020-08-19 21:46:28 -04:00
EmeraldSundisk c521d2502e Add files via upload 2020-08-18 18:27:06 -07:00
EmeraldSundisk 5e9af664ec Update CogStation.dmm 2020-08-17 20:39:54 -07:00
silicons d16a1ae301 Merge pull request #13190 from Detective-Google/art
adds art to ghost cafe
2020-08-17 03:15:47 -07:00
silicons 56d49aac2e Merge pull request #13186 from Detective-Google/telebort
a few snaxi improvements; chiefly labelling the telepads better.
2020-08-17 03:15:37 -07:00
silicons f611945b34 Merge pull request #13180 from Detective-Google/glass-floors
ports multiz glass floors (tgstation/tgstation#50831)
2020-08-17 03:14:15 -07:00
Detective Google eed7e4ad02 also painting frames 2020-08-17 00:39:25 -05:00
Detective Google ee7c528185 adds art to ghost cafe 2020-08-17 00:36:09 -05:00
Detective Google 3ac272c9be a few other little cleanups while I'm opening a PR 2020-08-16 21:03:11 -05:00
Detective Google 83332453b6 clarifies a bit more where each pad goes on snaxi. 2020-08-16 21:01:09 -05:00
silicons fa11480781 Merge pull request #13109 from Detective-Google/sm-fix
adds more heatpipes to snaxi sm
2020-08-16 18:36:16 -07:00
Detective Google 016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
Lin 07a4789278 Merge pull request #13112 from silicons/cog
what the fuck is an energy gun
2020-08-14 12:57:48 -05:00