what is this

modular_citadel/code/game/objects/items.dm

@@ -1,6 +1,4 @@
 /obj/item
-	var/total_mass //Total mass in arbitrary pound-like values. If there's no balance reasons for an item to have otherwise, this var should be the item's weight in pounds.
-
 	var/list/alternate_screams = list() //REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
 
 // lazy for screaming.

modular_citadel/code/game/objects/items/handcuffs.dm

@@ -1,5 +0,0 @@
-/obj/item/restraints/handcuffs/fake/kinky
-	name = "kinky handcuffs"
-	desc = "Fake handcuffs meant for erotic roleplay."
-	icon = 'modular_citadel/icons/obj/items_and_weapons.dmi'
-	icon_state = "handcuffgag"

modular_citadel/code/game/objects/items/melee/energy.dm

@@ -1,3 +0,0 @@
-/obj/item/melee/transforming/energy/sword
-	total_mass = 0.375 //Survival flashlights typically weigh around 5 ounces.
-	total_mass_on = 3.4 //The typical medieval sword, on the other hand, weighs roughly 3 pounds.

modular_citadel/code/game/objects/items/melee/eutactic_blades.dm

@@ -124,7 +124,7 @@
 			return
 		else
 			to_chat(user, "<span class='notice'>You combine the two light swords, making a single supermassive blade! You're cool.</span>")
-			new /obj/item/twohanded/hypereutactic(user.drop_location())
+			new /obj/item/twohanded/dualsaber/hypereutactic(user.drop_location())
 			qdel(W)
 			qdel(src)
 	else
@@ -233,7 +233,7 @@
 			return
 		else
 			to_chat(user, "<span class='notice'>You combine the two plastic swords, making a single supermassive toy! You're fake-cool.</span>")
-			new /obj/item/twohanded/hypereutactic/toy(user.loc)
+			new /obj/item/twohanded/dualsaber/hypereutactic/toy(user.loc)
 			qdel(W)
 			qdel(src)
 	else
@@ -247,7 +247,7 @@
 //	HYPEREUTACTIC Blades	/////////////////////////
 /////////////////////////////////////////////////////
 
-/obj/item/twohanded/hypereutactic
+/obj/item/twohanded/dualsaber/hypereutactic
 	icon = 'modular_citadel/icons/eutactic/item/hypereutactic.dmi'
 	icon_state = "hypereutactic"
 	lefthand_file = 'modular_citadel/icons/eutactic/mob/hypereutactic_left.dmi'
@@ -258,58 +258,29 @@
 	name = "hypereutactic blade"
 	desc = "A supermassive weapon envisioned to cleave the very fabric of space and time itself in twain, the hypereutactic blade dynamically flash-forges a hypereutactic crystaline nanostructure capable of passing through most known forms of matter like a hot knife through butter."
 	force = 7
-	throwforce = 5
-	throw_speed = 3
-	throw_range = 5
-	w_class = WEIGHT_CLASS_SMALL
-	var/w_class_on = WEIGHT_CLASS_BULKY
 	force_unwielded = 7
 	force_wielded = 40
 	wieldsound = 'sound/weapons/nebon.ogg'
 	unwieldsound = 'sound/weapons/neboff.ogg'
-	hitsound = "swing_hit"
+	hitsound_on = 'sound/weapons/nebhit.ogg'
+	slowdown_wielded = 1
 	armour_penetration = 60
 	light_color = "#37FFF7"
+	rainbow_colors = list("#FF0000", "#FFFF00", "#00FF00", "#00FFFF", "#0000FF","#FF00FF", "#3399ff", "#ff9900", "#fb008b", "#9800ff", "#00ffa3", "#ccff00")
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "destroyed", "ripped", "devastated", "shredded")
-	block_chance = 75
-	max_integrity = 200
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70)
-	resistance_flags = FIRE_PROOF
-	var/brightness_on = 6 //TWICE AS BRIGHT AS A REGULAR ESWORD
-	item_flags = SLOWS_WHILE_IN_HAND
+	spinnable = FALSE
+	total_mass_on = 4
 
-/obj/item/twohanded/hypereutactic/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
+/obj/item/twohanded/dualsaber/hypereutactic/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
 	altafterattack(A, user, TRUE, params)
 	return TRUE
 
