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.

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

Tweaks Service Pistol stats #11315

Merged
merged 7 commits into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)]"
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/beams.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Binary file modified icons/obj/ammo.dmi
Binary file not shown.
Loading