stuff (#22595)

Author: SapphicOverload

code/game/mecha/equipment/mecha_equipment.dm

@@ -108,11 +108,9 @@
 		return FALSE
 	if(!chassis)
 		return FALSE
-	if(chassis.Adjacent(target))
-		if(!(range & MECHA_MELEE))
-			chassis.default_melee_attack(target)
-			return FALSE
-	else if(!(range & MECHA_RANGED))
+	if(!(range & MECHA_MELEE) && chassis.default_melee_attack(target))
+		return FALSE
+	if(!(range & MECHA_RANGED) && !chassis.Adjacent(target))
 		return FALSE
 	if(!equip_ready)
 		return FALSE

code/game/mecha/equipment/weapons/armor.dm

@@ -19,29 +19,29 @@
 /obj/item/mecha_parts/mecha_equipment/armor/attach(obj/mecha/new_chassis)
 	. = ..()
 	if(equip_ready)
-		new_chassis.armor.attachArmor(armor)
+		new_chassis.armor = new_chassis.armor.attachArmor(armor)
 
 /obj/item/mecha_parts/mecha_equipment/armor/detach(atom/moveto)
 	if(equip_ready)
-		chassis.armor.detachArmor(armor)
+		chassis.armor = chassis.armor.detachArmor(armor)
 	return ..()
 
 /obj/item/mecha_parts/mecha_equipment/armor/set_ready_state(state)
 	if(equip_ready != state)
 		if(state)
-			chassis.armor.attachArmor(armor)
+			chassis.armor = chassis.armor.attachArmor(armor)
 		else
-			chassis.armor.detachArmor(armor)
+			chassis.armor = chassis.armor.detachArmor(armor)
 	return ..()
 
 /obj/item/mecha_parts/mecha_equipment/armor/melee //what is that noise? A BAWWW from TK mutants.
 	name = "armor booster module (Close Combat Weaponry)"
-	desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate."
+	desc = "Boosts exosuit armor against armed melee attacks."
 	icon_state = "mecha_abooster_ccw"
 	armor = list(MELEE = 20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 20, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, ELECTRIC = 0)
 
 /obj/item/mecha_parts/mecha_equipment/armor/ranged
 	name = "armor booster module (Ranged Weaponry)"
-	desc = "Boosts exosuit armor against ranged attacks. Completely blocks taser shots. Requires energy to operate."
+	desc = "Boosts exosuit armor against ranged attacks."
 	icon_state = "mecha_abooster_proj"
 	armor = list(MELEE = 0, BULLET = 15, LASER = 15, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, ELECTRIC = 0)

code/game/mecha/equipment/weapons/weapons.dm

@@ -200,6 +200,9 @@
 		chassis.default_melee_attack(target)
 	return TRUE
 
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/use(used)
+	return chassis?.cell?.use(used * energy_drain)
+
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun
 	equip_cooldown = 10
 	name = "Exosuit Proto-kinetic Accelerator"

code/game/mecha/mecha.dm

@@ -589,24 +589,25 @@
 		if(!W.equip_ready && (W.equip_cooldown < MECHA_MAX_COOLDOWN))
 			return
 
-	if(!selected && Adjacent(target))
+	if(!selected)
 		default_melee_attack(target)
-		return
-	if(selected.action_checks(target) && selected.action(target, user, params))
+	else if(selected.action_checks(target) && selected.action(target, user, params))
 		selected.start_cooldown()
 
 /obj/mecha/proc/default_melee_attack(atom/target)
 	if(internal_damage & MECHA_INT_CONTROL_LOST)
 		target = pick(oview(1,src))
-	if(!melee_can_hit || !istype(target, /atom))
-		return
+	if(!melee_can_hit || !isatom(target))
+		return FALSE
 	if(equipment_disabled)
-		return
+		return FALSE
+	if(!Adjacent(target))
+		return FALSE
 	target.mech_melee_attack(src, force, TRUE)
 	melee_can_hit = FALSE
 	adjust_overheat(punch_heat_cost)
 	addtimer(VARSET_CALLBACK(src, melee_can_hit, TRUE), melee_cooldown)
-
+	return TRUE
 
 /obj/mecha/proc/range_action(atom/target)
 	return

code/game/mecha/mecha_defense.dm

@@ -201,6 +201,11 @@
 		log_message("Exposed to dangerous temperature.", LOG_MECHA, color="red")
 		take_damage(5, BURN, 0, 1)
 
+/obj/mecha/tool_act(mob/living/user, obj/item/tool, tool_type, params)
+	if(istype(tool, /obj/item/mecha_parts/mecha_equipment) && !ismecha(tool.loc))
+		return FALSE
+	return ..()
+
 /obj/mecha/welder_act(mob/living/user, obj/item/tool, modifiers)
 	if(user.combat_mode)
 		return FALSE