Commit Graph

4909 Commits

Author SHA1 Message Date
silicons
910290edcf buffers 2020-07-23 00:22:33 -07:00
silicons
76f885e1a6 ok 2020-07-23 00:16:43 -07:00
silicons
286e5384d1 fix 2020-07-21 12:07:24 -07:00
silicons
2f11fb6a8b ok 2020-07-21 11:59:39 -07:00
silicons
9a5e53a21f ok 2020-07-21 11:57:47 -07:00
silicons
184e3992f3 fixes 2020-07-21 11:56:23 -07:00
silicons
4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
silicons
692656b02d Whew 2020-07-20 11:53:33 -07:00
silicons
526d257410 fix 2020-07-20 11:48:08 -07:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
d43a5cae26 let's refactor attack_hand. 2020-07-20 11:19:20 -07:00
silicons
984796b8c6 sigh 2020-07-20 10:46:52 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons
6ab250dd03 sigh 2020-07-20 10:13:50 -07:00
silicons
ae83a6df02 fix 2020-07-19 19:51:17 -07:00
silicons
55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons
910869d6bf more 2020-07-18 19:44:12 -07:00
silicons
b1ccccb322 more 2020-07-18 18:51:16 -07:00
silicons
1a040dd2a6 changes 2020-07-18 18:44:17 -07:00
silicons
0c6368e3e7 e 2020-07-18 18:34:16 -07:00
silicons
0b98b0409b sigh 2020-07-18 18:29:09 -07:00
silicons
7c5d4f863d click cd breakout 2020-07-18 18:10:21 -07:00
silicons
3d65be4ee9 sigh 2020-07-18 18:03:17 -07:00
silicons
1ba6777b35 Whew 2020-07-18 17:49:06 -07:00
silicons
771a28e685 oh boy 2020-07-18 17:48:51 -07: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
Lin
e165524763 Merge pull request #12803 from Citadel-Station-13/silicons-patch-32
removes tango dancing
2020-07-18 11:17:42 -05:00
silicons
655afda020 Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
2020-07-17 17:08:23 -07:00
silicons
a2c3643e20 fix 2020-07-17 12:46:32 -07: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
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08: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
Timothy Teakettle
a7e2668eff funniest 2020-07-15 23:50:39 +01:00
silicons
6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
2020-07-15 08:50:20 -07:00
BlackMajor
bd7c9d11d3 oh no 2020-07-16 02:02:29 +12:00
Artur
d0f1a805e4 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-14 16:15:48 +03:00
silicons
c333a71c74 Update life.dm 2020-07-14 04:30:38 -07:00
Lin
55c4e40fbb Merge pull request #12706 from silicons/records
adds security/medical records to character setup
2020-07-13 11:50:02 -05:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Timothy Teakettle
29628dd82a cows 2020-07-12 21:40:16 +01:00