farie82 229cf3e344 Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341) ...

* first commit. combos, CQC started

* CQC working

* All transfered to new system

* The actual bug fix

* add time in between combos

* time between combos limit and minor explaination tweak

* Krav maga fixes, time change. Minor text changes

* Move martial_art to mind

* Merge mistake fixed

* Steels review changes

2020-09-18 11:07:19 -04:00

..

admin

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

antagonists

…

arcade

alters description of rubber ducky prize (#14340)

2020-09-18 01:18:35 -04:00

assembly

Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co

2020-09-16 15:26:19 +02:00

awaymissions

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

buildmode

…

client

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

clothing

Adds rubber ducky shoes (#13996)

2020-09-16 18:29:49 -04:00

countdown

…

crafting

Adds rubber ducky shoes (#13996)

2020-09-16 18:29:49 -04:00

customitems

Added the 'Fancy Hiking Pack'

2020-09-14 19:52:45 +01:00

detective_work

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

economy

…

error_handler

…

events

Terror Princess Rework (#13657)

2020-09-17 18:29:32 -04:00

examine

Removes omni gas devices

2020-09-02 11:49:45 +01:00

ext_scripts

…

fish

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

flufftext

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

food_and_drinks

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

games

…

holiday

…

hydroponics

Adds Botany Jugs, and fixes hydroponic trays draining sealed containers [now without map edits] (#14212)

2020-09-18 01:14:19 -04:00

instruments

Add missing tab??

2020-09-16 13:25:54 +02:00

karma

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

keybindings

…

library

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

lighting

…

map_fluff

…

martial_arts

Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341)

2020-09-18 11:07:19 -04:00

mining

Adds PDA lamps and in-PDA ID sprites (#14032)

2020-09-16 10:38:49 -04:00

mob

Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341)

2020-09-18 11:07:19 -04:00

modular_computers

Merge pull request #14291 from Kyep/tgui_id_computer

2020-09-16 20:10:42 +01:00

nano

Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14190

2020-09-15 20:46:10 +01:00

ninja

Span instead of copypaste

2020-08-19 22:28:51 +02:00

paperwork

Makes most targeted spells select a target on click with a radius (#13220)

2020-09-18 10:30:32 -04:00

pda

Merge pull request #14028 from SteelSlayer/spawn-removal

2020-09-16 11:47:59 -04:00

persistence

…

power

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

procedural_mapping

…

projectiles

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

reagents

Adds Botany Jugs, and fixes hydroponic trays draining sealed containers [now without map edits] (#14212)

2020-09-18 01:14:19 -04:00

recycling

Moved 'no_wrap' to object

2020-08-28 12:52:39 +01:00

research

Adds Botany Jugs, and fixes hydroponic trays draining sealed containers [now without map edits] (#14212)

2020-09-18 01:14:19 -04:00

response_team

ERT idiotproofing and minor tweaks (#13834)

2020-09-16 16:38:25 -04:00

ruins

Initial commit, looks kind of ugly and texts are whatever

2020-08-17 16:31:12 +02:00

security_levels

AA suggestions

2020-08-29 10:01:18 -07:00

shuttle

Merge remote-tracking branch 'upstream/master' into spawn-removal

2020-09-16 09:38:20 -05:00

space_management

…

spacepods

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

station_goals

fixes merge conflict

2020-09-15 08:54:10 -07:00

store

…

surgery

Makes CNS rebooter stun on EMP (#14234)

2020-09-18 10:44:38 -04:00

telesci

…

tgui

Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14190

2020-09-15 20:46:10 +01:00

tooltip

…

unit_tests

…

vehicle

…