diff --git a/.gitignore b/.gitignore
index abf84becce..9d170c82da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@ temp.dmi
 /maps/RandomZLevels/backup
 /tools/midi2piano.zip
 /maps/yw/backup
+
+icons/mecha/mecha_ch.dmi
diff --git a/code/game/mecha/equipment/tools/medigun_vr.dm b/code/game/mecha/equipment/tools/medigun_vr.dm
index 19efa0a5fd..55a2009970 100644
--- a/code/game/mecha/equipment/tools/medigun_vr.dm
+++ b/code/game/mecha/equipment/tools/medigun_vr.dm
@@ -2,7 +2,8 @@
 	equip_cooldown = 6
 	name = "\improper BL-3 \"Phoenix\" directed restoration system"
 	desc = "The BL-3 'Phoenix' is a portable medical system used to treat external injuries from afar."
-	icon_state = "mecha_medbeam"
+	icon = 'icons/mecha/mecha_equipment_vr.dmi'
+	icon_state = "medbeam" //CHOMPedit, removed mecha_ wasn't what mechamedbeam was called
 	energy_drain = 1000
 	projectile = /obj/item/projectile/beam/medigun
 	fire_sound = 'sound/weapons/eluger.ogg'
diff --git a/code/game/mecha/equipment/tools/phoron_bore_ch.dm b/code/game/mecha/equipment/tools/phoron_bore_ch.dm
new file mode 100644
index 0000000000..55665356d8
--- /dev/null
+++ b/code/game/mecha/equipment/tools/phoron_bore_ch.dm
@@ -0,0 +1,13 @@
+//CHOMPedit, cool tunneling device is cool
+/obj/item/mecha_parts/mecha_equipment/weapon/phoron_bore
+	auto_rearm = 1
+	equip_cooldown = 15 // half of drill
+	name = "\improper PB-23 \"Phobos\" Phoron Bore"
+	desc = "A design for a large, mecha-mounted Phoron bore, stolen driectly from Grayson Manufactories Ltd. and reproducted by NT. It makes use a specialized compressed phoron crystal. The bolt it fires travels for 6 tiles before dissapaiting, breaking rocks and extracting minerals."
+	icon = 'icons/mecha/mecha_equipment_ch.dmi'
+	icon_state = "mecha_pbore"
+	energy_drain = 200
+	projectile = /obj/item/projectile/bullet/magnetic/bore
+	fire_sound = 'sound/weapons/railgun.ogg'
+
+	origin_tech = list(TECH_MATERIAL = 5, TECH_PHORON = 5, TECH_POWER = 5)
diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm
index 0fdd3df5be..a335a6e6c6 100644
--- a/code/modules/research/mechfab_designs.dm
+++ b/code/modules/research/mechfab_designs.dm
@@ -692,7 +692,7 @@
 	name = "Ripley Leg Actuator Overdrive"
 	desc = "System enhancements and overdrives to make a mech's legs move faster."
 	id = "mech_speedboost_ripley"
-	req_tech = list( TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4)
+	req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4)
 	materials = list(DEFAULT_WALL_MATERIAL = 10000, "silver" = 1000, "gold" = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/speedboost
 
diff --git a/code/modules/research/mechfab_designs_ch.dm b/code/modules/research/mechfab_designs_ch.dm
new file mode 100644
index 0000000000..f7bb85aa72
--- /dev/null
+++ b/code/modules/research/mechfab_designs_ch.dm
@@ -0,0 +1,18 @@
+
+/datum/design/item/mecha
+	build_type = MECHFAB
+	category = "Exosuit Equipment"
+	time = 10
+	materials = list(DEFAULT_WALL_MATERIAL = 7500)
+
+/datum/design/item/mecha/AssembleDesignDesc()
+	if(!desc)
+		desc = "Allows for the construction of \a '[item_name]' exosuit module."
+
+/datum/design/item/mecha/phoron_bore
+	name = "PB-23 \"Phobos\" Phoron Bore"
+	desc = "A large, mecha-mounted Phoron bore. It makes use a specialized compressed phoron crystal. The bolt it fires travels for 6 tiles before disapaiting, breaking rocks and extracting minerals."
+	id ="mech_phoron_bore"
+	req_tech = list(TECH_POWER = 5, TECH_PHORON = 5, TECH_MATERIAL = 5)
+	materials = list(MAT_PLASTEEL = 4000, "phoron" = 10000, "silver" = 2000)
+	build_path =/obj/item/mecha_parts/mecha_equipment/weapon/phoron_bore
\ No newline at end of file
diff --git a/icons/mecha/mecha_ch.dmi b/icons/mecha/mecha_ch.dmi
new file mode 100644
index 0000000000..fe4dfdfd8d
Binary files /dev/null and b/icons/mecha/mecha_ch.dmi differ
diff --git a/icons/mecha/mecha_equipment_ch.dmi b/icons/mecha/mecha_equipment_ch.dmi
new file mode 100644
index 0000000000..e96087439f
Binary files /dev/null and b/icons/mecha/mecha_equipment_ch.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index 86aca75b01..0090be550b 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -921,6 +921,7 @@
 #include "code\game\mecha\equipment\tools\medigun_vr.dm"
 #include "code\game\mecha\equipment\tools\orescanner.dm"
 #include "code\game\mecha\equipment\tools\passenger.dm"
+#include "code\game\mecha\equipment\tools\phoron_bore_ch.dm"
 #include "code\game\mecha\equipment\tools\rcd.dm"
 #include "code\game\mecha\equipment\tools\repair_droid.dm"
 #include "code\game\mecha\equipment\tools\shield.dm"
@@ -3159,6 +3160,7 @@
 #include "code\modules\research\designs.dm"
 #include "code\modules\research\destructive_analyzer.dm"
 #include "code\modules\research\mechfab_designs.dm"
+#include "code\modules\research\mechfab_designs_ch.dm"
 #include "code\modules\research\message_server.dm"
 #include "code\modules\research\prosfab_designs.dm"
 #include "code\modules\research\prosfab_designs_vr.dm"