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

Jump to bottom

contrabandInventory Changes (Fixed) #32934

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

contrabandInventory Changes (Fixed) #32934

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
f58e112
Reimport of .yml files, edit to medidrobe.yml
AgentSmithRadio Oct 20, 2024
e59e5e3
Fixed typo for "Richard" in AutoDrobe contrabandInventory
AgentSmithRadio Oct 21, 2024
b6109fd
contrabandInventory Revision
AgentSmithRadio Oct 23, 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
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@
ClothingOuterSuitFire: 2
ClothingOuterWinterAtmos: 2
ClothingNeckScarfStripedLightBlue: 3
contrabandInventory:
ToyFigurineAtmosTech: 1
3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
ClothingOuterVest: 2
ClothingBeltBandolier: 2
ClothingEyesGlassesSunglasses: 2

contrabandInventory:
ToyFigurineBartender: 1
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,8 @@
DrinkSakeBottleFull: 3
DrinkBeerCan: 5
DrinkWineCan: 5
contrabandInventory:
EthanolChemistryBottle: 3
DrinkBottleOfNothingFull: 1
emaggedInventory:
DrinkPoisonWinebottleFull: 2
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@
ClothingOuterWinterMiner: 2
ClothingNeckScarfStripedBrown: 3
ClothingShoesBootsWinterCargo: 2
contrabandInventory:
ToyFigurineCargoTech: 1
ToyFigurineSalvage: 1
ToyFigurineQuartermaster: 1
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
EncryptionKeyScience: 2
EncryptionKeySecurity: 1
EncryptionKeyService: 3
contrabandInventory:
RubberStampGreytide: 1
LuxuryPen: 1
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@
ClothingOuterCoatExpensive: 1
ClothingNeckScarfStripedCentcom: 3
ClothingNeckCloakCentcom: 3
contrabandInventory:
ToyFigurineCaptain: 1
ToyFigurineHeadOfPersonnel: 1
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@
FoodSnackChowMein: 3
FoodSnackDanDanNoodles: 3
PairedChopsticks: 3
contrabandInventory:
FoodBakedDumplings: 2
FoodSoupMiso: 2
# rice?
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
BoxCandle: 2
BoxCandleSmall: 2
Urn: 5
contrabandInventory:
FoodBakedBunHotX: 2
DrinkWineBottleFull: 1
ToyFigurineChaplain: 1
emaggedInventory:
ClothingOuterArmorCult: 1
ClothingHeadHelmetCult: 1
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@
ClothingShoesColorBlack: 2
ClothingShoesChef: 2
ClothingBeltChef: 2
contrabandInventory:
ToyFigurineChef: 1
5 changes: 5 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,9 @@
FoodButter: 3
FoodCheese: 1
FoodMeat: 6
contrabandInventory:
EggBoxBroken: 1
FoodBoxDonkpocket: 1
FoodFrozenSandwich: 2
FoodFrozenSandwichStrawberry: 2

2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@
ClothingHandsGlovesLatex: 2
ClothingHeadsetMedical: 2
ClothingOuterWinterChem: 2
contrabandInventory:
ToyFigurineChemist: 1
6 changes: 6 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
JugSodium: 2
JugSugar: 3
JugSulfur: 1
contrabandInventory:
DrinkLithiumFlask: 1
StrangePill: 3
emaggedInventory:
ToxinChemistryBottle: 1

Expand Down Expand Up @@ -50,6 +53,9 @@
JugSugar: 3
JugSulfur: 1
JugWeldingFuel: 1
contrabandInventory:
DrinkLithiumFlask: 1
StrangePill: 3
emaggedInventory:
PaxChemistryBottle: 3
MuteToxinChemistryBottle: 3
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@
CheapLighter: 4
Lighter: 2
FlippoLighter: 2
contrabandInventory:
GroundTobacco: 3
CigarGold: 2
Igniter: 1
emaggedInventory:
CigPackSyndicate: 1
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,6 @@
ClothingMaskNeckGaiter: 2
ClothingUniformJumpsuitTacticool: 1
ClothingUniformJumpskirtTacticool: 1
ToyFigurinePassenger: 1
ToyFigurineGreytider: 1
# DO NOT ADD MORE, USE UNIFORM DYING
4 changes: 3 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
- type: vendingMachineInventory
- type: vendingMachineInventory
id: HotDrinksMachineInventory
startingInventory:
DrinkHotCoffee: 5
DrinkCafeLatte: 5
DrinkTeacup: 5
DrinkGreenTea: 5
DrinkHotCoco: 5
contrabandInventory:
DrinkTeapot: 2
emaggedInventory:
DrinkNothing: 2
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkFourteenLokoCan: 2
contrabandInventory:
DrinkColaBottleFull: 2
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
7 changes: 6 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,9 @@
SpoonPlastic: 10
KnifePlastic: 10
FoodPlatePlastic: 10
FoodPlateSmallPlastic: 10
FoodPlateSmallPlastic: 10
contrabandInventory:
FoodShakerSalt: 1
FoodShakerPepper: 1
FoodCondimentBottleKetchup: 1
ReagentContainerMayo: 1
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@
ClothingUniformJumpskirtLibrarian: 3
ClothingShoesBootsLaceup: 2
ClothingHeadsetService: 2
contrabandInventory:
ToyFigurineLibrarian: 1

