Commit Graph
98 Commits
Author SHA1 Message Date
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
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
Hatterhat d27150331a fast hands 2019-11-11 18:59:31 -06:00
Ghommie 4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
Ghommie fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
Poojawa 2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
Poojawa 088bc484e3 Forensics re-destroyed, but better this time.
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
Poojawa 0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Chayse Ramsay 97c3b2eda7 Prevents runtime spam from Hugs of the North Star
Also fixes an unintended oversight of the Gloves of the North Star, with them causing the warcry upon picking up any item or clicking on any item in harm intent.
2019-08-14 18:29:35 +01:00
Poojawa dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00