diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 7b201d797bffe..04daa96aa50bf 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -39,6 +39,7 @@ new /obj/item/storage/box/suitbox/ce_tools(src) new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/gun/ballistic/automatic/pistol/service/ce(src) + new /obj/item/ammo_box/magazine/recharge/service(src) /obj/item/storage/box/suitbox/ce_tools name = "compression box of chief engineer tools" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 30e33594bb52e..e89ee18d1c0f6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -117,6 +117,7 @@ new /obj/item/healthanalyzer/advanced(src) new /obj/item/wallframe/defib_mount(src) new /obj/item/gun/ballistic/automatic/pistol/service/cmo(src) + new /obj/item/ammo_box/magazine/recharge/service(src) /obj/item/storage/box/suitbox/cmo name = "compression box of chief medical officer outfits" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 3c795568d0e42..b9526a4e9f7eb 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -39,6 +39,7 @@ new /obj/item/door_remote/research_director(src) new /obj/item/assembly/flash/handheld(src) new /obj/item/gun/ballistic/automatic/pistol/service/rd(src) + new /obj/item/ammo_box/magazine/recharge/service(src) /obj/item/storage/box/suitbox/rd name = "compression box of research director outfits" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 7994357c3e064..13c6f3439349c 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -41,6 +41,7 @@ new /obj/item/door_remote/captain(src) new /obj/item/storage/belt/sabre(src) new /obj/item/gun/ballistic/automatic/pistol/service/captain(src) + new /obj/item/ammo_box/magazine/recharge/service(src) /obj/item/storage/box/suitbox/cap name = "compression box of captain outfits" @@ -91,7 +92,7 @@ new /obj/item/clothing/suit/armor/vest/alt(src) new /obj/item/megaphone/command(src) new /obj/item/gun/ballistic/automatic/pistol/service/hop(src) - + new /obj/item/ammo_box/magazine/recharge/service(src) /obj/item/storage/box/suitbox/hop name = "compression box of head of personnel outfits" @@ -152,7 +153,6 @@ new /obj/item/storage/box/command_keys(src) new /obj/item/megaphone/sec(src) new /obj/item/computer_hardware/hard_drive/role/hos(src) - new /obj/item/storage/box/flashbangs(src) new /obj/item/storage/box/deputy(src) new /obj/item/storage/lockbox/medal/sec(src) new /obj/item/storage/lockbox/loyalty(src) @@ -168,6 +168,7 @@ new /obj/item/shield/riot/tele(src) new /obj/item/storage/belt/security/full(src) new /obj/item/gun/ballistic/automatic/pistol/service/hos(src) + new /obj/item/ammo_box/magazine/recharge/service(src) /obj/item/storage/box/suitbox/hos name = "compression box of head of security outfits" diff --git a/code/modules/projectiles/boxes_magazines/external/rechargable.dm b/code/modules/projectiles/boxes_magazines/external/rechargable.dm index 9bf883faa4955..c39eacccef35f 100644 --- a/code/modules/projectiles/boxes_magazines/external/rechargable.dm +++ b/code/modules/projectiles/boxes_magazines/external/rechargable.dm @@ -37,11 +37,11 @@ /obj/item/ammo_box/magazine/recharge/service name = "energy pistol magazine" desc = "A rechargeable energy pack used by service pistols." - icon_state = "officer-10" - max_ammo = 10 + icon_state = "officer-12" + max_ammo = 12 multiple_sprites = 1 ammo_type = /obj/item/ammo_casing/caseless/laser/lesslethal /obj/item/ammo_box/magazine/recharge/service/update_icon() ..() - icon_state = "officer-[round(ammo_count(),2)]" + icon_state = "officer-[CEILING(ammo_count(),3)]" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index b87a49f7991dd..54781b9044663 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -40,7 +40,7 @@ impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser/wall /obj/projectile/beam/laser/lesslethal - damage = 10 + damage = 11 stamina = 18 icon_state = "minilaser" diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index a9ace1d796c0b..8a8488cd2a936 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