Commit Graph

5635 Commits

Author SHA1 Message Date
Timothy Teakettle
5463673831 fuck 2020-07-23 19:02:50 +01:00
silicons
21143ade21 eyeroll 2020-07-23 11:01:33 -07:00
Timothy Teakettle
673188bc7e please show the hat 2020-07-23 18:57:24 +01:00
Timothy Teakettle
b18356c95d requested changes 2020-07-23 18:47:34 +01: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
Timothy Teakettle
41cd02152a tidy up 2020-07-23 18:30:25 +01: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
Timothy Teakettle
2290823ace fixes hat removal 2020-07-23 14:40:36 +01: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
silicons
697cef017b Update living.dm 2020-07-22 23:43:57 -07:00
timothyteakettle
a5945d3dc2 slight zombie tweaking 2020-07-23 01:09:09 +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
silicons
5f7ec688f2 Update clown.dm 2020-07-21 22:13:21 -07: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
Timothy Teakettle
5c88253f93 lots more hats 2020-07-21 22:58:13 +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
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
silicons
1450b11b01 sigh 2020-07-20 21:37:44 -07: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
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