2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@
ClothingHandsGlovesColorBlack: 2
ClothingHandsGlovesLatex: 2
ClothingHeadsetSecurity: 2
contrabandInventory:
ToyFigurineDetective: 1
6 changes: 5 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: vendingMachineInventory
- type: vendingMachineInventory
id: DinnerwareInventory
startingInventory:
ButchCleaver: 1
Expand Down Expand Up @@ -26,3 +26,7 @@
DrinkMugOne: 1
DrinkMugRainbow: 2
DrinkMugRed: 2
contrabandInventory:
CandyBowl: 1
BarSpoon: 2
DrinkShaker: 2
5 changes: 4 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: vendingMachineInventory
- type: vendingMachineInventory
id: DiscountDansInventory
startingInventory:
FoodSnackCheesie: 3
Expand All @@ -8,3 +8,6 @@
FoodSnackPopcorn: 3
FoodSnackEnergy: 3
CigPackMixed: 2
contrabandInventory:
FoodSnackDanDanNoodles: 3
FoodBakedBunHoney: 3
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
FoodDonutApple: 3
FoodDonutPink: 3
FoodDonutBungo: 3
contrabandInventory:
FoodBagel: 2
FoodBagelPoppy: 2
emaggedInventory:
FoodDonutPoison: 1
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
ClothingOuterWinterEngi: 2
ClothingNeckScarfStripedOrange: 3
ClothingShoesBootsWinterEngi: 2
contrabandInventory:
ToyFigurineEngineer: 1
ToyFigurineChiefEngineer: 1
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@
ClothingHandsGlovesColorYellow: 6
BoxInflatable: 2
ClothingHeadHatCone: 4
contrabandInventory:
DrinkBeerCan: 3
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@
PaperCNCSheet: 6
MysteryFigureBox: 2
BooksBag: 3
contrabandInventory:
Basketball: 1
FoodSnackBoritos: 3
DrinkSpaceMountainWindCan: 3
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkFourteenLokoCan: 2
contrabandInventory:
ClothingNeckStethoscope: 2
Saw: 2
Tourniquet: 3
Comment on lines +12 to +14
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I understand why these are in the soda vendor.

Copy link
Author

