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

very small pistol tweaks #3938

Closed
wants to merge 2 commits into from
Closed

very small pistol tweaks #3938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b57702
initial
rye-rice Dec 28, 2024
23fd3a8
accident
rye-rice Dec 28, 2024
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
2 changes: 1 addition & 1 deletion code/modules/cargo/packs/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

/datum/supply_pack/gun/commanders
name = "Commander Pistol Crate"
desc = "Contains a modified Candor 'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
desc = "Contains a high capacity'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
desc = "Contains a high capacity'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
desc = "Contains a high capacity 'Commander' pistol, produced by Nanotrasen and chambered in 9mm."

cost = 750
contains = list(/obj/item/storage/guncase/pistol/commander)
faction = /datum/faction/nt
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cargo/packs/magazines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/datum/supply_pack/magazine/co9mm_mag
name = "9mm Commander Magazine Crate"
desc = "Contains a 9mm magazine for the standard-issue Commander pistol, with a capacity of ten rounds."
desc = "Contains a 9mm magazine for the standard-issue Commander pistol, with a capacity of twelve rounds."
contains = list(/obj/item/ammo_box/magazine/co9mm/empty)
cost = 150
faction = /datum/faction/nt
Expand Down Expand Up @@ -94,7 +94,7 @@

/datum/supply_pack/magazine/m10mm_mag
name = "Ringneck Magazine Crate"
desc = "Contains a 10mm magazine for the Ringneck pistol, with a capacity of ten rounds."
desc = "Contains a 10mm magazine for the Ringneck pistol, with a capacity of eight rounds."
contains = list(/obj/item/ammo_box/magazine/m10mm_ringneck/empty)
cost = 150
faction = /datum/faction/syndicate/scarborough_arms
Expand Down
19 changes: 0 additions & 19 deletions code/modules/projectiles/boxes_magazines/external/pistol.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,25 +55,6 @@
/obj/item/ammo_box/magazine/pistol556mm/empty
start_empty = TRUE

/obj/item/ammo_box/magazine/co9mm/hp
name = "pistol magazine (9mm HP)"
desc= "A 10-round double-stack magazine for standard-issue 9mm pistols. These hollow point rounds do significant damage against soft targets, but are nearly ineffective against armored ones."
ammo_type = /obj/item/ammo_casing/c9mm/hp

/obj/item/ammo_box/magazine/co9mm/ap
name = "pistol magazine (9mm AP)"
desc= "A 10-round double-stack magazine for standard-issue 9mm pistols. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power."
ammo_type = /obj/item/ammo_casing/c9mm/ap

/obj/item/ammo_box/magazine/co9mm/rubber
name = "pistol magazine (9mm rubber)"
desc = "A 10-round double-stack magazine for standard-issue 9mm pistols. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
ammo_type = /obj/item/ammo_casing/c9mm/rubber

/obj/item/ammo_box/magazine/co9mm/update_icon_state()
. = ..()
icon_state = "[base_icon_state]-[ammo_count() == 1 ? 1 : round(ammo_count(),2)]"

/obj/item/ammo_box/magazine/m50
name = "handgun magazine (.50 AE)"
desc = "An oversized, 7-round handgun magazine for the Desert Eagle handgun. These rounds do significant damage with average performance against armor."
Expand Down
26 changes: 23 additions & 3 deletions code/modules/projectiles/guns/manufacturer/nanotrasen_sharplite/ballistics.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,34 @@ NO_MAG_GUN_HELPER(automatic/pistol/commander)

/obj/item/ammo_box/magazine/co9mm
name = "commander pistol magazine (9mm)"
desc = "A 10-round double-stack magazine for Commander pistols. These rounds do okay damage, but struggle against armor."
icon_state = "commander_mag-10"
desc = "A 12-round double-stack magazine for Commander pistols. These rounds do okay damage, but struggle against armor."
icon_state = "commander_mag-12"
base_icon_state = "commander_mag"
ammo_type = /obj/item/ammo_casing/c9mm
caliber = "9mm"
max_ammo = 10
max_ammo = 12
multiple_sprites = AMMO_BOX_PER_BULLET

/obj/item/ammo_box/magazine/co9mm/hp
name = "pistol magazine (9mm HP)"
desc= "A 12-round double-stack magazine for standard-issue 9mm pistols. These hollow point rounds do significant damage against soft targets, but are nearly ineffective against armored ones."
ammo_type = /obj/item/ammo_casing/c9mm/hp

/obj/item/ammo_box/magazine/co9mm/ap
name = "pistol magazine (9mm AP)"
desc= "A 12-round double-stack magazine for standard-issue 9mm pistols. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power."
ammo_type = /obj/item/ammo_casing/c9mm/ap

/obj/item/ammo_box/magazine/co9mm/rubber
name = "pistol magazine (9mm rubber)"
desc = "A 12-round double-stack magazine for standard-issue 9mm pistols. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
ammo_type = /obj/item/ammo_casing/c9mm/rubber

/obj/item/ammo_box/magazine/co9mm/update_icon_state()
. = ..()
icon_state = "[base_icon_state]-[ammo_count() == 1 ? 1 : round(ammo_count(),2)]"


/obj/item/ammo_box/magazine/co9mm/empty
start_empty = TRUE

Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ NO_MAG_GUN_HELPER(automatic/pistol/ringneck/indie)

/obj/item/ammo_box/magazine/m10mm_ringneck
name = "Ringneck pistol magazine (10mm)"
desc = "An 10-round magazine for the Ringneck pistol. These rounds do moderate damage, but struggle against armor."
desc = "An 8-round magazine for the Ringneck pistol. These rounds do moderate damage, but struggle against armor."
icon_state = "ringneck_mag-1"
base_icon_state = "ringneck_mag"
ammo_type = /obj/item/ammo_casing/c10mm
caliber = "10mm"
max_ammo = 10
max_ammo = 8
multiple_sprites = AMMO_BOX_FULL_EMPTY

/obj/item/ammo_box/magazine/m10mm_ringneck/empty
Expand Down
Binary file modified icons/obj/ammo.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/ammunition/ammo.dmi
View file
Open in desktop
Binary file not shown.
Loading