Merge branches 'discord-changlogs' and 'discord-changlogs' of https:/…

…/github.com/FoxxoTrystan/floofstation1 into discord-changlogs

Resources/Locale/en-US/flavors/flavor-profiles.ftl

@@ -210,6 +210,7 @@ flavor-complex-milk = like milk
 flavor-complex-tea = like tea
 flavor-complex-ice = like ice
 flavor-complex-mopwata = like stagnant, dirty water
+flavor-complex-nikkonectar = like creamy blueberries.
 
 ## Cocktails
 flavor-complex-long-island = suspiciously like iced tea

Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl

@@ -0,0 +1,28 @@
+reagent-effect-aphrodisiac-mild1 = You feel a tingling in your chest.
+reagent-effect-aphrodisiac-mild2 = Your body feels warm.
+reagent-effect-aphrodisiac-mild3 = You feel slightly aroused.
+reagent-effect-aphrodisiac-mild4 = You can feel your southern blood pumping.
+reagent-effect-aphrodisiac-mild5 = You begin to have inklings of fantasies.
+reagent-effect-aphrodisiac-mildoverdose = You feel nauseous.
+
+reagent-effect-aphrodisiac-normal1 = Your entire body is hot.
+reagent-effect-aphrodisiac-normal2 = Everyone is looking at you. They want you.
+reagent-effect-aphrodisiac-normal3 = You feel incredibly lustful.
+reagent-effect-aphrodisiac-normal4 = Your body buzzes with pleasure.
+reagent-effect-aphrodisiac-normal5 = Everyone's musk smells stronger.
+reagent-effect-aphrodisiac-normaloverdose1 = You forget what you were doing.
+reagent-effect-aphrodisiac-normaloverdose2 = Your mind feels clouded.
+reagent-effect-aphrodisiac-normaloverdose3 = Your heart is pounding.
+reagent-effect-aphrodisiac-normaloverdose4 = You feel the need for a nap
+reagent-effect-aphrodisiac-normaloverdose5 = Your eyes feel heavy.
+reagent-effect-aphrodisiac-normaloverdose6 = You lose your train of thought.
+
+reagent-effect-aphrodisiac-strong1 = You can't look at someone without wanting to fuck them.
+reagent-effect-aphrodisiac-strong2 = You need someone to breed with.
+reagent-effect-aphrodisiac-strong3 = Fuck them. Now.
+reagent-effect-aphrodisiac-strongoverdose1 = FIND SOMEONE.
+reagent-effect-aphrodisiac-strongoverdose2 = YOU NEED IT.
+reagent-effect-aphrodisiac-strongoverdose3 = FUCK THEM ALL.
+reagent-effect-aphrodisiac-strongoverdose4 = YOU HAVE TO BREED AT ALL COSTS.
+
+reagent-effect-aphrodisiac-fade = Your inhibitions begin to normalize...

Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/medicine.ftl

@@ -0,0 +1,5 @@
+reagent-name-pomelustine = pomelustine
+reagent-desc-pomelustine = A mild aphrodisiac, present naturally within certain fruits such as pomegranate, usually in too small of a dose to do too much harm.
+
+reagent-name-philterex = philterex
+reagent-desc-philterex = A strong aphrodisiac, not yet regulated by Space Law. It is known for its high use in particular sectors.

Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/narcotics.ftl

@@ -0,0 +1,2 @@
+reagent-name-libidozenithizine = libidozenithizine
+reagent-desc-libidozenithizine = An incredibly potent aphrodisiac. A controlled substance under space law, with ample punishment if abused. It will cause even the most reserved to lose their inhibition. Overdose is known to cause Nymphomania.

Resources/Locale/en-US/reagents/floofstation/drinks.ftl

@@ -0,0 +1,2 @@
+reagent-name-NNN = Nikko's Naughty Nectar
+reagent-desc-NNN = A sticky, musky white liquid that tastes of blueberries.

Resources/Locale/en-US/seeds/seeds.ftl

@@ -77,6 +77,8 @@ seeds-lily-name = lily
 seeds-lily-display-name = lily
 seeds-lingzhi-name = lingzhi
 seeds-lingzhi-display-name = lingzhi
+seeds-pomegranate-name = pomegranate
+seeds-pomegranate-display-name = pomegranate
 seeds-ambrosiavulgaris-name = ambrosia vulgaris
 seeds-ambrosiavulgaris-display-name = ambrosia vulgaris
 seeds-ambrosiadeus-name = ambrosia deus

Resources/Locale/en-US/traits/traits.ftl

@@ -32,6 +32,23 @@ trait-description-SocialAnxiety = You are anxious when you speak and stutter.
 trait-name-Snoring = Snoring
 trait-description-Snoring = You will snore while sleeping.
 
