Commit Graph
106 Commits
Author SHA1 Message Date
GhomandGitHub e4c6df71fc Update tacklers.dm 2020-04-23 14:35:36 +02:00
kevinz000andGitHub 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
kevinz000andGitHub b6a47a06ed Update tacklers.dm 2020-04-22 22:26:39 -07:00
GhomandGitHub 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
Artur eafc69aa65 Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
2020-04-17 16:22:15 +03: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
ZeroMan 35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
Ghommie 2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
YakumoChenandGitHub 2924be6a80 now with visible rings on hand(s) 2020-02-14 03:52:10 +00:00
YakumoChenandGitHub 5c246fd389 diamond ring changes
More code I stole from RP
2020-02-14 03:00:31 +00:00
kevinz000andGitHub de2a3c5502 Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
2020-02-06 23:53:54 -07:00
YakumoChenandGitHub 74fd722871 Update ring.dm 2020-02-01 00:28:04 +00:00
YakumoChenandGitHub 0020977891 this line ending shit is legitimate cancer 2020-01-31 19:05:23 -05:00
YakumoChenandGitHub c120221234 Update ring.dm 2020-01-31 23:13:58 +00:00
YakumoChenandGitHub 35e16c5cd5 Update ring.dm 2020-01-31 22:58:05 +00:00
YakumoChenandGitHub 6d44e59497 Update ring.dm 2020-01-31 22:56:34 +00:00
YakumoChenandGitHub 65ca071eb4 linting?? 2020-01-31 14:29:40 +00:00
YakumoChenandGitHub c489571d69 Update ring.dm 2020-01-31 13:55:06 +00:00
YakumoChenandGitHub 922f91b409 adds ring.dm to gloves 2020-01-31 06:34:29 -05:00
Seris02 a415dbf31b yas 2020-01-31 08:19:35 +08:00
Seris02 bf47daf099 MY PRECIOUS! GONE!! GOOOOOONE!!! 2020-01-30 17:00:14 +08:00
Ghommie 5875f2578c demodularize and removes lot of unused clothing with missing sprites. 2020-01-28 02:32:46 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 3fcb7808fd args 2019-12-13 02:30:17 +01:00
kevinz000andGitHub 8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
Ghommie baedb7e091 I'm unprofessional. 2019-11-14 15:16:06 +01:00
Ghommie 7603db2e8b Bad habit of pushing things before the compile. 2019-11-14 15:10:32 +01:00
Ghommie 358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
Hatterhat 8d2f833735 stamina hands 2019-11-11 19:14:12 -06:00