Gondola update! (#215)

Workbench-Team · Aug 10, 2023 · 1704487 · 1704487
1 parent d37e6dd
commit 1704487
Show file tree

Hide file tree

Showing 17 changed files with 222 additions and 4 deletions.
diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
@@ -13,6 +13,9 @@ ent-CrateNPCChicken = Chicken crate
 ent-CrateNPCCrab = Crab crate
     .desc = A crate containing three huge crabs.
 
+ent-CrateNPCGondola = Gondola crate
+    .desc = A crate containing a single gondola.
+
 ent-CrateNPCDuck = Duck crate
     .desc = A crate containing six fully grown ducks.
 

diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl
@@ -145,3 +145,6 @@ ent-MobHamster = hamster
 ent-MobPig = pig
     .desc = Oink.
     .suffix = { "" }
+ent-MobGondola = gondola
+    .desc = Gondola.
+    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl
@@ -169,3 +169,7 @@ ent-FoodMeatSpiderCutletCooked = spider cutlet
 ent-FoodMeatXenoCutletCooked = xeno cutlet
     .desc = A cutlet of cooked xeno, dripping with... tastiness?
     .suffix = { "" }
+ent-FoodMeatGondola = raw gondola meat
+    .desc = A raw piece of gondola. Stinky.
+    .suffix = { "" }
+	
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/livestock-crates.ftl
@@ -8,6 +8,8 @@ ent-CrateNPCChicken = ящик кур
     .desc = Ящик, содержащий четыре взрослые курицы.
 ent-CrateNPCCrab = ящик крабов
     .desc = Ящик, содержащий три огромных краба.
+ent-CrateNPCGondola = ящик с гондолой
+    .desc = Ящик, содержащий гондолу.
 ent-CrateNPCDuck = ящик уток
     .desc = Ящик, содержащий шесть взрослых уток.
 ent-CrateNPCCorgi = ящик корги

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl
@@ -145,3 +145,6 @@ ent-MobHamster = хомяк
 ent-MobPig = свинья
     .desc = Хрю.
     .suffix = { "" }
+ent-MobGondola = гондола
+    .desc = Гондола.
+    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl
@@ -169,3 +169,7 @@ ent-FoodMeatSpiderCutletCooked = паучья котлета
 ent-FoodMeatXenoCutletCooked = ксено котлета
     .desc = Котлета из ксеноса, сочащаяся... вкусом?
     .suffix = { "" }
+ent-FoodMeatGondola = сырое мясо гондолы
+    .desc = Сырой кусок гондолы. Липкое.
+    .suffix = { "" }
+	
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -48,6 +48,16 @@
   category: Livestock
   group: market
 
+- type: cargoProduct
+  id: LivestockGondola
+  icon:
+    sprite: Mobs/Animals/gondola.rsi
+    state: gondola
+  product: CrateNPCGondola
+  cost: 2000
+  category: Livestock
+  group: market
+
 - type: cargoProduct
   id: LivestockDuck
   icon:

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
@@ -53,6 +53,15 @@
       - id: MobCrab
         amount: 3
 
+- type: entity
+  id: CrateNPCGondola
+  parent: CrateLivestock
+  components:
+  - type: StorageFill
+    contents:
+      - id: MobGondola
+        amount: 1
+
 - type: entity
   id: CrateNPCDuck
   parent: CrateLivestock

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2461,3 +2461,50 @@
   - type: NpcFactionMember
     factions:
     - Passive
+
+- type: entity
+  name: gondola
+  parent: SimpleMobBase
+  id: MobGondola
+  description: Gondola.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: gondola
+      sprite: Mobs/Animals/gondola.rsi
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.25
+        density: 100
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: gondola
+      Critical:
+        Base: gondola_dead
+      Dead:
+        Base: gondola_dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatGondola
+      amount: 1
+  - type: InteractionPopup
+    successChance: 0.8
+    interactSuccessString: petting-success-bear
+    interactFailureString: petting-failure-generic
+    interactSuccessSound:
+      path: /Audio/Animals/sloth_squeak.ogg
+  - type: NpcFactionMember
+    factions:
+    - Passive
+
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -431,6 +431,9 @@
   components:
   - type: Sprite
     state: dough-pie
+  - type: SliceableFood
+    count: 3
+    slice: FoodDoughPastryBaseRaw
 
 - type: entity
   name: flat dough

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -71,6 +71,31 @@
     node: start
     defaultTarget: meat steak
 
+- type: entity
+  name: raw gondola meat
+  parent: FoodMeatBase
+  id: FoodMeatGondola
+  description: A raw piece of gondola. Stinky.
+  components:
+  - type: Tag
+    tags:
+    - Raw
+  - type: Sprite
+    state: gondola
+  - type: FlavorProfile
+    flavors:
+      - shocking
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 10
+        - ReagentId: Fat
+          Quantity: 5
+        - ReagentId: Toxin
+          Quantity: 5
+
 - type: entity
   name: raw human meat
   parent: FoodMeatBase

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1235,14 +1235,98 @@
     FoodDoughSlice: 3
 
 #Donks i guess
+
+- type: microwaveMealRecipe
+  id: RecipeDonkpocket
+  name: donk pocket recipe
+  result: FoodDonkpocket
+  time: 5
+  solids:
+    FoodDoughPastryBaseRaw: 1
+    FoodMeatMeatball: 1
+
+- type: microwaveMealRecipe
+  id: RecipeGondolapocket
+  name: gondola pocket recipe
+  result: FoodDonkpocketGondola
+  time: 5
+  solids:
+    FoodMeatGondola: 1
+    FoodDoughPastryBaseRaw: 1
+    FoodMeatMeatball: 1
+
+- type: microwaveMealRecipe
+  id: RecipeDonkpocketHonk
+  name: donk pocket recipe
+  result: FoodDonkpocketHonk
+  time: 5
+  reagents:
+    Sugar: 5
+  solids:
+    FoodDoughPastryBaseRaw: 1
+    FoodMeatMeatball: 1
+    FoodBanana: 1
+
+- type: microwaveMealRecipe
+  id: RecipeDonkpocketBerry
+  name: berry-pocket recipe
+  result: FoodDonkpocketBerry
+  time: 5
+  solids:
+    FoodDoughPastryBaseRaw: 1
+    FoodGrape: 1
+
+- type: microwaveMealRecipe
+  id: RecipeDankpocket
+  name: dank pocket recipe
+  result: FoodDonkpocketDank
+  time: 5
+  solids:
+    FoodDoughPastryBaseRaw: 1
+    FoodAmbrosiaVulgaris: 1
+
+- type: microwaveMealRecipe
+  id: RecipeDonkpocketPizzaPocket
+  name: pizza-pocket recipe
+  result: FoodDonkpocketPizza
+  time: 5
+  solids:
+    FoodDoughPastryBaseRaw: 1
+    FoodMeatMeatball: 1
+    FoodTomato: 1
+
+- type: microwaveMealRecipe
+  id: RecipeDonkpocketSpicy
+  name: spicy donk-pocket recipe
+  result: FoodDonkpocketSpicy
+  time: 5
+  solids:
+    FoodDoughPastryBaseRaw: 1
+    FoodMeatMeatball: 1
+    FoodChili: 1
+
+- type: microwaveMealRecipe
+  id: RecipeDonkpocketTeriyaki
+  name: teriyaki-pocket recipe
+  result: FoodDonkpocketTeriyaki
+  time: 5
+  reagents:
+    Soysauce: 5
+  solids:
+    FoodDoughPastryBaseRaw: 1
+    FoodMeatMeatball: 1
+
+#Warm pockets
+
 - type: microwaveMealRecipe
   id: RecipeWarmDonkpocket
   name: warm donk pocket recipe
   result: FoodDonkpocketWarm
   time: 5
   solids:
     FoodDonkpocket: 1
-
+
+
 - type: microwaveMealRecipe
   id: RecipeWarmDankpocket
   name: warm dank pocket recipe
@@ -1276,23 +1360,23 @@
     FoodDonkpocketPizza: 1
 
 - type: microwaveMealRecipe
-  id: RecipeDonkpocketHonk
+  id: RecipeWarmDonkpocketHonk
   name: warm honk-pocket recipe
   result: FoodDonkpocketHonkWarm
   time: 5
   solids:
     FoodDonkpocketHonk: 1
 
 - type: microwaveMealRecipe
-  id: RecipeDonkpocketBerry
+  id: RecipeWarmDonkpocketBerry
   name: warm berry-pocket recipe
   result: FoodDonkpocketBerryWarm
   time: 5
   solids:
     FoodDonkpocketBerry: 1
 
 - type: microwaveMealRecipe
-  id: RecipeDonkpocketGondola
+  id: RecipeWarmDonkpocketGondola
   name: warm gondola-pocket recipe
   result: FoodDonkpocketGondolaWarm
   time: 5

diff --git a/Resources/Textures/Mobs/Animals/gondola.rsi/gondola.png b/Resources/Textures/Mobs/Animals/gondola.rsi/gondola.png
diff --git a/Resources/Textures/Mobs/Animals/gondola.rsi/gondola_dead.png b/Resources/Textures/Mobs/Animals/gondola.rsi/gondola_dead.png
diff --git a/Resources/Textures/Mobs/Animals/gondola.rsi/meta.json b/Resources/Textures/Mobs/Animals/gondola.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "From tgstation, commit: https://github.com/tgstation/tgstation/commit/317528881774ce0ddd285dbd2a1bebbf7b017650",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "gondola",
+      "directions": 4
+    },
+    {
+      "name": "gondola_dead"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/gondola.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/gondola.png
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
@@ -87,6 +87,9 @@
     {
       "name": "goliath"
     },
+    {
+      "name": "gondola"
+    },
     {
       "name": "goliath-cooked"
     },