diff --git a/code/game/mecha/equipment/weapons/energy/laser.dm b/code/game/mecha/equipment/weapons/energy/laser.dm index 372fe67f0f..9aca9100d7 100644 --- a/code/game/mecha/equipment/weapons/energy/laser.dm +++ b/code/game/mecha/equipment/weapons/energy/laser.dm @@ -20,6 +20,17 @@ origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_POWER = 3) +/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/gamma //CHOMPedit begin : adds Gamma Laser as proof of concept + equip_cooldown = 5 + name = "\improper GA-X \"Render\" Experimental Gamma Laser" + desc = "A experimental suppression laser that fires blasts of radiation charged photons, extremely effective at punching through armor." + icon_state = "mecha_coil" + energy_drain = 80 + projectile = /obj/item/projectile/beam/gamma + fire_sound = 'sound/weapons/emitter.ogg' + + origin_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_PHORON = 4, TECH_POWER = 5, TECH_ILLEGAL = 3) //CHOMPedit end + /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray/rigged equip_cooldown = 12 name = "jury-rigged xray rifle" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 41430bea38..ef30cb5ffe 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -92,9 +92,9 @@ name = "gamma beam" icon_state = "xray" fire_sound = 'sound/weapons/eluger.ogg' - damage = 10 + damage = 8 //CHOMPedit armor_penetration = 90 - irradiate = 20 + irradiate = 7 //CHOMPedit light_color = "#00CC33" muzzle_type = /obj/effect/projectile/muzzle/xray diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm index 53a0c98ddf..d27ec97bf2 100644 --- a/code/modules/research/mechfab_designs.dm +++ b/code/modules/research/mechfab_designs.dm @@ -435,6 +435,13 @@ build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray materials = list(DEFAULT_WALL_MATERIAL = 9000, "glass" = 3000, "phoron" = 1000, "silver" = 1500, "gold" = 2500, "plastic" = 2000) +/datum/design/item/mecha/weapon/laser_gamma //CHOMPedit begin : add Gamma Laser + name = "GA-X \"Render\" Experimental Gamma Laser" + id = "mech_laser_gamma" + req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_PHORON = 4, TECH_POWER = 5, TECH_ILLEGAL = 3) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/gamma + materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 4000, "phoron" = 2500, "silver" = 1000, "gold" = 500, "uranium" = 3000) //CHOMPedit end + /datum/design/item/mecha/weapon/rigged_laser_xray name = "Jury-Rigged Xray Rifle" id = "mech_laser_xray-r"