Commit Graph
35694 Commits
Author SHA1 Message Date
nik707andGitHub fa8a6dd3e1 Merge pull request #12788 from silicons/gasmixture_vv
"""user-friendly""" vv handling for new c++ atmos gas mixtures
2020-07-16 01:19:20 -05:00
CitadelStationBot a99256b3b1 Automatic changelog generation for PR #12791 [ci skip] 2020-07-15 23:56:26 -05:00
nik707andGitHub bae425dc22 Merge pull request #12791 from timothyteakettle/funniest-shit-ive-ever-seen
funniest shit i've ever seen
2020-07-15 23:56:23 -05:00
timothyteakettle 8bfc30c8ac i can't spell 2020-07-16 02:54:31 +01:00
timothyteakettle 03bd806c73 pickle 2020-07-16 02:51:07 +01:00
silicons 7f9571f239 ok 2020-07-15 17:17:09 -07:00
siliconsandGitHub 4785a753ba Update SDQL_2.dm 2020-07-15 17:12:48 -07:00
Changelogs 885f5e1e64 Automatic changelog compile [ci skip] 2020-07-16 00:10:29 +00:00
silicons b279c82bb2 whew 2020-07-15 17:10:08 -07:00
silicons dba5855929 epic 2020-07-15 17:01:22 -07:00
silicons 96fb3cad8f ok 2020-07-15 17:00:17 -07:00
silicons 6fbd7914f5 stuff 2020-07-15 16:58:44 -07:00
CameronWoof a493ecdc4a suture and mesh additions 2020-07-15 16:44:24 -07:00
Timothy Teakettle a7e2668eff funniest 2020-07-15 23:50:39 +01:00
silicons f653fd5c3c kay 2020-07-15 14:58:51 -07:00
CitadelStationBot 74a1396928 Automatic changelog generation for PR #12783 [ci skip] 2020-07-15 16:48:58 -05:00
siliconsandGitHub 147a905b5d Merge pull request #12783 from Sneakyrat6/oocNotesExploit
Fixes seeing real name in OOC Notes
2020-07-15 14:48:55 -07:00
silicons 8f478ce66a quirky uh oh 2020-07-15 14:47:59 -07:00
CitadelStationBot 730f9d4837 Automatic changelog generation for PR #12774 [ci skip] 2020-07-15 14:03:04 -05:00
LinandGitHub 8d8195d42d Merge pull request #12774 from DeltaFire15/zeolite-runtimefix
Fixes a zeolite runtime
2020-07-15 14:03:00 -05:00
CitadelStationBot bd6e67b219 Automatic changelog generation for PR #12782 [ci skip] 2020-07-15 14:00:01 -05:00
siliconsandGitHub 8290809a84 Merge pull request #12782 from timothyteakettle/unfucks-money
[s] coin related patch
2020-07-15 11:59:58 -07:00
Timothy Teakettle 0184739005 undo the woopsy 2020-07-15 19:53:37 +01:00
Sneakyrat6 538e7c62cd Fixes seeing real name in OOC Notes 2020-07-15 13:32:56 -05:00
CitadelStationBot f187de33ad Automatic changelog generation for PR #12738 [ci skip] 2020-07-15 10:50:24 -05:00
siliconsandGitHub 6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
2020-07-15 08:50:20 -07:00
BlackMajor 06a4e57de9 changing this just means they can pick up jetpacks 2020-07-16 02:11:38 +12:00
BlackMajor bd7c9d11d3 oh no 2020-07-16 02:02:29 +12:00
b1tt3r1n0 d678806143 Circle Game, Updated
Title
2020-07-14 23:40:09 -04:00
Changelogs 7dda2ba76a Automatic changelog compile [ci skip] 2020-07-15 00:10:58 +00:00
Timothy Teakettle 6be10d041c add to clothesmate 2020-07-14 21:10:37 +01:00
Timothy Teakettle 0a4a0fadb3 snails 2020-07-14 20:59:25 +01:00
Timothy Teakettle 55af5f8ea2 give me my snails 2020-07-14 20:26:31 +01:00
CitadelStationBot 70e14aa329 Automatic changelog generation for PR #12760 [ci skip] 2020-07-14 14:22:20 -05:00
LinandGitHub b6d8167c1e Merge pull request #12760 from Sonic121x/patch-2
Fix Paramedic Jumpsuit
2020-07-14 14:22:17 -05:00
Timothy Teakettle 11148b0a26 optimisaiton 2020-07-14 18:51:46 +01:00
Timothy Teakettle 1f8e47c0f5 actually works 2020-07-14 18:40:20 +01:00
Artur 57e0cafb15 Fixes clockwork sleepers 2020-07-14 20:01:04 +03:00
siliconsandGitHub a381ed324d Update game_mode.dm 2020-07-14 09:28:50 -07:00
DeltaFire ac2dd85743 runtime fixies 2020-07-14 18:25:13 +02:00
Timothy Teakettle dd1cce50e8 better solution 2020-07-14 17:23:18 +01:00
Timothy Teakettle 657810bb13 please fix it 2020-07-14 17:08:57 +01:00
LinandGitHub 4f0aa3350c Merge pull request #12770 from Citadel-Station-13/silicons-patch-26
FUCK
2020-07-14 11:04:53 -05:00
Artur 8af78d1189 Merge remote-tracking branch 'origin/TGUI-3.0' into TGUI-3.0 2020-07-14 18:10:29 +03:00
Artur f5ee74803f Updates minter to tg and the prereqs 2020-07-14 18:08:12 +03:00
Timothy Teakettle 98f63772b3 fix wrestling rotation 2020-07-14 14:35:13 +01:00
ArturlangandGitHub 75eb276c98 Merge branch 'master' into TGUI-3.0 2020-07-14 16:17:23 +03:00
Artur d0f1a805e4 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-14 16:15:48 +03:00
Artur c964cadd85 Makes amber alert work 2020-07-14 16:15:32 +03:00
siliconsandGitHub c333a71c74 Update life.dm 2020-07-14 04:30:38 -07:00