new-frontiers-14 · Cheackraze · Jul 27, 2023 · Jul 23, 2023 · Jul 23, 2023 · Jul 23, 2023
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -10,7 +10,9 @@
             "args": [
                 "build",
                 "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
-                "/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+                "/consoleloggerparameters:NoSummary", // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+                "-c",
+                "Tools"
             ],
             "group": {
                 "kind": "build",
@@ -34,4 +36,4 @@
             "problemMatcher": "$msCompile"
         }
     ]
-}
+}
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
@@ -1,11 +1,11 @@
 - type: vendingMachineInventory
   id: EngiVendInventory
   startingInventory:
+    ClothingHandsGlovesColorYellow: 8
+    Multitool: 8
     ClothingEyesGlassesMeson: 10
     ClothingHeadHatWelding: 6
-    Multitool: 8
-    NetworkConfigurator: 15
-    PowerCellMedium: 15
-    ClothingHandsGlovesColorYellow: 8
     InflatableWallStack1: 24
     InflatableDoorStack1: 8
+    PowerCellMedium: 15
+    NetworkConfigurator: 15
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
@@ -1,14 +1,18 @@
 - type: vendingMachineInventory
   id: SalvageEquipmentInventory
   startingInventory:
-    Crowbar: 8
+    WeaponCrusherGlaive: 5
+    WeaponProtoKineticAccelerator: 5
+    WeaponCrusher: 5
+    WeaponCrusherDagger: 5
+    MiningDrill: 8
     Pickaxe: 8
+    Crowbar: 8
     OreBag: 6
-    Flare: 4
-    FlashlightLantern: 15
+    WelderIndustrialAdvanced: 2
+    WelderIndustrial: 3
     Floodlight: 10
-    HandheldGPSBasic: 14
     RadioHandheld: 5
-    WeaponCrusher: 5
-    WeaponCrusherDagger: 5
-    WeaponProtoKineticAccelerator: 5
+    HandheldGPSBasic: 14
+    Flare: 20
+    FlashlightLantern: 15
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
@@ -1,17 +1,19 @@
 - type: vendingMachineInventory
   id: YouToolInventory
   startingInventory:
-    CableApcStack: 20
+    Screwdriver: 15
     Crowbar: 15
-    Welder: 13
     Wirecutter: 15
     Wrench: 15
-    Screwdriver: 15
+    Welder: 13
+    ClothingHandsGlovesColorYellowBudget: 30
+    CableApcStack: 20
+    CableMVStack: 20
+    CableHVStack: 20
+    FlashlightLantern: 15
     trayScanner: 15
-    NetworkConfigurator: 13
     GasAnalyzer: 15
-    FlashlightLantern: 15
-    ClothingHandsGlovesColorYellowBudget: 30
+    NetworkConfigurator: 13
     AirlockPainter: 20
   # Some engineer forgot to take the multitool out the youtool when working on it, happens.
   contrabandInventory:

diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -75,7 +75,7 @@
     sprite: Clothing/Eyes/Glasses/meson.rsi
   - type: EyeProtection
   - type: StaticPrice
-    price: 300
+    price: 155
 
 - type: entity
   parent: ClothingEyesBase

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -168,7 +168,7 @@
     fiberColor: fibers-yellow
   - type: FingerprintMask
   - type: StaticPrice
-    price: 60
+    price: 45.5
 
 - type: entity
   parent: ClothingHandsGlovesColorYellow

diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -12,6 +12,8 @@
   - type: Tag
     tags:
     - HelmetEVA
+  - type: StaticPrice
+    price: 25
 
 #Large EVA Helmet
 - type: entity
@@ -36,7 +38,7 @@
     sprite: Clothing/Head/Helmets/eva_syndicate.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/eva_syndicate.rsi
- 
+
 #Cosmonaut Helmet
 - type: entity
   parent: ClothingHeadEVAHelmetBase

diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -30,7 +30,7 @@
     - HamsterWearable
     - WhitelistChameleon
   - type: StaticPrice
-    price: 60
+    price: 35.5
 
 - type: entity
   parent: WeldingMaskBase

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -76,6 +76,7 @@
     tags:
     - Hardsuit
 
+
 - type: entity
   abstract: true
   parent: ClothingOuterBase

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -28,6 +28,8 @@
     sprintModifier: 0.80
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitBasic
+  - type: StaticPrice
+    price: 155
 
 #Atmospherics Hardsuit
 - type: entity
@@ -121,6 +123,8 @@
         Caustic: 0.9
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSpatio
+  - type: StaticPrice
+    price: 275
 
 #Salvage Hardsuit
 - type: entity
@@ -169,7 +173,7 @@
     lowPressureMultiplier: 10000
   - type: ClothingSpeedModifier
     walkModifier: 0.7
-    sprintModifier: 0.7   
+    sprintModifier: 0.7
   - type: Armor
     modifiers:
       coefficients:
