Merge pull request #52 from Fansana/Nikkos_Toybox

NNN Modifications and Vending
Fansana · Jul 25, 2024 · c764be4 · c764be4
2 parents c5178ca + f2e4421
commit c764be4
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: