From 1845d4d4b88e51ff9f6507e265ccbdf16e84075e Mon Sep 17 00:00:00 2001 From: Jedi-Toothpaste <53096233+Jedi-Toothpaste@users.noreply.github.com> Date: Sun, 29 Dec 2024 21:54:32 +0000 Subject: [PATCH] scatter laser changes (#3603) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 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: --------- Signed-off-by: Jedi-Toothpaste <53096233+Jedi-Toothpaste@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> --- code/modules/cargo/packs/gun.dm | 7 +++++++ code/modules/projectiles/ammunition/energy/laser.dm | 11 +++++++++-- code/modules/projectiles/guns/energy/laser.dm | 6 +++--- code/modules/projectiles/projectile/beams.dm | 7 +++++++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index 24c871a13bd9..3d88b0e07e23 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -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." diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index a6e51733f29a..a256a34270c9 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -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' @@ -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 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 358492ded068..b72bdd55b5a3 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -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 @@ -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 diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index b0942a242cac..f28c51c84208 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -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"