Merge branch 'master' into 2024-10-13-Workflows2

whatston3 · Oct 16, 2024 · f72bbb5 · f72bbb5
2 parents 4ba4696 + 201da20
commit f72bbb5
Show file tree

Hide file tree

Showing 33 changed files with 133 additions and 128 deletions.
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -4585,3 +4585,15 @@ Entries:
         backpack in duffel, a toolbox fits in a backpack.
   id: 5406
   time: '2024-10-15T21:01:40.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Remove
+      message: >-
+        The old EVA suit, emergency EVA suit, and ancient EVA suit are no longer
+        printable.
+    - type: Tweak
+      message: >-
+        Material costs for small electronics like small gyroscope circuitboards
+        were increased.
+  id: 5407
+  time: '2024-10-15T23:58:44.0000000+00:00'
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -174,10 +174,10 @@
       flatReductions:
         Heat: 10 # the average lightbulb only does around four damage!
     slots: OUTERCLOTHING
-  - type: PhysicalComposition # Frontier
-    materialComposition: # Frontier
-      Durathread: 100 # Frontier
-      Cloth: 100 # Frontier
+#  - type: PhysicalComposition # Frontier
+#    materialComposition: # Frontier
+#      Durathread: 100 # Frontier
+#      Cloth: 50 # Frontier
 
 - type: entity
   parent: ClothingOuterBase

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -14,8 +14,6 @@
     - SuitEVA
     - MonkeyWearable
     - WhitelistChameleon
-  - type: StaticPrice
-    price: 65
 
 #Syndicate EVA
 - type: entity
@@ -121,13 +119,11 @@
         Radiation: 0.75
         Caustic: 0.5
   - type: GroupExamine
-  - type: StaticPrice # Frontier
-    price: 50
   - type: StealTarget
     stealGroup: ClothingOuterHardsuitVoidParamed
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetVoidParamed
     slot: head
   - type: ContainerContainer
     containers:
-      toggleable-clothing: !type:ContainerSlot {}
+      toggleable-clothing: !type:ContainerSlot {}
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -69,8 +69,6 @@
   - type: Tag
     tags:
       - Packet
-  - type: StaticPrice
-    price: 4.5
 
 - type: entity
   parent: BaseFoodCondimentPacket
@@ -99,6 +97,8 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 2
     fillBaseName: packet-trans-
+  - type: StaticPrice # Frontier
+    price: 5 # Frontier
 
 - type: entity
   parent: BaseFoodCondimentPacket
@@ -366,8 +366,8 @@
   - type: PhysicalComposition
     materialComposition:
       Glass: 50
-  - type: StaticPrice
-    price: 13.5
+  - type: StaticPrice # Frontier
+    price: 13.5 # Frontier
 
 - type: entity
   parent: BaseFoodCondimentBottle
@@ -564,10 +564,10 @@
         acts: [ "Destruction" ]
   - type: Sprite
     state: shaker-empty
-  - type: StaticPrice
-    price: 9
   - type: RefillableSolution
     solution: food
+  - type: StaticPrice # Frontier
+    price: 9 # Frontier
 
 - type: entity
   parent: BaseFoodShaker
@@ -607,4 +607,4 @@
     state: shaker-pepper
   - type: Tag
     tags:
-      - PepperShaker
+      - PepperShaker
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -54,8 +54,8 @@
     materialComposition:
       Glass: 60
   - type: SpaceGarbage
-  - type: StaticPrice
-    price: 3
+  - type: StaticPrice # Frontier
+    price: 4.5 # Frontier
 
 - type: entity
   name: broken plate
@@ -74,8 +74,8 @@
     tags:
     - Trash
   - type: SpaceGarbage
-  - type: StaticPrice
-    price: 1
+  - type: StaticPrice # Frontier
+    price: 1 # Frontier
 
 # Small Plate
 
@@ -109,11 +109,11 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: StaticPrice
-    price: 2
   - type: PhysicalComposition
     materialComposition:
       Glass: 30
+  - type: StaticPrice # Frontier
+    price: 2 # Frontier
 
 - type: entity
   parent: FoodPlateTrash
@@ -143,8 +143,8 @@
   - type: Tag
     tags:
     - Trash
