93b4570f8d
more changes
2020-07-17 23:23:47 +01:00
a4478b0cda
it continues
2020-07-17 22:38:28 +01:00
f1abe0651b
Update gas_mixture.dm
2020-07-17 12:54:48 -07:00
6cd9993e50
5
2020-07-17 15:54:45 -04:00
329ba4d823
Update gas_mixture.dm
2020-07-17 12:53:43 -07:00
a2c3643e20
fix
2020-07-17 12:46:32 -07:00
76c6c767d9
Merge pull request #12784 from silicons/shields
...
fixes active block toggle not existing
2020-07-17 14:43:40 -05:00
cc6079d413
Update human_movement.dm
2020-07-17 09:10:03 -07:00
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
484da28600
Merge branch 'master' into shoelaces
2020-07-16 17:31:41 -07:00
e03948dcba
Merge pull request #12229 from Arturlang/TGUI-3.0
...
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
9e05d9f748
fixes swarmers not being able to eat any items
2020-07-16 23:26:46 +02:00
ebd648c03d
name edgecase too
2020-07-16 18:32:24 +01:00
a8a495c0ac
rewrites pickle handling
2020-07-16 18:22:58 +01:00
9e73788714
Gah
2020-07-16 17:40:05 +03:00
fc909cd7c6
Added material sheets and tiles. This took more work than you'd think.
2020-07-17 01:17:54 +12:00
92ed5d3201
Merge branch 'master' into TGUI-3.0
2020-07-16 15:59:37 +03:00
af65b626e3
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-16 15:56:08 +03:00
7eab0263ba
https://github.com/tgstation/tgstation/pull/51213
2020-07-16 20:51:25 +08:00
819ca63456
https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing
2020-07-16 20:42:02 +08:00
abd0ac089d
https://github.com/tgstation/tgstation/pull/51687
2020-07-16 20:36:08 +08:00
8083efd1ad
https://github.com/tgstation/tgstation/pull/51864
2020-07-16 20:29:56 +08:00
9575c52b13
https://github.com/tgstation/tgstation/pull/52059 - the forgotten part
2020-07-16 20:21:39 +08:00
2afab07b4a
https://github.com/tgstation/tgstation/pull/52255
2020-07-16 20:05:37 +08:00
1e07a277f4
Makes extradimensional oranges weirder.
2020-07-16 03:17:28 -04:00
17ef5b4742
removes the still unused caches and daemons.
...
apparently I didn't /actually/ remove the structures fully but here's the rest of them. Oh well, RIP old clockcult buildings, maybe someone will have a use for you in the future.
2020-07-16 02:34:20 -04:00
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
8bfc30c8ac
i can't spell
2020-07-16 02:54:31 +01:00
03bd806c73
pickle
2020-07-16 02:51:07 +01:00
7f9571f239
ok
2020-07-15 17:17:09 -07:00
4785a753ba
Update SDQL_2.dm
2020-07-15 17:12:48 -07:00
b279c82bb2
whew
2020-07-15 17:10:08 -07:00
dba5855929
epic
2020-07-15 17:01:22 -07:00
96fb3cad8f
ok
2020-07-15 17:00:17 -07:00
6fbd7914f5
stuff
2020-07-15 16:58:44 -07:00
a493ecdc4a
suture and mesh additions
2020-07-15 16:44:24 -07:00
a7e2668eff
funniest
2020-07-15 23:50:39 +01:00
f653fd5c3c
kay
2020-07-15 14:58:51 -07:00
8f478ce66a
quirky uh oh
2020-07-15 14:47:59 -07:00
6121cbd091
Merge pull request #12738 from timothyteakettle/travelling-traders
...
the travelling trader midround event
2020-07-15 08:50:20 -07:00
bd7c9d11d3
oh no
2020-07-16 02:02:29 +12:00
14384abb59
removes the commented out Geis and Cache summon scriptures
...
Geis won't really work well how it is currently, and Caches could be added in the future as a form of storage/delivery system or power generation.
2020-07-15 00:12:30 -04:00
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
6be10d041c
add to clothesmate
2020-07-14 21:10:37 +01:00
55af5f8ea2
give me my snails
2020-07-14 20:26:31 +01:00
b6d8167c1e
Merge pull request #12760 from Sonic121x/patch-2
...
Fix Paramedic Jumpsuit
2020-07-14 14:22:17 -05:00
8af78d1189
Merge remote-tracking branch 'origin/TGUI-3.0' into TGUI-3.0
2020-07-14 18:10:29 +03:00
f5ee74803f
Updates minter to tg and the prereqs
2020-07-14 18:08:12 +03:00
75eb276c98
Merge branch 'master' into TGUI-3.0
2020-07-14 16:17:23 +03:00
d0f1a805e4
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-14 16:15:48 +03:00
Timothy Teakettle