Contraband Drop 1 - Narcotics 1

[KittenColony]

A new collection of PRs. Contraband.

About the PR

Adds several new items and sources for narcotics, including brand new ones with Unique* effects!

• New Cigarettes
  Hack into a shady cigs dispenser, and activate the contraband catalog to enjoy 6 new packets and 1 new brand!
  New Cigarette Brand ~ Garden Mirage. "Life's a Mirage, see through it."
  New unmarked packets! Unknown, unnamed, unbelievably good!

• Hack vending machines for different narcotics.
  Hack a Chefvend to get a hit of joy to keep you going, two bottles of Happiness.
  Hack a sec-vend to get a leg-up over rebels and runners, new Dynamoxine autoinjectors give a burst of energy for ten seconds!

• New Chemicals
  **Dynamoxine **
  An attempt by Nanotrasen to create a military stimulant for extended engagements, shelved after Donk Co. came out with Hyperzine, the recipe has been made publicly available recently.
  Mindleaf
  A questionably legal plant with an intoxicating, toxic sap, which can be refined into a plethora of drugs, both potent and pleasant.

Why / Balance

Characters might have a background with substance abuse, currently, the only real way to get these is through chemistry, spaceshrooms, maintpills or the occasional admin-run dealer events. This PR adds new sources for people to get their fixes, while also giving Security something to track down and interact with.

Technical details

Primarily YAML code, does include several new reagents, reactions and FTL files, vending machine changes not name-spaced, are tagged with [# _CD]

Media

Requirements

• I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
• I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog
add: Added a new cigarette brand laced with restricted chemicals.
add: Added a new collection of cigarette packets filled with potent narcotics.
add: Added Happiness pillbottles to the Chefvend
add: Added new Dynamoxine, an experimental stimulant, and Dynamoxine injectors to hacked Secvends
add: Added Mindleaf, a curious addition to Botany's supply, able to be turned into several potent drugs.

[KittenColony]

PR made to find issue with Dynamoxine using tests

[github-actions]

RSI Diff Bot; head commit e81e8c6 merging into d28d850
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_CD/Objects/Consumable/Drinks/strayglass.rsi

State	Old	New	Status
fill-1			Added
fill-2			Added
fill-3			Added
fill-4			Added
icon			Added
icon_empty			Added

Resources/Textures/_CD/Objects/Consumable/Smokeables/Cigarettes/Packs/darkgreen.rsi

State	Old	New	Status
closed			Added
equipped-BELT			Added
inhand-left			Added
inhand-right			Added
open			Added
trash			Added

Resources/Textures/_CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi

State	Old	New	Status
closed			Added
equipped-BELT			Added
inhand-left			Added
inhand-right			Added
open			Added
trash			Added

Resources/Textures/_CD/Objects/Misc/Contraband/drug_packets.rsi

State	Old	New	Status
brown_icon			Added
green_icon			Added

Resources/Textures/_CD/Objects/Specific/Chemistry/pills.rsi

State	Old	New	Status
inhand-left			Added
inhand-right			Added
pill			Added
pill1			Added
pill2			Added

Resources/Textures/_CD/Objects/Specific/Hydroponics/mindleaf.rsi

State	Old	New	Status
dead			Added
harvest			Added
produce			Added
seed			Added
stage-1			Added
stage-2			Added
stage-3			Added

Resources/Textures/_CD/Objects/Specific/Medical/medipen.rsi

State	Old	New	Status
dynamoxine			Added
dynamoxine_empty			Added

Edit: diff updated after e81e8c6

[DrSmugleaf]

Welds asked me for a PR review in voice chat

[KittenColony]

motherfucking GOD, HOW?

[dffdff2423]

ping me on discord when this is complete and ready for review

[KittenColony]

ping me on discord when this is complete and ready for review

won't be for a while, I might actually have to do split PRs to make it not... cross the 1k threshold

[KittenColony]

1.0 is marked as complete and ready for review.

[MilonPL]

type > abstract > parent > id > name > suffix > description > components
yaml conventions everywhere jfc

[dffdff2423]

It looks like you marked the above review from Milon as resolved but I don't see the actual changes. Did you forget to push them?

[KittenColony]

I'm not going to rewrite every YAML entity for the sake of convention when the vast majority of the existing code doesn't follow it

it was a pain in the ass to even get the random pack vending to work at all, and what's already there was copied from how the random jumpsuits are dispensed

HapPsiness is intentional

[LankLTE]

Test fail is related I believe

[KittenColony]

unlikely, the code its bitching about isn't touched

[dffdff2423]

We should be moving in the direction of following the conventions, even if old code does not. Having a random order for entity members for each entity damages readability because it requires more effort to see if an entity has a given member. entityTables are preferred because they allow more configuration on how random values are chosen.

We are currently discussing the mechanics of the reagents privately. I will get back to you shortly on those.

[dffdff2423]

I reran the test just in-case (although it looks like Lank did already).

[KittenColony]

as an aside with the reagents, all of them barring the sap and tea should be considered restricted chemicals / as non-insignificant contraband by the crew / security

[dffdff2423]

Currently blocked awaiting private maintainer discussion. I will update you as soon as possible.

[KittenColony]

Are you fucking kidding me

[Nairodian]

Okay I think this is alright. Next time you make a PR that adds/changes a lot I ask that you be more descriptive in your description about what the items actually functionally do instead of just a vague overview.

[dffdff2423]

Next time you make a pull request please break it up into multiple smaller PRs so it does not take a month to review. I don't care if you spam the repo with 20 PRs. It is far easier to review because I don't need to set aside an hour and I can consider each thing in isolation rather than all at once.

[LankLTE]

Will merge this after the upstream merge.