-  - type: StaticPrice
-    price: 1
+  - type: StaticPrice # Frontier
+    price: 1 # Frontier
 
 - type: entity
   name: plastic plate
@@ -162,8 +162,8 @@
   - type: Tag
     tags:
     - Trash
-  - type: StaticPrice
-    price: 1
+  - type: StaticPrice # Frontier
+    price: 1 # Frontier
 
 # Pie Tin
 
@@ -188,5 +188,5 @@
     materialComposition:
       Steel: 60
   - type: SpaceGarbage
-  - type: StaticPrice
-    price: 1
+  - type: StaticPrice # Frontier
+    price: 1 # Frontier
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
@@ -48,11 +48,8 @@
         Blunt: 3
   - type: Damageable
     damageContainer: Inorganic
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 100
   - type: StaticPrice
-    price: 10
+    price: 50
 
 - type: entity
   abstract: true
@@ -72,9 +69,10 @@
       Steel: 100
   - type: Tag
     tags:
-      - Trash
-  - type: StaticPrice
-    price: 1
+    - Trash
+  - type: StaticPrice # Frontier
+    price: 6 # Frontier
+
 # Tins
 
 # Need something that you can open these tins with. I suggest a prying or cutting tool.
@@ -195,4 +193,4 @@
   name: tinned meat
   components:
   - type: Sprite
-    sprite: Objects/Consumable/Food/Tins/meat.rsi
+    sprite: Objects/Consumable/Food/Tins/meat.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -32,4 +32,4 @@
     refineResult:
     - id: SheetGlass1
   - type: StaticPrice # Frontier
-    price: 1 # Frontier
+    price: 4 # Frontier
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -25,7 +25,7 @@
   - type: StaticPrice
     price: 0
   - type: StackPrice
-    price: 0.334 # Frontier: 2.25<0.334
+    price: 0.6 # Frontier: 2.25<0.6
   - type: PhysicalComposition
     materialComposition:
       Steel: 10

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -330,7 +330,7 @@
           Primed: { state: primed }
           # Unprimed: <Use state determined by enum.ConstructionVisuals.Layer>
   - type: StaticPrice
-    price: 25 # Frontier: 75<25 - TODO: material value rework
+    price: 30 # Frontier: 75<30
 
 - type: entity
   name: EMP grenade

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml
@@ -16,7 +16,7 @@
   - type: Physics
     bodyType: Static
   - type: StaticPrice
-    price: 15 # Frontier: 35<15 - TODO: material value rework
+    price: 20 # Frontier: 35<20
 
 - type: entity
   id: BenchColorfulComfy

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -47,7 +47,7 @@
         sound:
           collection: MetalBreak
   - type: StaticPrice
-    price: 10 # Frontier: 50<10
+    price: 15 # Frontier: 50<15
 
 #Starts unanchored, cannot be rotated while anchored
 - type: entity

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -74,7 +74,7 @@
   - type: Drain
     autoDrain: false
   - type: StaticPrice
-    price: 25 # Frontier: 100<25 - TODO: material value rework
+    price: 30 # Frontier: 100<30
   - type: UserInterface
     interfaces:
       enum.DisposalUnitUiKey.Key:

diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -63,7 +63,7 @@
         sound:
           collection: MetalGlassBreak
   - type: StaticPrice
-    price: 25 # Frontier: 75<25 - TODO: material value rework
+    price: 30 # Frontier: 75<30
 
 - type: entity
   id: PoweredLightPostSmallEmpty

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -103,4 +103,4 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice
-    price: 25
+    price: 30 # Frontier 25<30
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -203,10 +203,10 @@
       - ClothingHeadHatCone
       - Flare
       - Durathread # Frontier
-      - ClothingOuterSuitEmergency # Frontier
+#      - ClothingOuterSuitEmergency # Frontier
       - ClothingHeadHelmetEVA # Frontier
       - ClothingHeadHelmetEVALarge # Frontier
-      - ClothingOuterHardsuitEVA # Frontier
+#      - ClothingOuterHardsuitEVA # Frontier
       - ClothingOuterEVASuitContractor # Frontier
       - ClothingOuterEVASuitPilot # Frontier
   - type: EmagLatheRecipes
