80 Commits

Author SHA1 Message Date
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot cf51a4dce9 dusting off 2023-01-10 18:32:49 -03:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
Timothy Teakettle dad0aa72f0 OH BOY 2022-06-02 19:18:11 +01:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
silicons 2323bd31cd Merge pull request #15522 from bunny232/wintercoats
Insulation works both ways you know.
2022-02-26 18:08:59 -07:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
evan 2619387dc1 woops 2022-02-21 18:25:12 -05:00
evan 4d403ebca5 Update miscellaneous.dm 2022-02-21 18:14:56 -05:00
silicons c1928c9446 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-16 19:04:16 -07:00
Vynzill df72710cae herewego 2021-06-14 17:19:05 -05:00
silicons 1a800cc470 modifications 2021-06-07 19:40:16 -07:00
zeroisthebiggay bdd7ae54d4 Update miscellaneous.dm 2021-05-24 23:10:07 -04:00
zerothebigboy fc3c898cd4 tab 2021-05-24 21:49:36 -04:00
zerothebigboy 36fe3fef76 abuse 2021-05-24 21:40:15 -04:00
zerothebigboy bc61ada440 KILL 2021-05-19 13:24:40 -04:00
zerothebigboy af4823e83c KILL 2021-05-19 09:19:49 -04:00
zerothebigboy e22bdc3fb5 KILL 2021-05-18 18:56:28 -04:00
zerothebigboy fff719c408 KILL 2021-05-18 18:47:12 -04:00
kiwedespars 15a8d1d5e0 i did a thing
- reverted salt nerf
- made it so you can't parry while resting
2021-02-20 17:24:30 -08:00
DeltaFire 06101ee9c8 sigh 2021-02-12 03:30:15 +01:00
Lin fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
silicons 9ddb3dc5d9 fix 2021-01-13 16:22:43 -07:00
silicons 1dfe6d3685 Update miscellaneous.dm 2020-12-28 12:59:05 -07:00
silicons 8d981bfa82 high cooldown on failure 2020-12-27 12:05:32 -08:00
silicons 4da7a3867c fix 2020-12-27 10:22:27 -08:00
silicons 53253bfce1 changes 2020-12-27 10:13:09 -08:00
Hatterhat aa7c871b59 yea 2020-12-24 18:15:04 -06:00
Hatterhat 0db189333a >one fucking callback 2020-08-30 21:21:27 -05:00
zerothebigboy 21836b4ec8 : ) 2020-08-22 18:11:03 -04: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
zerothebigboy fb35248e3b a 2020-07-21 02:24:22 -04:00
silicons 910869d6bf more 2020-07-18 19:44:12 -07:00
Ghom 8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07: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
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02: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 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