mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Removes L6 SAW adminbus ammo and fixes icon update issue with energy weapons
This commit is contained in:
@@ -67,6 +67,10 @@
|
||||
if(ammo_type.len > 1)
|
||||
select_fire(user)
|
||||
update_icon()
|
||||
if(istype(user,/mob/living/carbon/human)) //This has to be here or else if you toggle modes by clicking the gun in hand
|
||||
var/mob/living/carbon/human/H = user //Otherwise the mob icon doesn't update, blame shitty human update_icons() code
|
||||
H.update_inv_l_hand()
|
||||
H.update_inv_r_hand()
|
||||
|
||||
/obj/item/weapon/gun/energy/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
|
||||
newshot() //prepare a new shot
|
||||
|
||||
@@ -131,28 +131,6 @@ obj/item/projectile/bullet/saw/incen/Move()
|
||||
..()
|
||||
icon_state = "a762-[round(ammo_count(),10)]"
|
||||
|
||||
/obj/item/ammo_box/magazine/mm556x45/buckshot //adminbus
|
||||
name = "box magazine (buckshot)"
|
||||
icon_state = "b762"
|
||||
caliber = "shotgun"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
|
||||
max_ammo = 300
|
||||
|
||||
/obj/item/ammo_box/magazine/mm556x45/buckshot/update_icon()
|
||||
..()
|
||||
icon_state = "b762-[round(ammo_count(),10)]"
|
||||
|
||||
/obj/item/ammo_box/magazine/m556x45/he // also adminbus
|
||||
name = "box magazine (40mm high explosive)"
|
||||
icon_state = "g762"
|
||||
caliber = "40mm"
|
||||
ammo_type =/obj/item/ammo_casing/a40mm
|
||||
max_ammo = 25
|
||||
|
||||
/obj/item/ammo_box/magazine/mm556x45/he/update_icon()
|
||||
..()
|
||||
icon_state = "g762-[round(ammo_count(),5)]"
|
||||
|
||||
//casings//
|
||||
|
||||
/obj/item/ammo_casing/mm556x45
|
||||
|
||||
Reference in New Issue
Block a user