Commit Graph

4983 Commits

Author SHA1 Message Date
silicons
5bf4afcade sigh 2020-07-27 14:09:37 -07:00
silicons
67b518bf42 experimental 2020-07-27 13:09:54 -07:00
silicons
bf4b2dfbf5 ok 2020-07-26 15:59:56 -07:00
silicons
7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
silicons
389a54590e fix 2020-07-26 00:32:14 -07:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
44d3a0aa27 fixes 2020-07-24 20:37:02 -07:00
nik707
6117b7d81e Merge pull request #12879 from timothyteakettle/let-bots-wear-hats
beepsky replaces THREAT_LEVEL with the actual threat
2020-07-23 20:11:57 -05:00
timothyteakettle
adc4c76be7 fix 2020-07-24 02:00:22 +01:00
timothyteakettle
332dae9ee1 beepsky now replaces THREAT_LEVEL with the threat 2020-07-24 01:31:07 +01:00
silicons
64de8f16a9 fixes 2020-07-23 16:59:27 -07:00
silicons
b20e3bc2b6 monkey attacks 2020-07-23 16:30:27 -07:00
silicons
5182f8e49a Merge pull request #12878 from Citadel-Station-13/Linzolle-patch-1
maybe you should be able to see wound descriptions
2020-07-23 16:20:05 -07:00
silicons
d946998fb9 Merge pull request #12857 from timothyteakettle/let-bots-wear-hats
adds deep beepsky lore to the game in the form of hats
2020-07-23 16:18:17 -07:00
Lin
a655502d9a tabs! 2020-07-23 22:58:00 +00:00
Lin
8a25582c1c Merge pull request #12850 from silicons/drag
fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async
2020-07-23 17:13:48 -05:00
silicons
03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
silicons
29a8c2eee6 flushed 2020-07-23 12:47:21 -07:00
silicons
aaa536b8fc ok 2020-07-23 11:38:15 -07:00
Timothy Teakettle
e4f0a84404 cut overlay 2020-07-23 19:33:26 +01:00
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
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
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