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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

energy shotgun isn't a taser any more since that removes the point of it being a sHOTGUN #8846

Merged
merged 1 commit into from Jun 9, 2020
Merged

energy shotgun isn't a taser any more since that removes the point of it being a sHOTGUN #8846

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/energy/laser.dm
View file
Open in desktop
Expand Up @@ -66,10 +66,10 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "cshotgun"
item_state = "shotgun"
desc = "A combat shotgun gutted and refitted with an internal laser system. Can switch between taser and scattered disabler shots."
desc = "A combat shotgun gutted and refitted with an internal disabler system."
shaded_charge = 0
pin = /obj/item/firing_pin/implant/mindshield
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter/disabler, /obj/item/ammo_casing/energy/electrode)
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter/disabler)

///Laser Cannon

Expand Down