From fcc36827a5532ddbe86d7101e1ecc73396bde4d7 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sat, 9 Mar 2024 20:24:41 +0100
Subject: [PATCH] [MIRROR] Adjusts some of the contraband weights for
 Contraband Crates. (#26813)

* Adjusts some of the contraband weights for Contraband Crates. (#81771)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This makes getting Contraband Plus (the better stuff with more
interesting effects), slightly higher in probability out of contraband
crates.

It also removes the completely redundant narcotics roll, and the truly
awful permabrig contraband roll, from Contraband Plus.

Some of the more interesting narcotics are now directly in Contraband
Plus.

## Why It's Good For The Game

The weights were a little uninteresting. You rarely if ever saw the
effects of the contraband crate change with the current values. It was
kind of lame to see a shiv in a contraband crate knowing that it was a
wasted Contraband Plus roll. This hopefully stops that from happening
too often.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
balance: Adjusts the values and contents of the Contraband Crate's item
loot table.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: san7890 <the@ san7890.com>

* Adjusts some of the contraband weights for Contraband Crates.

---------

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: san7890 <the@ san7890.com>
---
 .../game/objects/effects/spawners/random/contraband.dm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/effects/spawners/random/contraband.dm b/code/game/objects/effects/spawners/random/contraband.dm
index ca5acbdbe67..e65a73cfe4c 100644
--- a/code/game/objects/effects/spawners/random/contraband.dm
+++ b/code/game/objects/effects/spawners/random/contraband.dm
@@ -21,22 +21,20 @@
 		/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 10,
 		/obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 10,
 		/obj/item/storage/box/donkpockets = 10,
+		/obj/effect/spawner/random/contraband/plus = 10,
 		/obj/item/reagent_containers/pill/maintenance = 5,
-		/obj/effect/spawner/random/contraband/plus = 5,
 	)
 
 /obj/effect/spawner/random/contraband/plus
 	name = "contraband loot spawner plus"
 	desc = "Where'd ya find this?"
 	loot = list(
-		/obj/effect/spawner/random/contraband/prison = 40,
 		/obj/item/clothing/under/syndicate = 20,
 		/obj/item/reagent_containers/cup/bottle/thermite = 20,
-		/obj/item/reagent_containers/pill/maintenance = 10,
 		/obj/item/restraints/legcuffs/beartrap = 10,
-		/obj/effect/spawner/random/contraband/narcotics = 10,
-		/obj/item/seeds/kronkus = 5,
-		/obj/item/seeds/odious_puffball = 5,
+		/obj/item/food/drug/saturnx = 5,
+		/obj/item/reagent_containers/cup/blastoff_ampoule = 5,
+		/obj/item/food/drug/moon_rock = 5,
 		/obj/item/grenade/empgrenade = 5,
 		/obj/effect/spawner/random/contraband/armory = 1,
 	)