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

Makes the Cobra not just a better Mongrel (and fixes a typo) #3437

Merged
merged 3 commits into from
Oct 18, 2024
Merged

Makes the Cobra not just a better Mongrel (and fixes a typo) #3437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2bb02c
cobra mag shrink and typo fix
Apogee-dev Sep 26, 2024
afa1949
icon fix
Apogee-dev Oct 16, 2024
4d633b4
Merge branch 'master' into cobra-mag-tweak
FalloutFalcon Oct 18, 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
8 changes: 4 additions & 4 deletions 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/ringneck
name = "Ringneck Pistol Crate"
desc = "Contains a civillian variant of the Ringneck pistol, produced by Scarborough Arms and chambered in 10mm."
desc = "Contains a civilian variant of the Ringneck pistol, produced by Scarborough Arms and chambered in 10mm."
cost = 1000
contains = list(/obj/item/storage/pistolcase/ringneck)
faction = FACTION_SYNDICATE
Expand Down Expand Up @@ -66,7 +66,7 @@

/datum/supply_pack/gun/viperrevolver
name = "Viper-23 Revolver Crate"
desc = "Contains a a civillian variant of the Viper revolver, chambered in .357 magnum."
desc = "Contains a a civilian variant of the Viper revolver, chambered in .357 magnum."
cost = 2500
contains = list(/obj/item/storage/pistolcase/viper)

Expand Down Expand Up @@ -198,14 +198,14 @@

/datum/supply_pack/gun/boomslang90
name = "Boomslang-90 Rifle Crate"
desc = "Contains a civillian variant of the Boomslang Sniper rifle- modified with a 2x scope, rather than a sniper scope. Chambered in the powerful 6.5x57mm CLIP."
desc = "Contains a civilian variant of the Boomslang Sniper rifle- modified with a 2x scope, rather than a sniper scope. Chambered in the powerful 6.5x57mm CLIP."
cost = 5000
contains = list(/obj/item/storage/guncase/boomslang)
crate_name = "rifle crate"

/datum/supply_pack/gun/cobra20
name = "Cobra-20 SMG Crate"
desc = "Contains a civillian variant of the Cobra SMG, manufactured by Scaraborough Arms and chambered in .45"
desc = "Contains a civilian variant of the Cobra SMG, manufactured by Scaraborough Arms and chambered in .45"
cost = 3000
contains = list(/obj/item/storage/guncase/cobra)
crate_name = "SMG crate"
Expand Down
6 changes: 3 additions & 3 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 @@ -421,12 +421,12 @@ EMPTY_GUN_HELPER(automatic/smg/cobra/indie)

/obj/item/ammo_box/magazine/m45_cobra
name = "Cobra magazine (.45)"
desc = "A 28-round magazine for the Cobra submachine gun. These rounds do moderate damage, but struggle against armor."
icon_state = "cobra_mag-28"
desc = "A 24-round magazine for the Cobra submachine gun. These rounds do moderate damage, but struggle against armor."
icon_state = "cobra_mag-24"
base_icon_state = "cobra_mag"
ammo_type = /obj/item/ammo_casing/c45
caliber = ".45"
max_ammo = 28
max_ammo = 24

/obj/item/ammo_box/magazine/m45_cobra/update_icon_state()
. = ..()
Expand Down
Binary file modified icons/obj/ammo.dmi
View file
Open in desktop
Binary file not shown.
Loading