Merge remote-tracking branch 'origin/master' into BoSMidScout

Corvax-Frontier · Nov 25, 2024 · 5fae273 · 5fae273
2 parents d9410f3 + d99f349
commit 5fae273
Show file tree

Hide file tree

Showing 143 changed files with 1,474 additions and 474 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/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -427,6 +427,13 @@ protected void SetCartridgeSpent(EntityUid uid, CartridgeAmmoComponent cartridge
 
         cartridge.Spent = spent;
         Appearance.SetData(uid, AmmoVisuals.Spent, spent);
+
+        // Reduce entity spam from cartridges for N14.
+        if (spent)
+        {
+            var despawn = EnsureComp<TimedDespawnComponent>(uid);
+            despawn.Lifetime = 15f * 60; // 15 minutes
+        }
     }
 
     /// <summary>
@@ -458,10 +465,6 @@ protected void EjectCartridge(
         {
             Audio.PlayPvs(cartridge.EjectSound, entity, AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-1f));
         }
-
-        // Reduce entity spam from cartridges for N14.
-        var despawn = EnsureComp<TimedDespawnComponent>(entity);
-        despawn.Lifetime = 15f * 60; // 15 minutes
     }
 
     protected IShootable EnsureShootable(EntityUid uid)

diff --git a/Resources/Locale/en-US/_Nuclear14/job-names.ftl b/Resources/Locale/en-US/_Nuclear14/job-names.ftl
@@ -1,25 +1,25 @@
 # Midwest Brotherhood
-job-name-bos-mid-paladin-comm = Midwest Brotherhood Paladin Commander
+job-name-bos-mid-paladin-comm = Midwest BoS Paladin Commander
 job-description-bos-mid-paladin-comm = Lead the Midwest Brotherhood of Steel on their mission.
-job-name-bos-mid-paladin = Midwest Brotherhood Paladin
+job-name-bos-mid-paladin = Midwest BoS Paladin
 job-description-bos-mid-paladin = Follow the Paladin Commander on their mission.
-job-name-bos-mid-knight = Midwest Brotherhood Knight
+job-name-bos-mid-knight = Midwest BoS Knight
 job-description-bos-mid-knight = Follow the Paladin Commander on their mission.
-job-name-bos-mid-scribe = Midwest Brotherhood Scribe
+job-name-bos-mid-scribe = Midwest BoS Scribe
 job-description-bos-mid-scribe = Conduct scientific missions and research for your brotherhood chapter.
-job-name-bos-mid-squire = Midwest Brotherhood Squire
+job-name-bos-mid-squire = Midwest BoS Squire
 job-description-bos-mid-squire = Follow your Knight into battle and do their bidding.
 
 # Washington Brotherhood
-job-name-bos-washington-commander = Washington Brotherhood Commander
+job-name-bos-washington-commander = Washington BoS Paladin Commander
 job-description-bos-washington-commander = Lead the Washington Brotherhood of Steel to glory in their mission.
-job-name-bos-washington-initiate = Washington Brotherhood Initiate
+job-name-bos-washington-initiate = Washington BoS Initiate
 job-description-bos-washington-initiate = Prove yourself to your chapter to progress through the ranks.
-job-name-bos-washington-knight = Washington Brotherhood Knight
+job-name-bos-washington-knight = Washington BoS Knight
 job-description-bos-washington-knight = The military arm of the Brotherhood. Defend your chapter in their objectives and manufacture equipment.
-job-name-bos-washington-paladin = Washington Brotherhood Captain
+job-name-bos-washington-paladin = Washington BoS Paladin
 job-description-bos-washington-paladin = Protect the Brotherhood at all costs. Take the Commanders will out into the wasteland.
-job-name-bos-washington-scribe = Washington Brotherhood Scribe
+job-name-bos-washington-scribe = Washington BoS Scribe
 job-description-bos-washington-scribe = Conduct scientific missions and research for your brotherhood chapter.
 
 # Caravan

