Merge branch 'upstream-upstream' of https://github.com/frosty-dev/ss14-core into upstream-upstream

Content.Client/StatusIcon/StatusIconOverlay.cs

@@ -4,19 +4,16 @@ using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using System.Numerics;
-using Robust.Shared.Prototypes;
 
 namespace Content.Client.StatusIcon;
 
 public sealed class StatusIconOverlay : Overlay
 {
     [Dependency] private readonly IEntityManager _entity = default!;
-    [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     private readonly SpriteSystem _sprite;
     private readonly TransformSystem _transform;
     private readonly StatusIconSystem _statusIcon;
-    private readonly ShaderInstance _shader;
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
 
@@ -27,7 +24,6 @@ public sealed class StatusIconOverlay : Overlay
         _sprite = _entity.System<SpriteSystem>();
         _transform = _entity.System<TransformSystem>();
         _statusIcon = _entity.System<StatusIconSystem>();
-        _shader = _prototype.Index<ShaderPrototype>("unshaded").Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -40,8 +36,6 @@ public sealed class StatusIconOverlay : Overlay
         var scaleMatrix = Matrix3.CreateScale(new Vector2(1, 1));
         var rotationMatrix = Matrix3.CreateRotation(-eyeRot);
 
-        handle.UseShader(_shader);
-
         var query = _entity.AllEntityQueryEnumerator<StatusIconComponent, SpriteComponent, TransformComponent, MetaDataComponent>();
         while (query.MoveNext(out var uid, out var comp, out var sprite, out var xform, out var meta))
         {
@@ -105,7 +99,5 @@ public sealed class StatusIconOverlay : Overlay
                 handle.DrawTexture(texture, position);
             }
         }
-
-        handle.UseShader(null);
     }
 }

Content.Shared/Atmos/Atmospherics.cs

@@ -207,7 +207,7 @@ namespace Content.Shared.Atmos
         /// <summary>
         ///     This is calculated to help prevent singlecap bombs (Overpowered tritium/oxygen single tank bombs)
         /// </summary>
-        public const float MinimumTritiumOxyburnEnergy = 143000f;
+        public const float MinimumTritiumOxyburnEnergy = 430000f;
 
         public const float TritiumBurnOxyFactor = 100f;
         public const float TritiumBurnTritFactor = 10f;

Content.Shared/CCVar/CCVars.cs

@@ -202,7 +202,7 @@ namespace Content.Shared.CCVar
         ///     Prototype to use for map pool.
         /// </summary>
         public static readonly CVarDef<string>
-            GameMapPool = CVarDef.Create("game.map_pool", "WhiteMapPool", CVar.SERVERONLY);
+            GameMapPool = CVarDef.Create("game.map_pool", "DefaultMapPool", CVar.SERVERONLY);
 
         /// <summary>
         /// The depth of the queue used to calculate which map is next in rotation.
@@ -1002,7 +1002,7 @@ namespace Content.Shared.CCVar
         ///     Whether gas differences will move entities.
         /// </summary>
         public static readonly CVarDef<bool> SpaceWind =
-            CVarDef.Create("atmos.space_wind", false, CVar.SERVERONLY);
+            CVarDef.Create("atmos.space_wind", true, CVar.SERVERONLY);
 
         /// <summary>
         ///     Divisor from maxForce (pressureDifference * 2.25f) to force applied on objects.
@@ -1051,7 +1051,7 @@ namespace Content.Shared.CCVar
 		///     Also looks weird on slow spacing for unrelated reasons. If you do want to enable this, you should probably turn on instaspacing.
         /// </summary>
         public static readonly CVarDef<bool> MonstermosRipTiles =
-            CVarDef.Create("atmos.monstermos_rip_tiles", false, CVar.SERVERONLY);
+            CVarDef.Create("atmos.monstermos_rip_tiles", true, CVar.SERVERONLY);
 
         /// <summary>
         ///     Whether explosive depressurization will cause the grid to gain an impulse.
@@ -1065,7 +1065,7 @@ namespace Content.Shared.CCVar
         ///     1.0 for instant spacing, 0.2 means 20% of remaining air lost each time
         /// </summary>
         public static readonly CVarDef<float> AtmosSpacingEscapeRatio =
-            CVarDef.Create("atmos.mmos_spacing_speed", 0.05f, CVar.SERVERONLY);
+            CVarDef.Create("atmos.mmos_spacing_speed", 1f, CVar.SERVERONLY);
 
         /// <summary>
         ///     Minimum amount of air allowed on a spaced tile before it is reset to 0 immediately in kPa

Content.Shared/Item/HeldSpeedModifierSystem.cs

