Commit Graph

5635 Commits

Author SHA1 Message Date
silicons
475d8ed6fb Merge pull request #12950 from timothyteakettle/species-are-dumb
tail wagging fix
2020-07-28 10:15:17 -07:00
Timothy Teakettle
72972e1659 some species code fixes 2020-07-28 17:56:50 +01:00
silicons
ffcfd21613 fix 2020-07-27 14:24:10 -07:00
silicons
5bf4afcade sigh 2020-07-27 14:09:37 -07:00
silicons
67b518bf42 experimental 2020-07-27 13:09:54 -07:00
Timothy Teakettle
8d9c94c087 aliens can remove embeds now 2020-07-27 17:59:05 +01:00
Ghommie
f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
silicons
20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb
tidies up species files
2020-07-26 22:52:00 -07:00
BlackMajor
dd6fefa43e Merge pull request #12917 from Citadel-Station-13/silicons-patch-57
FIXES. STUNBATONS. FOR. THE LAST. TIME - WINGET IS A SLEEP() AND NO ONE REALIZED THAT MAKING BATONS MAKE PEOPLE -GLORF WOULD MAKE THEM BREAK UNDER LAG
2020-07-27 13:20:38 +12:00
BlackMajor
5e3cb62790 Merge pull request #12903 from Sishen1542/zoom-zoom-go-boom-boom
removes zoomba/roomba borg sprites
2020-07-27 13:00:17 +12:00
silicons
308c52df00 ok 2020-07-26 17:14:38 -07:00
silicons
0b17c761e7 whew 2020-07-26 17:11:23 -07:00
silicons
349874e512 haha 2020-07-26 16:49:47 -07:00
silicons
3ee5611b1d Update living_active_block.dm 2020-07-26 16:19:43 -07:00
silicons
cebd21696f Update living_active_parry.dm 2020-07-26 16:18:12 -07:00
silicons
bf4b2dfbf5 ok 2020-07-26 15:59:56 -07:00
silicons
e13b6d36da Merge pull request #12895 from Hatterhat/bokken
Training Bokkens - "funny wood sticks for parrying and beating the shit out of people"
2020-07-26 15:52:35 -07:00
Lin
8aa20d10b8 Merge pull request #12863 from Citadel-Station-13/clownops
clown mobss are now allied to each other and clownops are now allied to clown mobs
2020-07-26 17:51:00 -05:00
silicons
7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
Hatterhat
af08e8a37f altclick for fucked up parries! also bugfixes 2020-07-26 13:02:56 -05:00
silicons
389a54590e fix 2020-07-26 00:32:14 -07:00
silicons
829403a2ac Update say.dm 2020-07-25 23:52:15 -07:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
e2a7064c10 Update say.dm 2020-07-25 23:40:39 -07:00
Sishen
04feb3c4a5 borg 2020-07-25 03:22:48 -06:00
silicons
44d3a0aa27 fixes 2020-07-24 20:37:02 -07:00
timothyteakettle
e18bfb41b7 woopsy 2020-07-25 02:16:39 +01:00
timothyteakettle
e273d327bd yeah 2020-07-25 01:11:04 +01:00
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
timothyteakettle
060b3dcd04 im sorry moths 2020-07-24 03:27:44 +01: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
1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -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
Timothy Teakettle
ed8723e74e Merge branch 'master' into species-are-dumb 2020-07-23 22:15:10 +01:00
Timothy Teakettle
f4933c4177 let them scar 2020-07-23 22:14:41 +01:00
Timothy Teakettle
8f8aaee36c fixes up drinks 2020-07-23 22:09:14 +01:00
Timothy Teakettle
450509347a tidy species more 2020-07-23 21:57:32 +01: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