@AgentSmithRadio AgentSmithRadio Oct 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the Dr. Gibb machine. While most soda machines either receive a different soda (Dr. Gibb in PwrGame "Much Better Than Dr. Gibb" machines, or at least that's what they kept screaming at me during research and testing) or their full-sized bottle equivalents for the Cola/Soda and Space Mountain Wind machines, I wanted to try something more interesting for Dr. Gibb.

This is very much a field amputation kit, with a stethoscope for someone to throw on to pretend to be a doctor before doing it. While there is no amputation in the game, I wanted this to be somewhat jarring, that the seemingly innocent soda machine for some reason has these tools for amputation, with no anesthesia, wound dressing or anything else, and play into the shock value of seeing it for the first time. The reason to come back to this machine is the tourniquets, which is why their spawn is set to 3, so there's a higher chance that one will be there in a situation where you actually need it.

tl;dr: field amputation kit in Dr. "tastes like malpractice" Gibb machine in horror game.

emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
6 changes: 5 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
- type: vendingMachineInventory
- type: vendingMachineInventory
id: HappyHonkDispenserInventory
startingInventory:
HappyHonk: 10
HappyHonkMime: 4
contrabandInventory:
ToyFigurineClown: 1
ToyFigurineMime: 1
ToyFigurineNukie: 1
emaggedInventory:
HappyHonkCluwne: 1
HappyHonkNukie: 1
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@
ClothingHeadBandBotany: 3
ClothingHeadsetService: 2
ClothingOuterWinterHydro: 2
contrabandInventory:
ToyFigurineBotanist: 1

3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
ClothingHeadsetService: 2
ClothingOuterWinterJani: 2
ClothingNeckScarfStripedPurple: 3

contrabandInventory:
ToyFigurineJanitor: 1
emaggedInventory:
ClothingUniformJumpskirtJanimaid: 2
ClothingUniformJumpskirtJanimaidmini: 1
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
ClothingHeadHatPwig: 1
# "Legally" obtained currency
SpaceCash100: 2
ToyFigurineLawyer: 1
emaggedInventory:
CyberPen: 1
4 changes: 3 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@
Syringe: 5
ClothingEyesHudMedical: 2
ClothingEyesEyepatchHudMedical: 2

contrabandInventory:
BrutepackAdvanced1: 1
OintmentAdvanced1: 1
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@
ClothingShoesBootsWinterMed: 2
contrabandInventory:
ClothingUniformJumpskirtOfLife: 1
ToyFigurineMedicalDoctor: 1
ToyFigurineParamedic: 1
ToyFigurineChiefMedicalOfficer: 1
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@
BoxAgrichem: 1
#TO DO:
#plant analyzer
contrabandInventory:
UnstableMutagenChemistryBottle: 1
Joint: 1
emaggedInventory:
Left4ZedChemistryBottle: 1
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkFourteenLokoCan: 2
contrabandInventory:
DrinkDrGibbCan: 3
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@
Welder: 1
Screwdriver: 2
Crowbar: 2
contrabandInventory:
FoodBurgerRobot: 1
4 changes: 3 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: vendingMachineInventory
- type: vendingMachineInventory
id: SalvageEquipmentInventory
startingInventory:
Crowbar: 2
Expand All @@ -10,3 +10,5 @@
RadioHandheld: 2
WeaponGrapplingGun: 2
WeaponProtoKineticAccelerator: 4
contrabandInventory:
PlushieCarp: 1
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@
ClothingOuterWinterSci: 2
ClothingNeckScarfStripedPurple: 3
ClothingShoesBootsWinterSci: 2
contrabandInventory:
ToyFigurineResearchDirector: 1
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
RadioHandheldSecurity: 5
# security officers need to follow a diet regimen!
contrabandInventory:
WeaponMeleeNeedle: 2
FoodDonutHomer: 12
FoodBoxDonut: 2
#box evidence
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@
ClothingHeadHelmetJustice: 1
contrabandInventory:
ClothingMaskClownSecurity: 1
ToyFigurineSecurity: 1
ToyFigurineWarden: 1
ToyFigurineHeadOfSecurity: 1
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,8 @@
TowercapSeeds: 5
WheatSeeds: 5
WatermelonSeeds: 5
contrabandInventory:
NettleSeeds: 2
FoodSnackSemki: 2
emaggedInventory:
FlyAmanitaSeeds: 1
3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
DrinkSolDryCan: 2
DrinkLemonLimeCan: 2
DrinkFourteenLokoCan: 2
contrabandInventory:
DrinkChangelingStingCan: 2
emaggedInventory:
DrinkNukieCan: 2
DrinkChangelingStingCan: 2
3 changes: 1 addition & 2 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
FoodSnackPistachios: 3
FoodSnackSus: 3
FoodSnackSemki: 3
emaggedInventory:
contrabandInventory:
FoodSnackSyndi: 3

4 changes: 3 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: vendingMachineInventory
- type: vendingMachineInventory
id: SodaInventory
startingInventory:
DrinkColaCan: 3
Expand All @@ -8,6 +8,8 @@
DrinkSolDryCan: 3
DrinkLemonLimeCan: 3
DrinkFourteenLokoCan: 3
contrabandInventory:
DrinkColaBottleFull: 2
emaggedInventory:
DrinkNukieCan: 3
DrinkChangelingStingCan: 3
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
startingInventory:
DrinkSodaWaterCan: 10 #typically hacked product. Default product is "soda"
contrabandInventory:
DrinkSodaWaterBottleFull: 2
DrinkColaCan: 10
ClothingHeadHatUshanka: 2
Loading
Loading