Commit Graph

1826 Commits

Author SHA1 Message Date
silicons
9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
Miner Loot Shuffle MK III
2020-09-06 01:58:46 -07: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
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
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
83e72b4f96 Merge branch '13164' 2020-08-16 18:51:36 -07: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
Detective Google
81f7307575 yeah 2020-08-14 15:38:27 -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
EmeraldSundisk
0763436a1c Update CogStation.dmm 2020-08-13 23:06:09 -07:00
Trilbyspaceclone
1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
silicons
130c3a9480 Merge pull request #13096 from Michiyamenotehifunana/possum
Ports Opossums from Desert Rose
2020-08-11 16:19:42 -07:00
Detective Google
8976bea9a4 someone doesnt know how to fucking map edit 2020-08-11 10:35:52 -05:00
silicons
c18b26efe9 Merge pull request #13071 from ancientpower/box-medbay-doors
Adds doors to the west of box medbay
2020-08-11 01:45:23 -07:00
Letter N
7008dac8dd what if the maps aren't causing runtims 2020-08-11 11:49:25 +08:00
silicons
16306ad38b e 2020-08-10 18:14:34 -07:00
Detective Google
369af2a83a adds more heatpipes to snaxi sm 2020-08-10 14:50:37 -05:00
Michiyamenotehifunana
0f274d5891 Fixes some code anomalies
Adds newline to possum code, reverts var invalidation in kilostation's pets
2020-08-10 09:40:23 +08:00
Letter N
3a4dca33fa maps, will deal with tgui later 2020-08-09 21:09:55 +08:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons
1c2e42136c Merge pull request #13047 from Sishen1542/tbat
replaces box whiteship tbaton with truncheon
2020-08-09 05:45:50 -07:00
Letter N
186482ecef map fix 2020-08-09 19:50:45 +08:00