+trait-name-LatentPsychic = Latent Psychic
+trait-description-LatentPsychic = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy.
+                                  Thus, you are eligible for potentially receiving psychic powers.
+                                  It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret.
+
+trait-name-PsionicInsulation = χ Waveform Misalignment
+trait-description-PsionicInsulation = Through a quirk of fate, your brainwaves are permanently out of phase with the noösphere
+                                      You are immune to both positive and negative effects of nearly all psychic powers,
+                                      But you can never be a psionic yourself in this life. This trait is incompatible with
+                                      all other psychic traits.
+
+trait-name-NaturalTelepath = Natural Telepath
+trait-description-NaturalTelepath = As a naturally occuring Telepath, you are capable of fluent telepathic communication, regardless of
+                                    whether or not you possess any notable psychic powers. This offers all of the same benefits and
+                                    drawbacks of Latent Psychic, except that you are guaranteed to start with full Telepathy. You may
+                                    still gain powers as normal for a Latent Psychic.
+
 trait-name-NormalVisionHarpy = Trichromat Modification
 trait-description-NormalVisionHarpy = Your eyes have been modified by means of advanced medicine to see in the standard colors of Red, Green, and Blue.
 

Resources/Prototypes/Catalog/Fills/Crates/botany.yml

@@ -95,3 +95,4 @@
       - id: GrapeSeeds
       - id: WatermelonSeeds
       - id: PeaSeeds
+      - id: PomegranateSeeds

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

@@ -111,6 +111,7 @@
     ClothingHandsGlovesColorOrange: 2
     ClothingHandsGlovesColorPurple: 2
     ClothingEyesGlassesCheapSunglasses: 3
+    ClothingUniformLoinCloth: 5 # FloofStation
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml

@@ -22,6 +22,7 @@
     OnionSeeds: 5
     OnionRedSeeds: 5
     OrangeSeeds: 5
+    PomegranateSeeds: 3 # Floofstation
     PoppySeeds: 3
     PotatoSeeds: 5
     PumpkinSeeds: 5

Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml

@@ -1,4 +1,4 @@
-- type: vendingMachineInventory
+- type: vendingMachineInventory
   id: SodaInventory
   startingInventory:
     DrinkColaCan: 3
@@ -7,6 +7,7 @@
     DrinkIcedTeaCan: 3
     DrinkLemonLimeCan: 3
     DrinkFourteenLokoCan: 3
+    DrinkNNNCan: 3 #Floofstation
   emaggedInventory:
     DrinkNukieCan: 3
     DrinkChangelingStingCan: 3

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml

@@ -38,6 +38,7 @@
       - FoodAloe
       - FoodPoppy
       - FoodLingzhi
+      - FoodPomegranate # Floofstation
       - FoodAmbrosiaVulgaris
       - RiceBushel
       - FoodSoybeans

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -23,6 +23,7 @@
     - SolCommon
     understands:
     - GalacticCommon
+    - SolCommon
 
 - type: entity
   parent: BaseSpeciesDummy

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml

@@ -499,3 +499,22 @@
     sprite: Objects/Consumable/Drinks/wine_can.rsi
   - type: Item
     sprite: Objects/Consumable/Drinks/wine_can.rsi
+
+#Floof
+- type: entity
+  parent: DrinkCanBaseFull
+  id: DrinkNNNCan
+  name: Nikkos Naughty Nectar
+  description: A can of Nikko's Naughty Nectar! Best not to ask how it's made...
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: NikkosNaughtyNectar
+          Quantity: 30
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/nnn_can.rsi
+  - type: Item
+    sprite: Objects/Consumable/Drinks/nnn_can.rsi

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -1822,3 +1822,32 @@
   - type: Tag
     tags:
     - ClothMade
+
+- type: entity # Floofttation
+  name: pomegranate
+  parent: FoodProduceBase
+  id: FoodPomegranate
+  description: A delicious, sweet fruit, believed to have special properties.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - spooky
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 40
+        reagents:
+        - ReagentId: Pomelustine
+          Quantity: 30
+        - ReagentId: Nutriment
+          Quantity: 10
+  - type: Sprite
+    sprite: Floof/Objects/Specific/Hydroponics/pomegranate.rsi
+  - type: Produce
+    seedId: pomegranate
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Fruit

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

@@ -373,6 +373,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/lingzhi.rsi
 
+- type: entity # Floofstation
+  parent: SeedBase
+  name: packet of pomegranate seeds
+  description: "The Fruit of the Underworld"
+  id: PomegranateSeeds
+  components:
+    - type: Seed
+      seedId: pomegranate
+    - type: Sprite
+      sprite: Floof/Objects/Specific/Hydroponics/pomegranate.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of ambrosia vulgaris seeds

Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml

@@ -0,0 +1,14 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformLoinCloth
+  name: loin cloth
+  description: A piece of cloth wrapped around the waist.
+  components:
+  - type: Item
+    size: Small
+  - type: Sprite
+    sprite: Floof/Clothing/Uniforms/loincloth.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Uniforms/loincloth.rsi
+    equipDelay: 0
+    unequipDelay: 0

Resources/Prototypes/Floof/Loadouts/uniform.yml

