[WIP] Bladeatheon

_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm

@@ -1106,7 +1106,7 @@
 	pixel_x = -6;
 	pixel_y = 10
 	},
-/obj/item/melee/transforming/energy/sword/saber/pirate/red{
+/obj/item/melee/energy/sword/saber/pirate/red{
 	pixel_y = 8;
 	pixel_x = 10
 	},

_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm

@@ -1016,7 +1016,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/JungleRuins/jungle_cavecrew.dmm

@@ -2416,7 +2416,7 @@
 	pixel_y = -8;
 	pixel_x = 5
 	},
-/obj/item/melee/transforming/energy/sword/saber/pirate/red,
+/obj/item/melee/energy/sword/saber/pirate/red,
 /turf/open/floor/wood,
 /area/ruin/jungle/cavecrew/dormitories)
 "Dh" = (

_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm

@@ -2482,7 +2482,7 @@
 	icon_state = "gib3-old";
 	pixel_x = -6
 	},
-/obj/item/melee/transforming/energy/sword/saber/pirate/yellow{
+/obj/item/melee/energy/sword/saber/pirate/yellow{
 	pixel_x = -5;
 	pixel_y = 16
 	},

_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm

@@ -887,7 +887,7 @@
 /area/overmap_encounter/planetoid/lava/explored)
 "zb" = (
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner{
-	loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/keycard/gatedrop/lavacanyon);
+	loot = list(/obj/item/melee/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/keycard/gatedrop/lavacanyon);
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/overmap_encounter/planetoid/cave/explored)

_maps/RandomRuins/SpaceRuins/spacemall.dmm

@@ -6318,7 +6318,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" = (
@@ -11448,7 +11448,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/map_files/generic/CentCom.dmm

@@ -2661,7 +2661,7 @@
 /obj/item/clothing/suit/armor/tdome/red,
 /obj/item/clothing/head/helmet/thunderdome,
 /obj/item/melee/baton/loaded,
-/obj/item/melee/transforming/energy/sword/saber/red,
+/obj/item/melee/energy/sword/saber/red,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
@@ -3962,7 +3962,7 @@
 /obj/item/clothing/suit/armor/tdome/green,
 /obj/item/clothing/head/helmet/thunderdome,
 /obj/item/melee/baton/loaded,
-/obj/item/melee/transforming/energy/sword/saber/green,
+/obj/item/melee/energy/sword/saber/green,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
@@ -6922,7 +6922,7 @@
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 8
 	},
-/obj/item/melee/transforming/energy/ctf,
+/obj/item/melee/energy/ctf,
 /turf/open/floor/plasteel/dark,
 /area/ctf)
 "cEn" = (
@@ -7850,7 +7850,7 @@
 /obj/effect/turf_decal/corner/opaque/red{
 	dir = 8
 	},
-/obj/item/melee/transforming/energy/ctf,
+/obj/item/melee/energy/ctf,
 /turf/open/floor/plasteel/dark,
 /area/ctf)
 "eDS" = (
@@ -8401,7 +8401,7 @@
 /obj/item/clothing/suit/armor/tdome/green,
 /obj/item/clothing/head/helmet/thunderdome,
 /obj/item/melee/baton/loaded,
-/obj/item/melee/transforming/energy/sword/saber/green,
+/obj/item/melee/energy/sword/saber/green,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
@@ -14416,7 +14416,7 @@
 /obj/item/clothing/suit/armor/tdome/red,
 /obj/item/clothing/head/helmet/thunderdome,
 /obj/item/melee/baton/loaded,
-/obj/item/melee/transforming/energy/sword/saber/red,
+/obj/item/melee/energy/sword/saber/red,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},

_maps/shuttles/pirate/pirate_noderider.dmm

@@ -1502,7 +1502,7 @@
 /obj/item/storage/box/handcuffs,
 /obj/item/clothing/glasses/meson,
 /obj/item/megaphone,