@@ -11,13 +11,14 @@ public sealed class HeldSpeedModifierSystem : EntitySystem
 {
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
 
+    /*
     /// <inheritdoc/>
     public override void Initialize()
     {
         SubscribeLocalEvent<HeldSpeedModifierComponent, GotEquippedHandEvent>(OnGotEquippedHand);
         SubscribeLocalEvent<HeldSpeedModifierComponent, GotUnequippedHandEvent>(OnGotUnequippedHand);
         SubscribeLocalEvent<HeldSpeedModifierComponent, HeldRelayedEvent<RefreshMovementSpeedModifiersEvent>>(OnRefreshMovementSpeedModifiers);
-    }
+    }*/
 
     private void OnGotEquippedHand(Entity<HeldSpeedModifierComponent> ent, ref GotEquippedHandEvent args)
     {

Content.Shared/PneumaticCannon/PneumaticCannonComponent.cs

@@ -30,7 +30,7 @@ public sealed partial class PneumaticCannonComponent : Component
     /// </summary>
     [DataField("gasUsage")]
     [ViewVariables(VVAccess.ReadWrite)]
-    public float GasUsage = 0.142f;
+    public float GasUsage = 2f;
 
     /// <summary>
     ///     Base projectile speed at default power.

Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml

@@ -8,6 +8,7 @@
     contents:
       - id: ClothingMaskBreath
       - id: EmergencyOxygenTankFilled
+      - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
@@ -27,6 +28,7 @@
     contents:
       - id: ClothingMaskBreath
       - id: ExtendedEmergencyOxygenTankFilled
+      - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
@@ -47,6 +49,7 @@
     contents:
       - id: ClothingMaskGasSecurity
       - id: EmergencyOxygenTankFilled
+      - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
@@ -67,6 +70,7 @@
     contents:
       - id: ClothingMaskBreathMedical
       - id: EmergencyOxygenTankFilled
+      - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
@@ -92,6 +96,7 @@
     contents:
       - id: ClothingMaskBreath
       - id: EmergencyFunnyOxygenTankFilled
+      - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
@@ -110,6 +115,7 @@
     contents:
       - id: ClothingMaskGasSyndicate
       - id: ExtendedEmergencyOxygenTankFilled
+      - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE

Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml

@@ -28,10 +28,10 @@
   - type: GasTank
     outputPressure: 21.3
     air:
-      # 31 minutes
+      # 94 minutes
-      volume: 5
+      volume: 15
       moles:
-        - 2.051379050 # oxygen
+        - 6.154137219 # oxygen
       temperature: 293.15
 
 - type: entity
@@ -49,10 +49,10 @@
     - type: GasTank
       outputPressure: 21.3
       air:
-      # 4 minutes
+        # 13 minutes
-      volume: 0.66
+        volume: 2
         moles:
-        - 0.270782035 # oxygen
+          - 0.820551629 # oxygen
         temperature: 293.15
 
 - type: entity
@@ -79,10 +79,10 @@
     - type: GasTank
       outputPressure: 21.3
       air:
-      # 9 minutes
+        # 38 minutes
-      volume: 1.5
+        volume: 6
         moles:
-        - 0.615413715 # oxygen
+          - 2.461654887 # oxygen
         temperature: 293.15
 
 - type: entity
@@ -109,10 +109,10 @@
     - type: GasTank
       outputPressure: 21.3
       air:
-      # 15 minutes
+        # 63 minutes
-      volume: 2.5
+        volume: 10
         moles:
-        - 1.025689525 # oxygen
+          - 4.102758145 # oxygen
         temperature: 293.15
 
 - type: entity
@@ -160,12 +160,12 @@
     - type: GasTank
       outputPressure: 101.3
       air:
-      # 6 minutes due to output pressure
+        # 20 minutes due to output pressure
-      volume: 5
+        volume: 15
         moles:
-        - 0.451303391 # 22% oxygen
+          - 1.353910188 # 22% oxygen
-        - 1.600075659 # 78% nitrogen
+          - 4.800227031 # 78% nitrogen
-        # 2.051379050       total
+          # 6.154137219       total
         temperature: 293.15
 
 - type: entity
@@ -175,12 +175,13 @@
   name: nitrogen tank
   components:
     - type: GasTank
+      outputPressure: 21.3
       air:
-      # 31 minutes
+        # 94 minutes
-      volume: 5
+        volume: 15
         moles:
           - 0           # oxygen not included
-        - 2.051379050 # nitrogen
+          - 6.154137219 # nitrogen
         temperature: 293.15
 
 - type: entity
@@ -197,18 +198,18 @@
       #    30.3975   optimal output pressure
       outputPressure: 30.4
       air:
-      # only 22 minutes due to pressure
+        # only 66 minutes due to pressure
-      volume: 5
+        volume: 15
         moles:
-        - 1.435965335 # 70% oxygen
+          - 4.30789605 # 70% oxygen
           - 0 # nitrogen
           - 0 # CO2
           - 0 # plasma
           - 0 # tritium
           - 0 # water vapor
           - 0 # ammonia
-        - 0.615413715 # 30% N2O
+          - 1.84624116 # 30% N2O
-        # 2.051379050       total
+          # 6.15413721       total
         temperature: 293.15
 
 - type: entity

Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml

@@ -30,14 +30,14 @@
       - id: Screwdriver
       - id: Crowbar
       - id: Wirecutter
-      - id: CableApcStack10
+      - id: CableApcStack30
-      - id: CableMVStack10
+      - id: CableMVStack30
       - id: trayScanner
         prob: 0.9
       - id: ClothingHandsGlovesColorYellow
         prob: 0.05
         orGroup: GlovesOrWires
-      - id: CableHVStack10
+      - id: CableHVStack30
         orGroup: GlovesOrWires
 
 - type: entity
@@ -51,14 +51,14 @@
       - id: Screwdriver
       - id: Crowbar
       - id: Wirecutter
-      - id: CableApcStack10
+      - id: CableApcStack30
-      - id: CableMVStack10
+      - id: CableMVStack30
       - id: trayScanner
         prob: 0.9
       - id: ClothingHandsGlovesColorYellow
         prob: 0.05
         orGroup: GlovesOrWires
-      - id: CableHVStack10
+      - id: CableHVStack30
         orGroup: GlovesOrWires
 
 - type: entity

Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml

@@ -7,6 +7,7 @@
     FoodCondimentPacketKetchup: 5
   emaggedInventory:
     KitchenKnife: 2
+    SpaceMedipen: 3
     ClothingMaskBreath: 3
     EmergencyOxygenTankFilled: 3
     DrinkNukieCan: 2

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -268,6 +268,7 @@
     Telecrystal: 11
   categories:
     - UplinkExplosives
+  saleLimit: 1
   conditions:
   - !type:StoreWhitelistCondition
     whitelist:
@@ -483,6 +484,7 @@
     Telecrystal: 65
   categories:
     - UplinkUtility
+  saleLimit: 1
   conditions:
     - !type:StoreWhitelistCondition
       whitelist:
@@ -707,6 +709,7 @@
     Telecrystal: 20
   categories:
   - UplinkImplants
+  saleLimit: 1
   conditions:
   - !type:StoreWhitelistCondition
     whitelist:
@@ -1000,6 +1003,7 @@
     Telecrystal: 8
   categories:
   - UplinkTools
+  saleLimit: 1
   conditions:
   - !type:BuyerWhitelistCondition
     blacklist:
@@ -1015,11 +1019,6 @@
     Telecrystal: 2
   categories:
   - UplinkTools
-  conditions:
-  - !type:StoreWhitelistCondition
-    blacklist:
-      tags:
-      - NukeOpsUplink
 
 # Job Specific
 
@@ -1037,19 +1036,19 @@
     whitelist:
     - Botanist
 
-- type: listing
+#- type: listing
-  id: uplinkRiggedBoxingGlovesPassenger
+#  id: uplinkRiggedBoxingGlovesPassenger
-  name: uplink-rigged-boxing-gloves-name
+#  name: uplink-rigged-boxing-gloves-name
-  description: uplink-rigged-boxing-gloves-desc
+#  description: uplink-rigged-boxing-gloves-desc
-  productEntity: ClothingHandsGlovesBoxingRigged
+#  productEntity: ClothingHandsGlovesBoxingRigged
-  cost:
+#  cost:
-    Telecrystal: 6
+#    Telecrystal: 6
-  categories:
+#  categories:
-    - UplinkJob
+#    - UplinkJob
-  conditions:
+#  conditions:
-    - !type:BuyerJobCondition
+#    - !type:BuyerJobCondition
-      whitelist:
+#      whitelist:
-        - Passenger
+#        - Passenger
 
 - type: listing
   id: uplinkRiggedBoxingGlovesBoxer
@@ -1060,6 +1059,7 @@
     Telecrystal: 4
   categories:
   - UplinkJob
+  saleLimit: 1
   conditions:
   - !type:BuyerJobCondition
     whitelist:
@@ -1157,6 +1157,7 @@
   - !type:BuyerJobCondition
     whitelist:
     - Clown
+  saleLimit: 1
 
 - type: listing
   id: uplinkHotPotato
@@ -1188,6 +1189,7 @@
   - !type:BuyerDepartmentCondition
     whitelist:
     - Science
+  saleLimit: 1
 
 - type: listing
   id: uplinkProximityMine
@@ -1311,6 +1313,7 @@
     Telecrystal: 8
   categories:
   - UplinkArmor
+  saleLimit: 1
 
 - type: listing
   id: UplinkHardsuitSyndieElite
@@ -1321,6 +1324,7 @@
     Telecrystal: 10
   categories:
   - UplinkArmor
+  saleLimit: 1
 
 - type: listing
   id: UplinkClothingOuterHardsuitJuggernaut
@@ -1382,7 +1386,7 @@
   icon: { sprite: /Textures/Objects/Weapons/Melee/e_shield.rsi, state: eshield-on }
   productEntity: EnergyShield
   cost:
-    Telecrystal: 6
+    Telecrystal: 3
   categories:
   - UplinkMisc
   saleLimit: 1

Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

@@ -186,9 +186,9 @@
         - DoorElectronics
         - APCElectronics
         - InflatableWallStack5
-        - CableHVStack10
+        - CableHVStack30
-        - CableMVStack10
+        - CableMVStack30
-        - CableApcStack10
+        - CableApcStack30
         - PetCarrier
       chance: 0.6
       offset: 0.0

Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml

@@ -2,7 +2,7 @@
   id: GauzeLefteyePatch
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid]
+  speciesRestriction: [Moth, Dwarf, Human]
   coloring:
     default:
       type:
@@ -16,7 +16,7 @@
   id: GauzeLefteyeTape
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  speciesRestriction: [Moth, Dwarf, Human, Reptilian]
   coloring:
     default:
       type:
@@ -30,7 +30,7 @@
   id: GauzeRighteyePatch
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid]
+  speciesRestriction: [Moth, Dwarf, Human]
   coloring:
     default:
       type:
