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

Increases the price of automatic weapons and some handguns #3111

Merged
merged 9 commits into from
Jul 16, 2024
Merged

Increases the price of automatic weapons and some handguns #3111

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
44d4d4a
nerfd them
Martinpachu Jun 16, 2024
7ac44a2
equalizes wt and cobra
Martinpachu Jun 16, 2024
d3e27c5
Merge branch 'master' into autonerfcargo
Martinpachu Jun 16, 2024
e62accb
Merge branch 'autonerfcargo' of https://github.com/Martinpachu/Shipte…
Martinpachu Jun 16, 2024
a1e0abe
Update gun.dm
Martinpachu Jun 16, 2024
d5ac651
Merge remote-tracking branch 'upstream/master' into autonerfcargo
Martinpachu Jun 19, 2024
014fdb3
Merge remote-tracking branch 'upstream/master' into autonerfcargo
Martinpachu Jun 24, 2024
6d34d06
Update code/modules/cargo/packs/gun.dm
Martinpachu Jun 30, 2024
39e26df
rifle
Martinpachu Jun 30, 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
14 changes: 7 additions & 7 deletions code/modules/cargo/packs/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
/datum/supply_pack/gun/commanders
name = "Commander Pistol Crate"
desc = "Contains a modified Candor 'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
cost = 750
cost = 1000
contains = list(/obj/item/gun/ballistic/automatic/pistol/commander)

/datum/supply_pack/gun/makarovs
name = "Stechkin Pistol Crate"
desc = "Contains a concealable stechkin pistol, produced by Scarborough Arms and chambered in 10mm."
cost = 1000
cost = 1250
contains = list(/obj/item/gun/ballistic/automatic/pistol)

/datum/supply_pack/gun/candors
name = "Candor Pistol Crate"
desc = "Contains a Candor pistol, the trusty sidearm of any spacer, produced by Hunter's Pride and chambered in .45 ACP."
cost = 1000
cost = 1250
contains = list(/obj/item/gun/ballistic/automatic/pistol/candor)

/datum/supply_pack/gun/pepperbox
Expand Down Expand Up @@ -165,27 +165,27 @@
/datum/supply_pack/gun/cobra20
name = "Cobra-20 SMG Crate"
desc = "Contains a .45 submachine gun, manufactured by Scaraborough Arms and chambered in .45"
cost = 3000
cost = 6000
contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
crate_name = "SMG crate"

/datum/supply_pack/gun/wt550
name = "WT-550 Auto Rifle Crate"
desc = "Contains a high-powered, automatic personal defense weapon chambered in 4.6x30mm."
cost = 4000
cost = 6000
contains = list(/obj/item/gun/ballistic/automatic/smg/wt550)
crate_name = "auto rifle crate"

/datum/supply_pack/gun/p16
name = "P16 Assault Rifle Crate"
desc = "Contains a high-powered, automatic rifle chambered in 5.56mm."
cost = 5000
cost = 10000
contains = list(/obj/item/gun/ballistic/automatic/assault/p16)
crate_name = "auto rifle crate"

/datum/supply_pack/gun/skm
name = "SKM-24 Rifle Crate"
desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP."
cost = 5000
cost = 1000
FalloutFalcon marked this conversation as resolved.
Show resolved Hide resolved
Martinpachu marked this conversation as resolved.
Show resolved Hide resolved
contains = list(/obj/item/gun/ballistic/automatic/assault/skm)
crate_name = "auto rifle crate"
Loading