silicons
|
b20e3bc2b6
|
monkey attacks
|
2020-07-23 16:30:27 -07:00 |
|
silicons
|
29a8c2eee6
|
flushed
|
2020-07-23 12:47:21 -07:00 |
|
silicons
|
aaa536b8fc
|
ok
|
2020-07-23 11:38:15 -07:00 |
|
silicons
|
21143ade21
|
eyeroll
|
2020-07-23 11:01:33 -07:00 |
|
silicons
|
da4e208f94
|
ok
|
2020-07-23 10:40:12 -07:00 |
|
silicons
|
db24df58a0
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:36:46 -07:00 |
|
silicons
|
ec72015f4f
|
Merge pull request #12809 from BlackMajor/borgo
Gripper brained. The medborg can do chemistry now, oh no.
|
2020-07-23 10:35:16 -07:00 |
|
silicons
|
dad3d38933
|
Merge pull request #12869 from timothyteakettle/zombies-rework
the very much needed zombie buffs
|
2020-07-23 10:29:43 -07:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
silicons
|
4373e2b452
|
done
|
2020-07-23 10:18:10 -07:00 |
|
silicons
|
89a1fa544e
|
fixes
|
2020-07-23 10:12:34 -07:00 |
|
Timothy Teakettle
|
f5ac0b5762
|
some fixes
|
2020-07-23 18:10:46 +01:00 |
|
silicons
|
99eb77c052
|
fix
|
2020-07-23 09:32:28 -07:00 |
|
silicons
|
703afec454
|
ok
|
2020-07-23 08:57:15 -07:00 |
|
silicons
|
21d57eeeac
|
sigh
|
2020-07-23 00:27:45 -07:00 |
|
silicons
|
3a38344a04
|
fix
|
2020-07-23 00:25:06 -07:00 |
|
silicons
|
910290edcf
|
buffers
|
2020-07-23 00:22:33 -07:00 |
|
silicons
|
76f885e1a6
|
ok
|
2020-07-23 00:16:43 -07:00 |
|
timothyteakettle
|
a5945d3dc2
|
slight zombie tweaking
|
2020-07-23 01:09:09 +01: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 |
|
Timothy Teakettle
|
aea268548c
|
some fixes
|
2020-07-21 19:54:42 +01:00 |
|
silicons
|
4d48abf3a6
|
fixes
|
2020-07-21 11:46:17 -07:00 |
|
Timothy Teakettle
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
Lin
|
f7355dde62
|
Merge pull request #12728 from silicons/vote
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
|
2020-07-20 18:17:45 -05: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 |
|
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 |
|