@@ -44,7 +44,7 @@
   id: GauzeRighteyeTape
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Reptilian, Arachnid]
+  speciesRestriction: [Moth, Dwarf, Human, Reptilian]
   coloring:
     default:
       type:
@@ -58,7 +58,7 @@
   id: GauzeBlindfold
   bodyPart: Eyes
   markingCategory: Head
-  speciesRestriction: [Moth, Dwarf, Human, Arachnid]
+  speciesRestriction: [Moth, Dwarf, Human]
   coloring:
     default:
       type:

Resources/Prototypes/Entities/Mobs/Player/dragon.yml

@@ -157,10 +157,6 @@
     spawned:
     - id: FoodMeatDragon
       amount: 1
-  - type: MeleeWeapon
-    damage:
-      groups:
-        Brute: 12
 
 - type: entity
   id: ActionSpawnRift

Resources/Prototypes/Entities/Mobs/Species/base.yml

@@ -253,7 +253,7 @@
   - type: Barotrauma
     damage:
       types:
-        Blunt: 0.55 #per second, scales with pressure and other constants.
+        Blunt: 0.35 #per second, scales with pressure and other constants.
   - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.
     allowedStates:
     - Alive

Resources/Prototypes/Entities/Mobs/Species/slime.yml

@@ -35,7 +35,7 @@
   - type: Barotrauma
     damage:
       types:
-        Blunt: 0.60 #per second, scales with pressure and other constants. Slighty more than humans.
+        Blunt: 0.45 #per second, scales with pressure and other constants. Slighty more than humans.
   - type: Reactive
     groups:
       Flammable: [ Touch ]

Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml

@@ -40,7 +40,7 @@
     wideAnimationRotation: 180
     damage:
       types:
