Commit Graph
23554 Commits
Author SHA1 Message Date
timothyteakettle 584e74590f port1 2020-07-17 02:01:33 +01:00
siliconsandGitHub e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
DeltaFire 9e05d9f748 fixes swarmers not being able to eat any items 2020-07-16 23:26:46 +02:00
Timothy Teakettle ebd648c03d name edgecase too 2020-07-16 18:32:24 +01:00
Timothy Teakettle a8a495c0ac rewrites pickle handling 2020-07-16 18:22:58 +01:00
Artur 9e73788714 Gah 2020-07-16 17:40:05 +03:00
BlackMajor fc909cd7c6 Added material sheets and tiles. This took more work than you'd think. 2020-07-17 01:17:54 +12:00
ArturlangandGitHub 92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
Artur af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N 7eab0263ba https://github.com/tgstation/tgstation/pull/51213 2020-07-16 20:51:25 +08:00
Letter N 819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08:00
Letter N abd0ac089d https://github.com/tgstation/tgstation/pull/51687 2020-07-16 20:36:08 +08:00
Letter N 8083efd1ad https://github.com/tgstation/tgstation/pull/51864 2020-07-16 20:29:56 +08:00
Letter N 9575c52b13 https://github.com/tgstation/tgstation/pull/52059 - the forgotten part 2020-07-16 20:21:39 +08:00
Letter N 2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
TheSpaghettiandGitHub 1e07a277f4 Makes extradimensional oranges weirder. 2020-07-16 03:17:28 -04:00
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
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
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
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
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
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
Winter Flare d6413d5559 Adds Cracker Box, Soup
Fixes stray pixels on some sushi sprites.
Adds Spiral Soup, Bear Chili
Adds Cracker Box
2020-07-14 22:43:34 -04: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
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
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
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