From 4de0d7ecf8ed0837293bd964b58df73fdd13e922 Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Sat, 8 Jan 2022 21:49:48 -0500 Subject: [PATCH] Adjusted Botanist starting items, fucked doctor duffels and satchels (#6040) Co-authored-by: Moony --- .../Fills/Backpacks/Starter Gear/duffelbag.yml | 1 - .../Fills/Backpacks/Starter Gear/satchel.yml | 1 - Resources/Prototypes/Catalog/Fills/Items/belt.yml | 11 +++++++++++ .../Catalog/VendingMachines/Inventories/nutri.yml | 1 + .../Objects/Specific/chemistry-bottles.yml | 14 ++++++++++++++ .../Prototypes/Roles/Jobs/Civilian/botanist.yml | 1 + 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml index bc3f2c5ca2..83ab58aa1c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml @@ -34,7 +34,6 @@ - type: StorageFill contents: - id: BoxSurvival - - id: Medkit - type: entity abstract: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml index ae6105c1b8..5824bb3adc 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml @@ -34,7 +34,6 @@ - type: StorageFill contents: - id: BoxSurvival - - id: Medkit - type: entity abstract: true diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 23545c7c5d..3ec8204e46 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -63,3 +63,14 @@ - id: Ointment amount: 3 - id: EpinephrineMedipen #You never know what people are going to latejoin into + +- type: entity + id: ClothingBeltPlantFilled + parent: ClothingBeltPlant + suffix: Filled + components: + - type: StorageFill + contents: + - id: HydroponicsToolMiniHoe + - id: HydroponicsToolSpade + - id: RobustHarvestChemistryBottle diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml index 933020b9a3..93abb22531 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml @@ -8,6 +8,7 @@ WeedSpray: 20 PestSpray: 20 Syringe: 5 + RobustHarvestChemistryBottle: 3 #TO DO: #cultivator #secateurs diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index 9b4e9e5f3c..0812fe9beb 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -122,4 +122,18 @@ reagents: - ReagentId: Epinephrine Quantity: 30 + +- type: entity + id: RobustHarvestChemistryBottle + name: robust harvest bottle + description: This will increase the potency of your plants. + parent: BaseChemistryEmptyBottle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: RobustHarvest + Quantity: 30 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index 110d88ee80..29b4e9f80a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -20,6 +20,7 @@ id: BotanistPDA ears: ClothingHeadsetService outerClothing: ClothingOuterApronBotanist + belt: ClothingBeltPlantFilled innerclothingskirt: ClothingUniformJumpskirtHydroponics satchel: ClothingBackpackSatchelHydroponicsFilled duffelbag: ClothingBackpackDuffelFilled