From ac877a1337de56a90fc0393e839482786a545641 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 15 Mar 2017 03:27:58 -0700 Subject: [PATCH 1/5] Ports tesla mech gun, also adds xray/immolator guns --- code/game/mecha/combat/marauder.dm | 4 ++- code/game/mecha/equipment/weapons/weapons.dm | 32 +++++++++++++++++- .../designs/mechfabricator_designs.dm | 33 +++++++++++++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 97b442a51da..90a2c51b78d 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -48,7 +48,7 @@ wreckage = /obj/effect/decal/mecha_wreckage/seraph internal_damage_threshold = 20 force = 55 - max_equip = 5 + max_equip = 6 /obj/mecha/combat/marauder/seraph/add_cell() cell = new /obj/item/weapon/stock_parts/cell/bluespace(src) @@ -66,6 +66,8 @@ ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src) ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray(src) + ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/teleporter/precise(src) ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 0466aa698c6..c08df63d7d0 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -68,7 +68,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser equip_cooldown = 8 - name = "CH-PS \"Immolator\" Laser" + name = "CH-PS \"Standard\" Laser" icon_state = "mecha_laser" energy_drain = 30 projectile = /obj/item/projectile/beam @@ -90,6 +90,36 @@ projectile = /obj/item/projectile/ion fire_sound = 'sound/weapons/Laser.ogg' +/obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla + equip_cooldown = 35 + name = "P-X Tesla Cannon" + desc = "A weapon for combat exosuits. Fires bolts of electricity similar to the experimental tesla engine" + icon_state = "mecha_laser" + origin_tech = "materials=4;combat=5;magnets=4" + energy_drain = 500 + projectile = /obj/item/projectile/energy/shock_revolver + fire_sound = 'sound/magic/lightningbolt.ogg' + +/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray + equip_cooldown = 35 + name = "S-1 XRay Projector" + desc = "A weapon for combat exosuits. Fires beams of X-Rays that pass through solid matter." + icon_state = "mecha_laser" + origin_tech = "materials=3;combat=5;magnets=2;syndicate=2" + energy_drain = 80 + projectile = /obj/item/projectile/beam/xray + fire_sound = 'sound/weapons/laser3.ogg' + +/obj/item/mecha_parts/mecha_equipment/weapon/energy/immolator + equip_cooldown = 35 + name = "ZFI Immolator Cannon" + desc = "A weapon for combat exosuits. Fires beams of extreme heat that set targets on fire." + icon_state = "mecha_laser" + origin_tech = "materials=4;combat=4;magnets=3;plasmatech=2" + energy_drain = 80 + projectile = /obj/item/projectile/beam/immolator + fire_sound = 'sound/weapons/laser3.ogg' + /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse equip_cooldown = 30 name = "eZ-13 mk2 Heavy pulse rifle" diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 779a0809577..b8eb58ec5ce 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -959,6 +959,39 @@ construction_time = 100 category = list("Exosuit Equipment") +/datum/design/mech_tesla + name = "Exosuit Weapon (MKI Tesla Cannon)" + desc = "Allows for the construction of MKI Tesla Cannon." + id = "mech_tesla" + build_type = MECHFAB + req_tech = list("combat" = 6, "magnets" = 5, "materials" = 5) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla + materials = list(MAT_METAL = 10000, MAT_GLASS = 10000, MAT_SILVER = 10000) + construction_time = 100 + category = list("Exosuit Equipment") + +/datum/design/mech_xray + name = "Exosuit Weapon (MKI X-Ray Laser)" + desc = "Allows for the construction of MKI X-Ray Laser." + id = "mech_tesla" + build_type = MECHFAB + req_tech = list("combat" = 5, "materials" = 3, "syndicate" = 2, "magnets" = 2) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray + materials = list(MAT_GOLD = 5000, MAT_URANIUM = 10000, MAT_METAL = 4000) + construction_time = 100 + category = list("Exosuit Equipment") + +/datum/design/mech_immolator + name = "Exosuit Weapon (MKI Immolator Laser)" + desc = "Allows for the construction of MKI Immolator Laser." + id = "mech_tesla" + build_type = MECHFAB + req_tech = list("combat" = 4, "materials" = 4, "plasmatech" = 2, "magnets" = 3) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/immolator + materials = list(MAT_METAL = 4000, MAT_GLASS = 1000, MAT_SILVER = 3000, MAT_PLASMA = 2000) + construction_time = 100 + category = list("Exosuit Equipment") + //Cyborg Upgrade Modules /datum/design/borg_upgrade_reset From 649bbfd35ed6f6cff389b0461d2603f5ea76139d Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 15 Mar 2017 23:45:51 -0700 Subject: [PATCH 2/5] Admin mech weapons --- code/game/mecha/combat/marauder.dm | 11 +++--- code/game/mecha/equipment/weapons/weapons.dm | 35 ++++++++++++++++--- .../designs/mechfabricator_designs.dm | 13 ++++++- 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 90a2c51b78d..bf63b7ccab9 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -47,8 +47,8 @@ health = 550 wreckage = /obj/effect/decal/mecha_wreckage/seraph internal_damage_threshold = 20 - force = 55 - max_equip = 6 + force = 80 + max_equip = 8 /obj/mecha/combat/marauder/seraph/add_cell() cell = new /obj/item/weapon/stock_parts/cell/bluespace(src) @@ -62,11 +62,11 @@ for(ME in equipment) equipment -= ME qdel(ME) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/heavy(src) ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray/triple(src) ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/dual(src) ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/teleporter/precise(src) ME.attach(src) @@ -75,6 +75,7 @@ ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src) ME.attach(src) + /obj/mecha/combat/marauder/mauler desc = "Heavy-duty, combat exosuit, developed off of the existing Marauder model." name = "Mauler" diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index c08df63d7d0..d90ded73eb8 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -68,12 +68,18 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser equip_cooldown = 8 - name = "CH-PS \"Standard\" Laser" + name = "CH-PS \"Old Faithful\" Laser" icon_state = "mecha_laser" energy_drain = 30 projectile = /obj/item/projectile/beam fire_sound = 'sound/weapons/Laser.ogg' +/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/disabler + name = "DD7 Rapid Disabler Module" + projectile = /obj/item/projectile/beam/disabler + projectiles_per_shot = 2 + projectile_delay = 1 + /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy equip_cooldown = 10 name = "CH-LC \"Solaris\" Laser Cannon" @@ -102,7 +108,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray equip_cooldown = 35 - name = "S-1 XRay Projector" + name = "S-1 X-Ray Projector" desc = "A weapon for combat exosuits. Fires beams of X-Rays that pass through solid matter." icon_state = "mecha_laser" origin_tech = "materials=3;combat=5;magnets=2;syndicate=2" @@ -110,9 +116,14 @@ projectile = /obj/item/projectile/beam/xray fire_sound = 'sound/weapons/laser3.ogg' +/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray/triple + name = "X-XR Triple-barrel X-Ray Stream Projector" + projectiles_per_shot = 3 + projectile_delay = 1 + /obj/item/mecha_parts/mecha_equipment/weapon/energy/immolator equip_cooldown = 35 - name = "ZFI Immolator Cannon" + name = "ZFI Immolation Beam Gun" desc = "A weapon for combat exosuits. Fires beams of extreme heat that set targets on fire." icon_state = "mecha_laser" origin_tech = "materials=4;combat=4;magnets=3;plasmatech=2" @@ -303,8 +314,12 @@ variance = 6 projectile_delay = 2 +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/dual + name = "XMG-9 Autocannon" + projectiles_per_shot = 6 + /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack - name = "SRM-8 Missile Rack" + name = "SRM-8 Light Missile Rack" icon_state = "mecha_missilerack" projectile = /obj/item/missile fire_sound = 'sound/effects/bang.ogg' @@ -313,6 +328,7 @@ equip_cooldown = 60 var/missile_speed = 2 var/missile_range = 30 + var/heavy_missile = 0 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/action(target, params) if(!action_checks(target)) @@ -320,6 +336,8 @@ set_ready_state(0) var/obj/item/missile/M = new projectile(chassis.loc) M.primed = 1 + if(heavy_missile) + M.heavy_missile = 1 playsound(chassis, fire_sound, 50, 1) M.throw_at(target, missile_range, missile_speed, chassis) projectiles-- @@ -330,16 +348,23 @@ do_after_cooldown() return +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/heavy + name = "SRX-13 Heavy Missile Launcher" + heavy_missile = 1 /obj/item/missile icon = 'icons/obj/grenade.dmi' icon_state = "missile" var/primed = null + var/heavy_missile = 0 throwforce = 15 /obj/item/missile/throw_impact(atom/hit_atom) if(primed) - explosion(hit_atom, 0, 0, 2, 4, 0) + if(heavy_missile) + explosion(hit_atom, 2, 3, 4, 6, 0) + else + explosion(hit_atom, 0, 0, 2, 4, 0) qdel(src) else ..() diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index b8eb58ec5ce..ebe080d69aa 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -883,7 +883,7 @@ category = list("Exosuit Equipment") /datum/design/mech_laser - name = "Exosuit Weapon (CH-PS \"Immolator\" Laser)" + name = "Exosuit Weapon (CH-PL \"Standard\" Laser)" desc = "Allows for the construction of CH-PS Laser." id = "mech_laser" build_type = MECHFAB @@ -893,6 +893,17 @@ construction_time = 100 category = list("Exosuit Equipment") +/datum/design/mech_disabler + name = "Exosuit Weapon (CH-PD Disabler)" + desc = "Allows for the construction of CH-PD Disabler." + id = "mech_laser" + build_type = MECHFAB + req_tech = list("combat" = 3, "magnets" = 3) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/disabler + materials = list(MAT_METAL=10000) + construction_time = 100 + category = list("Exosuit Equipment") + /datum/design/mech_carbine name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)" desc = "Allows for the construction of FNX-99 \"Hades\" Carbine." From cf271b710dc2516358ef43a018a65c2b652bd5eb Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 16 Mar 2017 22:37:29 -0700 Subject: [PATCH 3/5] Neca Tweaks - DS/Gamma ERT mechs now have single-shot x-ray lasers to deal with blobs. - X-ray laser is no longer buildable by crew. --- code/game/mecha/combat/marauder.dm | 4 +++- .../research/designs/mechfabricator_designs.dm | 17 +++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index bf63b7ccab9..1a901f4a71e 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -21,7 +21,7 @@ add_req_access = 0 internal_damage_threshold = 25 force = 45 - max_equip = 4 + max_equip = 5 /obj/mecha/combat/marauder/loaded/New() @@ -30,6 +30,8 @@ ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack ME.attach(src) + ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray(src) + ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src) diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index ebe080d69aa..dbcbe71e167 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -883,7 +883,7 @@ category = list("Exosuit Equipment") /datum/design/mech_laser - name = "Exosuit Weapon (CH-PL \"Standard\" Laser)" + name = "Exosuit Weapon (CH-PL \"Old Faithful\" Laser)" desc = "Allows for the construction of CH-PS Laser." id = "mech_laser" build_type = MECHFAB @@ -981,20 +981,9 @@ construction_time = 100 category = list("Exosuit Equipment") -/datum/design/mech_xray - name = "Exosuit Weapon (MKI X-Ray Laser)" - desc = "Allows for the construction of MKI X-Ray Laser." - id = "mech_tesla" - build_type = MECHFAB - req_tech = list("combat" = 5, "materials" = 3, "syndicate" = 2, "magnets" = 2) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray - materials = list(MAT_GOLD = 5000, MAT_URANIUM = 10000, MAT_METAL = 4000) - construction_time = 100 - category = list("Exosuit Equipment") - /datum/design/mech_immolator - name = "Exosuit Weapon (MKI Immolator Laser)" - desc = "Allows for the construction of MKI Immolator Laser." + name = "Exosuit Weapon (ZFI Immolation Beam Gun)" + desc = "Allows for the construction of ZFI Immolation Beam Gun." id = "mech_tesla" build_type = MECHFAB req_tech = list("combat" = 4, "materials" = 4, "plasmatech" = 2, "magnets" = 3) From 713014196eb6cfd1a831814823dd999a29257f12 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 16 Mar 2017 22:39:27 -0700 Subject: [PATCH 4/5] Tweak Tweak 2 --- code/game/mecha/equipment/weapons/weapons.dm | 2 +- code/modules/research/designs/mechfabricator_designs.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index d90ded73eb8..5666b484475 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -75,7 +75,7 @@ fire_sound = 'sound/weapons/Laser.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/disabler - name = "DD7 Rapid Disabler Module" + name = "CH-PD Disabler" projectile = /obj/item/projectile/beam/disabler projectiles_per_shot = 2 projectile_delay = 1 diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index dbcbe71e167..26322518410 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -971,8 +971,8 @@ category = list("Exosuit Equipment") /datum/design/mech_tesla - name = "Exosuit Weapon (MKI Tesla Cannon)" - desc = "Allows for the construction of MKI Tesla Cannon." + name = "Exosuit Weapon (P-X Tesla Cannon)" + desc = "Allows for the construction of P-X Tesla Cannon." id = "mech_tesla" build_type = MECHFAB req_tech = list("combat" = 6, "magnets" = 5, "materials" = 5) From 6eb35ea4e93a68e53167356dd6d456fd8d0ebd3f Mon Sep 17 00:00:00 2001 From: Kyep Date: Sat, 18 Mar 2017 15:38:25 -0700 Subject: [PATCH 5/5] Old Faithful -> Firedart --- code/game/mecha/equipment/weapons/weapons.dm | 2 +- code/modules/research/designs/mechfabricator_designs.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 5666b484475..d31086b9885 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -68,7 +68,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser equip_cooldown = 8 - name = "CH-PS \"Old Faithful\" Laser" + name = "CH-PS \"Firedart\" Laser" icon_state = "mecha_laser" energy_drain = 30 projectile = /obj/item/projectile/beam diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 26322518410..73bcb13203e 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -883,7 +883,7 @@ category = list("Exosuit Equipment") /datum/design/mech_laser - name = "Exosuit Weapon (CH-PL \"Old Faithful\" Laser)" + name = "Exosuit Weapon (CH-PL \"Firedart\" Laser)" desc = "Allows for the construction of CH-PS Laser." id = "mech_laser" build_type = MECHFAB