diff --git a/serverdata/command/combat_commands.sdb b/serverdata/command/combat_commands.sdb
index 45917bee0..cf64caf96 100644
--- a/serverdata/command/combat_commands.sdb
+++ b/serverdata/command/combat_commands.sdb
@@ -25,9 +25,9 @@ centerofbeing	Brawler		centerOfBeing		STANDARD	BUFF	50	6	10	0	0	0	1	SINGLE_TARGE
 centerofbeing_1	Teras Kasi		centerOfBeing_1		STANDARD	BUFF	100	5	20	0	0	0	1	SINGLE_TARGET	0	0	0	0	KINETIC	KINETIC	0	0	0	FALSE	FALSE	FALSE	FALSE			0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	FALSE	force_strength_anim													
 chargeshot	Carbineer				STANDARD	ATTACK	0	5	0	0	0	0	1	SINGLE_TARGET	0	0	0	1.2	KINETIC	KINETIC	50	0	50	FALSE	FALSE	FALSE	FALSE	appearance/pt_special_attack_overcharge.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	charge									*heavy_wpn				
 chargeshot_1	Carbineer				STANDARD	ATTACK	0	7	2	0	0	0	1	SINGLE_TARGET	0	0	0	1.5	KINETIC	KINETIC	50	0	75	FALSE	FALSE	FALSE	FALSE	appearance/pt_special_attack_overcharge.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	charge									*heavy_wpn				
-comboattack	Teras Kasi				STANDARD	ATTACK	0	5	0	0	0	0	1	SINGLE_TARGET	0	0	0	0.4	KINETIC	KINETIC	5	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_smuggler_brawler_swipe.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	combo_4b													
-comboattack_1	Teras Kasi				STANDARD	ATTACK	0	7	2	0	0	0	1	SINGLE_TARGET	0	0	0	0.55	KINETIC	KINETIC	5	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_smuggler_brawler_swipe.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	combo_4a													
-comboattack_2	Teras Kasi				STANDARD	ATTACK	0	9	4	0	0	0	1	SINGLE_TARGET	0	0	0	0.7	KINETIC	KINETIC	5	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_smuggler_brawler_swipe.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	combo_4a													
+comboattack	Teras Kasi				STANDARD	ATTACK	0	5	0	0	0	0	1	SINGLE_TARGET	0	0	0	0.4	KINETIC	KINETIC	5	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_smuggler_brawler_swipe.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	combo_5a_medium													
+comboattack_1	Teras Kasi				STANDARD	ATTACK	0	7	2	0	0	0	1	SINGLE_TARGET	0	0	0	0.55	KINETIC	KINETIC	5	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_smuggler_brawler_swipe.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	combo_5a_medium													
+comboattack_2	Teras Kasi				STANDARD	ATTACK	0	9	4	0	0	0	1	SINGLE_TARGET	0	0	0	0.7	KINETIC	KINETIC	5	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_smuggler_brawler_swipe.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	combo_5a_medium													
 concealshot	Rifleman				STANDARD	ATTACK	0	8	3	0	0	0	1	SINGLE_TARGET	0	0	0	1.2	KINETIC	KINETIC	64	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_special_attack_aim.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	fire_1_special_single									*heavy_wpn				
 concealshot_1	Rifleman				STANDARD	ATTACK	0	10	5	0	0	0	1	SINGLE_TARGET	0	0	0	2.3	KINETIC	KINETIC	64	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_special_attack_aim.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	fire_1_special_single									*heavy_wpn				
 concussionshot	Smuggler				STANDARD	ATTACK	0	10	5	0	0	0	1	SINGLE_TARGET	0	0	0	0.4	KINETIC	KINETIC	35	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_special_attack_aim.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	fire_1_single_medium					fire_1_single_medium	fire_1_single_medium	fire_1_single_medium	fire_1_single_medium	*heavy_wpn				
@@ -199,4 +199,4 @@ traumatize	Combat Medic			traumatize	STANDARD	DEBUFF	50	8	3	0	0	50	1	SINGLE_TARG
 traumatize_1	Combat Medic			traumatize_1	STANDARD	DEBUFF	100	9	4	0	0	100	1	SINGLE_TARGET	0	0	0	0	KINETIC	KINETIC	48	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_special_attack_pointblank.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	fire_1_special_single_medium	combo_4a_light	combo_4b_light	combo_4c_light	combo_4d_light	fire_1_special_single_medium	fire_1_special_single_medium	fire_1_special_single_medium	fire_1_special_single_medium	*heavy_wpn				
 warcry	Pikeman			warcry	STANDARD	DELAY_ATTACK	0	5	0	0	0	0	1	SINGLE_TARGET	0	0	0	0	KINETIC	KINETIC	20	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_special_attack_warcry.prt	root	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	warcry													
 warcry_1	Pikeman	AoE		warcry_1	STANDARD	DELAY_ATTACK	0	10	5	0	0	0	1	AREA	15	0	0	0	KINETIC	KINETIC	15	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_special_attack_warcry.prt	root	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	warcry													
-warningshot	Pistoleer			warningShot	STANDARD	ATTACK	0	8	3	0	0	0	1	SINGLE_TARGET	0	0	0	0	KINETIC	KINETIC	35	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_special_attack_pointblank.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	fire_1_single_medium					fire_1_single_medium	fire_1_single_medium	fire_1_single_medium	fire_1_single_medium	*heavy_wpn				
\ No newline at end of file
+warningshot	Pistoleer			warningShot	STANDARD	ATTACK	0	8	3	0	0	0	1	SINGLE_TARGET	0	0	0	0	KINETIC	KINETIC	35	0	0	FALSE	FALSE	FALSE	FALSE	appearance/pt_special_attack_pointblank.prt	weapon	0	0	1	object/tangible/space/content_infrastructure/generic_egg_small.iff		-1	3	1	TARGET	HEALTH	TRUE	fire_1_single_medium					fire_1_single_medium	fire_1_single_medium	fire_1_single_medium	fire_1_single_medium	*heavy_wpn