projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-05 20:12:51 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/xbang21/NGECore2 into xbang21-master

Browse Source 
Conflicts:
	src/services/combat/CombatCommands.java
This commit is contained in:
Treeku
2013-12-12 14:34:24 +00:00
parent 001bf1b390 d54033a0c6
commit b6c9e74859
53 changed files with 368 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatCommands.java
+22
View File
@@ -395,6 +395,7 @@ public class CombatCommands {
core.commandService.registerCombatCommand("me_cranial_smash_3");
core.commandService.registerCombatCommand("me_cranial_smash_4");
core.commandService.registerCombatCommand("me_cranial_smash_5");
core.commandService.registerCommand("me_cure_affliction_1");
core.commandService.registerCombatCommand("me_dm_1");
core.commandService.registerCombatCommand("me_dm_2");
core.commandService.registerCombatCommand("me_dm_3");
@@ -418,8 +419,11 @@ public class CombatCommands {
core.commandService.registerCombatCommand("me_rv_ooc");
core.commandService.registerCombatCommand("me_rv_pvp_area");
core.commandService.registerCombatCommand("me_rv_pvp_single");
core.commandService.registerCommand("me_serotonin_boost_1");
core.commandService.registerCombatCommand("me_serotonin_purge_1");
core.commandService.registerCombatCommand("me_sh_1");
core.commandService.registerCommand("me_stasis_1");
core.commandService.registerCommand("me_stasis_self_1");
core.commandService.registerCombatCommand("me_thyroid_rupture_1");
core.commandService.registerCombatCommand("me_traumatize_1");
core.commandService.registerCombatCommand("me_traumatize_2");
@@ -436,6 +440,24 @@ public class CombatCommands {
core.commandService.registerCommand("me_reckless_stimulation_5");
core.commandService.registerCommand("me_reckless_stimulation_6");
core.commandService.registerCommand("me_stasis_self_1");
core.commandService.registerCommand("me_buff_health_1");
core.commandService.registerCommand("me_buff_health_2");
core.commandService.registerCommand("me_buff_health_3");
core.commandService.registerCommand("me_enhance_action_1");
core.commandService.registerCommand("me_enhance_action_2");
core.commandService.registerCommand("me_enhance_action_3");
core.commandService.registerCommand("me_enhance_agility_1");
core.commandService.registerCommand("me_enhance_agility_2");
core.commandService.registerCommand("me_enhance_agility_3");
core.commandService.registerCommand("me_enhance_block_1");
core.commandService.registerCommand("me_enhance_dodge_1");
core.commandService.registerCommand("me_enhance_precision_1");
core.commandService.registerCommand("me_enhance_precision_2");
core.commandService.registerCommand("me_enhance_precision_3");
core.commandService.registerCommand("me_enhance_strength_1");
core.commandService.registerCommand("me_enhance_strength_2");
core.commandService.registerCommand("me_enhance_strength_3");
core.commandService.registerCommand("me_evasion_1");
// Officer