From 476f7800c83e80a85ad8c930482318c48cf04254 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Fri, 23 Jun 2023 00:31:53 -0400 Subject: [PATCH] 22 New Cargo Bounties (#17582) --- Resources/Locale/en-US/cargo/bounties.ftl | 49 +++- .../Prototypes/Catalog/Bounties/bounties.yml | 272 +++++++++++++++++- .../Entities/Clothing/Uniforms/jumpskirts.yml | 4 + .../Entities/Clothing/Uniforms/jumpsuits.yml | 4 + .../Objects/Consumable/Food/Baked/bread.yml | 5 + .../Objects/Consumable/Food/Baked/misc.yml | 15 +- .../Objects/Consumable/Food/Baked/pie.yml | 5 +- .../Objects/Consumable/Food/meals.yml | 6 + .../Objects/Consumable/Food/produce.yml | 12 + .../Entities/Objects/Consumable/Food/soup.yml | 3 + .../Entities/Objects/Weapons/Melee/knife.yml | 1 + Resources/Prototypes/tags.yml | 36 +++ 12 files changed, 394 insertions(+), 18 deletions(-) diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index 158e08c446..9a744b1a5e 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -2,40 +2,85 @@ bounty-item-baseball-bat = Baseball bat bounty-item-box-hugs = Box of hugs bounty-item-brain = Brain +bounty-item-bread = Bread bounty-item-briefcase = Briefcase bounty-item-carp = Space carp +bounty-item-carrot = Carrot +bounty-item-carrot-fries = Carrot fries +bounty-item-clown-mask = Clown mask +bounty-item-clown-shoes = Clown shoes +bounty-item-corn = Ear of corn bounty-item-crayon = Crayon +bounty-item-cuban-carp = Cuban carp bounty-item-donk-pocket = Donk-pocket bounty-item-donut = Donut bounty-item-figurine = Action figure +bounty-item-flesh-monster = Flesh monster bounty-item-flower = Flower +bounty-item-galaxythisle = Galaxythistle +bounty-item-handcuffs = Handcuffs +bounty-item-instrument = Instrument +bounty-item-knife = Knife +bounty-item-lemon = Lemon +bounty-item-lime = Lime bounty-item-lung = Lung +bounty-item-monkey-cube = Monkey cube bounty-item-mouse = Dead mouse +bounty-item-pancake = Pancake +bounty-item-pen = Pen +bounty-item-percussion = Percussion instrument +bounty-item-pie = Pie +bounty-item-prison-uniform = Prison uniform +bounty-item-radio = Radio bounty-item-research-disk = Research disk +bounty-item-shiv = Shiv bounty-item-soap = Soap +bounty-item-soup = Soup bounty-item-spear = Spear +bounty-item-syringe = Syringe bounty-item-toolbox = Toolbox bounty-item-tech-disk = Technology disk bounty-item-trash = Trash -bounty-item-pen = Pen bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it. bounty-description-baseball-bat = Baseball fever is going on at CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream. bounty-description-box-hugs = Several chief officials have sustained serious boo-boos. A box of hugs is urgently needed to aid in their recovery. bounty-description-brain = Commander Caldwell was rendered brain-dead by a recent space lube accident. Unfortunately, we can't hire a replacement, so just send us a new brain to put in her instead. +bounty-description-bread = Problems with central planning have led to bread prices skyrocketing. Ship some bread to ease tensions. bounty-description-briefcase = Central Command will be holding a business convention this year. Ship a few briefcases in support. +bounty-description-carrot = After failing to watch instructional videos for proper welder safety, the salvage division on Station 15 has been blinded. Ship them some carrots so they can restore their eyesight. +bounty-description-carrot-fries = Night sight can mean life or death! A shipment of carrot fries is the order. bounty-description-carp = Admiral Pavlov has gone on strike ever since Central Command confiscated her "pet." She is demanding a space carp as a replacement, dead or alive. +bounty-description-clown-costume = Due to a recent issue at a space carp petting zoo, we've unfortunately lost Bonobobonobo the Clown. Send us a new costume so the kids can see him once more. +bounty-description-corn = After the recent destruction of Space Ohio, our corn imports are down 80%. Send us some so we can make up for it. bounty-description-crayon = Dr Jones' kid ate all our crayons again. Please send us yours. +bounty-description-cuban-carp = To celebrate the birth of Castro XXVII, ship one cuban carp to CentCom. bounty-description-donk-pocket = Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentCom immediately. bounty-description-donut = CentCom's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale. bounty-description-figurine = The vice president's son saw an ad for action figures on the telescreen and now he won't shut up about them. Ship some to ease his complaints. +bounty-description-flesh-monster = We've recently receieved reports of some kind of flesh monster infestation onboard several stations. Send us a few samples of these creatures so we can investigate new botanical opportunities. bounty-description-flower = Commander Zot really wants to sweep Security Officer Olivia off her feet. Send a shipment of flowers and he'll happily reward you. +bounty-description-galaxythistle = After a particularly nasty foam backpressure from a scrubber, a high-ranking officer got badly poisoned. Send us some galaxythistle so we can prepare him a homeopathic remedy. +bounty-description-handcuffs = A large influx of escaped convicts have arrived at Central Command. Now is the perfect time to ship out spare handcuffs (or restraints). +bounty-description-instrument = The hottest new band in the galaxy, Cindy Kate and the Saboteurs, lost their gear in a cargo shuttle collision. Send them a new set of instruments so they can play their show. +bounty-description-knife = One of our top commanders recently won a brand new set of knives on an official Nanotrasen gameshow. Unforunately, we don't have a set on hand. Send us a bunch of sharp things so we can throw something together, +bounty-description-lemon = Dr Jones's kid is starting up a lemonade stand. Small issue: lemons don't get shipped to this sector. Fix that for a nice reward. +bounty-description-lime = After a heavy drinking session, Admiral Pastich developed a strong addiction to fresh lime wedges. Send us some limes so we can prepare him his new favorite snack. bounty-description-lung = The pro-smoking league has been fighting to keep cigarettes on our stations for millennia. Unfortunately, they're lungs aren't fighting so hard anymore. Send them some new ones. +bounty-description-monkey-cube = Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes. bounty-description-mouse = Station 13 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike. +bounty-description-pancake = Here at Nanotrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen. +bounty-description-pen = We are hosting the intergalactic pen balancing competition. We need you to send us some standardized ball point pens. +bounty-description-percussion = Due to a poorly timed barfight, the United Galaxy-wide Mixed Percussion Ensemble lost all of their instruments. Send them a new set so they can jam once more. +bounty-description-pie = 3.14159? No! CentCom management wants edible pie! Ship a whole one. +bounty-description-prison-uniform = Terragov has been unable to source any new prisoner uniforms, so if you have any spares, we'll take them off your hands. +bounty-description-radio = A recent solar flare has fried all of our communication devices. Send us a new set of radios for our engineering crew so we can repair the network. bounty-description-research-disk = Turns out those bozos in the Research department have been spending all their time getting janitorial equipment. Send some research up to Central Command so we can actually get what we need. +bounty-description-shiv = Bzzzt... Transmission from prison planet OC-1001: we're facing an onslaught of uhm... "invaders." Yeah, invaders. Send us some shivs to fight them off with. bounty-description-soap = Soap has gone missing from CentCom's bathrooms and nobody knows who took it. Replace it and be the hero CentCom needs. +bounty-description-soup = To quell the homeless uprising, Nanotrasen will be serving soup to all underpaid workers. Ship any type of soup. bounty-description-spear = CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears. +bounty-description-syringe = The NT anti-drug task force is in need of some syringes in order to distribute them to low-income communities. Help some keep some peoples' jobs secure. bounty-description-toolbox = There's an absence of robustness at Central Command. Hurry up and ship some toolboxes as a solution. bounty-description-tech-disk = The new research assistant on Station 13 spilled a soda on the RND server. Send them some technology disks so they can build up their recipes. bounty-description-trash = Recently a group of janitors have run out of trash to clean up, without any trash Centcom wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation. -bounty-description-pen = We are hosting the intergalactic pen balancing competition. We need you to send us some standardized ball point pens. diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml index 3c1f52e886..6cf2d94c63 100644 --- a/Resources/Prototypes/Catalog/Bounties/bounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml @@ -42,6 +42,17 @@ components: - Brain +- type: cargoBounty + id: BountyBread + reward: 400 + description: bounty-description-bread + entries: + - name: bounty-item-bread + amount: 1 + whitelist: + tags: + - Bread + - type: cargoBounty id: BountyBriefcase reward: 1000 @@ -53,6 +64,28 @@ tags: - Briefcase +- type: cargoBounty + id: BountyCarrot + reward: 1500 + description: bounty-description-carrot + entries: + - name: bounty-item-carrot + amount: 10 + whitelist: + tags: + - Carrot + +- type: cargoBounty + id: BountyCarrotFries + reward: 1400 + description: bounty-description-carrot-fries + entries: + - name: bounty-item-carrot-fries + amount: 3 + whitelist: + tags: + - CarrotFries + - type: cargoBounty id: BountyCarp reward: 2000 @@ -64,6 +97,33 @@ tags: - Carp +- type: cargoBounty + id: BountyClownCostume + reward: 1500 + description: bounty-description-clown-costume + entries: + - name: bounty-item-clown-mask + amount: 1 + whitelist: + tags: + - ClownMask + - name: bounty-item-clown-shoes + amount: 1 + whitelist: + tags: + - ClownShoes + +- type: cargoBounty + id: BountyCorn + reward: 2000 + description: bounty-description-corn + entries: + - name: bounty-item-corn + amount: 10 + whitelist: + tags: + - Corn + - type: cargoBounty id: BountyCrayon reward: 800 @@ -75,6 +135,17 @@ tags: - Crayon +- type: cargoBounty + id: BountyCubanCarp + reward: 3200 + description: bounty-description-cuban-carp + entries: + - name: bounty-item-cuban-carp + amount: 1 + whitelist: + tags: + - CubanCarp + - type: cargoBounty id: BountyDonkPocket reward: 1200 @@ -108,6 +179,17 @@ tags: - Figurine +- type: cargoBounty + id: BountyFleshMonster + reward: 2500 + description: bounty-description-flesh-monster + entries: + - name: bounty-item-flesh-monster + amount: 8 + whitelist: + tags: + - Flesh + - type: cargoBounty id: BountyFlower reward: 400 @@ -119,6 +201,72 @@ tags: - Flower +- type: cargoBounty + id: BountyGalaxyThistle + reward: 2400 + description: bounty-description-galaxythistle + entries: + - name: bounty-item-galaxythistle + amount: 10 + whitelist: + tags: + - Galaxythistle + +- type: cargoBounty + id: BountyHandcuffs + reward: 400 + description: bounty-description-handcuffs + entries: + - name: bounty-item-handcuffs + amount: 5 + whitelist: + components: + - Handcuff + +- type: cargoBounty + id: BountyInstrument + reward: 1000 + description: bounty-description-instrument + entries: + - name: bounty-item-instrument + amount: 5 + whitelist: + components: + - Instrument + +- type: cargoBounty + id: BountyKnife + reward: 1200 + description: bounty-description-knife + entries: + - name: bounty-item-knife + amount: 5 + whitelist: + components: + - Sharp + +- type: cargoBounty + id: BountyLemon + reward: 2000 + description: bounty-description-lemon + entries: + - name: bounty-item-lemon + amount: 7 + whitelist: + tags: + - Lemon + +- type: cargoBounty + id: BountyLime + reward: 2000 + description: bounty-description-lime + entries: + - name: bounty-item-lime + amount: 7 + whitelist: + tags: + - Lime + - type: cargoBounty id: BountyLung reward: 3000 @@ -130,6 +278,17 @@ components: - Lung +- type: cargoBounty + id: BountyMonkeyCube + reward: 800 + description: bounty-description-monkey-cube + entries: + - name: bounty-item-monkey-cube + amount: 3 + whitelist: + tags: + - MonkeyCube + - type: cargoBounty id: BountyMouse reward: 600 @@ -141,6 +300,75 @@ tags: - Mouse +- type: cargoBounty + id: BountyPancake + reward: 2000 + description: bounty-description-pancake + entries: + - name: bounty-item-pancake + amount: 13 + whitelist: + tags: + - Pancake + +- type: cargoBounty + id: BountyPen + reward: 800 + description: bounty-description-pen + entries: + - name: bounty-item-pen + amount: 10 + whitelist: + tags: + - Write + +- type: cargoBounty + id: BountyPercussion + reward: 2500 + description: bounty-description-percussion + entries: + - name: bounty-item-percussion + amount: 7 + whitelist: + components: + - PercussionInstrument + +- type: cargoBounty + id: BountyPie + reward: 3142 + description: bounty-description-pie + entries: + - name: bounty-item-pie + amount: 1 + whitelist: + components: + - Pie + +- type: cargoBounty + id: BountyPrisonUniform + reward: 800 + description: bounty-description-prison-uniform + entries: + - name: bounty-item-prison-uniform + amount: 4 + whitelist: + tags: + - PrisonUniform + +- type: cargoBounty + id: BountyRadio + reward: 1000 + description: bounty-description-radio + entries: + - name: bounty-item-radio + amount: 12 + whitelist: + components: + - Headset + - RadioMicrophone + tags: + - Radio + - type: cargoBounty id: BountyResearchDisk reward: 1200 @@ -152,6 +380,17 @@ components: - ResearchDisk +- type: cargoBounty + id: BountyShiv + reward: 600 + description: bounty-description-shiv + entries: + - name: bounty-item-shiv + amount: 5 + whitelist: + tags: + - Shiv + - type: cargoBounty id: BountySoap reward: 800 @@ -163,6 +402,17 @@ tags: - Soap +- type: cargoBounty + id: BountySoup + reward: 1200 + description: bounty-description-soup + entries: + - name: bounty-item-soup + amount: 3 + whitelist: + tags: + - Soup + - type: cargoBounty id: BountySpear reward: 800 @@ -174,6 +424,17 @@ tags: - Spear +- type: cargoBounty + id: BountySyringe + reward: 1000 + description: bounty-description-syringe + entries: + - name: bounty-item-syringe + amount: 10 + whitelist: + tags: + - Syringe + - type: cargoBounty id: BountyTechDisk reward: 2000 @@ -206,14 +467,3 @@ whitelist: tags: - Trash - -- type: cargoBounty - id: BountyPen - reward: 800 - description: bounty-description-pen - entries: - - name: bounty-item-pen - amount: 10 - whitelist: - tags: - - Write diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 12ef43b63b..c2cc48cc99 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -279,6 +279,10 @@ controlsLocked: true randomMode: false mode: SensorCords + - type: Tag + tags: + - WhitelistChameleon + - PrisonUniform - type: entity parent: ClothingUniformSkirtBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index d5e60935e7..2427c2fef2 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -414,6 +414,10 @@ controlsLocked: true randomMode: false mode: SensorCords + - type: Tag + tags: + - WhitelistChameleon + - PrisonUniform - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index d30e0aa107..51fc0bfd21 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -11,6 +11,9 @@ - type: Food - type: Sprite sprite: Objects/Consumable/Food/Baked/bread.rsi + - type: Tag + tags: + - Bread - type: SolutionContainerManager solutions: food: @@ -29,6 +32,8 @@ - type: FlavorProfile flavors: - bread + - type: Tag + tags: [] #override bread - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index 71ee17d616..652efa4f5b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -246,6 +246,9 @@ map: ["pancakes9"] visible: false - type: Appearance + - type: Tag + tags: + - Pancake - type: entity name: blueberry pancake @@ -276,6 +279,9 @@ map: ["pancakesbb3"] visible: false - type: Appearance + - type: Tag + tags: + - Pancake - type: entity name: chocolate chip pancake @@ -315,6 +321,9 @@ Quantity: 5 - ReagentId: Theobromine Quantity: 1 + - type: Tag + tags: + - Pancake - type: entity name: waffles @@ -424,7 +433,7 @@ Quantity: 5 - ReagentId: Vitamin Quantity: 1 - + - type: entity name: dumplings parent: FoodBakedBase @@ -432,7 +441,7 @@ description: Average recipe for meat in doughs. components: - type: Sprite - state: dumplings + state: dumplings - type: SolutionContainerManager solutions: food: @@ -442,4 +451,4 @@ Quantity: 8 - ReagentId: Protein Quantity: 2 - + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index b2637028bb..4124cb7db5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -26,6 +26,7 @@ - type: Tag tags: - NoSpinOnThrow + - Pie - type: entity parent: FoodInjectableBase # Not sliceable @@ -148,9 +149,9 @@ whitelist: components: - OnUseTimerTrigger - insertSound: + insertSound: path: /Audio/Weapons/Guns/Empty/empty.ogg - ejectSound: + ejectSound: path: /Audio/Weapons/Guns/Empty/empty.ogg # Tastes like pie, cream, banana. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index fa686b0f96..46add4a699 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -77,6 +77,9 @@ - salty - type: Sprite state: fries-carrot + - type: Tag + tags: + - CarrotFries - type: SolutionContainerManager solutions: food: @@ -219,6 +222,9 @@ - fishy - batter - spicy + - type: Tag + tags: + - CubanCarp - type: Sprite state: cubancarp - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 25fc1ca242..c0045f78c7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -355,6 +355,9 @@ reagents: - ReagentId: JuiceLemon Quantity: 10 + - type: Tag + tags: + - Lemon - type: entity name: lime @@ -374,6 +377,9 @@ reagents: - ReagentId: JuiceLime Quantity: 10 + - type: Tag + tags: + - Lime - type: entity name: orange @@ -587,6 +593,9 @@ Quantity: 15 - ReagentId: Nutriment Quantity: 5 + - type: Tag + tags: + - Corn - type: Sprite sprite: Objects/Specific/Hydroponics/corn.rsi - type: Produce @@ -938,6 +947,9 @@ seedId: galaxythistle - type: Extractable grindableSolutionName: food + - type: Tag + tags: + - Galaxythistle - type: entity name: fly amanita diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index 4607e594c5..11ae8e80c7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -34,6 +34,9 @@ Blunt: 0 - type: Damageable damageContainer: Inorganic + - type: Tag + tags: + - Soup - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 077cac7f1c..34fa0a53b8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -138,6 +138,7 @@ tags: - CombatKnife - Knife + - Shiv - type: Construction graph: Shiv node: icon diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 311a21852f..5b2d7841ac 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -70,6 +70,9 @@ - type: Tag id: BrassInstrument +- type: Tag + id: Bread + - type: Tag id: Briefcase @@ -91,6 +94,9 @@ - type: Tag id: Carrot +- type: Tag + id: CarrotFries + - type: Tag id: Carpet @@ -167,6 +173,9 @@ - type: Tag id: CluwneHorn +- type: Tag #Ohioans die happy + id: Corn + - type: Tag id: Crayon @@ -215,6 +224,9 @@ - type: Tag id: ComputerTelevisionCircuitboard +- type: Tag + id: CubanCarp + - type: Tag id: Debug @@ -311,6 +323,9 @@ - type: Tag id: ForceNoFixRotations # fixrotations command WON'T target this +- type: Tag + id: Galaxythistle + - type: Tag id: GasScrubber @@ -446,6 +461,12 @@ - type: Tag id: LavaBrig +- type: Tag + id: Lemon + +- type: Tag + id: Lime + - type: Tag id: Machete @@ -568,6 +589,9 @@ - type: Tag id: PaintableAirlock +- type: Tag + id: Pancake + - type: Tag id: PercussionInstrument @@ -577,6 +601,9 @@ - type: Tag id: Pickaxe +- type: Tag + id: Pie + - type: Tag id: PillCanister @@ -607,6 +634,9 @@ - type: Tag id: Powerdrill +- type: Tag + id: PrisonUniform + - type: Tag id: ProximitySensor @@ -668,6 +698,9 @@ - type: Tag id: ShellShotgun +- type: Tag + id: Shiv + - type: Tag id: ShoesRequiredStepTriggerImmune @@ -692,6 +725,9 @@ - type: Tag id: SolarTrackerElectronics +- type: Tag + id: Soup + - type: Tag id: Spray