From 21f111b5e0169c6cf6fdcd5043819e986ed8c913 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 3 Jan 2019 07:38:10 -0500 Subject: [PATCH] [Ready] New mech weapon, Melon Seed Scatter shot! - Requested and helped made by Elllsiy (#7873) * Fixing updater * Adds the gunthingy * makes the bullet * Update mecha_designs.dm * Update all_nodes.dm * Fixes stam harm --- code/game/mecha/equipment/weapons/weapons.dm | 12 ++++++++++++ .../projectiles/projectile/bullets/shotgun.dm | 6 +++++- code/modules/research/designs/mecha_designs.dm | 10 ++++++++++ code/modules/research/techweb/all_nodes.dm | 9 +++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 6c0795028b..d8c0fbeeb3 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -275,6 +275,18 @@ variance = 25 harmful = TRUE +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/seedscatter + name = "\improper Melon Seed \"Scattershot\"" + desc = "A weapon for combat exosuits. Shoots a spread of pellets, shaped as seed." + icon_state = "mecha_scatter" + equip_cooldown = 30 + projectile = /obj/item/projectile/bullet/seed + projectiles = 4 + projectile_energy_cost = 55 + projectiles_per_shot = 10 + variance = 20 + harmful = TRUE + /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg name = "\improper Ultra AC 2" desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst." diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 457ec78e9b..c8c4a73b3b 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -88,8 +88,12 @@ do_sparks(1, TRUE, src) ..() -// Mech Scattershot +// Mech Scattershots /obj/item/projectile/bullet/scattershot damage = 20 stamina = 65 + +/obj/item/projectile/bullet/seed + damage = 4 + stamina = 1 diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm index cee0dc7413..3ee7d344dc 100644 --- a/code/modules/research/designs/mecha_designs.dm +++ b/code/modules/research/designs/mecha_designs.dm @@ -147,6 +147,16 @@ construction_time = 100 category = list("Exosuit Equipment") +/datum/design/mech_seedscatter + name = "Exosuit Weapon (Melon Seed \"Scattershot\")" + desc = "Allows for the construction of Melon Seed Scattershot." + id = "mech_seedscatter" + build_type = MECHFAB + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/seedscatter + materials = list(MAT_METAL=10000, MAT_GLASS = 10000) + construction_time = 70 + 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." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 826f8d05b8..28d9f6a202 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -724,6 +724,15 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 +/datum/techweb_node/mech_seedscatter + id = "mech_seedscatter" + display_name = "Exosuit Weapon (Melon Seed \"Scattershot\")" + description = "An advanced piece of mech weaponry" + prereq_ids = list("ballistic_weapons") + design_ids = list("mech_seedscatter") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + export_price = 5000 + /datum/techweb_node/mech_carbine id = "mech_carbine" display_name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)"