Commit Graph

5180 Commits

Author SHA1 Message Date
Hatterhat
25ab96cf53 funny revolver reskins 2020-08-03 20:39:06 -05:00
Hatterhat
6a5e26eb1c unatomic as shit 2020-08-01 12:31:13 -05:00
silicons
9ff94e019b Merge pull request #12924 from SiliconMain/analyzer
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
Lin
447a0b24bf Merge pull request #12944 from timothyteakettle/fixes-crates
fixes some crafted crates containing items
2020-07-28 22:11:30 -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
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
0152dcda65 fix 2020-07-28 13:24:45 -07:00
silicons
8313485632 fix 2020-07-28 11:31:28 -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
b0f03eac12 ok 2020-07-27 21:06:03 -07:00
silicons
2ba01663e5 Merge pull request #12945 from timothyteakettle/jar-fixes
bluespace jar / pet carrier logic tweak so it works correctly
2020-07-27 19:21:16 -07:00
timothyteakettle
f36071bb64 wouldnt it be cool if i tested the small logic change 2020-07-28 03:09:07 +01:00
Timothy Teakettle
dc14c02570 fix crates 2020-07-27 21:55:51 +01:00
Ghommie
f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
silicons
850bc0dc33 Merge pull request #12919 from SiliconMain/patch-5
Dura belt tweaks
2020-07-26 22:58:31 -07:00
silicons
d47b553527 Merge pull request #12892 from Literallynotpickles/hi
Reverts extinguishers into being alt-clickable
2020-07-26 22:56:22 -07:00
silicons
e240453044 Merge pull request #12884 from timothyteakettle/fix-a-bad-bug/exploit
fixes a dumb bug to do with material crafting
2020-07-26 22:52:30 -07:00
silicons
b5e21e5555 Merge pull request #12896 from timothyteakettle/jar-fixes
makes some small tweaks to pet carriers / bluespace jars
2020-07-26 17:21:28 -07:00
silicons
69335bae0e buff 2020-07-26 17:20:21 -07:00
silicons
4256826aae epic 2020-07-26 17:15:12 -07:00
silicons
0b17c761e7 whew 2020-07-26 17:11:23 -07:00
silicons
3ab4b62dc1 huh 2020-07-26 17:03:52 -07:00
silicons
279b3e7aed fix 2020-07-26 16:52:16 -07:00
silicons
349874e512 haha 2020-07-26 16:49:47 -07:00
silicons
21988d47f5 woops 2020-07-26 16:42:51 -07:00
silicons
ea1ea6dde1 Update weaponry.dm 2020-07-26 16:41:27 -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
Hatterhat
aabb60b5c5 shit damn boys its another fucking day 2020-07-26 17:42:24 -05:00
Lin
ea737d63dd Merge pull request #12904 from Citadel-Station-13/silicons-patch-54
proper fix for every borg being able to have mops, but doesn't remove the upgrade entirely
2020-07-26 17:22:47 -05:00
silicons
7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
SiliconMain
e11dab552f it just werks 2020-07-26 16:28:21 -05:00
SiliconMain
fdaa4b4372 aaaaaaaaaaa 2020-07-26 16:07:48 -05:00
SiliconMain
ad420c6633 AAAAAAAAAAAA 2020-07-26 15:53:08 -05:00
SiliconMain
abdafe15fa fuck 2020-07-26 15:21:24 -05:00
Hatterhat
6bf53859d2 wow maybe i should make it compile first 2020-07-26 14:42:45 -05:00
Hatterhat
af08e8a37f altclick for fucked up parries! also bugfixes 2020-07-26 13:02:56 -05:00
SiliconMain
1a78098885 on second thought 2020-07-26 05:20:53 -05:00
SiliconMain
54ed22d17d ye 2020-07-26 05:19:56 -05:00
SiliconMain
d1c3465d77 Update belt.dm 2020-07-26 04:28:18 -05:00
silicons
94e218ccc0 ok 2020-07-26 01:04:55 -07:00
silicons
d3e808f0e1 fix 2020-07-26 00:18:42 -07:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
2a29f73ac8 ok 2020-07-25 17:34:12 -07:00
silicons
91081ef24c Merge pull request #12872 from Iatots/hairball
Adds depth to the lick wounds mechanic.
2020-07-25 15:40:15 -07:00
Hatterhat
bf273cffdd burnt bokken backsprite, wound tweak 2020-07-25 16:18:26 -05:00
Hatterhat
fa5fd08be3 parry tweaks 2020-07-25 15:37:21 -05:00
Timothy Teakettle
76016c75f9 yes 2020-07-25 21:27:32 +01:00
Hatterhat
b9ce2e497d bare wound bonus, wound malus 2020-07-25 13:10:35 -05:00
Hatterhat
f28c98590a lowered parry windows! attack verbs! 2020-07-25 13:03:15 -05:00