@@ -400,8 +400,8 @@
       - ClothingOuterHardsuitScaf # Frontier
       - ClothingOuterHardsuitPilot # Frontier
       - ClothingOuterHardsuitMaximPrototype # Frontier
-      - ClothingHeadHelmetAncient # Frontier
-      - ClothingOuterHardsuitAncientEVA # Frontier
+#      - ClothingHeadHelmetAncient # Frontier
+#      - ClothingOuterHardsuitAncientEVA # Frontier
       - ConstructionBagOfHolding # Frontier
       - ServiceSelectiveDropper # Frontier
       - PlantAnalyzer # Frontier
@@ -852,7 +852,7 @@
       - WeaponLaserCarbinePractice
       - Zipties
       - ThrusterSecurityMachineCircuitboard # Frontier
-      - ClothingOuterSuitEmergency # Frontier
+#      - ClothingOuterSuitEmergency # Frontier
       - ClothingOuterEVASuitNfsd # Frontier
       - ClothingHeadHelmetEVA # Frontier
       - ClothingHeadHelmetEVALarge # Frontier
@@ -1038,7 +1038,7 @@
       - ClothingEyesGlassesChemical
       - WhiteCane
       - ClothingOuterEVASuitMedic # Frontier
-      - ClothingOuterSuitEmergency # Frontier
+#      - ClothingOuterSuitEmergency # Frontier
       - ClothingOuterHardsuitVoidParamed # Frontier
       - BaseChemistryEmptyVial # Frontier
       - PowerCellSmall # Frontier

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -61,7 +61,7 @@
     canCollide: false
     bodyType: static
   - type: StaticPrice
-    price: 11 # Frontier: 30<11 - TODO: material value rework
+    price: 12 # Frontier: 30<12
 
 #Note: The PipeDirection of the PipeNode should be the south-facing version, because the entity starts at an angle of 0 (south)
 

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -87,7 +87,7 @@
     graph: DisposalPipe
     node: broken
   - type: StaticPrice
-    price: 1
+    price: 6 # Frontier 1<6
 
 - type: entity
   id: DisposalPipe

diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -34,7 +34,7 @@
         sound:
           collection: MetalBreak
   - type: StaticPrice
-    price: 25 # Frontier: 75<25 - TODO: material value rework
+    price: 30 # Frontier: 75<30
 
 - type: entity
   abstract: true

diff --git a/Resources/Prototypes/Entities/Structures/Walls/girders.yml b/Resources/Prototypes/Entities/Structures/Walls/girders.yml
@@ -53,7 +53,7 @@
         sound:
           collection: MetalBreak
   - type: StaticPrice
-    price: 10 # Frontier: 30<10
+    price: 15 # Frontier: 30<15
   - type: Climbable # Frontier - Stop AI Abuse
   - type: RCDDeconstructable # Frontier
     cost: 4 # Frontier
@@ -101,7 +101,7 @@
               sound:
                 collection: MetalBreak
     - type: StaticPrice
-      price: 35 # Frontier: 130<25, 25<35
+      price: 70 # Frontier: 130<70
 
 - type: entity
   id: ClockworkGirder

diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -641,7 +641,7 @@
           5: { state: reinf_construct-5, visible: true}
   - type: ReinforcedWallReplacementMarker
   - type: StaticPrice
-    price: 50 # Frontier 250<50
+    price: 115 # Frontier 250<115
   - type: RadiationBlocker
     resistance: 5
   - type: RCDDeconstructable #Frontier
@@ -726,7 +726,7 @@
     key: walls
     base: riveted
   - type: StaticPrice
-    price: 50 # Frontier: 150<50 FRONTIER MERGE: may need review
+    price: 115 # Frontier: 150<115
   - type: RCDDeconstructable #Frontier
     cost: 6 #Frontier
     delay: 8 #Frontier

diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -49,7 +49,7 @@
     damageOverlay:
       sprite: Structures/Windows/cracks.rsi
   - type: StaticPrice
-    price: 30 # Frontier: 100<30
+    price: 50 # Frontier: 100<50
   - type: RadiationBlocker
     resistance: 2
 
@@ -105,7 +105,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice
-    price: 15 # Frontier:50<15
+    price: 25 # Frontier:50<25
   - type: RadiationBlocker
     resistance: 1