Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo

2025-07-07 18:09:10 -04:00
parent ab7a64e3b3 6eec2c5c51
commit 83f15bfada
617 changed files with 10860 additions and 4884 deletions
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
@@ -404,3 +404,15 @@
          steps:
            - tool: Prying
              doAfter: 1
+
+    - node: TableXeno
+      entity: TableXeno
+      edges:
+      - to: TableFrame
+        completed:
+        - !type:SpawnPrototype
+          prototype: SheetSteel1
+          amount: 1
+        steps:
+        - tool: Anchoring
+          doAfter: 1
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
@@ -510,6 +510,10 @@
          steps:
            - tool: Welding
              doAfter: 5
+        - to: wall
+          steps:
+            - tool: Brushing
+              doAfter: 12

    - node: reinforcedWallRust
      entity: WallReinforcedRust
@@ -518,3 +522,7 @@
          steps:
            - tool: Welding
              doAfter: 5
+        - to: reinforcedWall
+          steps:
+            - tool: Brushing
+              doAfter: 12
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
@@ -22,6 +22,12 @@
        amount: 2
        doAfter: 1

+    - to: pressureregulator
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
    - to: valve
      steps:
      - material: Steel
@@ -106,6 +112,22 @@
      - tool: Welding
        doAfter: 1

+  - node: pressureregulator
+    entity: GasPressureRegulator
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
  - node: valve
    entity: GasValve
    edges:
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -572,6 +572,17 @@
  conditions:
    - !type:NoUnstackableInTile

+- type: construction
+  id: GasPressureRegulator
+  graph: GasBinary
+  startNode: start
+  targetNode: pressureregulator
+  category: construction-category-utilities
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:NoUnstackableInTile
+
 - type: construction
  id: GasValve
  graph: GasBinary
--- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
@@ -33,7 +33,6 @@
  - ClothingUniformJumpskirtCapFormalDress
  # HoP
  - ClothingHeadHatHopcap
-  - ClothingHeadHatBeretHop
  - ClothingUniformJumpsuitHoP
  - ClothingUniformJumpskirtHoP
  # Generic
--- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
@@ -30,6 +30,7 @@
  - SignallerAdvanced
  - DeviceQuantumSpinInverter
  - DeviceDesynchronizer
+  - ClothingBackpackHarmpack

 - type: latheRecipePack
  id: ScienceClothing
@@ -37,6 +38,7 @@
  - ClothingShoesBootsMagSci
  - ClothingShoesBootsMoon
  - ClothingShoesBootsSpeed
+  - ClothingShoesBootsJump
  - ClothingBackpackHolding
  - ClothingBackpackSatchelHolding
  - ClothingBackpackDuffelHolding
--- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
@@ -75,6 +75,7 @@
  - PowerCageMedium
  - PowerCageSmall
  - TelescopicShield
+  - ClothingBackpackHarmpack

 - type: latheRecipePack
  id: SecurityBoards
--- a/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/service.yml
@@ -25,6 +25,7 @@
  - MopItem
  - Holoprojector
  - WetFloorSign
+  - WireBrush

 - type: latheRecipePack
  id: ServiceBoardsStatic
--- a/Resources/Prototypes/Recipes/Lathes/janitorial.yml
+++ b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
@@ -104,3 +104,11 @@
  materials:
    Steel: 250
    Glass: 1000
+
+- type: latheRecipe
+  id: WireBrush
+  result: WireBrush
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 100
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -167,6 +167,16 @@
    Plastic: 1000
    Silver: 500

+- type: latheRecipe
+  id: ClothingShoesBootsJump
+  result: ClothingShoesBootsJump
+  completetime: 2
+  materials:
+    Steel: 1400
+    Plastic: 600
+    Silver: 200
+    Plasma: 200
+
 - type: latheRecipe
  id: ModularReceiver
  result: ModularReceiver
@@ -265,4 +275,5 @@
  result: Ashtray
  completetime: 1
  materials:
-    Steel: 30
+    Steel: 30
+    
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -84,6 +84,18 @@
    Plasma: 500
    Glass: 500

+- type: latheRecipe
+  id: ClothingBackpackHarmpack
+  result: ClothingBackpackHarmpack
+  categories:
+  - Clothing
+  completetime: 15
+  materials:
+    Steel: 2000
+    Plastic: 1000
+    Plasma: 500
+    Gold: 500
+
 # Shields
 - type: latheRecipe
  parent: BaseShieldRecipe