Merge branch 'Vault-Overseers:master' into Slowdown_Tile

Vault-Overseers · Nov 21, 2024 · 6b55e07 · 6b55e07
2 parents 4337e3b + b759cff
commit 6b55e07
Show file tree

Hide file tree

Showing 48 changed files with 448 additions and 391 deletions.
diff --git a/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs b/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs
@@ -8,6 +8,6 @@ namespace Content.Server.Cargo.Components;
 [Access(typeof(CargoSystem))]
 public sealed partial class CargoPalletConsoleComponent : Component
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer:typeof(PrototypeIdSerializer<StackPrototype>))]
-    public string CashType = "Credit";
+    [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer: typeof(PrototypeIdSerializer<StackPrototype>))]
+    public string CashType = "Caps";
 }
diff --git a/Content.Server/Cargo/Components/StationBankAccountComponent.cs b/Content.Server/Cargo/Components/StationBankAccountComponent.cs
@@ -9,11 +9,11 @@ namespace Content.Server.Cargo.Components;
 public sealed partial class StationBankAccountComponent : Component
 {
     [ViewVariables(VVAccess.ReadWrite), DataField("balance")]
-    public int Balance = 2000;
+    public int Balance = 500;
 
     /// <summary>
     /// How much the bank balance goes up per second, every Delay period. Rounded down when multiplied.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("increasePerSecond")]
-    public int IncreasePerSecond = 1;
+    public float IncreasePerSecond = 0.05f;
 }
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -23,7 +23,7 @@ public sealed partial class CargoSystem
         /// <summary>
         /// How much time to wait (in seconds) before increasing bank accounts balance.
         /// </summary>
-        private const int Delay = 10;
+        private const int Delay = 200;
 
         /// <summary>
         /// Keeps track of how much time has elapsed since last balance increase.
@@ -84,7 +84,7 @@ private void UpdateConsole(float frameTime)
 
                 foreach (var account in EntityQuery<StationBankAccountComponent>())
                 {
-                    account.Balance += account.IncreasePerSecond * Delay;
+                    account.Balance += (int) (account.IncreasePerSecond * Delay);
                 }
 
                 var query = EntityQueryEnumerator<CargoOrderConsoleComponent>();

diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -4,7 +4,7 @@ cargo-console-menu-account-name-label = Account name:{" "}
 cargo-console-menu-account-name-none-text = None
 cargo-console-menu-shuttle-name-label = Shuttle name:{" "}
 cargo-console-menu-shuttle-name-none-text = None
-cargo-console-menu-points-label = Spesos:{" "}
+cargo-console-menu-points-label = Caps:{" "}
 cargo-console-menu-points-amount = ${$amount}
 cargo-console-menu-shuttle-status-label = Shuttle status:{" "}
 cargo-console-menu-shuttle-status-away-text = Away

diff --git a/Resources/Locale/en-US/cargo/price-gun-component.ftl b/Resources/Locale/en-US/cargo/price-gun-component.ftl
@@ -1,4 +1,4 @@
-price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} spesos.
+price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} caps.
 price-gun-verb-text = Appraisal
 price-gun-verb-message = Appraise {THE($object)}.
 price-gun-bounty-complete = The device confirms that the bounty contained within is completed.
diff --git a/Resources/Maps/N14/MercerIslandSewers.yml b/Resources/Maps/N14/MercerIslandSewers.yml
@@ -112,6 +112,7 @@ entities:
         - 0
   - uid: 2
     components:
+    - type: TradeStation
     - type: MetaData
       name: grid
     - type: Transform

diff --git a/Resources/Maps/N14/MercerIslandSurface.yml b/Resources/Maps/N14/MercerIslandSurface.yml
@@ -159,6 +159,7 @@ entities:
     - type: RadiationGridResistance
   - uid: 2
     components:
+    - type: TradeStation
     - type: MetaData
       name: grid
     - type: Transform

diff --git a/Resources/Maps/N14/SunnyvaleSurface.yml b/Resources/Maps/N14/SunnyvaleSurface.yml
@@ -180,6 +180,7 @@ entities:
   entities:
   - uid: 1
     components:
+    - type: TradeStation
     - type: MetaData
       name: Sunnyvale
     - type: Transform

diff --git a/Resources/Maps/N14/SunnyvaleUnderground.yml b/Resources/Maps/N14/SunnyvaleUnderground.yml
@@ -107,6 +107,7 @@ entities:
         - 0
   - uid: 2
     components:
+    - type: TradeStation
     - type: MetaData
       name: SunnyvaleUnderground
     - type: Transform

diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -6,7 +6,7 @@
   - type: Item
     storedRotation: -90
   - type: Battery
-    pricePerJoule: 0.15
+    pricePerJoule: 0.009
   - type: PowerCell
   - type: Explosive
     explosionType: Default

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -132,7 +132,7 @@
     stackType: Brutepack
     count: 10
   - type: StackPrice
-    price: 5
+    price: 1
 
 - type: entity
   id: Brutepack1
@@ -287,7 +287,7 @@
     stackType: Gauze
     count: 10
   - type: StackPrice
-    price: 10
+    price: 1
 
 - type: entity
   id: Gauze1

diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -87,6 +87,10 @@
     netsync: false
     radius: 1.1 #smallest possible
     color: orange
+  - type: Storage
+    whitelist:
+      tags:
+      - Cigarette
 
 - type: entity
   name: cheap lighter

diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -60,7 +60,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 30
+    price: 1
 
 - type: entity
   name: screwdriver
@@ -121,7 +121,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 30
+    price: 1
 
 - type: entity
   name: wrench
@@ -177,7 +177,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 22
+    price: 1
 
 - type: entity
   name: crowbar
@@ -232,7 +232,7 @@
     materialComposition:
       Steel: 100
   - type: StaticPrice
-    price: 22
+    price: 1
   - type: Prying
 
 - type: entity
@@ -312,7 +312,7 @@
       Steel: 100
       Plastic: 100
   - type: StaticPrice
-    price: 56
+    price: 2
 
 - type: entity
   name: network configurator
@@ -360,7 +360,7 @@
         - key: enum.NetworkConfiguratorUiKey.Link
           type: NetworkConfiguratorBoundUserInterface
     - type: StaticPrice
-      price: 56
+      price: 2
     # - type: GuideHelp
       # guides:
         # - NetworkConfigurator
@@ -413,7 +413,7 @@
 #  - type: DynamicPrice
 #    price: 100
   - type: StaticPrice
-    price: 100
+    price: 10
   - type: MeleeWeapon
     wideAnimationRotation: -90
     attackRate: 0.9
@@ -659,7 +659,7 @@
       Steel: 100
       Wood: 50
   - type: StaticPrice
-    price: 25
+    price: 1
   # Delta V: Adds tool quality for digging
   - type: Tool
     qualities:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -33,4 +33,4 @@
       params:
         volume: -1
   - type: StaticPrice
-    price: 1
+    price: 0.2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -48,7 +48,7 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
   - type: StaticPrice
-    price: 500
+    price: 30
 
 - type: entity
   name: AKMS

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -53,7 +53,7 @@
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
   - type: StaticPrice
-    price: 500
+    price: 10
 
 - type: entity
   name: Atreides

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -42,7 +42,7 @@
       ballistic-ammo: !type:Container
         ents: []
   - type: StaticPrice
-    price: 500
+    price: 10
 
 - type: entity
   name: Bulldog

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -36,7 +36,7 @@
       ballistic-ammo: !type:Container
         ents: []
   - type: StaticPrice
-    price: 500
+    price: 10
 
 - type: entity
   name: Kardashev-Mosin

diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml