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 |
|
BlackMajor
|
f265b85d3b
|
Merge pull request #12810 from lolman360/master
service borg fix/tweak
|
2020-07-20 11:42:59 +12:00 |
|
Timothy Teakettle
|
1b99cb9201
|
everything has the bonesetter
|
2020-07-19 18:32:44 +01:00 |
|
Timothy Teakettle
|
ca6b289da6
|
fix tables and some minor thing
|
2020-07-19 17:49:22 +01: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 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01: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 |
|
Timothy Teakettle
|
345c5c593d
|
everyone but slimes can scar basically
|
2020-07-18 22:31:52 +01:00 |
|
Timothy Teakettle
|
f290050a78
|
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
|
2020-07-18 22:02:24 +01:00 |
|
Timothy Teakettle
|
b184cfefc5
|
imagine allowing wound healing
|
2020-07-18 22:00:28 +01:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
Timothy Teakettle
|
fe79c53f04
|
bugfixes
|
2020-07-18 21:40:19 +01: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 |
|
BlackMajor
|
f68962e9d3
|
This is a bad idea
|
2020-07-18 16:46:08 +12:00 |
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
timothyteakettle
|
8bb9b11922
|
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
|
2020-07-18 01:26:41 +01:00 |
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
silicons
|
655afda020
|
Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
|
2020-07-17 17:08:23 -07:00 |
|
Timothy Teakettle
|
93b4570f8d
|
more changes
|
2020-07-17 23:23:47 +01:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01: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
|
484da28600
|
Merge branch 'master' into shoelaces
|
2020-07-16 17:31:41 -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 |
|