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.

Sign up for GitHub

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
merged 11 commits into from
Dec 29, 2024
Merged

scatter laser changes #3603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8d56da9
scatter laser changes
Jedi-Toothpaste Oct 20, 2024
0885988
reflavours scatter laser description
Jedi-Toothpaste Oct 20, 2024
faa9486
changed ap & falloff
Jedi-Toothpaste Oct 20, 2024
a5b9576
new laser sound (still bad)
Jedi-Toothpaste Oct 22, 2024
8ea8b22
adds scatter laser to cargo consoles
Jedi-Toothpaste Oct 23, 2024
507b8c3
Merge branch 'master' into scatter-laser-fixes
Jedi-Toothpaste Nov 5, 2024
c83d089
changes laser slug sound
Jedi-Toothpaste Nov 19, 2024
8080ce5
Merge branch 'master' into scatter-laser-fixes
Jedi-Toothpaste Nov 19, 2024
706cff2
removes faction tag
Jedi-Toothpaste Nov 28, 2024
7e16f6c
Merge branch 'master' into scatter-laser-fixes
Jedi-Toothpaste Dec 14, 2024
bc9c58f
Merge branch 'master' into scatter-laser-fixes
Jedi-Toothpaste Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions code/modules/cargo/packs/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,13 @@
crate_type = /obj/structure/closet/crate/secure/plasma
faction = /datum/faction/nt

/datum/supply_pack/gun/scatterlaser
name = "Scatter Laser Crate"
desc = "Contains a multi-function scatter energy gun, capable of firing armour penetrating slugs, and devastating scattered laser bolts."
cost = 1250
contains = list(/obj/item/gun/energy/laser/scatter)
crate_name = "scatter laser crate"

/datum/supply_pack/gun/ion
name = "Ion Rifle Crate"
desc = "Contains a single Mk.I Ion Projector, a special anti-tank rifle designed to disable electronic threats at range."
Expand Down
11 changes: 9 additions & 2 deletions code/modules/projectiles/ammunition/energy/laser.dm
View file
Open in desktop
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/cs-fire.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 @@ -51,8 +57,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,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 @@ -72,8 +72,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 mimicking the function of a shotgun, manufactured with an adjustable lens capable of projecting scattershot or slugs."
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
7 changes: 7 additions & 0 deletions code/modules/projectiles/projectile/beams.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,17 @@
damage = 0
nodamage = TRUE

/obj/projectile/beam/laser/slug
name = "laser slug"
icon_state = "heavylaser"
damage = 20
armour_penetration = 40

/obj/projectile/beam/scatter
name = "laser pellet"
icon_state = "scatterlaser"
damage = 5
range = 7

/obj/projectile/beam/xray
name = "\improper X-ray beam"
Expand Down
Loading