-        Blunt: 10
+        Blunt: 12
     soundHit:
       path: /Audio/Weapons/smash.ogg
   - type: Tool

Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml

@@ -75,6 +75,16 @@
   - type: Stack
     count: 10
 
+- type: entity
+  parent: CableHVStack
+  id: CableHVStack30
+  suffix: 30
+  components:
+  - type: Sprite
+    state: coilhv-30
+  - type: Stack
+    count: 30
+
 - type: entity
   parent: CableHVStack10
   id: CableHVStackLingering10
@@ -140,6 +150,16 @@
   - type: Stack
     count: 10
 
+- type: entity
+  parent: CableMVStack
+  id: CableMVStack30
+  suffix: 30
+  components:
+  - type: Sprite
+    state: coilmv-30
+  - type: Stack
+    count: 30
+
 - type: entity
   parent: CableMVStack10
   id: CableMVStackLingering10
@@ -204,6 +224,16 @@
     - type: Stack
       count: 10
 
+- type: entity
+  parent: CableApcStack
+  id: CableApcStack30
+  suffix: 30
+  components:
+    - type: Sprite
+      state: coillv-30
+    - type: Stack
+      count: 30
+
 - type: entity
   parent: CableApcStack10
   id: CableApcStackLingering10

Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml

@@ -22,12 +22,6 @@
     - key: enum.SharedGasTankUiKey.Key
       type: GasTankBoundUserInterface
   - type: GasTank
-    outputPressure: 21.3
-    air:
-      # If gas tank volume is changed, adjust MinimumTritiumOxyburnEnergy in Atmospherics.cs by the same proportions
-      volume: 5
-      temperature: 293.15
-    tankLowPressure: 30.0
   - type: Explosive
     explosionType: Default
     maxIntensity: 20
@@ -63,8 +57,12 @@
     sprite: Objects/Tanks/oxygen.rsi
   - type: Item
     sprite: Objects/Tanks/oxygen.rsi
-  - type: Clothing
+  - type: GasTank
-    sprite: Objects/Tanks/oxygen.rsi
+    outputPressure: 21.3
+    air:
+      volume: 15
+      temperature: 293.15
+    tankLowPressure: 30.0
 
 - type: entity
   parent: OxygenTank
@@ -80,7 +78,7 @@
     sprite: Objects/Tanks/yellow.rsi
 
 - type: entity
-  parent: GasTankRoundBase
+  parent: OxygenTank
   id: NitrogenTank
   name: nitrogen tank
   description: A standard cylindrical gas tank for nitrogen.
@@ -93,7 +91,7 @@
     sprite: Objects/Tanks/red.rsi
 
 - type: entity
-  parent: GasTankRoundBase
+  parent: OxygenTank
   id: EmergencyOxygenTank
   name: emergency oxygen tank
   description: An easily portable tank for emergencies. Contains very little oxygen, rated for survival use only.
@@ -105,7 +103,7 @@
     sprite: Objects/Tanks/emergency.rsi
   - type: GasTank
     air:
-      volume: 0.66
+      volume: 2
       temperature: 293.15
   - type: Clothing
     sprite: Objects/Tanks/emergency.rsi
@@ -146,7 +144,7 @@
     sprite: Objects/Tanks/emergency_extended.rsi
   - type: GasTank
     air:
-      volume: 1.5
+      volume: 6
       temperature: 293.15
   - type: Clothing
     sprite: Objects/Tanks/emergency_extended.rsi
@@ -176,7 +174,7 @@
     sprite: Objects/Tanks/emergency_double.rsi
   - type: GasTank
     air:
-      volume: 2.5
+      volume: 10
       temperature: 293.15
   - type: Clothing
     sprite: Objects/Tanks/emergency_double.rsi
@@ -220,6 +218,9 @@
   components:
   - type: GasTank
     outputPressure: 101.3
+    air:
+      volume: 15
+      temperature: 293.15
 
 - type: entity
   parent: GasTankRoundBase
@@ -233,6 +234,9 @@
     sprite: Objects/Tanks/anesthetic.rsi
   - type: GasTank
     outputPressure: 30.4
+    air:
+      volume: 15
+      temperature: 293.15
   - type: Clothing
     sprite: Objects/Tanks/anesthetic.rsi
 

Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml

@@ -48,12 +48,11 @@
       slots:
         - Back
     - type: GasTank
-      outputPressure: 21.3
+      outputPressure: 21.27825
       air:
-        volume: 5
+        volume: 70
         temperature: 293.15
     - type: Jetpack
-      moleUsage: 0.00085
     - type: Appearance
     - type: StaticPrice
       price: 100
@@ -98,12 +97,11 @@
   - type: GasTank
     outputPressure: 42.6
     air:
-      # 13 minutes of thrust
+      volume: 70
-      volume: 5
       temperature: 293.15
       moles:
-        - 1.025689525 # oxygen
+        - 11.315
-        - 1.025689525 # nitrogen
+        - 11.315
 
 #Empty black
 - type: entity
@@ -131,12 +129,11 @@
   - type: GasTank
     outputPressure: 42.6
     air:
-      # 13 minutes of thrust
+      volume: 70
-      volume: 5
       temperature: 293.15
       moles:
-        - 1.025689525 # oxygen
+        - 11.315
-        - 1.025689525 # nitrogen
+        - 11.315
 
 #Empty captain
 - type: entity
@@ -171,12 +168,11 @@
   - type: GasTank
     outputPressure: 42.6
     air:
-      # 13 minutes of thrust
+      volume: 70
-      volume: 5
       temperature: 293.15
       moles:
-        - 1.025689525 # oxygen
+        - 11.315
-        - 1.025689525 # nitrogen
+        - 11.315
 
 #Empty mini
 - type: entity
@@ -198,7 +194,7 @@
     - type: GasTank
       outputPressure: 42.6
       air:
