Skip to content

Commit

Permalink
reverts 'Increases the price of automatic weapons and some handguns' (s…
Browse files Browse the repository at this point in the history
…hiptest-ss13#3223)

Reverts shiptest-ss13#3111 as it was
awaiting testmerges for being a Very Unpopular pr among maintainers and
other voices in private-dev (extensively discussed) before it was
full-merged without that happening.

Lol

![woe2](https://github.com/user-attachments/assets/94c29def-6fe8-4bad-8b72-e66af04276fd)

:cl:
balance: Undoubles the price on every automatic gun and removed 250 from
the price of every semi-auto pistol.
/:cl:
  • Loading branch information
generalthrax authored and MysticalFaceLesS committed Jul 27, 2024
1 parent 6cfcf69 commit d15c130
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions code/modules/cargo/packs/gun.dm
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 = 1000
cost = 750
contains = list(/obj/item/storage/pistolcase/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 = 1250
cost = 1000
contains = list(/obj/item/storage/pistolcase/stechkin)

/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 = 1250
cost = 1000
contains = list(/obj/item/storage/pistolcase/candor)

/datum/supply_pack/gun/pepperbox
Expand Down Expand Up @@ -165,22 +165,22 @@
/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 = 6000
cost = 3000
contains = list(/obj/item/storage/guncase/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 = 6000
cost = 4000
contains = list(/obj/item/storage/guncase/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."
// [CELADON-EDIT] - CELADON_CARGO_ITEMS
// cost = 9000 // CELADON-EDIT - ORIGINAL
// cost = 5000 // CELADON-EDIT - ORIGINAL
cost = 2500
// [/CELADON-EDIT]
contains = list(/obj/item/storage/guncase/p16)
Expand All @@ -189,7 +189,7 @@
/datum/supply_pack/gun/skm
name = "SKM-24 Rifle Crate"
desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP."
cost = 9000
cost = 5000
contains = list(/obj/item/storage/guncase/skm)
crate_name = "auto rifle crate"

Expand Down

0 comments on commit d15c130

Please sign in to comment.