From 8cea25d4ccc2050a9b5d391da9f227a155fe5651 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 1 Nov 2024 11:51:36 +0400 Subject: [PATCH 01/13] Add files via upload --- .../Food/japanfood/Ingredients/dangodough.yml | 12 ++++ .../japanfood/Ingredients/rawramennoodles.yml | 10 +++ .../Consumable/Food/japanfood/chocopocky.yml | 30 +++++++++ .../Consumable/Food/japanfood/hanamidango.yml | 19 ++++++ .../Food/japanfood/mitarasidango.yml | 19 ++++++ .../Consumable/Food/japanfood/onigiri.yml | 19 ++++++ .../Food/japanfood/pockypack/pockypacks.yml | 65 +++++++++++++++++++ .../Food/japanfood/porkramennoodles.yml | 28 ++++++++ .../Food/japanfood/spicyporkramen.yml | 30 +++++++++ 9 files changed, 232 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml new file mode 100644 index 00000000000..5ffe3c7b2af --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml @@ -0,0 +1,12 @@ +- type: entity + name: Dough Dango Ball + parent: FoodBakingBase + id: Doughdangoball + description: A ball of dough. + components: + - type: FlavorProfile + flavors: + - dough + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/ingredients.rsi + state: doughdangoball \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml new file mode 100644 index 00000000000..26f87c249e8 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml @@ -0,0 +1,10 @@ +- type: entity + name: Raw Ramen Noodles + parent: FoodBakingBase + id: rawramennoodles + description: A raw ramen. + components: + - type: FlavorProfile + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/ingredients.rsi + state: rawramennoodles \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml new file mode 100644 index 00000000000..87a7652f7b1 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml @@ -0,0 +1,30 @@ +- type: entity + name: Chocolate Pocky + parent: FoodBakedBase + id: chocopocky + description: Don't forget to play the game with your date... + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: chocopocky + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Theobromine + Quantity: 3 + - ReagentId: CocoaPowder + Quantity: 1 + - type: Tag + tags: + - Cigarette + - type: Clothing + sprite: Corvax\Objects\Consumable\Food\pockypacks.rsi + slots: [ mask ] + equippedPrefix: unlit \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml new file mode 100644 index 00000000000..f0121078605 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml @@ -0,0 +1,19 @@ +- type: entity + name: Tricolor Dango + parent: FoodBakedBase + id: hanamidango + description: You like that colors, don't you? + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: hanamidango + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 15 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml new file mode 100644 index 00000000000..c57264538cb --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml @@ -0,0 +1,19 @@ +- type: entity + name: Mitarashi Dango + parent: FoodBakedBase + id: mitarashidango + description: Rice sweetness that beckons + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: mitarashidango + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 15 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml new file mode 100644 index 00000000000..c37070ca7fe --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml @@ -0,0 +1,19 @@ +- type: entity + name: Onigiri + parent: FoodBakedBase + id: onigiri + description: Best fried geometric shape in the galaxy + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: onigiri + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 20 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml new file mode 100644 index 00000000000..0328729b286 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml @@ -0,0 +1,65 @@ +- type: entity + id: PockyPackBase + parent: [ BaseStorageItem, BaseBagOpenClose ] + name: Pocky Pack + abstract: true + components: + - type: Sprite + layers: + - state: closed + - state: open + map: ["openLayer"] + visible: false + - state: pok1 + map: ["pok1"] + sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi + visible: false + - state: pok2 + map: ["pok2"] + sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi + visible: false + - state: pok3 + map: ["pok3"] + sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi + visible: false + - type: Tag + tags: + - CigPack + - Trash + - type: PhysicalComposition + materialComposition: + Steel: 50 + - type: SpaceGarbage + - type: Item + size: Tiny + shape: # Yes, this is cursed, but it breaks otherwise, dont question it. + - 0,0,0,1 + - type: Storage + grid: + - 0,0,4,1 + - type: StorageFill + contents: + - id: chocopocky + amount: 10 + - type: ItemCounter + count: + tags: [Cigarette] + composite: true + layerStates: + - pok1 + - pok2 + - pok3 + - type: Appearance + - type: StaticPrice + price: 150 + +- type: entity + id: ChocolatePockyPack + parent: PockyPackBase + name: Chocolate Pocky Pack + description: + components: + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi + - type: Item + sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml new file mode 100644 index 00000000000..a610145ea8a --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml @@ -0,0 +1,28 @@ +- type: entity + name: Pork Ramen + parent: FoodBowlBase + id: porkramennoodles + description: Ah, I See You're a Man of Culture As Well... + components: + - type: Item + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: porkramen + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Flavorol + Quantity: 5 + - ReagentId: Soysauce + Quantity: 2 + - type: Tag + tags: + - Meat + - Soup \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml new file mode 100644 index 00000000000..aaf76defda6 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml @@ -0,0 +1,30 @@ +- type: entity + name: Spicy Ramen + parent: FoodBowlBase + id: spicyporkramennoodles + description: So hot and so cute! + components: + - type: Item + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: spicyporkramen + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Flavorol + Quantity: 5 + - ReagentId: CapsaicinOil + Quantity: 2 + - ReagentId: Soysauce + Quantity: 2 + - type: Tag + tags: + - Meat + - Soup \ No newline at end of file From 140578f8425bf374c9d6fcff23a1f83b85e8ef48 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 1 Nov 2024 11:53:21 +0400 Subject: [PATCH 02/13] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood directory --- .../Food/japanfood/Ingredients/dangodough.yml | 12 ---- .../japanfood/Ingredients/rawramennoodles.yml | 10 --- .../Consumable/Food/japanfood/chocopocky.yml | 30 --------- .../Consumable/Food/japanfood/hanamidango.yml | 19 ------ .../Food/japanfood/mitarasidango.yml | 19 ------ .../Consumable/Food/japanfood/onigiri.yml | 19 ------ .../Food/japanfood/pockypack/pockypacks.yml | 65 ------------------- .../Food/japanfood/porkramennoodles.yml | 28 -------- .../Food/japanfood/spicyporkramen.yml | 30 --------- 9 files changed, 232 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml deleted file mode 100644 index 5ffe3c7b2af..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: entity - name: Dough Dango Ball - parent: FoodBakingBase - id: Doughdangoball - description: A ball of dough. - components: - - type: FlavorProfile - flavors: - - dough - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/ingredients.rsi - state: doughdangoball \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml deleted file mode 100644 index 26f87c249e8..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - name: Raw Ramen Noodles - parent: FoodBakingBase - id: rawramennoodles - description: A raw ramen. - components: - - type: FlavorProfile - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/ingredients.rsi - state: rawramennoodles \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml deleted file mode 100644 index 87a7652f7b1..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - name: Chocolate Pocky - parent: FoodBakedBase - id: chocopocky - description: Don't forget to play the game with your date... - components: - - type: Item - storedRotation: -90 - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: chocopocky - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Theobromine - Quantity: 3 - - ReagentId: CocoaPowder - Quantity: 1 - - type: Tag - tags: - - Cigarette - - type: Clothing - sprite: Corvax\Objects\Consumable\Food\pockypacks.rsi - slots: [ mask ] - equippedPrefix: unlit \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml deleted file mode 100644 index f0121078605..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - name: Tricolor Dango - parent: FoodBakedBase - id: hanamidango - description: You like that colors, don't you? - components: - - type: Item - storedRotation: -90 - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: hanamidango - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 15 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml deleted file mode 100644 index c57264538cb..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - name: Mitarashi Dango - parent: FoodBakedBase - id: mitarashidango - description: Rice sweetness that beckons - components: - - type: Item - storedRotation: -90 - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: mitarashidango - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 15 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml deleted file mode 100644 index c37070ca7fe..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - name: Onigiri - parent: FoodBakedBase - id: onigiri - description: Best fried geometric shape in the galaxy - components: - - type: Item - storedRotation: -90 - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: onigiri - - type: SolutionContainerManager - solutions: - food: - maxVol: 25 - reagents: - - ReagentId: Nutriment - Quantity: 20 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml deleted file mode 100644 index 0328729b286..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: PockyPackBase - parent: [ BaseStorageItem, BaseBagOpenClose ] - name: Pocky Pack - abstract: true - components: - - type: Sprite - layers: - - state: closed - - state: open - map: ["openLayer"] - visible: false - - state: pok1 - map: ["pok1"] - sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi - visible: false - - state: pok2 - map: ["pok2"] - sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi - visible: false - - state: pok3 - map: ["pok3"] - sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi - visible: false - - type: Tag - tags: - - CigPack - - Trash - - type: PhysicalComposition - materialComposition: - Steel: 50 - - type: SpaceGarbage - - type: Item - size: Tiny - shape: # Yes, this is cursed, but it breaks otherwise, dont question it. - - 0,0,0,1 - - type: Storage - grid: - - 0,0,4,1 - - type: StorageFill - contents: - - id: chocopocky - amount: 10 - - type: ItemCounter - count: - tags: [Cigarette] - composite: true - layerStates: - - pok1 - - pok2 - - pok3 - - type: Appearance - - type: StaticPrice - price: 150 - -- type: entity - id: ChocolatePockyPack - parent: PockyPackBase - name: Chocolate Pocky Pack - description: - components: - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi - - type: Item - sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml deleted file mode 100644 index a610145ea8a..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml +++ /dev/null @@ -1,28 +0,0 @@ -- type: entity - name: Pork Ramen - parent: FoodBowlBase - id: porkramennoodles - description: Ah, I See You're a Man of Culture As Well... - components: - - type: Item - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: porkramen - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Flavorol - Quantity: 5 - - ReagentId: Soysauce - Quantity: 2 - - type: Tag - tags: - - Meat - - Soup \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml deleted file mode 100644 index aaf76defda6..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - name: Spicy Ramen - parent: FoodBowlBase - id: spicyporkramennoodles - description: So hot and so cute! - components: - - type: Item - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: spicyporkramen - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Flavorol - Quantity: 5 - - ReagentId: CapsaicinOil - Quantity: 2 - - ReagentId: Soysauce - Quantity: 2 - - type: Tag - tags: - - Meat - - Soup \ No newline at end of file From b8dc7e4993afddf5cf6b83fb59bfac25be4c31c0 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 1 Nov 2024 11:54:30 +0400 Subject: [PATCH 03/13] Create Consumable --- Resources/Prototypes/Corvax/Entities/Objects/Consumable | 1 + 1 file changed, 1 insertion(+) create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable b/Resources/Prototypes/Corvax/Entities/Objects/Consumable new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable @@ -0,0 +1 @@ + From fc0743f2ac9a27ef65d2d83a4a51cd594e36389f Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 1 Nov 2024 11:54:48 +0400 Subject: [PATCH 04/13] Delete Resources/Prototypes/Corvax/Entities/Objects/Consumable --- Resources/Prototypes/Corvax/Entities/Objects/Consumable | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable b/Resources/Prototypes/Corvax/Entities/Objects/Consumable deleted file mode 100644 index 8b137891791..00000000000 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable +++ /dev/null @@ -1 +0,0 @@ - From ff280b1e9475cc431a7511da4eac82ab46b0d1ad Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 1 Nov 2024 11:56:31 +0400 Subject: [PATCH 05/13] Add files via upload --- .../Food/japanfood/Ingredients/dangodough.yml | 12 ++++ .../japanfood/Ingredients/rawramennoodles.yml | 10 +++ .../Consumable/Food/japanfood/chocopocky.yml | 30 +++++++++ .../Consumable/Food/japanfood/hanamidango.yml | 19 ++++++ .../Food/japanfood/mitarasidango.yml | 19 ++++++ .../Consumable/Food/japanfood/onigiri.yml | 19 ++++++ .../Food/japanfood/pockypack/pockypacks.yml | 65 +++++++++++++++++++ .../Food/japanfood/porkramennoodles.yml | 28 ++++++++ .../Food/japanfood/spicyporkramen.yml | 30 +++++++++ 9 files changed, 232 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml create mode 100644 Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml new file mode 100644 index 00000000000..5ffe3c7b2af --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/dangodough.yml @@ -0,0 +1,12 @@ +- type: entity + name: Dough Dango Ball + parent: FoodBakingBase + id: Doughdangoball + description: A ball of dough. + components: + - type: FlavorProfile + flavors: + - dough + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/ingredients.rsi + state: doughdangoball \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml new file mode 100644 index 00000000000..26f87c249e8 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/Ingredients/rawramennoodles.yml @@ -0,0 +1,10 @@ +- type: entity + name: Raw Ramen Noodles + parent: FoodBakingBase + id: rawramennoodles + description: A raw ramen. + components: + - type: FlavorProfile + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/ingredients.rsi + state: rawramennoodles \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml new file mode 100644 index 00000000000..87a7652f7b1 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/chocopocky.yml @@ -0,0 +1,30 @@ +- type: entity + name: Chocolate Pocky + parent: FoodBakedBase + id: chocopocky + description: Don't forget to play the game with your date... + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: chocopocky + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Theobromine + Quantity: 3 + - ReagentId: CocoaPowder + Quantity: 1 + - type: Tag + tags: + - Cigarette + - type: Clothing + sprite: Corvax\Objects\Consumable\Food\pockypacks.rsi + slots: [ mask ] + equippedPrefix: unlit \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml new file mode 100644 index 00000000000..f0121078605 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/hanamidango.yml @@ -0,0 +1,19 @@ +- type: entity + name: Tricolor Dango + parent: FoodBakedBase + id: hanamidango + description: You like that colors, don't you? + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: hanamidango + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 15 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml new file mode 100644 index 00000000000..c57264538cb --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/mitarasidango.yml @@ -0,0 +1,19 @@ +- type: entity + name: Mitarashi Dango + parent: FoodBakedBase + id: mitarashidango + description: Rice sweetness that beckons + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: mitarashidango + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 15 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml new file mode 100644 index 00000000000..c37070ca7fe --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/onigiri.yml @@ -0,0 +1,19 @@ +- type: entity + name: Onigiri + parent: FoodBakedBase + id: onigiri + description: Best fried geometric shape in the galaxy + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: onigiri + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 20 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml new file mode 100644 index 00000000000..0328729b286 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/pockypack/pockypacks.yml @@ -0,0 +1,65 @@ +- type: entity + id: PockyPackBase + parent: [ BaseStorageItem, BaseBagOpenClose ] + name: Pocky Pack + abstract: true + components: + - type: Sprite + layers: + - state: closed + - state: open + map: ["openLayer"] + visible: false + - state: pok1 + map: ["pok1"] + sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi + visible: false + - state: pok2 + map: ["pok2"] + sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi + visible: false + - state: pok3 + map: ["pok3"] + sprite: Corvax/Objects/Consumable/Food/pokvisualizer.rsi + visible: false + - type: Tag + tags: + - CigPack + - Trash + - type: PhysicalComposition + materialComposition: + Steel: 50 + - type: SpaceGarbage + - type: Item + size: Tiny + shape: # Yes, this is cursed, but it breaks otherwise, dont question it. + - 0,0,0,1 + - type: Storage + grid: + - 0,0,4,1 + - type: StorageFill + contents: + - id: chocopocky + amount: 10 + - type: ItemCounter + count: + tags: [Cigarette] + composite: true + layerStates: + - pok1 + - pok2 + - pok3 + - type: Appearance + - type: StaticPrice + price: 150 + +- type: entity + id: ChocolatePockyPack + parent: PockyPackBase + name: Chocolate Pocky Pack + description: + components: + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi + - type: Item + sprite: Corvax/Objects/Consumable/Food/pockypacks.rsi diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml new file mode 100644 index 00000000000..a610145ea8a --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/porkramennoodles.yml @@ -0,0 +1,28 @@ +- type: entity + name: Pork Ramen + parent: FoodBowlBase + id: porkramennoodles + description: Ah, I See You're a Man of Culture As Well... + components: + - type: Item + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: porkramen + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Flavorol + Quantity: 5 + - ReagentId: Soysauce + Quantity: 2 + - type: Tag + tags: + - Meat + - Soup \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml new file mode 100644 index 00000000000..aaf76defda6 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/japanfood/spicyporkramen.yml @@ -0,0 +1,30 @@ +- type: entity + name: Spicy Ramen + parent: FoodBowlBase + id: spicyporkramennoodles + description: So hot and so cute! + components: + - type: Item + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: spicyporkramen + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Flavorol + Quantity: 5 + - ReagentId: CapsaicinOil + Quantity: 2 + - ReagentId: Soysauce + Quantity: 2 + - type: Tag + tags: + - Meat + - Soup \ No newline at end of file From 3a6e9b8d2b68bd6eed19cadd84cc3e04f1a760ac Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 1 Nov 2024 11:58:22 +0400 Subject: [PATCH 06/13] Add files via upload --- Resources/Prototypes/_NF/Mail/mail.yml | 10 ++++++++++ Resources/Prototypes/_NF/Mail/mailDeliveries.yml | 1 + 2 files changed, 11 insertions(+) diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml index be5607c89f1..1389b70c4b6 100644 --- a/Resources/Prototypes/_NF/Mail/mail.yml +++ b/Resources/Prototypes/_NF/Mail/mail.yml @@ -2152,3 +2152,13 @@ - type: Mail contents: - id: FoodBoxDonut + +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseMail + id: MailNFPockyPack + suffix: chocopocky + components: + - type: Mail + contents: + - id: ChocolatePockyPack #CorvaxFrontier \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml index b3c772e2483..cee0dffa2c8 100644 --- a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml +++ b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml @@ -16,6 +16,7 @@ MailNFSodaSpaceUp: 0.2 MailNFUnusualFood: 0.25 MailNFUnusualProduce: 0.8 + MailNFPockyPack: 0.3 #CorvaxFrontier # Booze/Smoke Consumables MailNFAlcohol: 0.5 MailSake: 0.05 # MailNFAlcohol has ~10 bottles, should be about a tenth of MailNFAlcohol's weight. From cab7377dd2123de6248835c1a98159f94cd47874 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 1 Nov 2024 11:59:39 +0400 Subject: [PATCH 07/13] Add files via upload --- .../Cooking/JapanFood/ingredients/food.yml | 35 ++++++++++ .../Cooking/JapanFood/meal_recipes.yml | 68 +++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml create mode 100644 Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml new file mode 100644 index 00000000000..66ec7faf70d --- /dev/null +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml @@ -0,0 +1,35 @@ +- type: reaction + id: CreateDangoDough + impact: Low + quantized: true + conserveEnergy: false + reactants: + Rice: + amount: 5 + Water: + amount: 5 + Sugar: + amount: 5 + effects: + - !type:CreateEntityReactionEffect + entity: Doughdangoball + +- type: reaction + id: CreateRawRamen + impact: Low + quantized: true + conserveEnergy: false + reactants: + Flour: + amount: 10 + TableSalt: + amount: 5 + OilOlive: + amount: 5 + Egg: + amount: 6 + Water: + amount: 5 + effects: + - !type:CreateEntityReactionEffect + entity: rawramennoodles \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml new file mode 100644 index 00000000000..7b413493641 --- /dev/null +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -0,0 +1,68 @@ +- type: microwaveMealRecipe + id: Recipeporkramen + name: pork ramen recipe + result: porkramennoodles + time: 15 + solids: + FoodMeatCutlet: 3 + FoodBowlBig: 1 + FoodGarlic: 1 + rawramennoodles: 1 + reagents: + Water: 15 + Egg: 6 + recipeType: Oven # Frontier + +- type: microwaveMealRecipe + id: Recipehanamidango + name: dango hanami recipe + result: hanamidango + time: 10 + reagents: + GreenTea: 5 + JuiceWatermelon: 5 + solids: + Doughdangoball: 3 + recipeType: Oven # Frontier + +- type: microwaveMealRecipe + id: Recipemitarashidango + name: dango mitarashi recipe + result: mitarashidango + time: 10 + reagents: + Soysauce: 5 + Sugar: 5 + solids: + Doughdangoball: 3 + recipeType: Oven # Frontier + +- type: microwaveMealRecipe + id: Recipeonigiri + name: onigiri recipe + result: onigiri + time: 20 + reagents: + Mayo: 5 + Rice: 10 + solids: + FoodMeatChicken: 1 + recipeType: Oven # Frontier + +- type: microwaveMealRecipe + id: Recipespicyramen + name: spicy ramen recipe + result: spicyporkramennoodles + time: 20 + solids: + FoodMeatCutlet: 3 + FoodBowlBig: 1 + FoodGarlic: 1 + rawramennoodles: 1 + FoodChiliPepper: 1 + reagents: + Water: 15 + Egg: 6 + Hotsauce: 5 + recipeType: Oven # Frontier + From f4303515f067d81d4f8774c5ac025ea76fc2a455 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 1 Nov 2024 12:01:59 +0400 Subject: [PATCH 08/13] Add files via upload --- .../Food/ingredients.rsi/doughdangoball.png | Bin 0 -> 270 bytes .../Consumable/Food/ingredients.rsi/meta.json | 17 ++++++++ .../Food/ingredients.rsi/rawramennoodles.png | Bin 0 -> 524 bytes .../Food/japanfood.rsi/chocopocky.png | Bin 0 -> 153 bytes .../Food/japanfood.rsi/hanamidango.png | Bin 0 -> 677 bytes .../Consumable/Food/japanfood.rsi/meta.json | 37 ++++++++++++++++++ .../Food/japanfood.rsi/mitarashidango.png | Bin 0 -> 673 bytes .../Consumable/Food/japanfood.rsi/onigiri.png | Bin 0 -> 338 bytes .../Food/japanfood.rsi/porkramen.png | Bin 0 -> 839 bytes .../Food/japanfood.rsi/spicyporkramen.png | Bin 0 -> 1627 bytes .../Consumable/Food/pockypacks.rsi/closed.png | Bin 0 -> 396 bytes .../Food/pockypacks.rsi/equipped-BELT.png | Bin 0 -> 159 bytes .../Food/pockypacks.rsi/inhand-left.png | Bin 0 -> 347 bytes .../Food/pockypacks.rsi/inhand-right.png | Bin 0 -> 333 bytes .../Consumable/Food/pockypacks.rsi/meta.json | 33 ++++++++++++++++ .../Consumable/Food/pockypacks.rsi/open.png | Bin 0 -> 399 bytes .../pockypacks.rsi/unlit-equipped-MASK.png | Bin 0 -> 246 bytes .../Food/pokvisualizer.rsi/meta.json | 20 ++++++++++ .../Food/pokvisualizer.rsi/pok1.png | Bin 0 -> 149 bytes .../Food/pokvisualizer.rsi/pok2.png | Bin 0 -> 149 bytes .../Food/pokvisualizer.rsi/pok3.png | Bin 0 -> 149 bytes 21 files changed, 107 insertions(+) create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/rawramennoodles.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/hanamidango.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/mitarashidango.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/onigiri.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/spicyporkramen.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/closed.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-left.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/inhand-right.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/open.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/unlit-equipped-MASK.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok1.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png new file mode 100644 index 0000000000000000000000000000000000000000..61607a9a45f28ab1c77e512d6646fd81ca9e4b07 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>pWc?Ln2y} z6C_v{Cy4Yk1sYspRNg5yJ!I)W`^uke%s_DX$=UXkX6-qr=jY7+{r~aHxBuRlooL-+%8rWmof;}X#2e5nzhX}-P;T0k}j5QD&_;K?A$)78&qol`;+ E0GKgn(*OVf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json new file mode 100644 index 00000000000..60dc9729881 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "doughdangoball" + }, + { + "name": "rawramennoodles" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/rawramennoodles.png b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/rawramennoodles.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c64c07c8116471482c844c1b1fde45007daddd GIT binary patch literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TXLn2z= zPTB9xlqhq|-ZfgVv4D5h!W4-VUB@dGr+NPh@_9O62w3e~Se)w^=v@83fyLdKqiM37 zik8|lPFa>zvtyUx{=pKIgeCU~d_owPSLJCzdaZB;L5c_y@` zRLxEB{_XpVGG@348;Y5UCmJ!m&+S<)bJ3+I?CrtLZob)nj~(3kI6X;&dDpa(O~*u+*}Dh+vP)gqx@5Ag^)IiID$Xz7w`;d(NU3GNGP+!xXufuZ)ApbTF8ldT zJ+J3<{q#Qb$j)+Y)~>dfD^HwXoN1z4p8N1$Yj;ug7V8UdzMPP&pPRWoXu-Von>KW6 z|C=osSho5zo5Sy~hr??USdCV8Y~E+`_~-Pf&R{)Lo3~fIWNvS&ta@iCJ&WnV%bnsg zY&I}4Y+k52Wy7OytqTkk1s-`tER4xYD80utnfn+!uT~=K?M<4~rEW}n+tt0~k@hpL z=EGgi2fSx^y8ip}iC0^1A}}-?{59rY&7ZEn{2?$B`BEc1(|mmyw18|5AO?X;!IMFh Mr>mdKI;Vst0EB_yRR910 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/chocopocky.png new file mode 100644 index 0000000000000000000000000000000000000000..2f55451d05babfeb04c094f84e4bb33c7d30b299 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY;~ z2@Px%MM*?KR9J=Wlut;LaTv!xi?xH|4%<``Aqkp>Nrz_EN_vIr_68f6froZ5D8h~w zLUs|MU|zaJVRWcV#SRJDK~RV$VGClJG7(12Marf*+8~Oj%l;Jh&b@OY(Z28=-skx} zzvsjE`SCzmW&Q6mXeE@UI>zUB^U zt7|eTDJ6s^fG-d>m=m?)Rl2YoYXNH&)Z6fu7(x@kV{gkf2Z$vgmcVl9EPX4>C4<A6Pp5LAbK0yC9x8PSui&r%;ru% zc*fqAeK=J|CZr3ZAOL{$jAd}3pY_@I+2&5w!O0_5YAQ_Wljn3n6bz7q7?Nw3J-A2x zI8_Jr`zu&nO|iI|0-#gbqYFY8Kn?;~OBn&jhWyj1&${l@y@-B;U@06YvXIQi{pWA; z@y0Ed!tw0|00>P?8s7OP0EjFki7X_EfBQ~PcPl?f?o;R+C>kIGF*f`p`(J(a3b*gQ zLOtGq`*1@+dqMXb_!|U}Z5Eo38UVR)#ttC9KzMsLSS!VQwnur#~`*mf_$2q zj~XnGXLinkvda1=^b4j__CLrZ9UuSz01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjfPx%K}keGR9J=Wl|5(^VHn5%r=|I5{78zBL=v?G2?Xg-3RV)hK}v>XFyNwt4ql-{ zlyq_ER;UmV7YD@>?P3STEJ70OU@--Uuq9N9h67aL(^QUoi1xOLvLO;iXuK&rB6QO;p>Ua@?a_ zlnv2m&T(iGsx1J3orMWB?1n$?<&!J;bS4DjP!1e~j@!{vpjvGJCE#3S81>B^ls}Ok<^EiI#9a zGZj(^dV2LVi7{6*2el0)8X~DyX#v@O)AxqS(PAc?g7w0 zCp16I`OI|h$|+bZeM%;F*SGL`aU1>%CRi-ZZqB|d>yl_0!rwV46PZ;B!AmD#A9KUt zumV8$GZ7634$OoyCx~2{p@h9_2&t+`U_W*$WlpEF?∨6TR@fonsY)b z)d67=0KmO!VCuthNZ*Pu4vn<4v_9lfm#FY*Dx?y` zdY$y*E~{BW^IxFG+**w>&OA^yTgnv~0Ca2oA^=cQ5dY56y`Lj#M>`T7x1beExgukG z$sgSp=+Wb!;3qe_Gg8%_>6ZWi01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXX Hu0mjf#>gJ< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/onigiri.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/onigiri.png new file mode 100644 index 0000000000000000000000000000000000000000..a2631fa7836f507e4b08c44db1b266b883b09836 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}pFCY0Ln2y} z6C_v{Cy4YkF|zeM$(j=q{ZD@8{Ofl-w?(Ez_VKKnYxzt5uA|A;KeuKsF6f@fcviMC z$I{H<@`M9oZ+0+f_9ZACH@tpcF8PAVHm8S|MHc*)3;!@#n9HS|K{5W4j?0FnRVnuu z{g#R3HC%YWX^nHj$GX374B3R$&DUg|dvlvL+*wEA7Nddt42zwH1>A+k9bMgvPwcJx zIqBe$lf4hm?2BC@;Tfmruw7=lM5xS!>vvA>NPny*vhlipe9{VM@!OjVg#*7b2L^&< zEIJz>?(g0&ALl+H%kpGGQ0~uqJ-fU;GxDZh(g1n!1_Q$xS94DPZ(BD5eb1K~;hE;^ a%b*2ha{w_2Tne5HqC8#wT-G@yGywpVC56}k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png new file mode 100644 index 0000000000000000000000000000000000000000..1a08bc5491cc3d2c84307c3256be88146e70ab90 GIT binary patch literal 839 zcmV-N1GxN&P)Px%=Sf6CR9J=Wl1oSwaU91#hN!cXL$3Q^YfTNrM1(NNL#Sjz9n?$E1EV%th)!xr zdGHXV&}%F4Ad*r<7F|R#dK`Kg1a?t+SYpcdSZG#EbJI0DOow%*eT}=-C1Ssqnfdeo z|307j&OjoGBoZSAAx+7(o0b1oVuc>iAf){<&>)F_FB|^W@d_CvQ8DLO;ueV70KmL| zAxWO{5iAkwGZ-XM5se~dt5s_umW-}IxP*GYTvYg^ETh7MWqw;ATmtl42!_mknTwFo zlSq!X=&UHxHg`RInG}#fv1XKI;dIJD&Zk`9A#dU<<&R#w#FnoP8J*S>v&kh_bD9eKZkZdMcy9Q2Q zV|L$mUW_Oj*mw}Ms(E*%l=S=* zguF{grge1GAE4O2f|ADWz=0c&V9yp>w^eB~Dl75<$jJ*_Rf!{ggMzvxskWKa%4quvEPY|KOo@TNOKZl_IUm2m!jsMlqT#xJ{{ay>K)9_I*Ut zQU6SXkfvBO)7e^55VG!SJ4;W?N%-&?dv@|t?a=OUXm4#aTR8LJdC0kuaSy|z9_IZE z5xl4Z!4km<7t+hfxF_UU55BB`Dsgaw5rEqte`xDAlN3{8qu?jYDsbYyK0Ky?Dj^Cf z?9N{aK$cZtwK)v{!76I|{PG+CgRiDFVR_28EIcj&RYJWNg%nmAQlswsHvgSD|DyIB z3m&(Co=nJ~Bv6$2pot`s$Ul{zqg5v?`EC5e0000EWmrjOO-%qQ00008000000002e RQPx)`$V`O3meLV(Zc@u94Ps+D#6w<^YYjO^ri!pE*8(z)`RZD50TxP_ zsrZh1Z${!979bw-61!+4WhE}%B%MtWAtOq3;5k18Eq^@ZC1b4--Dl?06vF~In<7GV zp9`_!gi3@FL8fGy4JWYa@}zQ|ZbQB8#|lV?oCo?0kDpy@;i&hjibL1*JdLZ>l*bd` z504{!<$)00=Yr?_5Z1o+2jmt%q+kyKn~G$tHG;NRwvub3GbhhY&n!GM@sL*c*_giY zIML@<-wOcOMm-EK3lHj;d*cA1nkiI&!D;e6z7;AGDcA$|sshA@6L7C8z@HyKtz2(E zH;usYvjBk6fiB!^zMvdGO#F@OAD#dJY+D&s6^-}xSW5o7*HgXLa?jZT0Pz00X|%Ra z;`ZT608pw=MI30JeeC7DX^akZVau_j0D$mkofsYH0sxhm&SM9$yZsiTF#mKe1%Er` zZ!A)AsS4l^kE6cMhI_wGq3lWm2b{B)zk9J1jW>n?0M+;IV$YGS7`$-@W4|Y`<=9c2 zI8%k*t9RjhEr5=|1`G@c2pm7Fh}qqK%P8lZ@z3c*E%L}44m(hJR)OaOg8L(w)wfQ004~Kn@V+MhUk;#e^M8U*1+HRq(Te;9f1wNePHLIUc~za z?C6gmx_2XXbVMK(Nhqyci=kM|DDOvy-&0&jYLQ1SI2_~$Uom+T`K0g62ZT%xDgRE@ zJx@HrFq4+2)`7 z8B8Qm8mvJlfWWsm5pdX0d0;_kFaBHsW4YfSuKqs`Kxxz7GH>KY10W z8-l3Ym{hL4aPcnym?dP;7aqjT-v*Umm}bZ(zpfxEf`wL)9{R$As^j@2pKX3aQFhTr z_HRmkH@}YjtDN^d;V>1kMNGo$7V+LU^G`mT{HDU}qK!ymK3-j)`gP`Yi&*VS{TvqE zl5$@%CIbL|{N;fnI5wPEaPryWPy3yuYe~$<3j1>Ied7~TkdqIU>CPOZrjew_w471q&7|ev5E2w6Lvm<=S420Xe`e%y$ck2{=D9r=MEbQFatG7 z%Sv2?_uOI!G`KrpKK?wLu-3ZPBQ+}!JD*^Nbgg$i7|sWn`STRob6S7i$e!kjXXg{* zAupj*D(rpf%psWZ0Ga}@LDTW)d49b1SnoU!>~=PqPv9j)i^7{tFe=O(d)!g)MfvG| z#iI6{A5tu7DcA$K#Xl!VJJ*{}f!fl*?3csny=CVUfZ6{Zr~J`E_MsrzwN97nlsC@VMYVgYa~IQG)s-0000EWmrjOO-%qQ00008 Z000000002eQ7Vpk{e8sblT!|1A#>)bGh#JP$0m z@BSaBbzve0TsoimU%gadX1OmtLBW{imz_;=K*hKIhX?2Q^YA?4;o*Az-_XLq=#oCy zqF@urxVT>@792WoKw;hS^B+E4a&NOXo0k0$-*0fAMsPx|wx zEN9$zZ8?wAoH;yksp2QL&Bm@ z-=CQt-dUb6DPplxVoQ{i7T-TgTe~DWM4fH$9lw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pockypacks.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..d49b6f112c062ca4deab896a5acd022e4f6faeaa GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=X`U{QAr*7p-rC4}KtX`TF=Z!% z)^cvG#cWA3R%TW+Q!&FNfuKXy64h3+TD zh$5i5C8++ns7 ztHP=UwKkD|?lZdWRz7{!juU7Y5bTJYxJ0bFEu%|i>){u=5sb6{8F+k~?Cvpf$+w@s z7Ol#&eYCD6Dy~S&VbZEyS52y?eGlJo{`oh%*%fYa1)2%9IaSfWZ&!cVI6>DtIyHH^ zQeBy~XV3|uJ8L#=tkkQYxBL9_yFU(A>C0P*L#$(9SYRyoPemSR$?hE&XX zdrO<|P=G+|!^6qU0tTv@tFj$7GqALYF7SxpSh>PkF;GH=T=@;<$cjx4XGE*yM?pQr%zhaJTq*&ciuxSUN>jYOaCfr;xFp7 zq+Tem`l|ZUWM0iOfBClQe_jehY-3=kIP#VGW%!?34!b?#CxU;~HXJ=!e8Z&YOndOp z=+y9}ZsE^=-|s)OJoxAFKVLsEFg#Gd!+703bXKFu{63%&e5nzhX}-P;T0k}j)W}Q0 PlR+#`S3j3^P6SzbriXWy=SzxM?3CCNB_(;LR#p-ynfbl}{N6pN_APGccSXsgg0DyB0Wuk23&4x3=FC|!8Hq|@B0A5kuNpEGtJkR ZK?}&{0Adih6g(M3dAjIBdAG&%e^+n6>xxO-c5D9po$fDR6-hn+`~0kFOXKbab9AvcN*~vc)3=7UNf3aiv nXY+1-CeQ%B)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f@EI#B literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok2.png new file mode 100644 index 0000000000000000000000000000000000000000..03dbb5602e75f1460a0a06db60de609101f2c50f GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_ zF9dQjCbP0l+XkKg&`<| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png b/Resources/Textures/Corvax/Objects/Consumable/Food/pokvisualizer.rsi/pok3.png new file mode 100644 index 0000000000000000000000000000000000000000..82a27499f1d175ac0e798ddef1506a9837e84a1c GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rk*a2ArY-_ z&u!#nP~c&3EHt_2{JX6N< nPbvL)B+vl9)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f{&*`P literal 0 HcmV?d00001 From d044ca770c8dd794e69672291a4ecb90229164c6 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 2 Nov 2024 02:16:49 +0400 Subject: [PATCH 09/13] Add files via upload --- Resources/Prototypes/_NF/Mail/mail.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml index 1389b70c4b6..be5607c89f1 100644 --- a/Resources/Prototypes/_NF/Mail/mail.yml +++ b/Resources/Prototypes/_NF/Mail/mail.yml @@ -2152,13 +2152,3 @@ - type: Mail contents: - id: FoodBoxDonut - -- type: entity - categories: [ HideSpawnMenu ] - parent: BaseMail - id: MailNFPockyPack - suffix: chocopocky - components: - - type: Mail - contents: - - id: ChocolatePockyPack #CorvaxFrontier \ No newline at end of file From b60bd7a8b4d3efd58a540aa7520d6d088883b934 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 2 Nov 2024 02:17:45 +0400 Subject: [PATCH 10/13] Add files via upload --- Resources/Prototypes/Corvax/Mail/mail.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Mail/mail.yml diff --git a/Resources/Prototypes/Corvax/Mail/mail.yml b/Resources/Prototypes/Corvax/Mail/mail.yml new file mode 100644 index 00000000000..772d0369e3a --- /dev/null +++ b/Resources/Prototypes/Corvax/Mail/mail.yml @@ -0,0 +1,9 @@ +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseMail + id: MailNFPockyPack + suffix: chocopocky + components: + - type: Mail + contents: + - id: ChocolatePockyPack \ No newline at end of file From 339c7149811209d8f12487f9c54f3b75b2654e49 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 2 Nov 2024 11:00:03 +0400 Subject: [PATCH 11/13] Add files via upload --- .../japanfood/ingredients/japaningredients.ftl | 4 ++++ .../consumable/food/japanfood/japanfoods.ftl | 14 ++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl create mode 100644 Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl new file mode 100644 index 00000000000..09bf4d548a3 --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl @@ -0,0 +1,4 @@ +ent-Doughdangoball = шарик данго + .desc = Слепленный шарик из рисового теста. Начинай творить! +ent-rawramennoodles = сухая лапша для рамэна + .desc = Даже не думай есть её в таком виде. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl new file mode 100644 index 00000000000..2c6eaf3a449 --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl @@ -0,0 +1,14 @@ +ent-hanamidango = трёхцветное данго + .desc = Тебе нравятся разные цвета, не так ли? +ent-mitarashidango = митараши данго + .desc = Рисовая сладость, манящая своим сладким соусом. +ent-onigiri = онигири + .desc = Лучший рисовый треугольник в галактике. +ent-spicyporkramennoodles = острый рамэн + .desc = Выглядит так горячо... И так аппетитно! +ent-porkramennoodles = свиной рамэн + .desc = А-ах... Вижу вы тоже человек высокой культуры. +ent-ChocolatePockyPack = коробочка шоколадных покки + .desc = Отличная шоколадная сладость, которая так и манит своим видом. +ent-chocopocky = шоколадная палочка покки + .desc = Вкус беззаботной юности. \ No newline at end of file From 65f96db4c9a1669cd29a6ed44854da070b4596ee Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 2 Nov 2024 11:06:42 +0400 Subject: [PATCH 12/13] Update japanfoods.ftl --- .../objects/consumable/food/japanfood/japanfoods.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl index 2c6eaf3a449..4e3c0cead2b 100644 --- a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/japanfoods.ftl @@ -1,7 +1,7 @@ ent-hanamidango = трёхцветное данго .desc = Тебе нравятся разные цвета, не так ли? ent-mitarashidango = митараши данго - .desc = Рисовая сладость, манящая своим сладким соусом. + .desc = Рисовая сладость, манящая своим сладким соевым соусом. ent-onigiri = онигири .desc = Лучший рисовый треугольник в галактике. ent-spicyporkramennoodles = острый рамэн @@ -9,6 +9,6 @@ ent-spicyporkramennoodles = острый рамэн ent-porkramennoodles = свиной рамэн .desc = А-ах... Вижу вы тоже человек высокой культуры. ent-ChocolatePockyPack = коробочка шоколадных покки - .desc = Отличная шоколадная сладость, которая так и манит своим видом. + .desc = Отличное шоколадное печенье для заядлого одиночки или влюбленной парочки. ent-chocopocky = шоколадная палочка покки - .desc = Вкус беззаботной юности. \ No newline at end of file + .desc = Вкус беззаботной молодости. From 2ca3282ac0717597dffb9cb0f124ad4268c9501e Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Sat, 2 Nov 2024 11:08:26 +0400 Subject: [PATCH 13/13] Update japaningredients.ftl --- .../food/japanfood/ingredients/japaningredients.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl index 09bf4d548a3..63afbefe8f8 100644 --- a/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl +++ b/Resources/Locale/ru-RU/corvax/_nf/prototypes/entities/objects/consumable/food/japanfood/ingredients/japaningredients.ftl @@ -1,4 +1,4 @@ -ent-Doughdangoball = шарик данго - .desc = Слепленный шарик из рисового теста. Начинай творить! +ent-Doughdangoball = сырой шарик данго + .desc = Слепленный шарик из рисового теста. ent-rawramennoodles = сухая лапша для рамэна - .desc = Даже не думай есть её в таком виде. \ No newline at end of file + .desc = Даже не думай есть её в таком виде.