Skip to content

Commit

Permalink
[MIRROR] Disabler SMG: We got laser carbine, so why not have automati…
Browse files Browse the repository at this point in the history
…c disabler? [MDB IGNORE] (#24568)

* Disabler SMG: We got laser carbine, so why not have automatic disabler? (#79158)

## About The Pull Request
Basically, it's #78685, but instead of an automatic deadly laser gun,
it's an automatic disabler gun.

https://github.com/tgstation/tgstation/assets/42353186/6ce1c401-30a6-45f7-a55c-4d95f742c35a

_For comprasion, normal disabler takes 4 shoots and too uses 80% of
charge_

![disabler
SMG](https://github.com/tgstation/tgstation/assets/42353186/7242a0bd-9e78-4e98-a746-7c735b4f997e)

![smg
inahnd](https://github.com/tgstation/tgstation/assets/42353186/a20848ab-9157-43a8-a146-6c3b57e0a817)

It's a side-grade as well, the damage is halved (15 instead of 30) while
the ammo count (40 instead of 20) is higher. So damage potential stays
the same.
The sound which it uses is more weak sounding to signify that.

You **can't** dual wield them.

You can order a crate of 3 at Cargo.
## Why It's Good For The Game
Automatic guns are fun, and as laser carbine showed - REAL FUN.
This introduces another automatic gun available to the crew through
Cargo because variety is always good, and this way we cover the both
most prominent projectiles (Lasers and Disablers).
Now Security can have fun without only killing people, this also lets
Pacificists have some as well.

<details>
  <summary>GET DISABLED</summary>

![HoS does
ratatata](https://github.com/tgstation/tgstation/assets/42353186/29b0d1b3-3bae-4230-ac03-958c58d67a7e)

</details>

## Changelog
:cl:
add: New automatic weapon for the crew - Disabler SMG. Capable of
rapidly firing weak disabler beams.
/:cl:

---------

Co-authored-by: Jacquerel <7483112+Jacquerel@ users.noreply.github.com>

* Disabler SMG: We got laser carbine, so why not have automatic disabler?

---------

Co-authored-by: DrTuxedo <[email protected]>
Co-authored-by: Jacquerel <7483112+Jacquerel@ users.noreply.github.com>
  • Loading branch information
3 people authored and FFMirrorBot committed Oct 24, 2023
1 parent 3dd52ac commit 9eb6fb2
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 0 deletions.
8 changes: 8 additions & 0 deletions code/modules/cargo/packs/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,14 @@
crate_name = "laser carbine crate"
crate_type = /obj/structure/closet/crate/secure/plasma

/datum/supply_pack/security/armory/disabler_smg
name = "Disabler SMG Crate"
desc = "Contains three disabler SMGs, capable of rapidly firing weak disabler beams."
cost = CARGO_CRATE_VALUE * 7
contains = list(/obj/item/gun/energy/disabler/smg = 3)
crate_name = "disabler smg crate"
crate_type = /obj/structure/closet/crate/secure/plasma

/datum/supply_pack/security/armory/exileimp
name = "Exile Implants Crate"
desc = "Contains five Exile implants."
Expand Down
5 changes: 5 additions & 0 deletions code/modules/projectiles/ammunition/energy/stun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
fire_sound = 'sound/weapons/taser2.ogg'
harmful = FALSE

/obj/item/ammo_casing/energy/disabler/smg
projectile_type = /obj/projectile/beam/disabler/weak
e_cost = LASER_SHOTS(40, STANDARD_CELL_CHARGE)
fire_sound = 'sound/weapons/taser3.ogg'

/obj/item/ammo_casing/energy/disabler/hos
e_cost = LASER_SHOTS(20, STANDARD_CELL_CHARGE * 1.2)

Expand Down
20 changes: 20 additions & 0 deletions code/modules/projectiles/guns/energy/stun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,26 @@
overlay_x = 15, \
overlay_y = 10)

/obj/item/gun/energy/disabler/smg
name = "disabler smg"
desc = "An automatic disabler variant, as opposed to the conventional model, boasts a higher ammunition capacity at the cost of slightly reduced beam effectiveness."
icon_state = "disabler_smg"
ammo_type = list(/obj/item/ammo_casing/energy/disabler/smg)
shaded_charge = 1

/obj/item/gun/energy/disabler/smg/Initialize(mapload)
. = ..()
AddComponent(/datum/component/automatic_fire, 0.15 SECONDS, allow_akimbo = FALSE)

/obj/item/gun/energy/disabler/add_seclight_point()
AddComponent(\
/datum/component/seclite_attachable, \
light_overlay_icon = 'icons/obj/weapons/guns/flashlights.dmi', \
light_overlay = "flight", \
overlay_x = 15, \
overlay_y = 13, \
)

/obj/item/gun/energy/disabler/cyborg
name = "cyborg disabler"
desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating."
Expand Down
Binary file modified icons/mob/inhands/weapons/guns_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/guns_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/weapons/guns/energy.dmi
Binary file not shown.
Binary file added sound/weapons/taser3.ogg
Binary file not shown.

0 comments on commit 9eb6fb2

Please sign in to comment.