cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gun Muzzle Flash (2) (#94172)

Browse Source 
## About The Pull Request

Continues https://github.com/tgstation/tgstation/pull/81507

Adds a directional muzzle flash to all guns (excluding suppressors,
toys, e-bow, etc).
Changes color depending on the laser/projectile.
If anything is missed, let me know.

## Why It's Good For The Game

Realism
Cool visuals
Makes sense
This commit is contained in:
archbtw
2025-11-30 13:37:00 -06:00
committed by GitHub
parent 3858064261
commit 3425cf03e5
24 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/_ammunition.dm
+2
View File
@@ -16,6 +16,8 @@
var/caliber = null
///The bullet type to create when New() is called
var/projectile_type = null
///Muzzle flash color based on ammo casing.
var/muzzle_flash_color = LIGHT_COLOR_ORANGE
///the loaded projectile in this ammo casing
var/obj/projectile/loaded_projectile = null
///Pellets for spreadshot
code/modules/projectiles/ammunition/energy/_energy.dm
+1
View File
@@ -9,3 +9,4 @@
fire_sound = 'sound/items/weapons/laser.ogg'
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/red
newtonian_force = 0.5
muzzle_flash_color = LIGHT_COLOR_CYAN
code/modules/projectiles/ammunition/energy/laser.dm
+3
View File
@@ -2,6 +2,7 @@
projectile_type = /obj/projectile/beam/laser
e_cost = LASER_SHOTS(12, STANDARD_CELL_CHARGE)
select_name = "kill"
muzzle_flash_color = COLOR_SOFT_RED
/obj/item/ammo_casing/energy/laser/hellfire
projectile_type = /obj/projectile/beam/laser/hellfire
@@ -17,6 +18,7 @@
projectile_type = /obj/projectile/beam/laser
e_cost = LASER_SHOTS(16, STANDARD_CELL_CHARGE)
select_name = "kill"
muzzle_flash_color = COLOR_SOFT_RED
/obj/item/ammo_casing/energy/lasergun/pistol
e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE)
@@ -112,6 +114,7 @@
select_name = "DESTROY"
fire_sound = 'sound/items/weapons/pulse.ogg'
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue
muzzle_flash_color = LIGHT_COLOR_BLUE
/obj/item/ammo_casing/energy/laser/bluetag
projectile_type = /obj/projectile/beam/lasertag/bluetag
code/modules/projectiles/ammunition/energy/special.dm
+1
View File
@@ -3,6 +3,7 @@
select_name = "ion"
fire_sound = 'sound/items/weapons/ionrifle.ogg'
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue
muzzle_flash_color = LIGHT_COLOR_BLUE
/obj/item/ammo_casing/energy/ion/hos
projectile_type = /obj/projectile/ion/weak
code/modules/projectiles/ammunition/energy/stun.dm
+2
View File
@@ -5,6 +5,7 @@
e_cost = LASER_SHOTS(5, STANDARD_CELL_CHARGE)
harmful = FALSE
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect
muzzle_flash_color = LIGHT_COLOR_DIM_YELLOW
/obj/item/ammo_casing/energy/electrode/spec
e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE)
@@ -26,6 +27,7 @@
fire_sound = 'sound/items/weapons/taser2.ogg'
harmful = FALSE
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue
muzzle_flash_color = LIGHT_COLOR_CYAN
/obj/item/ammo_casing/energy/disabler/smg
projectile_type = /obj/projectile/beam/disabler/weak