Commit Graph

4953 Commits

Author SHA1 Message Date
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
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
Hatterhat
af08e8a37f altclick for fucked up parries! also bugfixes 2020-07-26 13:02:56 -05:00
silicons
829403a2ac Update say.dm 2020-07-25 23:52:15 -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
timothyteakettle
e273d327bd yeah 2020-07-25 01:11:04 +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
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
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
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
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
Timothy Teakettle
f5ac0b5762 some fixes 2020-07-23 18:10:46 +01:00
Timothy Teakettle
2290823ace fixes hat removal 2020-07-23 14:40:36 +01: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
Timothy Teakettle
aea268548c some fixes 2020-07-21 19:54:42 +01: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