-        volume: 1.5
+        volume: 20
 
 # Filled mini
 - type: entity
@@ -210,12 +206,11 @@
   - type: GasTank
     outputPressure: 42.6
     air:
-      # 4 minutes of thrust
-      volume: 1.5
       temperature: 293.15
+      volume: 20
       moles:
-        - 0.307706858 # oxygen
+      - 0.747
-        - 0.307706858 # nitrogen
+      - 0.747
 
 #Empty security
 - type: entity
@@ -243,12 +238,11 @@
   - type: GasTank
     outputPressure: 42.6
     air:
-      # 13 minutes thrust
+      volume: 70
-      volume: 5
       temperature: 293.15
       moles:
-        - 1.025689525 # oxygen
+        - 11.315
-        - 1.025689525 # nitrogen
+        - 11.315
 
 #Empty void
 - type: entity
@@ -278,9 +272,8 @@
   - type: GasTank
     outputPressure: 42.6
     air:
-      # 13 minutes of thrust
+      volume: 70
-      volume: 5
       temperature: 293.15
       moles:
-        - 1.025689525 # oxygen
+        - 11.315
-        - 1.025689525 # nitrogen
+        - 11.315

Resources/Prototypes/Entities/Objects/Tools/toolbox.yml

@@ -27,7 +27,7 @@
   - type: MeleeWeapon
     damage:
       types:
-        Blunt: 12
+        Blunt: 15
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml

@@ -39,7 +39,7 @@
     attackRate: 0.75
     damage:
       types:
-        Slash: 16
+        Slash: 33
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
   - type: Item
@@ -69,14 +69,14 @@
     damage:
       types:
         Blunt: 10
-        Slash: 10
+        Slash: 20
         Structural: 5
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 5
+        Blunt: 4
-        Slash: 5
+        Slash: 12
         Structural: 10
   - type: Item
     size: Ginormous

Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml

@@ -19,14 +19,15 @@
       types:
         # axes are kinda like sharp hammers, you know?
         Blunt: 5
-        Slash: 10
+        Slash: 13
         Structural: 10
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Slash: 10
+        Blunt: 2.5
-        Structural: 40
+        Slash: 10.5
+        Structural: 60
   - type: Item
     size: Ginormous
   - type: Clothing

Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml

@@ -14,7 +14,7 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Slash: 10
+        Slash: 12
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
   - type: Sprite

Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml

@@ -46,7 +46,7 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Slash: 15
+        Slash: 20
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
@@ -102,7 +102,7 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Slash: 15
+        Slash: 20
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
@@ -125,7 +125,7 @@
     attackRate: 0.75
     damage:
       types:
-        Slash: 20
+        Slash: 33
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item

Resources/Prototypes/Maps/White/Whitebagel.yml

@@ -1,55 +0,0 @@
-- type: gameMap
-  id: WhiteBagel
-  mapName: 'Bagel Station'
-  mapPath: /Maps/White/Whitebagel.yml
-  minPlayers: 0
-  stations:
-    Bagel:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Bagel Station {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: '14'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-            CargoTechnician: [ 3, 3 ]
-            Passenger: [ -1, -1 ]
-            Bartender: [ 2, 2 ]
-            Botanist: [ 3, 3 ]
-            Chef: [ 2, 2 ]
-            Clown: [ 1, 1 ]
-            Janitor: [ 3, 3 ]
-            Mime: [ 1, 1 ]
-            Captain: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 4, 4 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 3, 3 ]
-            Chemist: [ 2, 3 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 4, 4 ]
-            HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 4, 4 ]
-            Chaplain: [ 1, 1 ]
-            Warden: [ 1, 1 ]
-            Librarian: [ 1, 1 ]
-            Lawyer: [ 2, 2 ]
-            Quartermaster: [ 1, 1 ]
-            SalvageSpecialist: [ 3, 3 ]
-            Musician: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 2, 2 ]
-            MedicalIntern: [ 2, 2 ]
-            ServiceWorker: [ 2, 2 ]
-            SecurityCadet: [ 2, 2 ]
-            Reporter: [ 2, 2 ]
-            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 2, 2 ]
-            Paramedic: [ 1, 1 ]

Resources/Prototypes/Maps/White/Whitebox.yml

@@ -1,54 +0,0 @@
-- type: gameMap
-  id: WhiteBox
-  mapName: 'Box Station'
-  mapPath: /Maps/White/Whitebox.yml
-  minPlayers: 0
-  stations:
-    Boxstation:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Box Station {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'TG'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-            CargoTechnician: [ 3, 3 ]
-            Passenger: [ -1, -1 ]
-            Bartender: [ 2, 2 ]
-            Botanist: [ 3, 3 ]
-            Chef: [ 2, 2 ]
-            Clown: [ 1, 1 ]
-            Janitor: [ 3, 3 ]
-            Mime: [ 1, 1 ]
-            Captain: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 4, 4 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 4, 4 ]
-            Chemist: [ 3, 3 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 5, 5 ]
-            HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 6, 6 ]
-            Chaplain: [ 2, 2 ]
-            Warden: [ 1, 1 ]
-            Librarian: [ 2, 2 ]
-            Lawyer: [ 2, 2 ]
-            Quartermaster: [ 1, 1 ]
-            SalvageSpecialist: [ 3, 3 ]
-            Musician: [ 2, 2 ]
-            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 4, 4 ]
-            MedicalIntern: [ 4, 4 ]
-            ServiceWorker: [ 4, 4 ]
-            SecurityCadet: [ 4, 4 ]
-            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 4, 4 ]
-            Paramedic: [ 1, 1 ]

Resources/Prototypes/Maps/White/Whitekettle.yml

