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

[MIRROR] Disabler SMG: We got laser carbine, so why not have automatic disabler? #272

Merged
merged 1 commit into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.
Loading