From f2e442195476be231274cad85623aacdb605e991 Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Mon, 22 Jul 2024 15:15:39 -0500 Subject: [PATCH] NNN modifications and vending --- .../VendingMachines/Inventories/cola.yml | 1 + .../Catalog/VendingMachines/Inventories/gib.yml | 1 + .../VendingMachines/Inventories/pwrgame.yml | 1 + .../Inventories/shamblersjuice.yml | 1 + .../VendingMachines/Inventories/sovietsoda.yml | 1 + .../VendingMachines/Inventories/spaceup.yml | 3 ++- .../VendingMachines/Inventories/starkist.yml | 3 ++- .../FloofStation/Reagents/Drinks/drinks.yml | 17 ++++++++++++++++- 8 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index 2f9ce3d3ae6..9608088edd7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -7,6 +7,7 @@ DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 + DrinkNNNCan: 3 #Floofstation emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml index 38ea3a00129..cc0f26285ab 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml @@ -7,6 +7,7 @@ DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 + DrinkNNNCan: 3 #Floofstation emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml index 96513fca8a8..7f39276a982 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml @@ -8,6 +8,7 @@ DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 + DrinkNNNCan: 3 #Floofstation emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml index 08c0162c080..a2edb53d5e9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml @@ -7,6 +7,7 @@ DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 + DrinkNNNCan: 3 #Floofstation emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml index 34f0906366a..dc1052ea853 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sovietsoda.yml @@ -4,3 +4,4 @@ DrinkSodaWaterCan: 10 #typically hacked product. Default product is "soda" contrabandInventory: DrinkColaCan: 10 + DrinkNNNCan: 20 #Floofstation diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml index 0dc33cf07f9..d0c026e83e2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: SpaceUpInventory startingInventory: DrinkSpaceUpCan: 3 @@ -8,6 +8,7 @@ DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 + DrinkNNNCan: 3 #Floofstation emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml index 6afbe1eae64..dfd76ac508a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: StarkistInventory startingInventory: DrinkStarkistCan: 4 @@ -7,6 +7,7 @@ DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 DrinkFourteenLokoCan: 2 + DrinkNNNCan: 3 #Floofstation emaggedInventory: DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml b/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml index cf39c6e3191..442cf2eda54 100644 --- a/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml +++ b/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml @@ -13,7 +13,22 @@ effects: - !type:SatiateThirst factor: 2 - #TO-DO Lust+ + Medicine: + metabolismRate : 0.5 + effects: + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-aphrodisiac-mild1" + - "reagent-effect-aphrodisiac-mild2" + - "reagent-effect-aphrodisiac-mild3" + - "reagent-effect-aphrodisiac-mild4" + - "reagent-effect-aphrodisiac-mild5" + probability: 0.02 + conditions: + - !type:ReagentThreshold + max: 50 footstepSound: collection: FootstepSticky params: