Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scatter laser changes #3603

Merged
11 changes: 9 additions & 2 deletions code/modules/projectiles/ammunition/energy/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
projectile_type = /obj/projectile/beam/laser
select_name = "kill"

/obj/item/ammo_casing/energy/laser/slug
projectile_type = /obj/projectile/beam/laser/slug
select_name = "slug"
delay = 0.9 SECONDS
fire_sound = 'sound/weapons/gun/laser/laser_slug.ogg'

/obj/item/ammo_casing/energy/laser/eoehoma
projectile_type = /obj/projectile/beam/laser/eoehoma
fire_sound = 'sound/weapons/gun/laser/e-fire.ogg'
Expand Down Expand Up @@ -48,8 +54,9 @@

/obj/item/ammo_casing/energy/laser/scatter
projectile_type = /obj/projectile/beam/scatter
pellets = 5
variance = 25
pellets = 10
variance = 40
e_cost = 1598 //12 shots upgraded cell, 6 with normal cell
select_name = "scatter"

/obj/item/ammo_casing/energy/laser/ultima
Expand Down
6 changes: 3 additions & 3 deletions code/modules/projectiles/guns/energy/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
/obj/item/gun/energy/laser/captain/scattershot
name = "scatter shot laser rifle"
desc = "An industrial-grade heavy-duty laser rifle with a modified laser lens to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theoretically infinite use."
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser/slug)
shaded_charge = FALSE

/obj/item/gun/energy/laser/cyborg
Expand All @@ -74,8 +74,8 @@

/obj/item/gun/energy/laser/scatter
name = "scatter laser gun"
desc = "A laser gun equipped with a refraction kit that spreads bolts."
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
desc = "A laser gun equipped with a refraction kit that spreads bolts. Also has a trigger to fire laser 'slugs'."
Jedi-Toothpaste marked this conversation as resolved.
Show resolved Hide resolved
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser/slug)
manufacturer = MANUFACTURER_NONE

/obj/item/gun/energy/laser/scatter/shotty
Expand Down
5 changes: 5 additions & 0 deletions code/modules/projectiles/projectile/beams.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@
damage = 0
nodamage = TRUE

/obj/projectile/beam/laser/slug
name = "laser slug"
icon_state = "heavylaser"
damage = 30
Jedi-Toothpaste marked this conversation as resolved.
Show resolved Hide resolved

/obj/projectile/beam/scatter
name = "laser pellet"
icon_state = "scatterlaser"
Expand Down
Binary file added sound/weapons/gun/laser/laser_slug.ogg
Binary file not shown.
Loading