cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,620 Commits 55 Branches 0 Tags
eb20501cc03d8eb61eb13a96a7f612b5461913cb
Commit Graph

1961 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
1bd715ffc6 Merge pull request #13525 from Detective-Google/hilberts-juke 
fixes the hilbert's jukebox(?)
 2020-10-10 22:01:09 -07:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
silicons
6d5cee7775 Merge pull request #13500 from LetterN/map-updates 
Updates Lambda station
 2020-10-06 17:04:22 -07:00
silicons
eae67e38f4 Merge pull request #13509 from EmeraldSundisk/helter 
Slight adjustment to the "Skelter" ruin.
 2020-10-06 17:02:24 -07:00
Detective Google
ddc9b9d184 yeet 2020-10-06 01:23:29 -05: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
EmeraldSundisk
ec45402192 Add files via upload 2020-10-03 13:32:02 -07:00
Letter N
dee73e234b updatestuff 2020-10-03 11:01:23 +08:00
EmeraldSundisk
1bf6ca9181 Update skelter.dmm 2020-10-02 14:46:37 -07:00
Detective Google
86871a92fc fixes the door bolts on the snow cabin 2020-10-02 11:41:43 -05:00
Detective Google
57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
silicons
4dd9f20d22 Merge pull request #13470 from EmeraldSundisk/skelter 
Helter-Skelter.
 2020-10-01 03:09:51 -07: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
EmeraldSundisk
f310e940d1 Add files via upload 2020-09-30 14:52:58 -07:00
EmeraldSundisk
d7e9f39667 pixel fix 2020-09-30 12:43:18 -07:00
EmeraldSundisk
d2ae67aeea Add files via upload 2020-09-29 14:25:00 -07:00
EmeraldSundisk
ff1094b33b Create skelter.dmm 2020-09-29 14:10:20 -07: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
silicons
9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces 
Miner Loot Shuffle MK III
 2020-09-06 01:58:46 -07: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
Trilbyspaceclone
9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04: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
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04: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
e24064afa8 Merge pull request #13203 from MrJWhit/final-teg-fixups 
Prettying up the TEG
 2020-08-22 15:21:09 -07: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