-/obj/item/twohanded/hypereutactic/altafterattack(atom/target, mob/living/carbon/user, proximity_flag, click_parameters)	//does right click memes
+/obj/item/twohanded/dualsaber/hypereutactic/altafterattack(atom/target, mob/living/user, proximity_flag, click_parameters)	//does right click memes
 	if(istype(user))
 		user.visible_message("<span class='notice'>[user] points the tip of [src] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
 	return TRUE
 
-/obj/item/twohanded/hypereutactic/wield(mob/living/carbon/M) //Specific wield () hulk checks due to reflection chance for balance issues and switches hitsounds.
-	if(M.has_dna())
-		if(M.dna.check_mutation(HULK))
-			to_chat(M, "<span class='warning'>You lack the grace to wield this!</span>")
-			return
-	..()
-	if(wielded)
-		sharpness = IS_SHARP
-		w_class = w_class_on
-		hitsound = 'sound/weapons/nebhit.ogg'
-		START_PROCESSING(SSobj, src)
-		set_light(brightness_on)
-
-/obj/item/twohanded/hypereutactic/unwield() //Specific unwield () to switch hitsounds.
-	sharpness = initial(sharpness)
-	w_class = initial(w_class)
-	..()
-	hitsound = "swing_hit"
-	STOP_PROCESSING(SSobj, src)
-	set_light(0)
-	slowdown = initial(slowdown)
-
-/obj/item/twohanded/hypereutactic/update_icon()
+/obj/item/twohanded/dualsaber/hypereutactic/update_icon()
 	var/mutable_appearance/blade_overlay = mutable_appearance('modular_citadel/icons/eutactic/item/hypereutactic.dmi', "hypereutactic_blade")
 	var/mutable_appearance/gem_overlay = mutable_appearance('modular_citadel/icons/eutactic/item/hypereutactic.dmi', "hypereutactic_gem")
 
@@ -329,21 +300,21 @@
 
 	SEND_SIGNAL(src, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)//blood overlays get weird otherwise, because the sprite changes. (retained from original desword because I have no idea what this is)
 
-/obj/item/twohanded/hypereutactic/AltClick(mob/living/user)
-	if(!in_range(src, user))	//Basic checks to prevent abuse
+/obj/item/twohanded/dualsaber/hypereutactic/AltClick(mob/living/user)
+	if(!user.canUseTopic(src, BE_CLOSE, FALSE) || hacked)
 		return
 	if(user.incapacitated() || !istype(user))
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
-
 	if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
 		var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
-		if(energy_color_input)
-			light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
+		if(!energy_color_input || !user.canUseTopic(src, BE_CLOSE, FALSE) || hacked)
+			return
+		light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
 		update_icon()
 		update_light()
 
-/obj/item/twohanded/hypereutactic/worn_overlays(isinhands, icon_file)
+/obj/item/twohanded/dualsaber/hypereutactic/worn_overlays(isinhands, icon_file)
 	. = ..()
 	if(isinhands)
 		var/mutable_appearance/gem_inhand = mutable_appearance(icon_file, "hypereutactic_gem")
@@ -354,70 +325,19 @@
 			blade_inhand.color = light_color
 			. += blade_inhand
 
-/obj/item/twohanded/hypereutactic/examine(mob/user)
+/obj/item/twohanded/dualsaber/hypereutactic/examine(mob/user)
 	..()
-	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+	if(!hacked)
+		to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
 
-////////// stuff beneath this is all taken from the desword ////////////  wow very professional such OOP wow
-
-/obj/item/twohanded/hypereutactic/attack(mob/target, mob/living/carbon/human/user)
-	if(user.has_dna())
-		if(user.dna.check_mutation(HULK))
-			to_chat(user, "<span class='warning'>You grip the blade too hard and accidentally close it!</span>")
-			unwield()
-			return
-	..()
-	if(HAS_TRAIT(user, TRAIT_CLUMSY) && (wielded) && prob(40))
-		impale(user)
-		return
-
-/obj/item/twohanded/hypereutactic/Destroy()
-	STOP_PROCESSING(SSobj, src)
+/obj/item/twohanded/dualsaber/hypereutactic/rainbow_process()
 	. = ..()
-
-/obj/item/twohanded/hypereutactic/proc/impale(mob/living/user)
-	to_chat(user, "<span class='warning'>You spin around a bit before losing your balance and impaling yourself on [src].</span>")
-	if (force_wielded)
-		user.take_bodypart_damage(20,25)
-	else
-		user.adjustStaminaLoss(25)
-
-/obj/item/twohanded/hypereutactic/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
-	if(wielded)
-		return ..()
-	return FALSE
-
-/obj/item/twohanded/hypereutactic/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)  //In case thats just so happens that it is still activated on the groud, prevents hulk from picking it up
-	if(wielded)
-		to_chat(user, "<span class='warning'>You can't pick up such dangerous item with your meaty hands without losing fingers, better not to!</span>")
-		return TRUE
-
-/obj/item/twohanded/hypereutactic/process()
-	if(wielded)
-		open_flame()
-	else
-		STOP_PROCESSING(SSobj, src)
-
-/obj/item/twohanded/hypereutactic/IsReflect()
-	if(wielded)
-		return TRUE
-
-/obj/item/twohanded/hypereutactic/ignition_effect(atom/A, mob/user)
-	// same as /obj/item/melee/transforming/energy, mostly
-	if(!wielded)
-		return ""
-	var/in_mouth = ""
-	if(iscarbon(user))
-		var/mob/living/carbon/C = user
-		if(C.wear_mask == src)
-			in_mouth = ", barely missing their nose"
-	. = "<span class='warning'>[user] swings [user.p_their()] [src][in_mouth]. [user.p_they()] light[user.p_s()] [A] in the process.</span>"
-	playsound(loc, hitsound, get_clamped_volume(), 1, -1)
-	add_fingerprint(user)
+	update_icon()
+	update_light()
 
 //////////////////	TOY VERSION	/////////////////////////////
 
