 Enric Gabriel
|
0b427c9f6f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-15 23:32:38 -03:00 |
|
|
SandPoot
|
6809afb45c
|
Many borg changes (seriously) (#69)
|
2020-09-15 23:25:59 -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 |
|
|
Enric Gabriel
|
8e25c340e1
|
oops
|
2020-09-11 19:05:53 -03:00 |
|
|
Enric Gabriel
|
ef96fd6389
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-11 18:51:33 -03:00 |
|
|
Tupinambis
|
fe7a21ebc7
|
Coggers Fixes + Mass Driver Things
|
2020-09-07 22:33:54 -05:00 |
|
|
Enric Gabriel
|
499fec6a16
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-06 10:42:43 -03: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 |
|
|
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 |
|
|
Enric Gabriel
|
2cede2e06f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 01:42:50 -03:00 |
|
|
Enric Gabriel
|
c10471fac9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 01:42:29 -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 |
|
|
Enric Gabriel
|
0db4397e7c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-27 14:07:17 -03: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 |
|
|
Enric Gabriel
|
d210e46705
|
there
|
2020-08-23 21:19:11 -03:00 |
|
|
Enric Gabriel
|
78124ace3f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-23 12:54:24 -03:00 |
|
|
MrJWhit
|
9db6941dad
|
Fuck
|
2020-08-23 00:48:58 -04:00 |
|
|
Enric Gabriel
|
8e2774bf0a
|
try to fix broken box
|
2020-08-22 20:41:17 -03:00 |
|
|
Enric Gabriel
|
f759503b49
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-22 20:30:49 -03: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 |
|
|
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
|
dc61b0fbd7
|
Captain Plasma -> Mumkey Jones
|
2020-08-19 23:25:27 -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 |
|
|
MrJWhit
|
92a664bb68
|
Update engine_teg.dmm
|
2020-08-18 04:32:47 -04:00 |
|
|
MrJWhit
|
5adb1c75d5
|
Update engine_teg.dmm
|
2020-08-18 03:45:37 -04:00 |
|
|
EmeraldSundisk
|
5e9af664ec
|
Update CogStation.dmm
|
2020-08-17 20:39:54 -07:00 |
|
|
Enric Gabriel
|
cf2c21ea52
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-17 12:06:32 -03: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 |
|