From 47d6a439f1b6f40f374f66767cb0caec99f456d7 Mon Sep 17 00:00:00 2001 From: Digi Purpur Date: Sat, 17 Jun 2023 09:04:05 -0700 Subject: [PATCH] All the changes required for coilgun FXs to work Changes object/effects from "pointdefense" to "coildefense" to use when you prefer "projectile" PD turrets (point defense turrets vars and such should just use the old laser effects for cases where we wanna use those instead of the new ones Rykka and I added here!) --- code/game/machinery/pointdefense.dm | 4 ++-- .../temporary_visuals/projectiles/impact.dm | 10 +++++++++- .../temporary_visuals/projectiles/muzzle.dm | 10 +++++++++- .../temporary_visuals/projectiles/tracer.dm | 10 +++++++++- code/modules/projectiles/projectile/beams.dm | 15 +++++++++++++++ icons/obj/projectiles_impact_ch.dmi | Bin 2357 -> 2356 bytes icons/obj/projectiles_muzzle_ch.dmi | Bin 3307 -> 3307 bytes icons/obj/projectiles_tracer_ch.dmi | Bin 654 -> 654 bytes 8 files changed, 44 insertions(+), 5 deletions(-) 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 44cf6c75ba27f6afb1210fe9abff92d1c3abe457..4aa05cdb011f5ee969990d739f9cacbfa7961367 100644 GIT binary patch delta 157 zcmV;O0Al~O60{PKB!7r{R9JLGWpiV4X>fFDZ*Bkpc$_82u?oU46a~=vy|1{mtB6fq z-y$iJq5TC3O=<$EDM?WLdk4>UdfcYFS)gabZ(nN6F9@#Z3)3gM79bcEQ}FQ_+CR0~ z<{{|fe%Q4=)*O@bTgT*LsSpfITd}*Z5GW?+ll?+4oD@^a`4WI&fFDZ*Bkpc$_82u?oU46a~;Z?<+3tDq>UD zw@8X)Xn#S1Nll<_Lh?}jdk4>UdfcYFU0`NQ?@(LH2N>7$h14f`iC~PHR1E1A<)0=_ z0vKJ|i+jqWZ7!%36cauY6KjMQUV49sll2bs?! M?KgVaEU~qJ2oYOKUjP6A diff --git a/icons/obj/projectiles_muzzle_ch.dmi b/icons/obj/projectiles_muzzle_ch.dmi index 9c876d3618c631e81b78896f914c11909c706000..c2fae91aa698f046960b03d4e6ea9cf5dd21d700 100644 GIT binary patch delta 138 zcmV;50CoTC8S5F4M}Ni^*S8pm=>WfAhqeZbI- sX-uR445<*~1B{kx^kau^u=E8WfF;FuoK+wI01OvNL_t(&fw9IV48*KIHUIzs delta 138 zcmV;50CoTC8S5F4M}J0&>sw5T=>WfAn)D$}3MI5^QbRRI< sMmM@?|1_zX(gsFHHTu!O43@rH%_c~#Dg>JV01OvNL_t(&fw9IV3@W%g_5c6? diff --git a/icons/obj/projectiles_tracer_ch.dmi b/icons/obj/projectiles_tracer_ch.dmi index 3c6152254621fd99b07a30fa0a9c96543ed31f0e..da1423f76af10268bf9edc1a04242a303672d85c 100644 GIT binary patch delta 138 zcmV;50CoS41&#%fJAVqoFc1dd`R*xx+Ev81uD3{vWN2SOLUT2NXe0@WZ|~r@eLXJo z)vhp$<+qj^^Am#e@x=6rz6A)Tktt}rhxSixt|$0005ONwK=r0qVs-N&o-= delta 138 zcmV;50CoS41&#%fJAV#>Fc1dd`R*zHz-o*X*INw4bbwbdH9c$-prmayzP*Fr_O-Z; zcROR4EWb6En05%R=L^#(`WhhU4O7tg3iY2-T~!F0r@HNNq_|hFOT*-2E)aA~OLm(U s2n>_g)qNr8PKIes>42c;7UMi%m@NMQIME{nb^j;<0005ONwK=r0c6ZSWB>pF