silicons
|
78312c23bf
|
sigh
|
2020-07-28 21:53:07 -07:00 |
|
Lin
|
a5dd08a054
|
Merge pull request #12734 from silicons/shoelaces
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
|
2020-07-28 21:51:43 -05:00 |
|
Lin
|
81a7542aa6
|
Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
|
2020-07-28 21:51:10 -05:00 |
|
Lin
|
ae02a7348c
|
Merge pull request #12929 from Citadel-Station-13/silicons-patch-59
silicons (and all other nonhuman mobs) can now block (with the right items)
|
2020-07-28 21:48:14 -05:00 |
|
Lin
|
e8ab87c396
|
Merge pull request #12928 from Citadel-Station-13/silicons-patch-58
silicons (and any other nonhuman mob) can now parry
|
2020-07-28 21:48:03 -05:00 |
|
Lin
|
91dc8b96d0
|
Merge pull request #12932 from silicons/ok_2
perfect parries with an energy sword now reflect projectiles back at their shooter
|
2020-07-28 21:45:53 -05:00 |
|
Lin
|
18fa47e479
|
Merge pull request #12931 from Citadel-Station-13/silicons-patch-61
nerfs parrying bullets with a wooden stick following complaints
|
2020-07-28 21:45:36 -05:00 |
|
silicons
|
ab67ae3291
|
Merge pull request #12951 from timothyteakettle/haha-yes-blood
bloodsucker blood loss fix
|
2020-07-28 13:26:07 -07:00 |
|
silicons
|
6c83beea02
|
Merge pull request #12937 from Ghommie/Ghommie-cit834
Fixing new bugs and stuff.
|
2020-07-28 10:46:17 -07:00 |
|
silicons
|
a5063a92b9
|
Merge pull request #12941 from timothyteakettle/alien-embeds-work
aliens can remove embeds now
|
2020-07-28 10:45:31 -07:00 |
|
Timothy Teakettle
|
c8960624d3
|
sorry artur
|
2020-07-28 18:37:01 +01:00 |
|
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
|
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
|
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 |
|