Merge pull request #2586 from ARF-SS13/LaserAdd

Preps to add a new laser to the game.
ARF-SS13 · Jul 1, 2023 · 0e9be4f · 0e9be4f
2 parents 76b874b + 0f3a1ef
commit 0e9be4f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 0 deletions.
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
@@ -48,3 +48,7 @@
 /obj/effect/projectile/impact/laser/emitter
 	name = "emitter impact"
 	icon_state = "impact_emitter"
+
+/obj/effect/projectile/impact/laser/solar
+	name = "laser impact"
+	icon_state = "impact_solar"
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
@@ -39,3 +39,6 @@
 /obj/effect/projectile/muzzle/laser/emitter
 	name = "emitter flash"
 	icon_state = "muzzle_emitter"
+
+/obj/effect/projectile/muzzle/laser/solar
+	icon_state = "muzzle_solar"
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
@@ -75,3 +75,7 @@
 /obj/effect/projectile/tracer/laser/emitter
 	name = "emitter beam"
 	icon_state = "emitter"
+
+/obj/effect/projectile/tracer/laser/solar
+	name = "laser beam"
+	icon_state = "solar"
diff --git a/modular_coyote/icons/objects/xcomlaser.dmi b/modular_coyote/icons/objects/xcomlaser.dmi
diff --git a/modular_coyote/icons/objects/xcomlaserLeft.dmi b/modular_coyote/icons/objects/xcomlaserLeft.dmi
diff --git a/modular_coyote/icons/objects/xcomlaserRight.dmi b/modular_coyote/icons/objects/xcomlaserRight.dmi
diff --git a/modular_coyote/sound/items/xcom/LaserHit.wav b/modular_coyote/sound/items/xcom/LaserHit.wav
diff --git a/modular_coyote/sound/items/xcom/LaserRifleFire.wav b/modular_coyote/sound/items/xcom/LaserRifleFire.wav