diff --git a/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl new file mode 100644 index 00000000000..d02640f1200 --- /dev/null +++ b/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 = Your clothes feel tight. Why not take them off... +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 = STRIP STRIP STRIP +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... diff --git a/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/medicine.ftl b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/medicine.ftl new file mode 100644 index 00000000000..20cd4df96ff --- /dev/null +++ b/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. diff --git a/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/narcotics.ftl b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/narcotics.ftl new file mode 100644 index 00000000000..627d6137252 --- /dev/null +++ b/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. diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index b3983782883..6d843d73403 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index f10fd010f64..3b47eb99353 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -95,3 +95,4 @@ - id: GrapeSeeds - id: WatermelonSeeds - id: PeaSeeds + - id: PomegranateSeeds diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 05e3ae0eb0e..c732fa5268c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml index 6edf341e108..5286c3f6fb9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml @@ -38,6 +38,7 @@ - FoodAloe - FoodPoppy - FoodLingzhi + - FoodPomegranate # Floofstation - FoodAmbrosiaVulgaris - RiceBushel - FoodSoybeans diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index eec7711d4af..8eb36c71b51 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 2b232d643d3..b8a19d5add5 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/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 diff --git a/Resources/Prototypes/FloofStation/Reactions/chemicals.yml b/Resources/Prototypes/FloofStation/Reactions/chemicals.yml new file mode 100644 index 00000000000..e0e9caed66f --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/FloofStation/Reactions/medicine.yml b/Resources/Prototypes/FloofStation/Reactions/medicine.yml new file mode 100644 index 00000000000..858a56a8e28 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml new file mode 100644 index 00000000000..10e77d2fdaf --- /dev/null +++ b/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.03 + 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.02 + 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 diff --git a/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/narcotics.yml b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/narcotics.yml new file mode 100644 index 00000000000..702bd1593a3 --- /dev/null +++ b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/narcotics.yml @@ -0,0 +1,50 @@ +- type: reagent + id: Libidozenithizine + name: reagent-name-libidozenithizine + group: Narcotics + desc: reagent-desc-libidozenithizine + physicalDesc: reagent-physical-desc-milky + flavor: spooky + color: "#c90084" + metabolisms: + Narcotic: + effects: + - !type:PopupMessage + type: Local + visualType: Medium + probability: 0.10 + messages: + - reagent-effect-aphrodisiac-strong1 + - reagent-effect-aphrodisiac-strong2 + - reagent-effect-aphrodisiac-strong3 + conditions: + - !type:ReagentThreshold + max: 10.0 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 10.0 + damage: + types: + Poison: 0.05 + - !type:PopupMessage + type: Local + visualType: LargeCaution + probability: 0.2 + messages: + - reagent-effect-aphrodisiac-strongoverdose1 + - reagent-effect-aphrodisiac-strongoverdose2 + - reagent-effect-aphrodisiac-strongoverdose3 + - reagent-effect-aphrodisiac-strongoverdose4 + conditions: + - !type:ReagentThreshold + min: 10.0 + - !type:PopupMessage + type: Local + visualType: Small + probability: 0.2 + messages: + - "reagent-effect-aphrodisiac-fade" + conditions: + - !type:ReagentThreshold + max: 0.1 diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 82a3fba5b41..851c3c14bf1 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1032,6 +1032,33 @@ Max: 20 PotencyDivisor: 5 +- type: seed # Floofstation + id: pomegranate + name: seeds-pomegranate-name + noun: seeds-noun-seeds + displayName: seeds-pomegranate-display-name + plantRsi: Floof/Objects/Specific/Hydroponics/pomegranate.rsi + packetPrototype: PomegranateSeeds + productPrototypes: + - FoodPomegranate + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + idealLight: 6 + waterConsumption: 0.60 + chemicals: + Pomelustine: + Min: 5 + Max: 30 + PotencyDivisor: 10 + Nutriment: + Min: 1 + Max: 10 + PotencyDivisor: 25 + - type: seed id: ambrosiaVulgaris name: seeds-ambrosiavulgaris-name diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml index 0c3370890c8..2c2afb9eff6 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml @@ -33,6 +33,7 @@ - AloeSeeds - PoppySeeds - LingzhiSeeds + - PomegranateSeeds # Floofstation - AmbrosiaVulgarisSeeds - GalaxythistleSeeds - FlyAmanitaSeeds diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml index a41fac14ffa..fb6dc343a1d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml @@ -57,6 +57,8 @@ orGroup: Seeds - id: LingzhiSeeds orGroup: Seeds + - id: PomegranateSeeds # Floofstation + orGroup: Seeds - id: OatSeeds orGroup: Seeds - id: OnionSeeds diff --git a/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml b/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml index 60153e87e8c..35668bc6cc8 100644 --- a/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml +++ b/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml @@ -6,6 +6,7 @@ Botany and Chemistry can often work together to produce better medicine (or recr + diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png new file mode 100644 index 00000000000..817c0f4bff1 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png differ diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png new file mode 100644 index 00000000000..b0047ff701c Binary files /dev/null and b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png differ diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json new file mode 100644 index 00000000000..775f8df408f --- /dev/null +++ b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + } + ] +} diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png new file mode 100644 index 00000000000..a947a6149b9 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png differ diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png new file mode 100644 index 00000000000..9b1d7886f8f Binary files /dev/null and b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png differ diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png new file mode 100644 index 00000000000..97245d27f2f Binary files /dev/null and b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png differ diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png new file mode 100644 index 00000000000..02222142cee Binary files /dev/null and b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png differ diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png new file mode 100644 index 00000000000..37bd6d53d11 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png differ diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png new file mode 100644 index 00000000000..8667357c88a Binary files /dev/null and b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png differ diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png new file mode 100644 index 00000000000..9a2100edd39 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png differ diff --git a/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png new file mode 100644 index 00000000000..be279f7c12c Binary files /dev/null and b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png differ