 silicons
|
82d8b7266f
|
Merge pull request #13238 from Hatterhat/insidious-tackle
insidious combat gloves but they can tackle now
|
2020-08-23 17:36:03 -07:00 |
|
|
silicons
|
7f942abef2
|
Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
|
2020-08-23 05:08:14 -07:00 |
|
|
zerothebigboy
|
21836b4ec8
|
: )
|
2020-08-22 18:11:03 -04:00 |
|
|
Hatterhat
|
8645a2954f
|
tackle hando
|
2020-08-22 16:13:41 -05:00 |
|
|
lolman360
|
c9de596fde
|
Verified!
|
2020-08-09 15:31:49 +10:00 |
|
|
lolman360
|
50448549fb
|
ee
|
2020-08-09 15:26:08 +10: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 |
|
|
silicons
|
67b518bf42
|
experimental
|
2020-07-27 13:09:54 -07:00 |
|
|
silicons
|
49070d732b
|
ohhhhhhh boy
|
2020-07-26 15:10:08 -07:00 |
|
|
Hatterhat
|
af08e8a37f
|
altclick for fucked up parries! also bugfixes
|
2020-07-26 13:02:56 -05:00 |
|
|
silicons
|
33d5ba788b
|
aight
|
2020-07-24 20:19:18 -07:00 |
|
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
|
silicons
|
9222933d77
|
Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
|
2020-07-23 10:25:25 -07:00 |
|
|
silicons
|
744b6d6b48
|
Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
|
2020-07-21 19:20:52 -07:00 |
|
|
zerothebigboy
|
fb35248e3b
|
a
|
2020-07-21 02:24:22 -04:00 |
|
|
silicons
|
910869d6bf
|
more
|
2020-07-18 19:44:12 -07:00 |
|
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
|
Ghommie
|
6fc584518a
|
Fixing (un)equip penalties from obscured inv slots.
|
2020-07-03 00:07:30 +02:00 |
|
|
Ghom
|
8cb15f9279
|
Actually Balanced and Standardized Vendor Prices. (#12495)
|
2020-06-09 22:22:53 -07:00 |
|
|
Ghom
|
ab5d65a454
|
Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
|
2020-05-24 13:05:15 -07:00 |
|
|
Ghommie
|
94f014589d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-25 17:09:34 +02:00 |
|
|
Ghom
|
e4c6df71fc
|
Update tacklers.dm
|
2020-04-23 14:35:36 +02:00 |
|
|
kevinz000
|
c43f4e2e5e
|
Update tacklers.dm
|
2020-04-22 22:27:48 -07:00 |
|
|
kevinz000
|
af222768fe
|
Revert "Update tacklers.dm"
This reverts commit b6a47a06ed.
|
2020-04-22 22:27:17 -07:00 |
|
|
kevinz000
|
b6a47a06ed
|
Update tacklers.dm
|
2020-04-22 22:26:39 -07:00 |
|
|
Ghom
|
5a6a205b9d
|
Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
|
2020-04-21 15:50:44 +02:00 |
|
|
Artur
|
f0823bc2b6
|
Combat looks better
|
2020-04-18 13:57:34 +03:00 |
|
|
Ghommie
|
87a6bd013c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-17 21:57:21 +02:00 |
|
|
Artur
|
eafc69aa65
|
Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
|
2020-04-17 16:22:15 +03:00 |
|
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
|
Artur
|
375c62175f
|
Finishing touches, fixes icons
|
2020-04-15 12:04:25 +03:00 |
|
|
necromanceranne
|
d0d766efb5
|
Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts
|
2020-04-15 19:00:01 +10:00 |
|
|
Ghommie
|
42ff9b1d35
|
Final test, fixes and parent calls.
|
2020-04-14 01:23:26 +02:00 |
|
|
Ghommie
|
05a954f000
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 02:01:01 +02:00 |
|
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03:00 |
|
|
Ghommie
|
7c1e5aa2c9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
|
2020-04-09 15:46:19 +02:00 |
|
|
necromanceranne
|
b494aa3370
|
Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now
|
2020-04-07 17:51:25 +10:00 |
|
|
necromanceranne
|
1c50192c12
|
further fixing stuff
|
2020-04-06 13:42:23 +10:00 |
|
|
necromanceranne
|
a6bd6d23fe
|
Some cleanup with help from rohesie, hopefully I figured it out
|
2020-04-06 12:28:14 +10:00 |
|
|
necromanceranne
|
38586c9d92
|
I feel like this is more fitting
|
2020-04-04 20:09:09 +11:00 |
|
|
necromanceranne
|
4c051f70e8
|
fixes this too
|
2020-04-04 19:16:59 +11:00 |
|
|
necromanceranne
|
bd5446e906
|
NYOOPS
|
2020-04-04 18:21:18 +11:00 |
|
|
necromanceranne
|
fcb816675b
|
not only am I blind I am also dumb
|
2020-04-04 18:20:17 +11:00 |
|
|
necromanceranne
|
7935eb8364
|
pretty sure this was brekaing stuff
|
2020-04-04 17:24:44 +11:00 |
|
|
necromanceranne
|
c6e82382a3
|
I feel like messing with this is basically unnecessary
|
2020-04-04 16:51:32 +11:00 |
|
|
necromanceranne
|
8af29a178c
|
Hooks up the chaplain null rod gloves to the choice of gloves
|
2020-04-04 16:42:37 +11:00 |
|
|
necromanceranne
|
71e19aead2
|
ports over my krav changes from tg and also hooked in pugilist gloves to summon equipment for cultists and gave all that shit a sprite ye
|
2020-04-04 16:29:29 +11:00 |
|
|
necromanceranne
|
0c46c151f9
|
Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage.
|
2020-04-03 19:42:25 +11:00 |
|
|
Ghommie
|
c3faf94d8f
|
WIP
|
2020-03-30 05:29:39 +02:00 |
|