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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Laser pouch can no longer be used as a magazine for Lasguns or Tesla guns." #16891

Closed
wants to merge 1 commit into from
Closed

Revert "Laser pouch can no longer be used as a magazine for Lasguns or Tesla guns." #16891

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/energy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
damage_falloff_mult = 0.25
fire_delay = 2
default_ammo_type = /obj/item/cell/lasgun/lasrifle
allowed_ammo_types = list(/obj/item/cell/lasgun/lasrifle, /obj/item/cell/lasgun/lasrifle/recharger)
allowed_ammo_types = list(/obj/item/cell/lasgun/lasrifle, /obj/item/cell/lasgun/lasrifle/recharger, /obj/item/cell/lasgun/volkite/powerpack/marine)
/// A list of available modes this gun can switch to
var/list/datum/lasrifle/mode_list = list()
/// The index of the current mode selected, used for non radial mode switches
Expand Down Expand Up @@ -379,7 +379,7 @@
equip_slot_flags = ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
default_ammo_type = /obj/item/cell/lasgun/lasrifle
allowed_ammo_types = list(/obj/item/cell/lasgun/lasrifle, /obj/item/cell/lasgun/lasrifle/recharger)
allowed_ammo_types = list(/obj/item/cell/lasgun/lasrifle, /obj/item/cell/lasgun/lasrifle/recharger, /obj/item/cell/lasgun/volkite/powerpack/marine)
gun_features_flags = GUN_WIELDED_FIRING_ONLY|GUN_ENERGY|GUN_AMMO_COUNTER|GUN_AMMO_COUNT_BY_SHOTS_REMAINING|GUN_NO_PITCH_SHIFT_NEAR_EMPTY|GUN_SHOWS_AMMO_REMAINING
muzzle_flash_color = COLOR_TESLA_BLUE
ammo_level_icon = "tesla"
Expand Down
Loading