melee combat rework test

_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm

@@ -1014,7 +1014,7 @@
 /obj/effect/turf_decal/spline/fancy/transparent/neutral/corner{
 	dir = 1
 	},
-/obj/item/dualsaber/toy,
+/obj/item/melee/duelenergy/saber/toy,
 /turf/open/floor/plasteel/icemoon,
 /area/ruin/unpowered/crashed_holemaker)
 "rm" = (

_maps/RandomRuins/SpaceRuins/spacemall.dmm

@@ -6315,7 +6315,7 @@
 "xM" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/item/dualsaber/toy,
+/obj/item/melee/duelenergy/saber/toy,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/spacemall/shop2)
 "xN" = (
@@ -11422,7 +11422,7 @@
 /turf/open/floor/plating/grass,
 /area/ruin/space/has_grav/spacemall)
 "QO" = (
-/obj/item/dualsaber/toy,
+/obj/item/melee/duelenergy/saber/toy,
 /obj/item/toy/redbutton{
 	pixel_x = 14
 	},

_maps/shuttles/syndicate/syndicate_ngr_derecho.dmm

@@ -3529,8 +3529,8 @@
 /obj/machinery/light/small/directional/south,
 /obj/machinery/firealarm/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/melee/axe/sledgehammer,
-/obj/item/melee/axe/sledgehammer{
+/obj/item/melee/sledgehammer/gorlex,
+/obj/item/melee/sledgehammer/gorlex{
 	pixel_x = 5
 	},
 /turf/open/floor/pod,

_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm

@@ -6126,7 +6126,7 @@
 "Ol" = (
 /obj/structure/rack,
 /obj/machinery/airalarm/directional/south,
-/obj/item/melee/axe/sledgehammer,
+/obj/item/melee/sledgehammer/gorlex,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/fore)
 "On" = (

code/__DEFINES/combat.dm

@@ -40,7 +40,9 @@
 //Actual combat defines
 
 //click cooldowns, in tenths of a second, used for various combat actions
+#define HEAVY_WEAPON_CD 10
 #define CLICK_CD_MELEE 8
+#define LIGHT_WEAPON_CD 6
 #define CLICK_CD_RANGE 4
 #define CLICK_CD_RAPID 2
 #define CLICK_CD_CLICK_ABILITY 6
@@ -49,6 +51,7 @@
 #define CLICK_CD_RESIST 20
 #define CLICK_CD_GRABBING 10
 #define CLICK_CD_LOOK_UP 5
+#define CLICK_CD_PARRY 8
 
 //Cuff resist speeds
 #define FAST_CUFFBREAK 1
@@ -74,6 +77,11 @@
 #define PROJECTILE_ATTACK 3
 #define THROWN_PROJECTILE_ATTACK 4
 #define LEAP_ATTACK 5
+#define ALL_ATTACK_TYPES list(MELEE_ATTACK, UNARMED_ATTACK, PROJECTILE_ATTACK, THROWN_PROJECTILE_ATTACK, LEAP_ATTACK)
+#define NON_PROJECTILE_ATTACKS list(MELEE_ATTACK, UNARMED_ATTACK, LEAP_ATTACK)
+
+// the standard parry time out time
+#define PARRY_DEFAULT_TIMEOUT 1 SECONDS
 
 //attack visual effects
 #define ATTACK_EFFECT_PUNCH "punch"

code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm

@@ -70,6 +70,9 @@
 #define COMSIG_HUMAN_CHECK_SHIELDS "human_check_shields"
 	#define SHIELD_BLOCK (1<<0)
 
+//sent from living mobs when they parry
+#define COMSIG_HUMAN_PARRY "human_parry"
+
 // Mob transformation signals
 ///Called when a human turns into a monkey, from /mob/living/carbon/proc/finish_monkeyize()
 #define COMSIG_HUMAN_MONKEYIZE "human_monkeyize"

code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_item.dm

@@ -30,6 +30,8 @@
 	#define COMPONENT_BLOCK_MARK_RETRIEVAL 1
 #define COMSIG_ITEM_WEARERCROSSED "wearer_crossed" //called on item when crossed by something (): (/atom/movable, mob/living/crossed)
 
+#define COMSIG_ITEM_UNIQUE_ACTION "item_unique_action" //from base of obj/item/unique_action(): (mob/living/user)
+
 ///from base of item/sharpener/attackby(): (amount, max)
 #define COMSIG_ITEM_SHARPEN_ACT "sharpen_act"
 	#define COMPONENT_BLOCK_SHARPEN_APPLIED 1

code/__DEFINES/keybinding.dm

@@ -44,6 +44,7 @@
 #define COMSIG_KB_HUMAN_QUICKEQUIP_DOWN "keybinding_human_quickequip_down"
 #define COMSIG_KB_HUMAN_QUICKEQUIPBELT_DOWN "keybinding_human_quickequipbelt_down"
 #define COMSIG_KB_HUMAN_UNIQUEACTION "keybinding_uniqueaction"
+#define COMSIG_KB_HUMAN_PARRY "keybinding_parry"
 #define COMSIG_KB_HUMAN_BAGEQUIP_DOWN "keybinding_human_bagequip_down"
 #define COMSIG_KB_HUMAN_EQUIPMENTSWAP_DOWN "keybinding_human_equipmentswap_down"
 #define COMSIG_KB_HUMAN_SUITEQUIP_DOWN "keybinding_human_suitequip_down"

code/_onclick/item_attack.dm

@@ -72,7 +72,8 @@
 	if((I.item_flags & SURGICAL_TOOL) && user.a_intent == INTENT_HELP)
 		if(attempt_initiate_surgery(I, src, user))
 			return TRUE
-	user.changeNext_move(CLICK_CD_MELEE)
+	//This should really be in attack but 2 much logic doesnt call parent
+	user.changeNext_move(I.attack_cooldown)
 	return I.attack(src, user)
 
 /mob/living/attack_hand(mob/living/user)
@@ -126,14 +127,13 @@
 	log_combat(user, M, "attacked", src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
 	add_fingerprint(user)
 
-
 /// The equivalent of the standard version of [/obj/item/proc/attack] but for object targets.
 /obj/item/proc/attack_obj(obj/O, mob/living/user)
 	if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, O, user) & COMPONENT_NO_ATTACK_OBJ)
 		return
 	if(item_flags & NOBLUDGEON)
 		return
-	user.changeNext_move(CLICK_CD_MELEE)
+	user.changeNext_move(attack_cooldown)
 	user.do_attack_animation(O)
 	O.attacked_by(src, user)