diff --git a/.gitignore b/.gitignore index abf84becce..4df27ee41b 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ temp.dmi /maps/RandomZLevels/backup /tools/midi2piano.zip /maps/yw/backup + +icons/mecha/mecha_equipment_ch.dmi diff --git a/code/game/mecha/equipment/tools/phoron_bore.dm b/code/game/mecha/equipment/tools/phoron_bore.dm deleted file mode 100644 index 47212a434f..0000000000 --- a/code/game/mecha/equipment/tools/phoron_bore.dm +++ /dev/null @@ -1,13 +0,0 @@ -//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 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." - icon = 'icons/mecha/mecha_equipment_vr.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/game/mecha/equipment/tools/phoron_bore_ch.dm b/code/game/mecha/equipment/tools/phoron_bore_ch.dm index 47212a434f..55665356d8 100644 --- a/code/game/mecha/equipment/tools/phoron_bore_ch.dm +++ b/code/game/mecha/equipment/tools/phoron_bore_ch.dm @@ -3,8 +3,8 @@ auto_rearm = 1 equip_cooldown = 15 // half of drill name = "\improper 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." - icon = 'icons/mecha/mecha_equipment_vr.dmi' + 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 diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi index 5bd3176c65..65dfa98237 100644 Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ 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_vr.dmi b/icons/mecha/mecha_equipment_vr.dmi index 6ca5e5a2f6..ec23292b90 100644 Binary files a/icons/mecha/mecha_equipment_vr.dmi and b/icons/mecha/mecha_equipment_vr.dmi differ