@@ -1,55 +0,0 @@
-- type: gameMap
-  id: WhiteKettle
-  mapName: 'Kettle'
-  mapPath: /Maps/White/Whitekettle.yml
-  minPlayers: 0
-  stations:
-    Kettle:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Kettle {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: '14'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-            CargoTechnician: [ 3, 3 ]
-            Passenger: [ -1, -1 ]
-            Bartender: [ 1, 2 ]
-            Botanist: [ 3, 4 ]
-            Chef: [ 2, 3 ]
-            Clown: [ 1, 2 ]
-            Janitor: [ 4, 4 ]
-            Mime: [ 1, 2 ]
-            Captain: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 4, 6 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 3, 5 ]
-            Chemist: [ 2, 3 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 4, 6 ]
-            ResearchAssistant: [ 4, 4 ]
-            HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 4, 6 ]
-            Chaplain: [ 1, 2 ]
-            Warden: [ 1, 1 ]
-            Librarian: [ 1, 2 ]
-            Lawyer: [ 2, 3 ]
-            Quartermaster: [ 1, 1 ]
-            SalvageSpecialist: [ 3, 4 ]
-            Musician: [ 1, 2 ]
-            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 4, 4 ]
-            MedicalIntern: [ 4, 4 ]
-            ServiceWorker: [ 4, 4 ]
-            SecurityCadet: [ 4, 4 ]
-            Detective: [ 1, 1 ]
-            Zookeeper: [1, 1]
-            Paramedic: [2, 2]

Resources/Prototypes/Maps/White/Whitemeta.yml

@@ -1,54 +0,0 @@
-- type: gameMap
-  id: WhiteMeta
-  mapName: 'Meta Station'
-  mapPath: /Maps/White/Whitemeta.yml
-  minPlayers: 0
-  stations:
-    Meta:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Meta Station {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'TG'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-            CargoTechnician: [ 3, 3 ]
-            Passenger: [ -1, -1 ]
-            Bartender: [ 2, 2 ]
-            Botanist: [ 3, 3 ]
-            Chef: [ 2, 2 ]
-            Clown: [ 1, 1 ]
-            Janitor: [ 3, 3 ]
-            Mime: [ 1, 1 ]
-            Captain: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 4, 4 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 4, 4 ]
-            Chemist: [ 3, 3 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 6, 6 ]
-            HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 6, 6 ]
-            Chaplain: [ 2, 2 ]
-            Warden: [ 1, 1 ]
-            Librarian: [ 2, 2 ]
-            Lawyer: [ 2, 2 ]
-            Quartermaster: [ 1, 1 ]
-            SalvageSpecialist: [ 3, 3 ]
-            Musician: [ 2, 2 ]
-            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 4, 4 ]
-            MedicalIntern: [ 4, 4 ]
-            ServiceWorker: [ 4, 4 ]
-            SecurityCadet: [ 4, 4 ]
-            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 4, 4 ]
-            Paramedic: [ 1, 1 ]

Resources/Prototypes/Maps/White/WonderBox.yml

@@ -1,62 +0,0 @@
-- type: gameMap
-  id: WonderBox
-  mapName: 'WonderBox Station'
-  mapPath: /Maps/White/WonderBox.yml
-  minPlayers: 20
-  stations:
-    WonderBoxStation:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} WonderBox Station {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'TG'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-            CargoTechnician: [ 6, 6 ]
-            Passenger: [ -1, -1 ]
-            Bartender: [ 2, 2 ]
-            Botanist: [ 3, 3 ]
-            Chef: [ 2, 2 ]
-            Clown: [ 1, 1 ]
-            Janitor: [ 4, 4 ]
-            Mime: [ 1, 1 ]
-            Captain: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 10, 10 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 5, 5 ]
-            Paramedic: [ 4, 4 ]
-            Musician: [ 1, 1 ]
-            Chemist: [ 3, 3 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 8, 8 ]
-            HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 6, 6 ]
-            Chaplain: [ 1, 1 ]
-            Warden: [ 1, 1 ]
-            Librarian: [ 2, 2 ]
-            Lawyer: [ 2, 2 ]
-            Quartermaster: [ 1, 1 ]
-            SalvageSpecialist: [ 6, 6 ]
-            AtmosphericTechnician: [ 4, 4 ]
-            TechnicalAssistant: [ 4, 4 ]
-            MedicalIntern: [ 3, 3 ]
-            ServiceWorker: [ 3, 3 ]
-            SecurityCadet: [ 6, 6 ]
-            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 3, 3 ]
-            MedicalCyborg: [ 2, 0 ]
-            SecurityCyborg: [ 2, 0 ]
-            EngineerCyborg: [ 2, 0 ]
-            NekoCyborg: [ 2, 0 ]
-            SeniorResearcher: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]

Resources/Prototypes/Objectives/objectiveGroups.yml

@@ -33,7 +33,7 @@
   weights:
     EscapeShuttleObjective: 1
     DieObjective: 0.05
-    #HijackShuttleObjective: 0.02
+    HijackShuttleObjective: 0.02
 
 - type: weightedRandom
   id: TraitorObjectiveGroupSocial

Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml

@@ -25,6 +25,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtCargo
+  innerClothingSkirt: ClothingUniformJumpskirtCargo
   satchel: ClothingBackpackSatchelCargoFilled
   duffelbag: ClothingBackpackDuffelCargoFilled

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -49,6 +49,6 @@
     underwearb: ClothingUnderwearBottomBoxersQM # White-Underwear
   underweart: ClothingUnderwearTopBraQM # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesQM # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtQM
+  innerClothingSkirt: ClothingUniformJumpskirtQM
   satchel: ClothingBackpackSatchelQuartermasterFilled
   duffelbag: ClothingBackpackDuffelQuartermasterFilled

Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml

@@ -20,6 +20,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtColorGrey
+  innerClothingSkirt: ClothingUniformJumpskirtColorGrey
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml

