From a3fbf79c9e47d8771c158cbcb740a07b0eb5d9a4 Mon Sep 17 00:00:00 2001
From: Mechoid <Mechoid@users.noreply.github.com>
Date: Sat, 25 Aug 2018 19:59:51 -0700
Subject: [PATCH] Touch stuff in reference to responses.

---
 code/game/mecha/equipment/mecha_equipment.dm     | 4 ++--
 code/game/mecha/equipment/tools/medical_tools.dm | 2 +-
 code/game/mecha/equipment/tools/tools.dm         | 4 ++--
 code/game/mecha/equipment/weapons/weapons.dm     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 16c6dd72f5..fec8c18e1d 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -19,7 +19,7 @@
 	var/salvageable = 1
 	var/required_type = /obj/mecha //may be either a type or a list of allowed types
 	var/equip_type = null //mechaequip2
-	var/allow_duplicate = 0
+	var/allow_duplicate = FALSE
 
 /obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(target=1)
 	sleep(equip_cooldown)
@@ -104,7 +104,7 @@
 		return 0
 	return 1
 
-/obj/item/mecha_parts/mecha_equipment/proc/handle_movement_action() //Any modules that have special effects or needs when moving.
+/obj/item/mecha_parts/mecha_equipment/proc/handle_movement_action() //Any modules that have special effects or needs when taking a step or floating through space.
 	return
 
 /obj/item/mecha_parts/mecha_equipment/proc/action(atom/target)
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index ae01d0c6b5..92a250ddfa 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -12,7 +12,7 @@
 	var/inject_amount = 5
 	required_type = /obj/mecha/medical
 	salvageable = 0
-	allow_duplicate = 1
+	allow_duplicate = TRUE
 
 /obj/item/mecha_parts/mecha_equipment/tool/sleeper/New()
 	..()
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index da9d052cc2..dd4472282c 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -866,7 +866,7 @@
 /obj/item/mecha_parts/mecha_equipment/combat_shield/attach(obj/mecha/M as obj)
 	..()
 	if(chassis)
-		my_shield.shield_health = my_shield.shield_health / 2
+		my_shield.shield_health = 0
 		my_shield.my_mecha = chassis
 		my_shield.forceMove(chassis)
 
@@ -1153,7 +1153,7 @@
 	var/mob/living/carbon/occupant = null
 	var/door_locked = 1
 	salvageable = 0
-	allow_duplicate = 1
+	allow_duplicate = TRUE
 
 	equip_type = EQUIP_HULL
 
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 23419b4eba..5f2b7254e4 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -166,7 +166,7 @@
 	description_fluff = "Essentially an Orion mounted inside a modified Gaia case."
 	icon_state = "mecha_phase"
 	energy_drain = 25
-	projectile = /obj/item/projectile/energy/phase
+	projectile = /obj/item/projectile/energy/phase/heavy
 	fire_sound = 'sound/weapons/Taser.ogg'
 
 	equip_type = EQUIP_UTILITY