minigun powerpack fixes (#16676)

tgstation · Oct 17, 2024 · 33ded0f · 33ded0f
1 parent 225a986
commit 33ded0f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm
@@ -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

diff --git a/code/modules/projectiles/magazines/specialist.dm b/code/modules/projectiles/magazines/specialist.dm
@@ -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

diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
diff --git a/icons/mob/inhands/weapons/ammo_left.dmi b/icons/mob/inhands/weapons/ammo_left.dmi
diff --git a/icons/mob/inhands/weapons/ammo_right.dmi b/icons/mob/inhands/weapons/ammo_right.dmi