-/obj/item/melee/transforming/energy/sword/saber/red,
+/obj/item/melee/energy/sword/saber/red,
 /obj/item/pinpointer/crew,
 /obj/item/clothing/mask/gas/atmos,
 /obj/item/clothing/mask/whistle,

_maps/shuttles/roumain/srm_elder.dmm

@@ -1453,7 +1453,7 @@
 /obj/vehicle/ridden/wheelchair{
 	dir = 4
 	},
-/obj/item/melee/transforming/cleaving_saw/old,
+/obj/item/melee/cleaving_saw/old,
 /turf/open/floor/ship/dirt/dark,
 /area/ship/bridge)
 "rj" = (

_maps/shuttles/solgov/solgov_chronicle.dmm

@@ -1947,8 +1947,8 @@
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/dorm)
 "ti" = (
-/obj/item/energyhalberd/purple,
-/obj/item/energyhalberd/purple,
+/obj/item/melee/duelenergy/halberd/purple,
+/obj/item/melee/duelenergy/halberd/purple,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},

code/__DEFINES/combat.dm

@@ -40,13 +40,15 @@
 //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
 #define CLICK_CD_BREAKOUT 100
 #define CLICK_CD_HANDCUFFED 10
-#define CLICK_CD_RESIST 20
+#define CLICK_CD_RESIST 1
 #define CLICK_CD_GRABBING 10
 #define CLICK_CD_LOOK_UP 5
 
@@ -74,6 +76,12 @@
 #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 0.75 SECONDS
+#define PARRY_RIPOST 0.50 SECONDS
 
 //attack visual effects
 #define ATTACK_EFFECT_PUNCH "punch"

code/__DEFINES/dcs/signals/signals.dm

@@ -666,12 +666,6 @@
 #define COMSIG_TRY_STORAGE_RETURN_INVENTORY "storage_return_inventory"	//(list/list_to_inject_results_into, recursively_search_inside_storages = TRUE)
 #define COMSIG_TRY_STORAGE_CAN_INSERT "storage_can_equip" //(obj/item/insertion_candidate, mob/user, silent) - returns bool
 
-// /datum/component/two_handed signals
-#define COMSIG_TWOHANDED_WIELD "twohanded_wield" //from base of datum/component/two_handed/proc/wield(mob/living/carbon/user): (/mob/user)
-	#define COMPONENT_TWOHANDED_BLOCK_WIELD 1
-#define COMSIG_TWOHANDED_UNWIELD "twohanded_unwield" //from base of datum/component/two_handed/proc/unwield(mob/living/carbon/user): (/mob/user)
-
-
 // /datum/action signals
 #define COMSIG_ACTION_TRIGGER "action_trigger" //from base of datum/action/proc/Trigger(): (datum/action)
 	#define COMPONENT_ACTION_BLOCK_TRIGGER 1

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

@@ -36,6 +36,8 @@
 	#define COMPONENT_BLOCK_SHARPEN_BLOCKED 2
 	#define COMPONENT_BLOCK_SHARPEN_ALREADY 4
 	#define COMPONENT_BLOCK_SHARPEN_MAXED 8
+
+#define COMSIG_ITEM_USE_CELL "item_use_cell"
 
 #define COMSIG_TOOL_IN_USE "tool_in_use" ///from base of [/obj/item/proc/tool_check_callback]: (mob/living/user)
 #define COMSIG_TOOL_START_USE "tool_start_use" ///from base of [/obj/item/proc/tool_start_check]: (mob/living/user)
@@ -66,3 +68,8 @@
 	#define COMSIG_ITEM_SPLIT_VALUE 1
 #define COMSIG_ITEM_SPLIT_PROFIT "item_split_profits" //Called when getting the item's exact ratio for cargo's profit.
 #define COMSIG_ITEM_SPLIT_PROFIT_DRY "item_split_profits_dry" //Called when getting the item's exact ratio for cargo's profit, without selling the item.