@@ -239,7 +243,7 @@
     damageCoefficient: 0.4
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitWarden
-    
+
 #Captain's Hardsuit
 - type: entity
   parent: ClothingOuterHardsuitBase

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -12,6 +12,8 @@
   - type: Tag
     tags:
     - SuitEVA
+  - type: StaticPrice
+    price: 75
 
 #Syndicate EVA
 - type: entity
@@ -107,4 +109,4 @@
         Heat: 0.90
         Radiation: 0.75
         Caustic: 0.5
-  - type: GroupExamine
+  - type: GroupExamine
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -92,6 +92,8 @@
     layers:
     - state: crypt_silver
     - state: com_label
+  - type: StaticPrice
+    price: 7.5
 
 - type: entity
   parent: EncryptionKey

diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -22,3 +22,5 @@
   - type: Tag
     tags:
     - Radio
+  - type: StaticPrice
+    price: 85.5
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -155,6 +155,8 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 75
 
 - type: entity
   name: broken floodlight

diff --git a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
@@ -39,6 +39,7 @@
   placement:
     mode: SnapgridCenter
 
+
 - type: entity
   id: InflatableDoor
   name: inflatable door

diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -96,6 +96,8 @@
   - type: Battery
     maxCharge: 720
     startingCharge: 720
+  - type: StaticPrice
+    price: 75
 
 - type: entity
   id: PowerCellMediumPrinted

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -22,3 +22,5 @@
       tags:
         - Ore
   - type: Dumpable
+  - type: StaticPrice
+    price: 55.5
diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
@@ -30,7 +30,7 @@
     tags:
       - DroneUsable
   - type: StaticPrice
-    price: 80
+    price: 150
   - type: PhysicalComposition
     materialComposition:
       Steel: 400

diff --git a/Resources/Prototypes/Entities/Objects/Tools/airlock_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/airlock_painter.yml
@@ -18,4 +18,4 @@
         tags:
           - PaintableAirlock
     - type: StaticPrice
-      price: 40
+      price: 250
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: 5
+    price: 0.334
 
 - type: entity
   id: CableHVStack

diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -74,3 +74,5 @@
         startValue: 10.0
         endValue: 1.0
         property: Radius
+  - type: StaticPrice
+    price: 7.5
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -70,7 +70,7 @@
     netsync: false
   - type: Appearance
   - type: StaticPrice
-    price: 40
+    price: 15.5
 
 - type: entity
   name: seclite

diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -184,6 +184,8 @@
       slots:
         - Back
         - suitStorage
+    - type: StaticPrice
+      price: 32.5
 
 - type: entity
   parent: GasTankBase

diff --git a/Resources/Prototypes/Entities/Objects/Tools/gps.yml b/Resources/Prototypes/Entities/Objects/Tools/gps.yml
@@ -12,3 +12,5 @@
   - type: Item
     sprite: Objects/Devices/gps.rsi
   - type: HandheldGPS
+  - type: StaticPrice
+    price: 55
diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
@@ -22,6 +22,8 @@
     - type: Tag
       tags:
         - DroneUsable
+    - type: StaticPrice
+      price: 7.5
 # TODO: Add stack sprites + visuals.
 
 - type: entity
@@ -48,6 +50,8 @@
     - type: Tag
       tags:
         - DroneUsable
+    - type: StaticPrice
+      price: 15
 # TODO: Add stack sprites + visuals.
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -185,6 +185,8 @@
       outputPressure: 42.6
       air:
         volume: 20
+    - type: StaticPrice
+      price: 125
 
 # Filled mini
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
@@ -22,4 +22,4 @@
     tags:
       - DroneUsable
   - type: StaticPrice
-    price: 60
+    price: 150
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -41,7 +41,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 30
+    price: 19.5
 
 - type: entity
   name: screwdriver
@@ -84,7 +84,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 30
+    price: 15
 
 - type: entity
   name: wrench
@@ -154,7 +154,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 22
+    price: 15.5
 
 - type: entity
   parent: Crowbar
@@ -216,7 +216,7 @@
       Steel: 100
       Plastic: 100
   - type: StaticPrice
-    price: 56
+    price: 165
 
 - type: entity
   name: network configurator
@@ -264,7 +264,7 @@
       tags:
         - DroneUsable
     - type: StaticPrice
-      price: 56
+      price: 100
     - type: GuideHelp
       guides:
         - NetworkConfigurator

diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -63,7 +63,7 @@
     materialComposition:
       Steel: 200
   - type: StaticPrice
-    price: 40
+    price: 25.5
   - type: IgnitionSource
     temperature: 700
 
@@ -84,6 +84,8 @@
         - ReagentId: WeldingFuel
           Quantity: 250
         maxVol: 250
+  - type: StaticPrice
+    price: 1755
 
 - type: entity
   name: advanced industrial welding tool
@@ -104,6 +106,8 @@
         maxVol: 250
   - type: Tool
     speed: 1.3
+  - type: StaticPrice
+    price: 2575
 
 - type: entity
   name: experimental welding tool