Merge pull request #6772 from Kyep/mech_weapons

Ports tesla mech gun, also adds xray/immolator guns
This commit is contained in:
tigercat2000
2017-05-22 13:01:10 -07:00
committed by GitHub
3 changed files with 102 additions and 9 deletions
@@ -883,7 +883,7 @@
category = list("Exosuit Equipment")
/datum/design/mech_laser
name = "Exosuit Weapon (CH-PS \"Immolator\" Laser)"
name = "Exosuit Weapon (CH-PL \"Firedart\" 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."
@@ -959,6 +970,28 @@
construction_time = 100
category = list("Exosuit Equipment")
/datum/design/mech_tesla
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)
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_immolator
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)
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