@@ -31,6 +31,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtBartender
+  innerClothingSkirt: ClothingUniformJumpskirtBartender
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml

@@ -27,6 +27,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtHydroponics
+  innerClothingSkirt: ClothingUniformJumpskirtHydroponics
   satchel: ClothingBackpackSatchelHydroponicsFilled
   duffelbag: ClothingBackpackDuffelHydroponicsFilled

Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml

@@ -25,6 +25,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtChaplain
+  innerClothingSkirt: ClothingUniformJumpskirtChaplain
   satchel: ClothingBackpackSatchelChaplainFilled
   duffelbag: ClothingBackpackDuffelChaplainFilled

Resources/Prototypes/Roles/Jobs/Civilian/chef.yml

@@ -33,6 +33,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtChef
+  innerClothingSkirt: ClothingUniformJumpskirtChef
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml

@@ -29,7 +29,7 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtJanitor
+  innerClothingSkirt: ClothingUniformJumpskirtJanitor
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled
 

Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml

@@ -25,6 +25,6 @@
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
   inhand:
     - BriefcaseBrownFilled
-  innerclothingskirt: ClothingUniformJumpskirtColorLightBrown
+  innerClothingSkirt: ClothingUniformJumpskirtColorLightBrown
   satchel: ClothingBackpackSatchelLibrarianFilled
   duffelbag: ClothingBackpackDuffelLibrarianFilled

Resources/Prototypes/Roles/Jobs/Civilian/mime.yml

@@ -34,7 +34,7 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtMime
+  innerClothingSkirt: ClothingUniformJumpskirtMime
   satchel: ClothingBackpackSatchelMimeFilled
   duffelbag: ClothingBackpackDuffelMimeFilled
 

Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml

@@ -1,4 +1,4 @@
-- type: job
+- type: job
   id: ServiceWorker
   name: job-name-serviceworker
   description: job-description-serviceworker
@@ -25,6 +25,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtBartender
+  innerClothingSkirt: ClothingUniformJumpskirtBartender
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -49,6 +49,6 @@
     underwearb: ClothingUnderwearBottomBoxersCap # White-Underwear
   underweart: ClothingUnderwearTopBraCap # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesCap # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtCaptain
+  innerClothingSkirt: ClothingUniformJumpskirtCaptain
   satchel: ClothingBackpackSatchelCaptainFilled
   duffelbag: ClothingBackpackDuffelCaptainFilled

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -71,6 +71,6 @@
     underwearb: ClothingUnderwearBottomBoxersHOP # White-Underwear
   underweart: ClothingUnderwearTopBraHOP # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesHOP # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtHoP
+  innerClothingSkirt: ClothingUniformJumpskirtHoP
   satchel: ClothingBackpackSatchelHOPFilled
   duffelbag: ClothingBackpackDuffelHOPFilled

Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml

@@ -30,6 +30,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtAtmos
+  innerClothingSkirt: ClothingUniformJumpskirtAtmos
   satchel: ClothingBackpackSatchelAtmosphericsFilled
   duffelbag: ClothingBackpackDuffelAtmosphericsFilled

Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml

@@ -51,6 +51,6 @@
     underwearb: ClothingUnderwearBottomBoxersCE # White-Underwear
   underweart: ClothingUnderwearTopBraCE # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesCE # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtChiefEngineer
+  innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer
   satchel: ClothingBackpackSatchelChiefEngineerFilled
   duffelbag: ClothingBackpackDuffelChiefEngineerFilled

Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml

@@ -32,6 +32,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtEngineering
+  innerClothingSkirt: ClothingUniformJumpskirtEngineering
   satchel: ClothingBackpackSatchelEngineeringFilled
   duffelbag: ClothingBackpackDuffelEngineeringFilled

Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml

@@ -29,6 +29,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtColorYellow
+  innerClothingSkirt: ClothingUniformJumpskirtColorYellow
   satchel: ClothingBackpackSatchelEngineeringFilled
   duffelbag: ClothingBackpackDuffelEngineeringFilled

Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml

@@ -13,7 +13,7 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtColorBlack
+  innerClothingSkirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled
 
@@ -30,6 +30,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtColorBlack
+  innerClothingSkirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -267,7 +267,7 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpsuitColorBrown
+  innerClothingSkirt: ClothingUniformJumpsuitColorBrown
   satchel: ClothingBackpackDuffelCBURNFilled
   duffelbag: ClothingBackpackDuffelCBURNFilled
 

Resources/Prototypes/Roles/Jobs/Justice/inspector.yml

@@ -34,6 +34,6 @@
   underwearb: ClothingUnderwearBottomPantiesInspector # White-Underwear
   inhand:
     - BriefcaseBrownFilled
-  innerclothingskirt: ClothingUniformJumpskirtInspector
+  innerClothingSkirt: ClothingUniformJumpskirtInspector
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Medical/chemist.yml

@@ -30,6 +30,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtChemistry
+  innerClothingSkirt: ClothingUniformJumpskirtChemistry
   satchel: ClothingBackpackSatchelChemistryFilled
   duffelbag: ClothingBackpackDuffelChemistryFilled

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -47,6 +47,6 @@
     underwearb: ClothingUnderwearBottomBoxersCMO # White-Underwear
   underweart: ClothingUnderwearTopBraCMO # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesCMO # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtCMO
+  innerClothingSkirt: ClothingUniformJumpskirtCMO
   satchel: ClothingBackpackSatchelCMOFilled
   duffelbag: ClothingBackpackDuffelCMOFilled

Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml

@@ -29,6 +29,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtMedicalDoctor
+  innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor
   satchel: ClothingBackpackSatchelMedicalFilled
   duffelbag: ClothingBackpackDuffelMedicalFilled

Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml

