Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

# Conflicts: # .github/CODEOWNERS # Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs # Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs # Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs # Resources/Prototypes/Entities/Effects/chemistry_effects.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml # Resources/Prototypes/GameRules/meteorswarms.yml # Resources/Prototypes/Procedural/dungeon_configs.yml
2025-05-27 12:21:14 +03:00
parent 67f8135a96 854c506a75
commit d5fbdbdec0
1165 changed files with 76878 additions and 44718 deletions
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/soil.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/soil.yml
@@ -0,0 +1,23 @@
+- type: constructionGraph
+  id: Soil
+  start: start
+  graph:
+  - node: start
+    actions:
+    - !type:DeleteEntity {}
+    edges:
+    - to: fungalSoil
+      completed:
+      - !type:SnapToGrid
+        southRotation: true
+      steps:
+      - material: WoodPlank
+        amount: 10
+        doAfter: 10
+      - tag: Mushroom
+        name: soil-construction-graph-any-mushroom
+        icon:
+          sprite: Objects/Misc/spaceshroom.rsi
+          state: object
+  - node: fungalSoil
+    entity: FungalSoil
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_pipes.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_pipes.yml
@@ -14,6 +14,14 @@
      - material: Steel
        amount: 2
        doAfter: 1
+    - to: signaller
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+      - material: Cable
+        amount: 1
+        doAfter: 1
    - to: trunk
      steps:
      - material: Steel
@@ -108,6 +116,20 @@
      steps:
      - tool: Welding
        doAfter: 1
+  - node: signaller
+    entity: DisposalSignaller
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:SpawnPrototype
+        prototype: CableApcStack1 # I have no idea why this does not work
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
  - node: trunk
    entity: DisposalTrunk
    edges:
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -1253,3 +1253,15 @@
  canBuildInImpassable: false
  conditions:
    - !type:TileNotBlocked
+
+- type: construction
+  id: FungalSoil
+  graph: Soil
+  startNode: start
+  targetNode: fungalSoil
+  category: construction-category-structures
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -119,6 +119,15 @@
  placementMode: SnapgridCenter
  canBuildInImpassable: false

+- type: construction
+  id: DisposalSignaller
+  graph: DisposalPipe
+  startNode: start
+  targetNode: signaller
+  category: construction-category-utilities
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+
 - type: construction
  id: DisposalTrunk
  graph: DisposalPipe
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -2306,6 +2306,17 @@
    FoodCabbage: 1
    FoodOnionSlice: 2

+- type: microwaveMealRecipe
+  id: RecipeTacoDragon
+  name: draco recipe
+  result: FoodTacoDragon
+  time: 10
+  group: Savory
+  solids:
+    FoodTacoShell: 1
+    FoodMeatDragonCutlet: 2
+    FoodChiliPepper: 1
+
 - type: microwaveMealRecipe
  id: RecipeCroissant
  name: croissant recipe
--- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
@@ -93,6 +93,8 @@
  - SyringeCryostasis
  - BluespaceBeaker
  - SyringeBluespace
+  - LauncherSyringe
+  - MiniSyringe

 - type: latheRecipePack
  id: MedicalBoards
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -12,6 +12,7 @@
  id: BorgModulesStatic
  recipes:
  - BorgModuleTool
+  - BorgModuleCable
  - BorgModuleFireExtinguisher

 - type: latheRecipePack
--- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
@@ -46,6 +46,7 @@
  recipes:
  - PowerCellMicroreactor
  - PowerCellHigh
+  - PowerCellHyper

 - type: latheRecipePack
  id: ScienceWeapons
--- a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
@@ -20,6 +20,7 @@
  - FoodPlateMuffinTin
  - FoodKebabSkewer
  - SprayBottle
+  - TrashBag
  - LightReplacer
  - MopItem
  - Holoprojector
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -216,3 +216,23 @@
  materials:
    Steel: 100
    Plastic: 100
+
+- type: latheRecipe
+  id: LauncherSyringe
+  result: LauncherSyringe
+  completetime: 10
+  materials:
+    Silver: 200
+    Steel: 1000
+    Plastic: 200
+    Glass: 100
+
+- type: latheRecipe
+  id: MiniSyringe
+  result: MiniSyringe
+  completetime: 2
+  materials:
+    Steel: 200
+    Glass: 100
+    Plastic: 100
+
--- a/Resources/Prototypes/Recipes/Lathes/powercells.yml
+++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml
@@ -32,6 +32,19 @@
    Plastic: 200
    Gold: 50

+- type: latheRecipe
+  id: PowerCellHyper
+  result: PowerCellHyperPrinted
+  categories:
+  - Parts
+  completetime: 10
+  materials:
+    Steel: 800
+    Glass: 700
+    Plasma: 300
+    Gold: 200
+    Silver: 300
+
 - type: latheRecipe
  id: PowerCellMicroreactor
  result: PowerCellMicroreactorPrinted
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -127,6 +127,11 @@
  id: BorgModuleTool
  result: BorgModuleTool

+- type: latheRecipe
+  parent: BaseBorgModuleRecipe
+  id: BorgModuleCable
+  result: BorgModuleCable
+
 - type: latheRecipe
  parent: BaseBorgModuleRecipe
  id: BorgModuleFireExtinguisher
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -221,7 +221,8 @@
  materials:
    Steel: 1500
    Glass: 1000
-    Gold: 850
+    Gold: 500
+    Uranium: 300

 - type: latheRecipe
  parent: BaseWeaponRecipeLong
@@ -230,7 +231,7 @@
  materials:
    Steel: 1250
    Plastic: 750
-    Gold: 500
+    Gold: 350

 - type: latheRecipe
  parent: BaseWeaponRecipeLong
@@ -240,7 +241,7 @@
    Steel: 1500
    Glass: 500
    Plastic: 250
-    Gold: 100
+    Gold: 250

 - type: latheRecipe
  parent: BaseWeaponRecipeLong
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -561,7 +561,7 @@
  id: Opporozidone
  minTemp: 400 #Maybe if a method of reducing reagent temp exists one day, this could be -50
  reactants:
-    Cognizine: 
+    Cognizine:
      amount: 1
    Plasma:
      amount: 2
@@ -589,10 +589,10 @@
  impact: Medium
  reactants:
    Cryoxadone:
-      amount: 1
-    Aloe:
      amount: 2
-    Sigynate:
+    Aloe:
+      amount: 1
+    Leporazine:
      amount: 2
  products:
      Aloxadone: 4