Commit Graph

15410 Commits

Author SHA1 Message Date
timothyteakettle
a155f24253 let santa hat go on 2020-07-22 16:53:51 +01:00
timothyteakettle
a607130e3c please compile 2020-07-22 16:24:35 +01:00
timothyteakettle
ed1e8c4221 support for masks 2020-07-22 15:43:58 +01:00
timothyteakettle
6a4264085c woops 2: electric boogaloo 2020-07-22 00:17:03 +01:00
timothyteakettle
0706ac9d2a woops 2020-07-22 00:14:26 +01:00
timothyteakettle
6891bff9d3 further emotes 2020-07-22 00:07:15 +01:00
timothyteakettle
3a520bba3f more hats 2020-07-21 23:45:04 +01:00
Timothy Teakettle
5c88253f93 lots more hats 2020-07-21 22:58:13 +01:00
Timothy Teakettle
0942b46796 more fashions 2020-07-21 18:43:58 +01:00
timothyteakettle
8e2c76db7c two more 2020-07-21 16:42:59 +01:00
timothyteakettle
99a2068dd2 its cool and hip 2020-07-21 16:26:51 +01:00
timothyteakettle
4daf71d99e woo it works 2020-07-21 03:34:50 +01:00
timothyteakettle
47ff13c539 apply the overlay 2020-07-21 02:37:21 +01:00
timothyteakettle
1ed035e4a3 move 2020-07-21 02:29:41 +01:00
timothyteakettle
3e0403a7e9 BEEPSKY FASHION 2020-07-21 02:22:42 +01:00
BlackMajor
f265b85d3b Merge pull request #12810 from lolman360/master
service borg fix/tweak
2020-07-20 11:42:59 +12:00
Lin
f2e0e5c247 Merge pull request #12814 from Citadel-Station-13/silicons-patch-35
fixes gateways switching to active power use when thy should not be using power at all
2020-07-19 11:10:51 -05:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
silicons
56f56d5cbe Update gateway.dm 2020-07-18 10:24:36 -07:00
Lin
e165524763 Merge pull request #12803 from Citadel-Station-13/silicons-patch-32
removes tango dancing
2020-07-18 11:17:42 -05:00
lolman360
55ed77a89d Update robot_modules.dm 2020-07-18 16:15:47 +10:00
lolman360
f84b044f34 Update robot_modules.dm 2020-07-18 16:05:57 +10:00
silicons
b98102a824 Merge pull request #12762 from zeroisthebiggay/a
drops martial art minpops down to twenty pop
2020-07-17 17:11:02 -07:00
silicons
c924290cd1 Merge pull request #12733 from TheObserver-sys/Finally,moreblorble
Slime Extractification
2020-07-17 17:10:32 -07:00
silicons
8caf063765 Merge pull request #12757 from Owai-Seek/better-snack-comments
Updates some comments.
2020-07-17 17:09:50 -07:00
silicons
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
silicons
655afda020 Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
2020-07-17 17:08:23 -07:00
silicons
04df84d1e0 Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
2020-07-17 17:07:46 -07:00
silicons
a2c3643e20 fix 2020-07-17 12:46:32 -07:00
Lin
76c6c767d9 Merge pull request #12784 from silicons/shields
fixes active block toggle not existing
2020-07-17 14:43:40 -05:00
silicons
cc6079d413 Update human_movement.dm 2020-07-17 09:10:03 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
2020-07-16 17:28:42 -07: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
Arturlang
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
nik707
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
silicons
b279c82bb2 whew 2020-07-15 17:10:08 -07:00