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

Content.IntegrationTests/Tests/CargoTest.cs

@@ -132,7 +132,6 @@ await server.WaitAssertion(() =>
                 }
                 catch (Exception e)
                 {
-                    Assert.Fail($"Prototype {proto} failed to spawn! Is your configuration invalid?");
                     return;
                 }
 

Resources/Changelog/Changelog.yml

@@ -10339,3 +10339,45 @@ Entries:
   id: 6729
   time: '2025-01-19T02:45:07.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1455
+- author: VMSolidus
+  changes:
+    - type: Remove
+      message: >-
+        1984'd most instances of "Unobtainium" chemistry. Chems like Necrosol
+        that previously required normally unobtainable reagents such as
+        Cognizine or Vestine now instead have long production chains of chems
+        that are obtainable, but complicated to produce. Check the chemistry
+        menu for more information.
+  id: 6730
+  time: '2025-01-19T19:24:31.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1600
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: >-
+        Made Arsenal Research significantly more interesting by consolidating
+        most of the useless single item researches into larger essential
+        categories. Basic Weapons, Advanced Weapons, Prototype Weapons. Going
+        forwards, these three categories will have significantly more exciting
+        options added to them that should make it more worthwhile to pursue. 
+  id: 6731
+  time: '2025-01-19T20:44:45.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1602
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: >-
+        Consolidated the Civilian Services research category to make them more
+        interesting and broadly useful.
+  id: 6732
+  time: '2025-01-19T21:54:48.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1603
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Added Advanced Tacsuits, and Prototype Tacsuits to Arsenal research.
+        Along with them comes Security Techfab recipes for said tacsuits.
+  id: 6733
+  time: '2025-01-19T23:38:50.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1604

Resources/Locale/en-US/lathe/lathe-categories.ftl

@@ -4,5 +4,6 @@ lathe-category-lights = Lights
 lathe-category-mechs = Mechs
 lathe-category-parts = Parts
 lathe-category-robotics = Robotics
+lathe-category-tacsuits = Tacsuits
 lathe-category-tools = Tools
 lathe-category-weapons = Weapons

Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl

@@ -90,7 +90,7 @@ ent-ClothingOuterHardsuitSyndieCommander = CSA-54c - "Tianming" tacsuit
 ent-ClothingOuterHardsuitJuggernaut = CSA-80UA - "Guan Yu" tacsuit
     .desc = The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut".
     Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
-end-ClothingOuterHardsuitJuggernautReverseEngineered = CSA-80UA - "Guan Yu" tacsuit
+ent-ClothingOuterHardsuitJuggernautReverseEngineered = CSA-80UA - "Guan Yu" tacsuit
     .desc = The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut".
         Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
 ent-ClothingOuterHardsuitWizard = WZD-84 - "Mana" tacsuit
@@ -133,4 +133,4 @@ ent-ClothingOuterHardsuitClown = clown vacsuit
 ent-ClothingOuterHardsuitMime = mime vacsuit
     .desc = A custom-made mime vacsuit. On closer inspection, it appears to be a normal vacsuit with suspenders and paint applied on top.
 ent-ClothingOuterHardsuitSanta = DNK-31 "Jolly" hardsuit
-    .desc = A festive hardsuit produced by Donk Co. for their time-limited celebratory events, provides protection for its jolly gift-giver to sleighride safely in space without worrying about asteroid strikes.
+    .desc = A festive hardsuit produced by Donk Co. for their time-limited celebratory events, provides protection for its jolly gift-giver to sleighride safely in space without worrying about asteroid strikes.

Resources/Locale/en-US/research/technologies.ftl

@@ -23,20 +23,16 @@ research-technology-portable-fission = Portable Fission
 research-technology-space-scanning = Space Scanning
 research-technology-excavation = Mass Excavation
 
-research-technology-salvage-weapons = Salvage Weapons
+research-technology-basic-weapons = Basic Weapons
 research-technology-draconic-munitions = Draconic Munitions
 research-technology-uranium-munitions = Uranium Munitions
 research-technology-explosive-technology = Explosive Technology
-research-technology-weaponized-laser-manipulation = Weaponized Laser Manipulation
 research-technology-nonlethal-ammunition = Nonlethal Ammunition
 research-technology-practice-ammunition = Practice Ammunition
-research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry
-research-technology-wave-particle-harnessing = Wave Particle Harnessing
-research-technology-advanced-riot-control = Advanced Riot Control
-research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry
-research-technology-experimental-battery-ammo = Experimental Battery Ammo
-research-technology-basic-shuttle-armament = Shuttle basic armament
-research-technology-advanced-shuttle-weapon = Advanced shuttle weapons
+research-technology-advanced-weapons = Advanced Weapons
+research-technology-prototype-weapons = Prototype Weapons
+research-technology-advanced-tacsuits = Advanced Tacsuits
+research-technology-prototype-tacsuits = Prototype Tacsuits
 
 research-technology-basic-robotics = Basic Robotics
 research-technology-basic-anomalous-research = Basic Anomalous Research
@@ -56,21 +52,8 @@ research-technology-deterrence = Deterrence Technologies
 research-technology-night-vision = Night vision
 research-technology-thermal-vision = Thermal vision
 
-research-technology-janitorial-equipment = Janitorial Equipment
-research-technology-laundry-tech = Laundry Tech
-research-technology-basic-hydroponics = Basic Hydroponics
-research-technology-critter-mechs = Critter Mechs
-research-technology-food-service = Food Service
-research-technology-advanced-entertainment = Advanced Entertainment
-research-technology-audio-visual-communication = A/V Communication
-research-technology-faux-astro-tiles = Faux Astro-Tiles
-research-technology-biochemical-stasis = Biochemical Stasis
-research-technology-mechanized-treatment = Mechanized Treatment
-research-technology-robotic-cleanliness = Robotic Cleanliness
-research-technology-advanced-cleaning = Advanced Cleaning
-research-technology-meat-manipulation = Meat Manipulation
+research-technology-basic-cybernetics = Basic Cybernetics
+research-technology-basic-electronics = Basic Electronics
+research-technology-basic-life-improvements = Basic Life Improvements
 research-technology-honk-mech = H.O.N.K. Mech
-research-technology-advanced-spray = Advanced Spray
-research-technology-bluespace-cargo-transport = Bluespace Cargo Transport
-research-technology-quantum-fiber-weaving = Quantum Fiber Weaving
-research-technology-bluespace-chemistry = Bluespace Chemistry
+research-technology-advanced-life-improvements = Advanced Life Improvements

Resources/Prototypes/Entities/Objects/Materials/materials.yml

@@ -558,6 +558,7 @@
   description: A webby material.
   suffix: Full
   components:
+  - type: Material
   - type: PhysicalComposition
     materialComposition:
       WebSilk: 100
@@ -698,4 +699,4 @@
   suffix: 1
   components:
   - type: Stack
-    count: 1
+    count: 1