Skip to content

Commit

Permalink
scatter laser changes (#3603)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
WIP: I want some feedback, 'slug' noises are **not final** I want to get
the weapon balance right first mostly.

### NEW Laser Slug Mode!
Instead of switching your scatter-laser to a regular TG Laser it is now
a ✨ slug ✨ which fires for 30 damage with standard AP.
**UPDATE**: Laser Slug now deals **20** Damage with an AP of 40, this
keeps the TTK relatively the same, especially against armoured targets.
Imagine it like being hit by a laser-shaped bat.
Has a delay of 0.9 Seconds between firing which gives it an almost
identical time to kill (TTK) to the SL-204.
> _(don't question why I want to keep the slug mode similar it's more
punishing when you miss okay it's balanced okay we can tweak this)_

Now uses the heavy laser projectile to help distinguish what kind of
laser weapon your enemy is using.
> _down the line I can definitely get some unique sprites for the laser
itself alongside a new scatter laser sprite maybe_ 🥺

Also, it finally doesn't just say, "kill" when you switch modes!

![image](https://github.com/user-attachments/assets/180e2a38-7c35-4be7-9f69-8d4c5b278a78)

New laser slug noise- bear in mind this is **not the final version**.
_This one is bad, I know._

https://youtu.be/GyuE71jnlxE

> will update this with an edit when I get the final version





### REWORKED Scatter Mode!
Double the pellets, double the fun. With an increased variance for the
pellets; hose down those corridors! You _go_ Girl.
With pellets up from **5** to **10**, you become a threat- however, they
drop off just as hard as regular buckshot, so shoot carefully.
UPDATE: The pellets only fly 6 tiles forward, but if you're point-blank,
it won't matter much.

![image](https://github.com/user-attachments/assets/a9a134c1-1ddd-47aa-9a74-be8e113c4293)

Increased the base damage from 3->5 which makes you extremely scary, if
you can get close enough.
> _it's not techshells though, they're still way more insane_

All these pellets come at a cost, however, you get approx. half the
shots. (**6** shots with a Regular Cell, and **12** with a Superior
Cell)

![image](https://github.com/user-attachments/assets/1bc7c0c0-8259-41f3-a82c-cc08859edf5d)

![image](https://github.com/user-attachments/assets/fc773bed-eeb3-4506-8f87-161415a47873)




## Why It's Good For The Game
Currently, the average shiptester has two reactions to the scatter laser
The First: They do not pick it up.
The Second: They pick it up and switch mode to, 'kill' for a SL-204
called 'scatter laser'
This makes the scatter laser unique, and quite scary in some situations
and hopefully not making it relegated to a glorified SL-204.

## Changelog

:cl:
add: new secondary 'slug' mode for the scatter laser (and other scatter
lasers sub-types)
add: scatter laser to cargo, for you freaks who want to buy it
change: slug mode now uses cs-fire.ogg as its firing sound
del: removed old secondary mode for scatter lasers (and scatter laser
sub-types)
balance: laser scatter mode now fires 10 pellets instead of 5
balance: laser scatter pellets now do 5 damage instead of 3
balance: laser scatter mode variance increased from 25 to 40
balance: doubled laser scatter mode energy cost (6 shots with normal
cell, 12 with upgraded)
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Jedi-Toothpaste <[email protected]>
Co-authored-by: Erika Fox <[email protected]>
  • Loading branch information
Jedi-Toothpaste and Erikafox authored Dec 29, 2024
1 parent 99ff245 commit 1845d4d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
7 changes: 7 additions & 0 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,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
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
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
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

0 comments on commit 1845d4d

Please sign in to comment.