-/obj/item/twohanded/hypereutactic/toy
+/obj/item/twohanded/dualsaber/hypereutactic/toy
 	name = "\improper DX Hyper-Euplastic LightSword"
 	desc = "A supermassive toy envisioned to cleave the very fabric of space and time itself in twain. Realistic visuals and sounds! Ages 8 and up."
 	force = 0
@@ -427,11 +347,13 @@
 	force_unwielded = 0
 	force_wielded = 0
 	attack_verb = list("attacked", "struck", "hit")
+	total_mass_on = TOTAL_MASS_TOY_SWORD
+	slowdown_wielded = 0
 
-/obj/item/twohanded/hypereutactic/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+/obj/item/twohanded/dualsaber/hypereutactic/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	return FALSE
 
-/obj/item/twohanded/hypereutactic/toy/IsReflect()//Stops it from reflecting energy projectiles
+/obj/item/twohanded/dualsaber/hypereutactic/toy/IsReflect()//Stops it from reflecting energy projectiles
 	return FALSE
 
 ////////		Tatortot NEB		/////////////// (same stats as regular esword)
@@ -455,17 +377,7 @@
 
 //RAINBOW MEMES
 
-/obj/item/twohanded/hypereutactic/toy/rainbow
+/obj/item/twohanded/dualsaber/hypereutactic/toy/rainbow
 	name = "\improper Hyper-Euclidean Reciprocating Trigonometric Zweihander"
 	desc = "A custom-built toy with fancy rainbow lights built-in."
-	var/list/rainbow_colors = list("#FF0000", "#FFFF00", "#00FF00", "#00FFFF", "#0000FF","#FF00FF", "#3399ff", "#ff9900", "#fb008b", "#9800ff", "#00ffa3", "#ccff00")
-
-/obj/item/twohanded/hypereutactic/toy/rainbow/process()
-	. = ..()
-	var/set_color = pick(rainbow_colors)
-	light_color = set_color
-	update_light()
-	update_icon()
-
-/obj/item/twohanded/hypereutactic/toy/rainbow/AltClick(mob/living/user)
-	return
+	hacked = TRUE

modular_citadel/code/game/objects/items/melee/misc.dm

@@ -4,7 +4,7 @@
 	var/hardstun_ds = 1
 	var/softstun_ds = 0
 	var/stam_dmg = 30
-	cooldown = 20
+	cooldown = 0
 	total_mass = 3.75
 
 /obj/item/melee/classic_baton/attack(mob/living/target, mob/living/user)

modular_citadel/code/game/objects/items/melee/transforming.dm

@@ -1,15 +0,0 @@
-/obj/item/melee/transforming
-	var/total_mass_on //Total mass in ounces when transformed. Primarily for balance purposes. Don't think about it too hard.
-
-/obj/item/melee/transforming/getweight()
-	if(total_mass && total_mass_on)
-		if(active)
-			return max(total_mass_on,MIN_MELEE_STAMCOST)
-		else
-			return max(total_mass,MIN_MELEE_STAMCOST)
-	else
-		return initial(w_class)*1.25
-
-/obj/item/melee/transforming/cleaving_saw
-	total_mass = 2.75
-	total_mass_on = 5

modular_citadel/code/game/objects/items/stunsword.dm

@@ -7,6 +7,14 @@
 	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
 	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
 
+/obj/item/melee/baton/stunsword/get_belt_overlay()
+	if(istype(loc, /obj/item/storage/belt/sabre))
+		return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "stunsword")
+	return ..()
+
+/obj/item/melee/baton/stunsword/get_worn_belt_overlay(icon_file)
+	return mutable_appearance(icon_file, "-stunsword")
+
 /obj/item/ssword_kit
 	name = "stunsword kit"
 	desc = "a modkit for making a stunbaton into a stunsword"