Commit Graph

45 Commits

Author SHA1 Message Date
Fox McCloud 1ad27bc030 more hit type verbs 2019-04-09 21:57:47 -04:00
Fox McCloud 6557082d43 changes 2019-04-07 22:21:17 -04:00
Fox McCloud 061278224b derp 2019-04-07 21:31:30 -04:00
Fox McCloud 03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc
# Conflicts:
#	code/game/objects/items.dm
2019-04-07 19:54:14 -04:00
Fox McCloud d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Dave 6328051e45 Fixes Krav Maga Disarms 2019-03-20 12:47:46 -04:00
Fox McCloud 4969a03e94 Fixes and Updates CQC 2018-11-24 00:31:23 -05:00
datlo 12f6413417 SPACING SKREEE 2018-11-22 00:27:52 +00:00
datlo 5ef666f0f5 oops forgot to remove a line
durrr
2018-11-21 17:27:29 +00:00
datlo f1ada4fefa big commit changes in desc
Added missing spacings
Added attack logging
Raised cost to 9 TC, made it tator and nukies, added to surplus, allowed
nukies to have gloves of north star, and updated description
Added a check preventing usage of CQC with gloves of north star
Fix a bug where attacks would not go through if a combo was done but the
target was critically injured (regular attacks now done instead)
Changed disarm logic, now always hits for 5 damage and use regular
disarm logic for disarming/pushing
Replaced "Big Bossed" attack verb by "neck chopped" and "gut punched"
because nofunallowed
2018-11-21 17:18:32 +00:00
datlo e0037ffefe space activated
mama mia stop the copy pasta
2018-11-20 15:03:38 +00:00
datlo 65286d7830 Adds the CQC manual to nukie uplinks 2018-11-20 03:51:52 +00:00
B.A.L 4102faf1d6 Refunds and text warning 2018-11-18 22:34:54 -07:00
B.A.L 00c8f5bd07 Item restriction and uplink description 2018-11-17 21:47:45 -07:00
Ty-Omaha 216f03ddca moves boxing attack logs to the ALL preference 2018-10-12 23:28:04 -04:00
Ty-Omaha c2d6726168 Update code/modules/martial_arts/brawling.dm 2018-10-12 23:25:10 -04:00
Ty-Omaha d84c191a88 removes boxing attack logs 2018-10-12 22:54:39 -04:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
nicetoolbox 385f290bc3 Clean up some grabs 2018-09-16 12:28:39 -07:00
nicetoolbox ea8cebfd5e Fix human grabbedby not returning the grab 2018-09-16 12:14:01 -07:00
Fox McCloud aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Kyep 412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
2018-06-13 16:55:21 -07:00
Tayyyyyyy aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy 42f85919de More their 2018-05-25 18:34:26 -07:00
Tayyyyyyy 170266d827 More pronouns 2018-05-25 18:34:23 -07:00
Fox McCloud c0d5655f4d Further Improves Attack Animations 2018-05-17 19:48:03 -04:00
tigercat2000 df26483e67 Fix runtime logs & Remove a bunch of painful admin notifications 2018-04-25 16:35:02 -07:00
tigercat2000 c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown 7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
Mars 4451354398 Makes cutting off fingertips optional 2017-10-08 17:26:10 +02:00
Sam 7c7c8c70cb Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines 2017-06-10 10:16:33 +01:00
Sam 4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
FalseIncarnate c2ad198203 can_use_guns -> no_guns 2017-06-09 21:39:50 -04:00
FalseIncarnate 9e88e7f1db Adds Highlander Style: The Martial Art of Highlanders
Adds a new martial art: Highlander Style!
- Wielders of the powerful Highlander claymores are imbued with this
mythical prowress. Should your both your hands ever lack a grip on a
Highlander claymore, you will relinquish your newfound skill.
- Highlander Style grants immunity to ranged attacks and an unwavering
distain of cowardly guns. Just like with Sleeping Carp, you will deflect
projectiles and cannot fire guns (but can pick them up to throw in the
trash where they belong).

Adds new weapon: Highlander Claymore
- Grants the wielder the Highlander Style while held in either hand.
- Normal claymores were left in, but do not provide the martial art (so
they are "safe" to use outside highlander)

Minor refactor to martial arts which prevent use of guns.
- No longer relies on the name of the style, but rather the new
aptly-named var: `can_use_guns`

🆑
rscadd: Adds Highlander Style, granted to the wielder of Highlander
Claymores. This martial art allows you to deflect ranged attacks from
the weapons of COWARDS. FOR THE HONOR OF THE HIGHLANDERS!
tweak: Highlander now equips combatants with a Highlander claymore
instead of a normal claymore. FIGHT ON BROTHERS!
/🆑
2017-06-07 02:35:23 -04:00
Sam c1cc319f62 Uses more intent defines 2017-06-03 18:29:50 +01:00
Sam 2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Crazylemon64 6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
TheDZD f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
Isaac Erwin f2c1c7406d Various grammar/spelling fixes 2016-08-05 18:43:33 -04:00
Fox-McCloud 14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00
FreeStylaLT 38dfb6db6f Adds appropriate HUH, KUH, KYAH, WROOAAAAH, etc. sounds to sleeping carp (#4798) 2016-06-30 20:39:41 -04:00
Aurorablade 47f22e9152 lol2chat 2016-04-24 00:22:37 -04:00
Aurorablade 2f3754af77 folder rename in progreess... 2016-04-22 23:58:03 -04:00