@@ -0,0 +1,7 @@
+- type: loadout
+  id: LoadoutUniformLoinCloth
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformLoinCloth

Resources/Prototypes/FloofStation/Flavors/flavors.yml

@@ -0,0 +1,4 @@
+- type: flavor
+  id: nikkonectar
+  flavorType: Complex
+  description: flavor-complex-nikkonectar

Resources/Prototypes/FloofStation/Reactions/chemicals.yml

@@ -0,0 +1,15 @@
+- type: reaction
+  minTemp: 369
+  id: Libidozenithizine
+  impact: High
+  reactants:
+    Pomelustine:
+      amount: 5
+    Philterex:
+      amount: 5
+    Impedrezene:
+      amount: 5
+    Silicon:
+      amount: 5
+  products:
+    Libidozenithizine: 5

Resources/Prototypes/FloofStation/Reactions/medicine.yml

@@ -0,0 +1,14 @@
+- type: reaction
+  id: Philterex
+  impact: Medium
+  reactants:
+    Inaprovaline:
+      amount: 2
+    Saline:
+      amount: 1
+    Ephedrine:
+      amount: 1
+    Benzene:
+      amount: 1
+  products:
+      Philterex: 5

Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml

@@ -0,0 +1,130 @@
+- type: reagent
+  id: Pomelustine
+  name: reagent-name-pomelustine
+  group: Medicine
+  desc: reagent-desc-pomelustine
+  physicalDesc: reagent-physical-desc-sticky
+  flavor: fruity
+  color: "#45072f"
+  metabolisms:
+    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.035
+        conditions:
+          - !type:ReagentThreshold
+            max: 50
+      - !type:PopupMessage # Overdose causes nausea and vomiting
+        type: Local
+        visualType: Medium
+        messages:
+          - "reagent-effect-aphrodisiac-mildoverdose"
+        probablity: 0.06
+        conditions:
+          - !type:ReagentThreshold
+            min: 50
+      - !type:Drunk
+        conditions:
+        - !type:ReagentThreshold
+          min: 50
+      - !type:ChemVomit
+        conditions:
+        - !type:ReagentThreshold
+          min: 60
+        probability: 0.05
+      - !type:PopupMessage
+        type: Local
+        visualType: Small
+        messages:
+          - "reagent-effect-aphrodisiac-fade" # A decent chance to notify the player when their meds run out, but could happen silently.
+        probability: 0.35
+        conditions:
+          - !type:ReagentThreshold
+            max: 0.1
+
+- type: reagent
+  id: Philterex
+  name: reagent-name-philterex
+  group: Medicine
+  desc: reagent-desc-philterex
+  physicalDesc: reagent-physical-desc-syrupy
+  flavor: sweet
+  color: "#ae0072"
+  metabolisms:
+    Medicine:
+      metabolismRate : 0.5
+      effects:
+      - !type:PopupMessage
+        type: Local
+        visualType: Large
+        messages:
+          - "reagent-effect-aphrodisiac-normal1"
+          - "reagent-effect-aphrodisiac-normal2"
+          - "reagent-effect-aphrodisiac-normal3"
+          - "reagent-effect-aphrodisiac-normal4"
+          - "reagent-effect-aphrodisiac-normal5"
+        probability: 0.04
+        conditions:
+        - !type:ReagentThreshold
+          max: 16.5
+      - !type:PopupMessage
+        type: Local
+        visualType: MediumCaution
+        messages:
+          - "reagent-effect-aphrodisiac-normaloverdose1" # overdose makes you tired and forgetful
+          - "reagent-effect-aphrodisiac-normaloverdose2"
+          - "reagent-effect-aphrodisiac-normaloverdose3"
+          - "reagent-effect-aphrodisiac-normaloverdose4"
+          - "reagent-effect-aphrodisiac-normaloverdose5"
+          - "reagent-effect-aphrodisiac-normaloverdose6"
+        probability: 0.06
+        conditions:
+        - !type:ReagentThreshold
+          min: 16.5
+      - !type:Emote
+        conditions:
+        - !type:ReagentThreshold
+          min: 16.5
+        emote: Yawn
+        showInChat: true
+        probability: 0.02
+      - !type:MovespeedModifier
+        walkSpeedModifier: 0.8
+        sprintSpeedModifier: 0.8
+        conditions:
+        - !type:ReagentThreshold
+          min: 16.5
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          min: 30.0
+        key: ForcedSleep
+        component: ForcedSleeping
+        refresh: false
+        type: Add
+        probability: 0.1
+      - !type:HealthChange # poisons you if you take way too much
+        conditions:
+        - !type:ReagentThreshold
+          min: 30
+        damage:
+          types:
+            Poison: 1
+      - !type:PopupMessage
+        type: Local
+        visualType: Small
+        messages:
+          - "reagent-effect-aphrodisiac-fade" # A decent chance to notify the player when their meds run out, but could happen silently.
+        probability: 0.32
+        conditions:
+          - !type:ReagentThreshold
+            max: 0.1