diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index c736aac35d8..33d13c4ec0d 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -58,7 +58,7 @@ /obj/effect/temp_visual/dir_setting/firing_effect icon = 'icons/effects/effects.dmi' icon_state = "firing_effect" - duration = 2 + duration = 3 /obj/effect/temp_visual/dir_setting/firing_effect/setDir(newdir) switch(newdir) @@ -74,8 +74,14 @@ pixel_y = rand(-1,1) ..() -/obj/effect/temp_visual/dir_setting/firing_effect/energy - icon_state = "firing_effect_energy" +/obj/effect/temp_visual/dir_setting/firing_effect/blue + icon = 'icons/effects/effects.dmi' + icon_state = "firing_effect_blue" + duration = 3 + +/obj/effect/temp_visual/dir_setting/firing_effect/red + icon = 'icons/effects/effects.dmi' + icon_state = "firing_effect_red" duration = 3 /obj/effect/temp_visual/dir_setting/firing_effect/magic diff --git a/code/modules/projectiles/ammunition/energy/_energy.dm b/code/modules/projectiles/ammunition/energy/_energy.dm index 11c8707a5e7..0d3e11ec51a 100644 --- a/code/modules/projectiles/ammunition/energy/_energy.dm +++ b/code/modules/projectiles/ammunition/energy/_energy.dm @@ -7,5 +7,5 @@ var/e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE) //The amount of energy a cell needs to expend to create this shot. var/select_name = CALIBER_ENERGY fire_sound = 'sound/weapons/laser.ogg' - firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/red var/select_color = FALSE //SKYRAT EDIT ADDITION - This is the color that shows up when selecting an ammo type. Disabled by default diff --git a/code/modules/projectiles/ammunition/energy/ebow.dm b/code/modules/projectiles/ammunition/energy/ebow.dm index 535ea126576..a6a928c2509 100644 --- a/code/modules/projectiles/ammunition/energy/ebow.dm +++ b/code/modules/projectiles/ammunition/energy/ebow.dm @@ -3,6 +3,7 @@ select_name = "bolt" e_cost = LASER_SHOTS(1, STANDARD_CELL_CHARGE * 0.5) fire_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' // Even for non-suppressed crossbows, this is the most appropriate sound + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect /obj/item/ammo_casing/energy/bolt/halloween projectile_type = /obj/projectile/energy/bolt/halloween diff --git a/code/modules/projectiles/ammunition/energy/gravity.dm b/code/modules/projectiles/ammunition/energy/gravity.dm index fe73ad26883..6ad3a776475 100644 --- a/code/modules/projectiles/ammunition/energy/gravity.dm +++ b/code/modules/projectiles/ammunition/energy/gravity.dm @@ -4,6 +4,7 @@ select_name = "gravity" delay = 50 var/obj/item/gun/energy/gravity_gun/gun + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect /obj/item/ammo_casing/energy/gravity/Initialize(mapload) if(istype(loc,/obj/item/gun/energy/gravity_gun)) diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index c47181688a4..6eb2d238bb0 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -78,6 +78,7 @@ pellets = 3 variance = 15 harmful = FALSE + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue /obj/item/ammo_casing/energy/laser/heavy projectile_type = /obj/projectile/beam/laser/heavylaser @@ -89,6 +90,7 @@ e_cost = LASER_SHOTS(200, STANDARD_CELL_CHARGE * 40) select_name = "DESTROY" fire_sound = 'sound/weapons/pulse.ogg' + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue /obj/item/ammo_casing/energy/laser/bluetag projectile_type = /obj/projectile/beam/lasertag/bluetag @@ -134,6 +136,7 @@ /obj/item/ammo_casing/energy/nanite/cryo projectile_type = /obj/projectile/energy/cryo select_name = "cryo" + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue ///not exactly an energy ammo casing, but it's used by the laser gatling. /obj/item/ammo_casing/laser @@ -145,7 +148,7 @@ slot_flags = null projectile_type = /obj/projectile/beam fire_sound = 'sound/weapons/laser.ogg' - firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/red /obj/item/ammo_casing/laser/Initialize(mapload) . = ..() diff --git a/code/modules/projectiles/ammunition/energy/portal.dm b/code/modules/projectiles/ammunition/energy/portal.dm index 0ef63491f11..787f2e4eac7 100644 --- a/code/modules/projectiles/ammunition/energy/portal.dm +++ b/code/modules/projectiles/ammunition/energy/portal.dm @@ -6,10 +6,12 @@ select_name = "blue" //Weakref to the gun that shot us var/datum/weakref/gun + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue /obj/item/ammo_casing/energy/wormhole/orange projectile_type = /obj/projectile/beam/wormhole/orange select_name = "orange" + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/red /obj/item/ammo_casing/energy/wormhole/Initialize(mapload, obj/item/gun/energy/wormhole_projector/wh) . = ..() diff --git a/code/modules/projectiles/ammunition/energy/special.dm b/code/modules/projectiles/ammunition/energy/special.dm index b4c29137a9f..9a733dbc47a 100644 --- a/code/modules/projectiles/ammunition/energy/special.dm +++ b/code/modules/projectiles/ammunition/energy/special.dm @@ -2,6 +2,7 @@ projectile_type = /obj/projectile/ion select_name = "ion" fire_sound = 'sound/weapons/ionrifle.ogg' + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue /obj/item/ammo_casing/energy/ion/hos projectile_type = /obj/projectile/ion/weak @@ -37,10 +38,12 @@ select_name = "freeze" e_cost = LASER_SHOTS(40, STANDARD_CELL_CHARGE * 10) fire_sound = 'sound/weapons/pulse3.ogg' + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue /obj/item/ammo_casing/energy/temp/hot projectile_type = /obj/projectile/temp/hot select_name = "bake" + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/red /obj/item/ammo_casing/energy/meteor projectile_type = /obj/projectile/meteor @@ -63,6 +66,7 @@ e_cost = LASER_SHOTS(33, STANDARD_CELL_CHARGE) select_name = "shock" projectile_type = /obj/projectile/energy/tesla_cannon + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue /obj/item/ammo_casing/energy/shrink projectile_type = /obj/projectile/beam/shrink diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm index ee2f9fa17ee..7186804b354 100644 --- a/code/modules/projectiles/ammunition/energy/stun.dm +++ b/code/modules/projectiles/ammunition/energy/stun.dm @@ -4,6 +4,7 @@ fire_sound = 'sound/weapons/taser.ogg' e_cost = LASER_SHOTS(5, STANDARD_CELL_CHARGE) harmful = FALSE + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect /obj/item/ammo_casing/energy/electrode/spec e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE) @@ -21,6 +22,7 @@ e_cost = LASER_SHOTS(20, STANDARD_CELL_CHARGE) fire_sound = 'sound/weapons/taser2.ogg' harmful = FALSE + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue /obj/item/ammo_casing/energy/disabler/hos e_cost = LASER_SHOTS(20, STANDARD_CELL_CHARGE * 1.2) diff --git a/code/modules/projectiles/guns/special/meat_hook.dm b/code/modules/projectiles/guns/special/meat_hook.dm index 7438b22a5a9..dd83bbd030f 100644 --- a/code/modules/projectiles/guns/special/meat_hook.dm +++ b/code/modules/projectiles/guns/special/meat_hook.dm @@ -29,7 +29,7 @@ desc = "A hook." projectile_type = /obj/projectile/hook caliber = CALIBER_HOOK - firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect /obj/projectile/hook name = "hook" diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm index 10c652b77b5..3d88c40fdfb 100644 --- a/code/modules/projectiles/projectile/special/temperature.dm +++ b/code/modules/projectiles/projectile/special/temperature.dm @@ -26,6 +26,7 @@ /obj/projectile/temp/hot name = "heat beam" + icon_state = "lava" temperature = 100 // Raise the body temp by 100 points /obj/projectile/temp/cryo diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm index fe97c5f2b89..a8793416296 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm @@ -78,7 +78,7 @@ //Base energy weapon type /obj/item/mecha_parts/mecha_equipment/weapon/energy name = "general energy weapon" - firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/red /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser equip_cooldown = 8 @@ -100,6 +100,7 @@ variance = 25 projectiles_per_shot = 5 fire_sound = 'sound/weapons/taser2.ogg' + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy equip_cooldown = 15 @@ -173,6 +174,7 @@ equip_cooldown = 8 projectile = /obj/projectile/energy/electrode fire_sound = 'sound/weapons/taser.ogg' + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect /obj/item/mecha_parts/mecha_equipment/weapon/honker diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index b01986a9522..1859a451270 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