From cf82e2cae5bc97e2a8ac5762ef62495bf63fdd20 Mon Sep 17 00:00:00 2001 From: Aaron Date: Fri, 17 Jan 2020 21:39:36 -0500 Subject: [PATCH] adds desired changes self explaintory --- code/game/mecha/equipment/tools/medigun_vr.dm | 2 +- .../mecha/equipment/tools/phoron_bore_ch.dm | 13 +++++++++++++ code/modules/research/mechfab_designs.dm | 8 -------- code/modules/research/mechfab_designs_ch.dm | 18 ++++++++++++++++++ icons/mecha/mecha_equipment_vr.dmi | Bin 5645 -> 5645 bytes vorestation.dme | 3 ++- 6 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 code/game/mecha/equipment/tools/phoron_bore_ch.dm create mode 100644 code/modules/research/mechfab_designs_ch.dm diff --git a/code/game/mecha/equipment/tools/medigun_vr.dm b/code/game/mecha/equipment/tools/medigun_vr.dm index 5307a2d154..55a2009970 100644 --- a/code/game/mecha/equipment/tools/medigun_vr.dm +++ b/code/game/mecha/equipment/tools/medigun_vr.dm @@ -3,7 +3,7 @@ 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 = 'icons/mecha/mecha_equipment_vr.dmi' - icon_state = "mecha_medbeam" + 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..47212a434f --- /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 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/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm index 7416832ae9..a335a6e6c6 100644 --- a/code/modules/research/mechfab_designs.dm +++ b/code/modules/research/mechfab_designs.dm @@ -696,14 +696,6 @@ materials = list(DEFAULT_WALL_MATERIAL = 10000, "silver" = 1000, "gold" = 1000) build_path = /obj/item/mecha_parts/mecha_equipment/speedboost -/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 - /datum/design/item/synthetic_flash name = "Synthetic Flash" id = "sflash" 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_equipment_vr.dmi b/icons/mecha/mecha_equipment_vr.dmi index 94ea7582e47965b9a6eda884cfe028bb48ec4a52..6ca5e5a2f603b998b2f6194b276a1b1629d252ff 100644 GIT binary patch delta 148 zcmV;F0Biq^ER8IXIcSm13WG2VfY0_Rg5Jmeu3m;?c+gjnSTkE@8%gW-`a5_V4BA@) z-^T|@1-JX7?V;&f^(G0HJ=AbL998kLQ#4S+<*W)rb~bTeLc~Z=L+MBx92{?fqTuQz zN~wy;N`M+ps(1=I+UJp>G9AM8r;*SlerX+9=pS3by>FoDTJ;4Jx4nO-u|^=V@EsL~ CXGX^W delta 148 zcmV;F0Biq^ER8IXIcSj03WG2Z2G8ax7QL7LUA+`b@u06DYuuVpla)P-?Xd#K@hII7}fr)Z#t%UKnM>}=vbLc~Z=L+MBx92{?fqTuQz zN~wy;N`M+ps(1=I+V7E}G9BXg9Ze&lOQhG4h5oS>-1`Qau2o;h9>3h^?cR;C@EsLb Ck4Y2& diff --git a/vorestation.dme b/vorestation.dme index 1603dd0a69..beae0753d2 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -920,7 +920,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.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" @@ -3157,6 +3157,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"