@@ -28,6 +28,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtColorWhite
+  innerClothingSkirt: ClothingUniformJumpskirtColorWhite
   satchel: ClothingBackpackSatchelMedicalFilled
   duffelbag: ClothingBackpackDuffelMedicalFilled

Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml

@@ -27,6 +27,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtColorWhite
+  innerClothingSkirt: ClothingUniformJumpskirtColorWhite
   satchel: ClothingBackpackSatchelScienceFilled
   duffelbag: ClothingBackpackDuffelScienceFilled

Resources/Prototypes/Roles/Jobs/Science/research_director.yml

@@ -43,6 +43,6 @@
     underwearb: ClothingUnderwearBottomBoxersRD # White-Underwear
   underweart: ClothingUnderwearTopBraRD # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesRD # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtResearchDirector
+  innerClothingSkirt: ClothingUniformJumpskirtResearchDirector
   satchel: ClothingBackpackSatchelResearchDirectorFilled
   duffelbag: ClothingBackpackDuffelResearchDirectorFilled

Resources/Prototypes/Roles/Jobs/Science/scientist.yml

@@ -26,6 +26,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraWhite # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtScientist
+  innerClothingSkirt: ClothingUniformJumpskirtScientist
   satchel: ClothingBackpackSatchelScienceFilled
   duffelbag: ClothingBackpackDuffelScienceFilled

Resources/Prototypes/Roles/Jobs/Security/detective.yml

@@ -40,6 +40,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtDetective
+  innerClothingSkirt: ClothingUniformJumpskirtDetective
   satchel: ClothingBackpackSatchelSecurityFilledDetective
   duffelbag: ClothingBackpackDuffelSecurityFilledDetective

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -54,6 +54,6 @@
     underwearb: ClothingUnderwearBottomBoxersHOS # White-Underwear
   underweart: ClothingUnderwearTopBraHOS # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesHOS # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtHoS
+  innerClothingSkirt: ClothingUniformJumpskirtHoS
   satchel: ClothingBackpackSatchelHOSFilled
   duffelbag: ClothingBackpackDuffelHOSFilled

Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml

@@ -37,6 +37,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtColorRed
+  innerClothingSkirt: ClothingUniformJumpskirtColorRed
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled

Resources/Prototypes/Roles/Jobs/Security/security_officer.yml

@@ -39,6 +39,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtSec
+  innerClothingSkirt: ClothingUniformJumpskirtSec
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled

Resources/Prototypes/Roles/Jobs/Security/warden.yml

@@ -41,6 +41,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpskirtWarden
+  innerClothingSkirt: ClothingUniformJumpskirtWarden
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled

Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml

@@ -23,6 +23,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraSports # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: UniformShortsRedWithTop
+  innerClothingSkirt: UniformShortsRedWithTop
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml

@@ -23,6 +23,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraSports # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpsuitPsychologist
+  innerClothingSkirt: ClothingUniformJumpsuitPsychologist
   satchel: ClothingBackpackSatchelMedicalFilled
   duffelbag: ClothingBackpackDuffelMedicalFilled

Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml

@@ -21,6 +21,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraSports # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpsuitJournalist
+  innerClothingSkirt: ClothingUniformJumpsuitJournalist
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml

@@ -22,6 +22,6 @@
     underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
   underweart: ClothingUnderwearTopBraSports # White-Underwear
   underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  innerclothingskirt: ClothingUniformJumpsuitSafari
+  innerClothingSkirt: ClothingUniformJumpsuitSafari
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/White/Catalog/uplink.yml

@@ -73,6 +73,9 @@
     Telecrystal: 2
   categories:
   - UplinkImplants
+  conditions:
+  - !type:ListingLimitedStockCondition # To prevent infinitely cheinsmoking using multiple implants
+    stock: 1
 
 - type: listing
   id: UplinkHardlightSpearImplanter

Resources/Prototypes/White/Emotes/harpy_emotes.yml

@@ -53,7 +53,7 @@
   chatMessages: [пиукает]
   chatTriggers:
     - пиу
-    - пиу-пиу
+    - пеу-пиу
     - пиукает.
     - пиукает
     - pew.
@@ -92,10 +92,9 @@
   category: Vocal
   chatMessages: [щёлкает]
   chatTriggers:
-    - щелкает клювом
     - щелк
     - щёлкает
-    - щёлкает клювом
+    - щелкает
     - щёлк
     - clicks.
     - click.
@@ -152,8 +151,12 @@
   category: Vocal
   chatMessages: [тарахтит]
   chatTriggers:
+    - щебечет
+    - щебечет.
+    - щебечет!
     - тарахтит
-    - тараътит.
+    - тарахтит.
+    - тарахтит!
     - chitter
     - chitter.
     - chitter!

Resources/ServerInfo/Guidebook/Survival.xml

@@ -12,6 +12,7 @@
 - Если вы при смерти и можете упасть бес сознания в любую секунду, воспользуйтесь экстренным или космическим медипеном из вашего аварийного набора. Изначально он находится в рюкзаке. Применение гарантирует, что в течении некоторого времени вы будете способны бороться за свою жизнь, и возможно, в итоге спастись. Экстренный медипен также может быть использовано для поднятия людей, находящихся в данный момент бес сознания.
 <Box>
 <GuideEntityEmbed Entity="EmergencyMedipen"/>
+<GuideEntityEmbed Entity="SpaceMedipen"/>
 </Box>
 - В вашем наборе есть дыхательная маска и малый кислородный баллон, которые помогут вам дольше продержаться в аварийной ситуации.
 <Box>

Resources/migration.yml

@@ -157,9 +157,6 @@ TransmitterSubspaceStockPart: null
 # 2024-01-10
 ClothingHeadHatHoodRad: null
 
-# 2024-01-12
-SpaceMedipen: null
-
 # 2024-01-18
 ClothingHeadHelmetVoidParamed: null