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

Jump to bottom

minigun powerpack fixes #16676

Merged
merged 1 commit into from
Oct 17, 2024
Merged

minigun powerpack fixes #16676

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion code/modules/projectiles/guns/specialist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,11 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
reload_sound = 'sound/weapons/guns/interact/minigun_reload.ogg'
cocked_sound = 'sound/weapons/guns/interact/minigun_cocked.ogg'
default_ammo_type = null
allowed_ammo_types = list(/obj/item/ammo_magazine/minigun_powerpack)
allowed_ammo_types = list(
/obj/item/ammo_magazine/minigun_powerpack,
/obj/item/ammo_magazine/minigun_powerpack/fancy,
/obj/item/ammo_magazine/minigun_powerpack/merc,
)
w_class = WEIGHT_CLASS_HUGE
force = 20
wield_delay = 1.2 SECONDS
Expand Down
4 changes: 0 additions & 4 deletions code/modules/projectiles/magazines/specialist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,6 @@
max_rounds = 500
item_map_variant_flags = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT)

/obj/item/ammo_magazine/minigun_powerpack/snow
icon_state = "s_powerpack"
item_map_variant_flags = null

/obj/item/ammo_magazine/minigun_powerpack/fancy
icon_state = "powerpack_fancy"
item_map_variant_flags = null
Expand Down
Binary file modified icons/mob/clothing/back.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/ammo_left.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/ammo_right.dmi
View file
Open in desktop
Binary file not shown.
Loading