56f56d5cbe
Update gateway.dm
2020-07-18 10:24:36 -07:00
e165524763
Merge pull request #12803 from Citadel-Station-13/silicons-patch-32
...
removes tango dancing
2020-07-18 11:17:42 -05:00
0364fe8579
lower cost
2020-07-18 03:50:17 -04:00
55ed77a89d
Update robot_modules.dm
2020-07-18 16:15:47 +10:00
f84b044f34
Update robot_modules.dm
2020-07-18 16:05:57 +10:00
f68962e9d3
This is a bad idea
2020-07-18 16:46:08 +12:00
74b2764591
sprites and some missed things
2020-07-18 03:08:03 +01:00
d65f0e956c
replaces the abscond default quickbind to gateway default quickbind
2020-07-17 21:54:05 -04:00
e8fade4f7f
changes
2020-07-18 02:29:12 +01:00
8bb9b11922
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
2020-07-18 01:26:41 +01:00
7714fcfaba
more changes
2020-07-18 01:26:38 +01:00
431c52b7e2
Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh
2020-07-17 17:22:43 -07:00
b98102a824
Merge pull request #12762 from zeroisthebiggay/a
...
drops martial art minpops down to twenty pop
2020-07-17 17:11:02 -07:00
c924290cd1
Merge pull request #12733 from TheObserver-sys/Finally,moreblorble
...
Slime Extractification
2020-07-17 17:10:32 -07:00
8caf063765
Merge pull request #12757 from Owai-Seek/better-snack-comments
...
Updates some comments.
2020-07-17 17:09:50 -07:00
93d669d205
Merge pull request #12759 from YakumoChen/hierophant-hugbox
...
set hierophant friendly fire check to on by default
2020-07-17 17:09:17 -07:00
655afda020
Merge pull request #12780 from BlackMajor/borgo
...
Even more engiborg power creep
2020-07-17 17:08:23 -07:00
04df84d1e0
Merge pull request #12776 from timothyteakettle/snail-shells
...
snail shell backpack
2020-07-17 17:07:46 -07:00
61f4fbc67a
Merge branch 'master' into foodport-p2-7/12/20
2020-07-17 19:27:50 -04:00
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
silicons