Commit Graph

30 Commits

Author SHA1 Message Date
necromanceranne
9919a23966 This fixes everyone being a pugilist holy fuck 2020-04-21 00:36:54 +10: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
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
ff4847b441 Adds the damage roll into a proc checked on each of the harm, disarm and grab acts and before a combo is complete, and also checks for whether we are in combat mode, lying down or if the target is in combat mode 2020-04-06 15:01:59 +10: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
0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie
e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
kevinz000
162a0def29 parentheses 2020-01-15 19:09:38 -07:00
kevinz000
45c92bcb6f s 2020-01-15 19:07:47 -07:00
kevinz000
b341818f04 mobility flags 2020-01-12 11:00:12 -08:00
kevinz000
0fc6d0e891 compile 2020-01-11 11:28:03 -08:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Seris02
a106fde6cc a few fixes here and there and updating it 2019-12-24 23:38:27 +08:00
Ghommie
6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
Ghommie
aab7ad192b Martial arts pacifism fixes and boxing buff, more ported pacifist fixes. 2019-11-20 21:00:17 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
Poojawa
b6430559e9 datums 2018-09-11 02:49:41 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
kevinz000
42d0541a28 fixes cqc working outside chef assigned areas (#37375)
* cqc

* Update martial.dm

* Update cqc.dm

* Update cqc.dm

* Update human_defense.dm

* Update human_defense.dm

* Update human_defense.dm
2018-04-24 10:23:34 -05:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
Iamgoofball
04ec62d03d Fixes the name on the cook's culinary school training (#35635)
Totally forgot to do this
2018-02-15 10:39:44 -06:00
Iamgoofball
5793fe893f The Cook now only works under siege. (#35597)
The chef's CQC skill now only works in the kitchen area
2018-02-13 14:18:49 -06:00
ThePainkiller
90947a50ad fix/spellcheck: Changes command error on cqc.dm (#34634)
* Update holy_weapons.dm

* Update cqc.dm
2018-01-19 08:57:18 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
25df88509a Reorganizes martial arts and stores them in the MIND. 2017-05-22 07:13:10 -05:00