Letter N
|
a2419f760a
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-12 13:18:09 +08:00 |
|
dzahlus
|
6dabe348fa
|
fixes oversights
fixes grenadelauncher.ogg being used where it shouldnt FOR GOOD NOW I SWEAR. Bokken sound fixed, mech weapons now use proper sound too
|
2021-02-08 14:43:33 +01:00 |
|
Letter N
|
f87aa0ac5b
|
toast. And DiscoFox™️
|
2021-02-08 18:46:05 +08:00 |
|
necromanceranne
|
0fda694a52
|
A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused.
|
2021-01-04 15:30:28 +11:00 |
|
necromanceranne
|
6a247e2a68
|
Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites
|
2021-01-02 04:26:39 +11:00 |
|
necromanceranne
|
0aa5338f9b
|
Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays
|
2021-01-01 05:42:28 +11:00 |
|
Trilbyspaceclone
|
9c8f3305bb
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-30 00:41:42 -04:00 |
|
silicons
|
664b2490c3
|
Merge pull request #13235 from timothyteakettle/bokken-update
buffs bokkens stamina damage by 2
|
2020-08-27 10:07:31 -07:00 |
|
Trilbyspaceclone
|
c4885d81f3
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-27 03:41:14 -04:00 |
|
Timothy Teakettle
|
cdb3647c56
|
thank
|
2020-08-24 15:38:49 +01:00 |
|
timothyteakettle
|
3cf81dcc6c
|
this is better
|
2020-08-22 01:56:56 +01:00 |
|
timothyteakettle
|
703a4ec262
|
weaker than fists
|
2020-08-22 01:47:27 +01:00 |
|
zerothebigboy
|
5d611155f1
|
a
|
2020-08-21 02:15:30 -04:00 |
|
zerothebigboy
|
5741db4a13
|
Merge branch 'thefunnytemporalkatanas' of https://github.com/zeroisthebiggay/Citadel-Station-13 into thefunnytemporalkatanas
# Conflicts:
# code/game/objects/items/weaponry.dm
|
2020-08-21 02:13:44 -04:00 |
|
zerothebigboy
|
421e32f3f9
|
a final touch up
|
2020-08-21 02:06:36 -04:00 |
|
zerothebigboy
|
cca7e66457
|
a slight blink flavor
|
2020-08-21 01:54:09 -04:00 |
|
zeroisthebiggay
|
a183fb3165
|
Update weaponry.dm
thats an extra space
|
2020-08-21 01:45:23 -04:00 |
|
zeroisthebiggay
|
7f036428bd
|
Update weaponry.dm
thats an extra space
|
2020-08-21 01:40:19 -04:00 |
|
zerothebigboy
|
b960f4055d
|
a
|
2020-08-21 01:31:30 -04:00 |
|
silicons
|
9c63a09907
|
Merge branch 'pr-13087'
|
2020-08-16 18:40:07 -07:00 |
|
Hatterhat
|
bc0ca30647
|
there is no cooldown, press G
|
2020-08-16 15:45:11 -05:00 |
|
Hatterhat
|
d5b788a655
|
shortparry window restored, glaive parry req wield
|
2020-08-12 23:33:59 -05:00 |
|
Trilbyspaceclone
|
1b61a5feb2
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-12 15:10:37 -04:00 |
|
Hatterhat
|
f4f8812318
|
whitespace (tm)
|
2020-08-10 11:30:36 -05:00 |
|
Hatterhat
|
4610908b8e
|
Merge branch 'master' into parries-but-dumber
|
2020-08-10 11:29:27 -05:00 |
|
Hatterhat
|
301adc6769
|
ung
|
2020-08-09 23:58:12 -05:00 |
|
Hatterhat
|
ff49790ac9
|
radius/force/blockchance nerf
|
2020-08-09 21:27:57 -05:00 |
|
silicons
|
25d7b15478
|
Merge pull request #13060 from Hatterhat/timestop-katana
wizard timestop parrying katana
|
2020-08-09 05:41:55 -07:00 |
|
Hatterhat
|
a496588171
|
bokken cooldown nerf but slightly
|
2020-08-08 14:31:45 -05:00 |
|
Hatterhat
|
c7e850ae19
|
longparry stagger reduced, cooldown made universal
|
2020-08-08 14:14:47 -05:00 |
|
Hatterhat
|
98d305e5f6
|
bokken nerfs, desword deflects
|
2020-08-08 14:11:47 -05:00 |
|
Hatterhat
|
56bf84abfe
|
parry debug stick
|
2020-08-08 00:48:55 -05:00 |
|
Hatterhat
|
029d88ac9d
|
play a real shin megami tensei game
|
2020-08-07 03:32:54 -05:00 |
|
Hatterhat
|
32a1c90b67
|
what are we in for
|
2020-08-07 03:25:05 -05:00 |
|
Hatterhat
|
965efe6dab
|
funny timestop katana adminbus only
|
2020-08-07 03:13:43 -05:00 |
|
TrilbySpaceClone
|
3ae10ac826
|
update?
|
2020-08-06 13:09:41 -04:00 |
|
Trilbyspaceclone
|
e1e6198140
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-03 10:53:08 -04:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
silicons
|
4256826aae
|
epic
|
2020-07-26 17:15:12 -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 |
|
Hatterhat
|
aabb60b5c5
|
shit damn boys its another fucking day
|
2020-07-26 17:42: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 |
|
Timothy Teakettle
|
75c40f6d93
|
what if wound values didnt suck
|
2020-07-26 18:51:19 +01: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 |
|
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 |
|
Hatterhat
|
eb6cb1151c
|
i forgot the actual defining feature
|
2020-07-25 06:59:31 -05:00 |
|