+
+// /datum/component/two_handed signals
+#define COMSIG_TWOHANDED_WIELD "twohanded_wield" //from base of datum/component/two_handed/proc/wield(mob/living/carbon/user): (/mob/user)
+	#define COMPONENT_TWOHANDED_BLOCK_WIELD 1
+#define COMSIG_TWOHANDED_UNWIELD "twohanded_unwield" //from base of datum/component/two_handed/proc/unwield(mob/living/carbon/user): (/mob/user)

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

@@ -0,0 +1,12 @@
+// /datum/component/transforming signals
+
+/// From /datum/component/transforming/proc/on_attack_self(obj/item/source, mob/user): (obj/item/source, mob/user, active)
+#define COMSIG_TRANSFORMING_PRE_TRANSFORM "transforming_pre_transform"
+	/// Return COMPONENT_BLOCK_TRANSFORM to prevent the item from transforming.
+	#define COMPONENT_BLOCK_TRANSFORM (1<<0)
+/// From /datum/component/transforming/proc/do_transform(obj/item/source, mob/user): (obj/item/source, mob/user, active)
+#define COMSIG_TRANSFORMING_ON_TRANSFORM "transforming_on_transform"
+	/// Return COMPONENT_NO_DEFAULT_MESSAGE to prevent the transforming component from displaying the default transform message / sound.
+	#define COMPONENT_NO_DEFAULT_MESSAGE (1<<0)
+
+#define COMSIG_ITEM_FORCE_TRANSFORM "item_force_transform"

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

@@ -12,3 +12,8 @@
 #define COMSIG_OBJ_HIDE "obj_hide"
 /// from base of [/atom/proc/obj_destruction]: (damage_flag)
 #define COMSIG_OBJ_DESTRUCTION "obj_destruction"
+
+/// Sent from /obj/item/update_weight_class(). (old_w_class, new_w_class)
+#define COMSIG_ITEM_WEIGHT_CLASS_CHANGED "item_weight_class_changed"
+/// Sent from /obj/item/update_weight_class(), to its loc. (obj/item/changed_item, old_w_class, new_w_class)
+#define COMSIG_ATOM_CONTENTS_WEIGHT_CLASS_CHANGED "atom_contents_weight_class_changed"

code/__DEFINES/is_helpers.dm

@@ -10,6 +10,9 @@
 
 #define isgenerator(A) (istype(A, /generator))
 
+#define isbadpath(A) (A == initial(A.bad_type))
+#define isbadtype(A) (A.type == A.bad_type)
+
 //Turfs
 //#define isturf(A) (istype(A, /turf)) This is actually a byond built-in. Added here for completeness sake.
 

code/__DEFINES/traits.dm

@@ -301,6 +301,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NO_STORAGE_INSERT "no_storage_insert" //cannot be inserted in a storage.
 #define TRAIT_T_RAY_VISIBLE "t-ray-visible" // Visible on t-ray scanners if the atom/var/level == 1
 #define TRAIT_NO_TELEPORT "no-teleport" //you just can't
+/// A transforming item that is actively extended / transformed
+#define TRAIT_TRANSFORM_ACTIVE "active_transform"
 #define TRAIT_WIELDED "wielded" //The item is currently being wielded
 
 //quirk traits

code/_compile_options.dm

@@ -81,6 +81,7 @@
 
 #ifdef ALL_TESTS
 #define BASIC_TESTS
+//#define EXTRA_ICON_TESTS
 #define CREATE_AND_DESTROY_TEST
 #define PLANET_GEN_TEST
 #define RUIN_PLACEMENT_TEST

code/_onclick/item_attack.dm

@@ -72,7 +72,6 @@
 	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)
 	return I.attack(src, user)
 
 /mob/living/attack_hand(mob/living/user)
@@ -94,6 +93,8 @@
  * * mob/living/user - The mob hitting with this item
  */
 /obj/item/proc/attack(mob/living/M, mob/living/user)
+	user.changeNext_move(attack_cooldown)
+
 	if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user) & COMPONENT_ITEM_NO_ATTACK)
 		return
 	SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, 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)