diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm index ac032cfd61..bc4595bc01 100644 --- a/code/game/machinery/pointdefense.dm +++ b/code/game/machinery/pointdefense.dm @@ -225,10 +225,10 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) if(!istype(M)) return //We throw a laser but it doesnt have to hit for meteor to explode - var/obj/item/projectile/beam/pointdefense/beam = new(get_turf(src)) + var/obj/item/projectile/beam/coildefense/coil = new(get_turf(src)) playsound(src, fire_sounds, 75, 1, 40, pressure_affected = FALSE, ignore_walls = TRUE) // CHOMPEdit: Pew use_power_oneoff(idle_power_usage * 10) - beam.launch_projectile(target = M.loc, user = src) + coil.launch_projectile(target = M.loc, user = src) // CHOMPEdit: Changing "beam" var to "coil" for the new coilgun type point defense turrets (to match the coilgun sprite and sfx names) spawn(10) playsound(src, fire_sounds, 75, 1, 40, pressure_affected = FALSE, ignore_walls = TRUE) // CHOMPEdit: Pew diff --git a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm index cbf8db46be..0b962a48b6 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm @@ -102,4 +102,12 @@ light_color = "#80F5FF" //VOREStation edit ends /obj/effect/projectile/impact/pointdefense - icon_state = "impact_pointdef" \ No newline at end of file + icon_state = "impact_pointdef" + //CHOMPStation add coilgun pointdefense +/obj/effect/projectile/impact/coildefense + icon = 'icons/obj/projectiles_impact_ch.dmi' + icon_state = "impact_coildef" + light_range = 2 + light_power = 3 + light_color = "#FFFFFF" +//CHOMPStation add end <3 diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm index a817c9e74d..b2e73ead43 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm @@ -114,4 +114,12 @@ light_color = "#80F5FF" //VOREStation edit ends /obj/effect/projectile/muzzle/pointdefense - icon_state = "muzzle_pointdef" \ No newline at end of file + icon_state = "muzzle_pointdef" +//CHOMPStation add coilgun pointdefense +/obj/effect/projectile/muzzle/coildefense + icon = 'icons/obj/projectiles_muzzle_ch.dmi' + icon_state = "muzzle_coildef" + light_range = 3 + light_power = 1 + light_color = "#FFFFFF" +//CHOMPStation add end <3 diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm index 01a6b64e1c..f6d03516c6 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm @@ -141,4 +141,12 @@ light_color = "#80F5FF" //VOREStation edit ends /obj/effect/projectile/tracer/pointdefense - icon_state = "beam_pointdef" \ No newline at end of file + icon_state = "beam_pointdef" +//CHOMPStation add coilgun pointdefense +/obj/effect/projectile/tracer/coildefense + icon = 'icons/obj/projectiles_tracer_ch.dmi' + icon_state = "tracer_coildef" + light_range = 1 + light_power = 2 + light_color = "#FFFFFF" +//CHOMPStation add end <3 diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 0402f0faf7..28a3c64c5b 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -397,6 +397,21 @@ tracer_type = /obj/effect/projectile/tracer/pointdefense impact_type = /obj/effect/projectile/impact/pointdefense +// CHOMPADD a physical/projectile coil-gun type pointdefense +/obj/item/projectile/beam/coildefense + name = "defense coil salvo" + icon_state = "coil" + damage = 15 + damage_type = ELECTROCUTE //You should be safe inside a voidsuit + sharp = FALSE //"Wide" spectrum beam + light_color = "#FFFFFF" + + excavation_amount = 200 // Good at shooting rocks + + muzzle_type = /obj/effect/projectile/muzzle/coildefense + tracer_type = /obj/effect/projectile/tracer/coildefense + impact_type = /obj/effect/projectile/impact/coildefense + /obj/item/projectile/beam/precursor //CHOMPedit added Precursor beam name = "precursor beam" diff --git a/icons/obj/projectiles_impact_ch.dmi b/icons/obj/projectiles_impact_ch.dmi index 44cf6c75ba..4aa05cdb01 100644 Binary files a/icons/obj/projectiles_impact_ch.dmi and b/icons/obj/projectiles_impact_ch.dmi differ diff --git a/icons/obj/projectiles_muzzle_ch.dmi b/icons/obj/projectiles_muzzle_ch.dmi index 9c876d3618..c2fae91aa6 100644 Binary files a/icons/obj/projectiles_muzzle_ch.dmi and b/icons/obj/projectiles_muzzle_ch.dmi differ diff --git a/icons/obj/projectiles_tracer_ch.dmi b/icons/obj/projectiles_tracer_ch.dmi index 3c61522546..da1423f76a 100644 Binary files a/icons/obj/projectiles_tracer_ch.dmi and b/icons/obj/projectiles_tracer_ch.dmi differ