diff --git a/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl b/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl
@@ -44,9 +44,9 @@ undecided-loadout-category-morale-description =
     1 NCR spear flag, 1 9mm pistol, 2 9mm magazines, 1 combat knife,
     and a C ration MRE.
 
-undecided-loadout-category-medic-name = Medic Kit
+undecided-loadout-category-medic-name = Combat Lifesaver Kit
 undecided-loadout-category-medic-description =
-    A crate containing all a NCR medic needs to patrol on the wasteland.
+    A crate containing all an NCR CLS needs to patrol the wasteland.
     Includes 1 NCR leather vest, 1 medical belt, 1 9mm SMG,
     4 9mm SMG magazines, 1 combat knife, and a C ration MRE.
 
@@ -172,8 +172,8 @@ undecided-loadout-category-bos-scribe-field-name = Brotherhood Scribe Field Kit
 undecided-loadout-category-bos-scribe-field-description =
     A crate containing everything a member of Brotherhood scribes.
         For supporting your unit from the back.
-    Includes 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
-     1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
+    Includes 1 AEP-7 pistol, 2 energy cells, 1 scribe webbing,
+     1 field scribe clothing, 1 knife, 2 stimpak, 1 gauze, 1 bruise pack, 1 ointment, 1 C ration MRE
 
 undecided-loadout-category-bos-scribe-engineer-name = Brotherhood Scribe Engineer Kit
 undecided-loadout-category-bos-scribe-engineer-description =
@@ -234,8 +234,8 @@ undecided-loadout-category-bos-washington-scribe-field-name = Brotherhood Scribe
 undecided-loadout-category-bos-washington-scribe-field-description =
     A crate containing everything a member of Brotherhood scribes.
         For supporting your unit from the back.
-    Includes 1 AEP-7 pistol, 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
-     1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
+    Includes 1 AEP-7 pistol, 1 AEP-7 pistol, 2 energy cells, 1 scribe webbing,
+     1 field scribe clothing, 1 knife, 2 stimpak, 1 gauze, 1 bruise pack, 1 ointment, 1 C ration MRE
 
 undecided-loadout-category-bos-washington-scribe-engineer-name = Brotherhood Scribe Engineer Kit
 undecided-loadout-category-bos-washington-scribe-engineer-description =

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/Locale/en-US/deltav/accessories/hair.ftl b/Resources/Locale/en-US/deltav/accessories/hair.ftl
@@ -10,3 +10,13 @@ marking-HumanHairClassicCrewcut = Crewcut Classic
 marking-HumanHairClassicLong = Long 1 (Classic)
 marking-HumanHairClassicLong2 = Long 2 (Classic)
 marking-HumanHairClassicLong3 = Long 3 (Classic)
+marking-ZetaHairLongSpikehair = Long Spikehair
+marking-ZetaHairNerfish = Nerfish
+marking-ZetaHairPlantpoofs = Plantish Poofs
+marking-ZetaHairQuadspike = Quadspike
+marking-ZetaHairRattyRoyalty = Ratty Royalty
+marking-ZetaHairShortMessy = Short and Messy
+marking-ZetaHairShortSpikehair = Short Spikehair
+marking-ZetaHairSpikehawk = Spikehawk
+marking-ZetaHairPolitical = The Political
+marking-ZetaHairZetaBasicBraids = Basic Braids (Zeta)
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/Corvax/Roles/ai_factions.yml b/Resources/Prototypes/Corvax/Roles/ai_factions.yml
@@ -7,11 +7,17 @@
   - BrotherhoodMidwestSecureArea # turrets
   - BrotherhoodWashingtonSecureArea # turrets
   - CaravanCompany
+  - CaravanCompanySecureArea # turrets
   - NCR
+  - NCRSecureArea # turrets
   - Rangers
   - Townsfolk
   - Tribal
   - Vault
+  - VaultSecureArea # turrets
   - WastelandInsect
   - WastelandAnimal
   - Zetan
+  - Feral
+  - HostileRobot
+  - Raider
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