diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 04a1849134f..3d0a73d62df 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4051,7 +4051,7 @@ Entries: - type: Add message: >- Glass/Crystal shards and floor tiles now deal damage and embed in - victims when colliding with them. + victims when colliding with them. id: 6107 time: '2024-05-11T01:23:00.0000000+00:00' - author: FoxxoTrystan @@ -4262,7 +4262,7 @@ Entries: - type: Fix message: >- Spent bullet casings now fly away from a shooter in a cinematic manner, - rather than fall at their feet. + rather than fall at their feet. id: 6133 time: '2024-07-01T22:37:29.0000000+00:00' - author: WarMechanic diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml new file mode 100644 index 00000000000..b7424c8c0a8 --- /dev/null +++ b/Resources/Changelog/Floof.yml @@ -0,0 +1,7 @@ +Name: Floof +Order: 1 +Entries: +- author: FoxxoTrystan + changes: + - {message: 'Created the Floof Station changelog.', type: Add} + time: '2024-7-12T00:00:00.0000000+00:00' diff --git a/Resources/Locale/en-US/changelog/changelog-window.ftl b/Resources/Locale/en-US/changelog/changelog-window.ftl index b8b8ac18824..9c5ba5ba89b 100644 --- a/Resources/Locale/en-US/changelog/changelog-window.ftl +++ b/Resources/Locale/en-US/changelog/changelog-window.ftl @@ -10,5 +10,7 @@ changelog-version-tag = version v{ $version } changelog-button = Changelog changelog-button-new-entries = Changelog (new!) -changelog-tab-title-Changelog = Floof Station -changelog-tab-title-Admin = Floof Station Admin +changelog-tab-title-Changelog = Einstein Engines +changelog-tab-title-Admin = Einstein Engines Admin + +changelog-tab-title-Floof = Floof Station diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 35de5555a29..b69f4934a92 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/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 diff --git a/Resources/Locale/en-US/reagents/floofstation/drinks.ftl b/Resources/Locale/en-US/reagents/floofstation/drinks.ftl new file mode 100644 index 00000000000..0f77ef58b6b --- /dev/null +++ b/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. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 2c4c27137f0..aadb05df8e7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index 494f05f6a31..d3de4d8dd8d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 5b3295b96cb..e00e06279e5 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -23,6 +23,7 @@ - SolCommon understands: - GalacticCommon + - SolCommon - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 38ebc132c9f..f8ada34e648 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/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 diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml new file mode 100644 index 00000000000..e5c76890ba5 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/Floof/Loadouts/uniform.yml b/Resources/Prototypes/Floof/Loadouts/uniform.yml new file mode 100644 index 00000000000..35c197603f9 --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/uniform.yml @@ -0,0 +1,7 @@ +- type: loadout + id: LoadoutUniformLoinCloth + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformLoinCloth diff --git a/Resources/Prototypes/FloofStation/Flavors/flavors.yml b/Resources/Prototypes/FloofStation/Flavors/flavors.yml new file mode 100644 index 00000000000..e9a75f2231f --- /dev/null +++ b/Resources/Prototypes/FloofStation/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: nikkonectar + flavorType: Complex + description: flavor-complex-nikkonectar diff --git a/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml b/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml new file mode 100644 index 00000000000..cf39c6e3191 --- /dev/null +++ b/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml @@ -0,0 +1,20 @@ +- type: reagent + id: NikkosNaughtyNectar + name: reagent-name-NNN + parent: BaseDrink + desc: reagent-desc-NNN + physicalDesc: reagent-physical-desc-creamy + flavor: nikkonectar + color: "#deebff" + recognizable: true + viscosity: 0.15 + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + #TO-DO Lust+ + footstepSound: + collection: FootstepSticky + params: + volume: 3 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png new file mode 100644 index 00000000000..6f4518ffb94 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/meta.json new file mode 100644 index 00000000000..29892515189 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/VOREStation/VOREStation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png new file mode 100644 index 00000000000..85275913d59 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon_open.png new file mode 100644 index 00000000000..163f7afc520 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png new file mode 100644 index 00000000000..ea78e1b319a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png new file mode 100644 index 00000000000..ea0b1987719 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/meta.json new file mode 100644 index 00000000000..ae9e3374079 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Originally Rootbeer, Edited by Memeji", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +}