Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

# Conflicts: # .github/CODEOWNERS # Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs # Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs # Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs # Resources/Prototypes/Entities/Effects/chemistry_effects.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml # Resources/Prototypes/GameRules/meteorswarms.yml # Resources/Prototypes/Procedural/dungeon_configs.yml
2025-05-27 12:21:14 +03:00
parent 67f8135a96 854c506a75
commit d5fbdbdec0
1165 changed files with 76878 additions and 44718 deletions
--- a/Resources/Prototypes/AppearanceCustomization/station_ai.yml
+++ b/Resources/Prototypes/AppearanceCustomization/station_ai.yml
@@ -0,0 +1,163 @@
+# Groups
+- type: stationAiCustomizationGroup
+  id: StationAiCoreIconography
+  name: station-ai-customization-core
+  category: CoreIconography
+  protoIds:
+  - StationAiIconAi
+  - StationAiIconAngel
+  - StationAiIconBliss
+  - StationAiIconClown
+  - StationAiIconDorf
+  - StationAiIconHeartline
+  - StationAiIconSmiley
+
+- type: stationAiCustomizationGroup
+  id: StationAiHolograms
+  name: station-ai-customization-hologram
+  category: Hologram
+  protoIds:
+  - StationAiHologramFemale
+  - StationAiHologramMale
+  - StationAiHologramFace
+  - StationAiHologramCat
+  - StationAiHologramDog
+
+# Iconography
+- type: stationAiCustomization
+  abstract: true
+  id: StationAiIconBase
+  previewKey: Occupied
+  previewBackground:
+    sprite: Mobs/Silicon/station_ai.rsi
+    state: base
+
+- type: stationAiCustomization
+  parent: StationAiIconBase
+  id: StationAiIconAi
+  name: station-ai-icon-ai
+  layerData:
+    Occupied:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: ai
+    Dead:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: ai_dead
+
+- type: stationAiCustomization
+  parent: StationAiIconBase
+  id: StationAiIconAngel
+  name: station-ai-icon-angel
+  layerData:
+    Occupied:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: ai_angel
+    Dead:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: ai_angel_dead
+
+- type: stationAiCustomization
+  parent: StationAiIconBase
+  id: StationAiIconBliss
+  name: station-ai-icon-bliss
+  layerData:
+    Occupied:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: ai_bliss
+    Dead:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: ai_dead
+
+- type: stationAiCustomization
+  parent: StationAiIconBase
+  id: StationAiIconClown
+  name: station-ai-icon-clown
+  layerData:
+    Occupied:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: ai_clown
+    Dead:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: ai_clown_dead
+
+- type: stationAiCustomization
+  parent: StationAiIconBase
+  id: StationAiIconDorf
+  name: station-ai-icon-dorf
+  layerData:
+    Occupied:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: ai_dorf
+    Dead:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: ai_dead
+
+- type: stationAiCustomization
+  parent: StationAiIconBase
+  id: StationAiIconHeartline
+  name: station-ai-icon-heartline
+  layerData:
+    Occupied:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: "ai_heartline"
+    Dead:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: "ai_heartline_dead"
+
+- type: stationAiCustomization
+  parent: StationAiIconBase
+  id: StationAiIconSmiley
+  name: station-ai-icon-smiley
+  layerData:
+    Occupied:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: "ai_smiley"
+    Dead:
+      sprite: Mobs/Silicon/station_ai.rsi
+      state: "ai_dead"
+
+# Holograms
+- type: stationAiCustomization
+  id: StationAiHologramFemale
+  name: station-ai-hologram-female
+  previewKey: Hologram
+  layerData:
+    Hologram:
+      sprite: Mobs/Silicon/holograms.rsi
+      state: ai_female
+
+- type: stationAiCustomization
+  id: StationAiHologramMale
+  name: station-ai-hologram-male
+  previewKey: Hologram
+  layerData:
+    Hologram:
+      sprite: Mobs/Silicon/holograms.rsi
+      state: ai_male
+
+- type: stationAiCustomization
+  id: StationAiHologramFace
+  name: station-ai-hologram-face
+  previewKey: Hologram
+  layerData:
+    Hologram:
+      sprite: Mobs/Silicon/holograms.rsi
+      state: ai_face
+
+- type: stationAiCustomization
+  id: StationAiHologramCat
+  name: station-ai-hologram-cat
+  previewKey: Hologram
+  layerData:
+    Hologram:
+      sprite: Mobs/Silicon/holograms.rsi
+      state: ai_cat
+
+- type: stationAiCustomization
+  id: StationAiHologramDog
+  name: station-ai-hologram-dog
+  previewKey: Hologram
+  layerData:
+    Hologram:
+      sprite: Mobs/Silicon/holograms.rsi
+      state: ai_dog
--- a/Resources/Prototypes/Body/Organs/vox.yml
+++ b/Resources/Prototypes/Body/Organs/vox.yml
@@ -27,14 +27,7 @@
    specialDigestible:
      tags:
      - Trash
-      - Fruit
-      - ReptilianFood
-      - Meat
-      - Pill
-      - Crayon
-      - Paper
-      - VoxFood
-      - Vegetable
+    isSpecialDigestibleExclusive: false

 - type: entity
  parent: OrganHumanLiver
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -94,3 +94,28 @@
      - ReagentId: Blood
        Quantity: 20

+- type: entity
+  parent: PartAnimal
+  id: LeftHandSmartCorgi
+  name: corgi hand
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - state: l_hand
+  - type: BodyPart
+    partType: Hand
+    symmetry: Left
+
+- type: entity
+  parent: PartAnimal
+  id: RightHandSmartCorgi
+  name: corgi hand
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - state: r_hand
+  - type: BodyPart
+    partType: Hand
+    symmetry: Right
--- a/Resources/Prototypes/Body/Prototypes/Specific/smartcorgi.yml
+++ b/Resources/Prototypes/Body/Prototypes/Specific/smartcorgi.yml
@@ -0,0 +1,28 @@
+- type: body
+  id: SmartCorgi
+  name: corgi
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - righthand
+      - lefthand
+      - legs
+      organs:
+        brain: OrganHumanBrain # feels strange but it is what it is
+        lungs: OrganAnimalLungs
+        stomach: OrganAnimalStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    lefthand:
+      part: LeftHandSmartCorgi
+    righthand:
+      part: RightHandSmartCorgi
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -750,23 +750,12 @@
      - Flash

 - type: cargoBounty
-  id: BountyTeethSpaceCarp
-  reward: 800
-  description: bounty-description-tooth-space-carp
+  id: BountyRing
+  reward: 12500
+  description: bounty-description-ring
  entries:
-  - name: bounty-item-tooth-space-carp
-    amount: 8
+  - name: bounty-item-ring
+    amount: 2
    whitelist:
      tags:
-      - ToothSpaceCarp
-
- type: cargoBounty
-  id: BountyTeethSharkminnow
-  reward: 1500
-  description: bounty-description-tooth-sharkminnow
-  entries:
-  - name: bounty-item-tooth-sharkminnow
-    amount: 5
-    whitelist:
-      tags:
-      - ToothSharkminnow
+      - Ring
--- a/Resources/Prototypes/Catalog/Bounties/groups.yml
+++ b/Resources/Prototypes/Catalog/Bounties/groups.yml
@@ -0,0 +1,11 @@
+- type: cargoBountyGroup
+  id: StationBounty
+
+- type: cargoBountyGroup
+  id: SalvageJobTier1
+
+- type: cargoBountyGroup
+  id: SalvageJobTier2
+
+- type: cargoBountyGroup
+  id: SalvageJobTier3
--- a/Resources/Prototypes/Catalog/Bounties/salvage_jobs.yml
+++ b/Resources/Prototypes/Catalog/Bounties/salvage_jobs.yml
@@ -0,0 +1,173 @@
+# NOTE: if you add any bounties to this, you need to go to Resources/Prototypes/Entities/Stations/base.yml and adjust the thresholds on BaseStationSalvageJobs.
+# If you don't do this, you won't raise the limit for completing a given rank and may throw off some balance.
+
+# Tier 1
+
+- type: cargoBounty
+  id: BountyTeethSpaceCarp
+  reward: 7500
+  description: bounty-description-tooth-space-carp
+  group: SalvageJobTier1
+  sprite:
+    sprite: Mobs/Aliens/Carps/space.rsi
+    state: icon
+  entries:
+  - name: bounty-item-tooth-space-carp
+    amount: 10
+    whitelist:
+      tags:
+      - ToothSpaceCarp
+
+- type: cargoBounty
+  id: BountySalvageScrap
+  reward: 7500
+  description: bounty-description-salvage-scrap
+  group: SalvageJobTier1
+  sprite:
+    sprite: Objects/Materials/Scrap/generic.rsi
+    state: metal-1
+  entries:
+  - name: bounty-item-scrap
+    amount: 10
+    whitelist:
+      tags:
+      - SalvageScrap
+
+- type: cargoBounty
+  id: BountySalvageOreGold
+  reward: 7500
+  description: bounty-description-salvage-ore-gold
+  group: SalvageJobTier1
+  sprite:
+    sprite: Objects/Materials/ore.rsi
+    state: gold
+  entries:
+  - name: bounty-item-ore-gold
+    amount: 45
+    whitelist:
+      tags:
+      - OreGold
+
+- type: cargoBounty
+  id: BountySalvageOreSilver
+  reward: 7500
+  description: bounty-description-salvage-ore-silver
+  group: SalvageJobTier1
+  sprite:
+    sprite: Objects/Materials/ore.rsi
+    state: silver
+  entries:
+  - name: bounty-item-ore-silver
+    amount: 45
+    whitelist:
+      tags:
+      - OreSilver
+
+# Tier 2
+
+- type: cargoBounty
+  id: BountyTeethSharkminnow
+  reward: 12500
+  description: bounty-description-tooth-sharkminnow
+  group: SalvageJobTier2
+  sprite:
+    sprite: Mobs/Aliens/Carps/sharkminnow.rsi
+    state: icon
+  entries:
+  - name: bounty-item-tooth-sharkminnow
+    amount: 3
+    whitelist:
+      tags:
+      - ToothSharkminnow
+
+- type: cargoBounty
+  id: BountySalvageOrePlasma
+  reward: 12500
+  description: bounty-description-salvage-ore-plasma
+  group: SalvageJobTier2
+  sprite:
+    sprite: Objects/Materials/ore.rsi
+    state: plasma
+  entries:
+  - name: bounty-item-ore-plasma
+    amount: 45
+    whitelist:
+      tags:
+      - OrePlasma
+
+- type: cargoBounty
+  id: BountySalvageOreUranium
+  reward: 12500
+  description: bounty-description-salvage-ore-uranium
+  group: SalvageJobTier2
+  sprite:
+    sprite: Objects/Materials/ore.rsi
+    state: uranium
+  entries:
+  - name: bounty-item-ore-uranium
+    amount: 30
+    whitelist:
+      tags:
+      - OreUranium
+
+- type: cargoBounty
+  id: BountySalvageOreBananium
+  reward: 12500
+  description: bounty-description-salvage-ore-bananium
+  group: SalvageJobTier2
+  sprite:
+    sprite: Objects/Materials/ore.rsi
+    state: bananium
+  entries:
+  - name: bounty-item-ore-bananium
+    amount: 30
+    whitelist:
+      tags:
+      - OreBananium
+
+# Tier 3
+
+- type: cargoBounty
+  id: BountyGoliathPlates
+  reward: 20000
+  description: bounty-description-plates
+  group: SalvageJobTier3
+  sprite:
+    sprite: Mobs/Aliens/Asteroid/goliath.rsi
+    state: goliath
+  entries:
+  - name: bounty-item-plates
+    amount: 6
+    whitelist:
+      tags:
+      - GoliathPlate
+
+- type: cargoBounty
+  id: BountyHivelordRemains
+  reward: 20000
+  description: bounty-description-remains
+  group: SalvageJobTier3
+  sprite:
+    sprite: Mobs/Aliens/Asteroid/hivelord.rsi
+    state: hivelord
+  entries:
+  - name: bounty-item-remains
+    amount: 3
+    whitelist:
+      tags:
+      - HivelordRemains
+
+- type: cargoBounty
+  id: BountySalvageDiamond
+  reward: 20000
+  description: bounty-description-diamond
+  group: SalvageJobTier3
+  sprite:
+    sprite: Objects/Materials/materials.rsi
+    state: diamond
+  entries:
+  - name: bounty-item-diamond
+    amount: 3
+    whitelist:
+      tags:
+      - Diamond
--- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
@@ -27,3 +27,13 @@
  cost: 750
  category: cargoproduct-category-name-cargo
  group: market
+
+- type: cargoProduct
+  id: CargoCrusherDagger
+  icon:
+    sprite: Objects/Weapons/Melee/crusher_dagger.rsi
+    state: icon
+  product: CrateCrusherDagger
+  cost: 2500
+  category: cargoproduct-category-name-cargo
+  group: market
--- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -48,6 +48,26 @@
  category: cargoproduct-category-name-materials
  group: market

+- type: cargoProduct
+  id: MaterialGold
+  icon:
+    sprite: Objects/Materials/ingots.rsi
+    state: gold_3
+  product: CrateMaterialGold
+  cost: 3225
+  category: cargoproduct-category-name-materials
+  group: market
+
+- type: cargoProduct
+  id: MaterialSilver
+  icon:
+    sprite: Objects/Materials/ingots.rsi
+    state: silver_3
+  product: CrateMaterialSilver
+  cost: 2580
+  category: cargoproduct-category-name-materials
+  group: market
+
 - type: cargoProduct
  id: MaterialTextiles
  icon:
@@ -74,7 +94,7 @@
    sprite: Objects/Materials/materials.rsi
    state: cardboard_3
  product: CrateMaterialCardboard
-  cost: 750
+  cost: 330
  category: cargoproduct-category-name-materials
  group: market

@@ -84,7 +104,7 @@
    sprite: Objects/Materials/Sheets/other.rsi
    state: paper_3
  product: CrateMaterialPaper
-  cost: 1000
+  cost: 185
  category: cargoproduct-category-name-materials
  group: market

--- a/Resources/Prototypes/Catalog/Cargo/markets.yml
+++ b/Resources/Prototypes/Catalog/Cargo/markets.yml
@@ -0,0 +1,11 @@
+- type: cargoMarket
+  id: market
+
+- type: cargoMarket
+  id: SalvageJobReward2
+
+- type: cargoMarket
+  id: SalvageJobReward3
+
+- type: cargoMarket
+  id: SalvageJobRewardMAX
--- a/Resources/Prototypes/Catalog/Cargo/salvage_rewards.yml
+++ b/Resources/Prototypes/Catalog/Cargo/salvage_rewards.yml
@@ -0,0 +1,83 @@
+# Rank 2
+- type: cargoProduct
+  id: CargoDoubleEmergencyTank
+  icon:
+    sprite: Objects/Tanks/emergency_double.rsi
+    state: icon
+  product: CrateDoubleEmergencyTank
+  cost: 2400
+  category: cargoproduct-category-name-cargo
+  group: SalvageJobReward2
+
+- type: cargoProduct
+  id: CargoSeismicCharge
+  icon:
+    sprite: Objects/Weapons/Bombs/seismic.rsi
+    state: icon
+  product: CrateSeismicCharge
+  cost: 1800
+  category: cargoproduct-category-name-cargo
+  group: SalvageJobReward2
+
+- type: cargoProduct
+  id: CargoCrusher
+  icon:
+    sprite: Objects/Weapons/Melee/crusher.rsi
+    state: icon
+  product: CrateCrusher
+  cost: 5000
+  category: cargoproduct-category-name-cargo
+  group: SalvageJobReward2
+
+- type: cargoProduct
+  id: CargoSalvageHardsuit
+  icon:
+    sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
+    state: icon
+  product: CrateSalvageHardsuit
+  cost: 7500
+  category: cargoproduct-category-name-cargo
+  group: SalvageJobReward2
+
+# Rank 3
+- type: cargoProduct
+  id: CargoFulton
+  icon:
+    sprite: /Textures/Objects/Tools/fulton.rsi
+    state: extraction_pack
+  product: CrateFulton
+  cost: 3000
+  category: cargoproduct-category-name-cargo
+  group: SalvageJobReward3
+
+- type: cargoProduct
+  id: CargoVoidJetpack
+  icon:
+    sprite: Objects/Tanks/Jetpacks/void.rsi
+    state: icon
+  product: CrateVoidJetpack
+  cost: 4000
+  category: cargoproduct-category-name-cargo
+  group: SalvageJobReward3
+
+- type: cargoProduct
+  id: CargoCrusherGlaive
+  icon:
+    sprite: Objects/Weapons/Melee/crusher_glaive.rsi
+    state: icon
+  product: CrateCrusherGlaive
+  cost: 8000
+  category: cargoproduct-category-name-cargo
+  group: SalvageJobReward3
+
+# Max Rank
+
+- type: cargoProduct
+  id: CargoSupremeSalvagerCloak
+  icon:
+    sprite: Clothing/Neck/Cloaks/miner.rsi
+    state: icon
+  product: CrateSupremeSalvagerCloak
+  cost: 25000
+  category: cargoproduct-category-name-cargo
+  group: SalvageJobRewardMAX
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -324,3 +324,23 @@
        amount: 2
      - id: SyndieTrickyBomb
        amount: 2
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledStarterKit
+  name: basic operative bundle
+  description: "Contains a weapon, medical supplies, breaching tools, spare ammo, and some simple utilities."
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponSubMachineGunC20r
+      - id: MagazinePistolSubMachineGun
+        amount: 3
+      - id: MagazinePistol
+      - id: SyndicateJawsOfLife
+      - id: C4
+        amount: 2
+      - id: MedkitCombatFilled
+      - id: EmpImplanter
+      - id: ClothingShoesBootsMagSyndie
+      - id: AgentIDCard
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -235,6 +235,20 @@
  - type: Label
    currentLabel: reagent-name-nitrogen

+- type: entity
+  parent: BoxSurvival
+  id: BoxMimeMoth
+  suffix: Mime, Emergency moth
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingMaskBreath
+    - id: EmergencyOxygenTankFilled
+    - id: EmergencyMedipen
+    - id: Flare
+    - id: FoodBreadBaguetteCotton
+    - id: DrinkWaterBottleFull
+
 - type: entity
  parent: BoxCardboard
  id: BoxSurvivalSyndicate
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -477,3 +477,20 @@
    contents:
      - id: Envelope
        amount: 9
+
+- type: entity
+  name: utensil box
+  parent: BoxCardboard
+  id: BoxUtensil
+  description: A box filled with forks and spoons.
+  components:
+  - type: Sprite
+    layers:
+      - state: box
+      - state: utensils
+  - type: StorageFill
+    contents:
+      - id: Fork
+        amount: 2
+      - id: Spoon
+        amount: 2
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -179,7 +179,7 @@
    - id: ClothingOuterHardsuitCBURN
      prob: 0.001
      orGroup: Clothes
-    - id: ClothingOuterHardsuitBasic
+    - id: ClothingOuterHardsuitSanta
      prob: 0.001
      orGroup: Clothes
    - id: ClothingBackpackERTClown
--- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
@@ -84,12 +84,12 @@
      amount: 1
    - id: DrinkGlass
      amount: 4
+    - id: FoodPlateMuffinTin
+      amount: 4
    - id: FoodPlateTin
      amount: 4
-    - id: Fork
-      amount: 2
-    - id: Spoon
-      amount: 2
+    - id: BoxUtensil
+      amount: 1

 - type: entity
  id: CrateFoodBarSupply
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -84,16 +84,36 @@
    contents:
      - id: SheetPlasma

+- type: entity
+  id: CrateMaterialGold
+  parent: CrateGenericSteel
+  name: gold crate
+  description: 30 bars of gold.
+  components:
+  - type: StorageFill
+    contents:
+    - id: IngotGold
+
+- type: entity
+  id: CrateMaterialSilver
+  parent: CrateGenericSteel
+  name: silver crate
+  description: 30 bars of silver.
+  components:
+  - type: StorageFill
+    contents:
+    - id: IngotSilver
+
 - type: entity
  id: CrateMaterialCardboard
  parent: CrateGenericSteel
  name: cardboard crate
-  description: 60 pieces of cardboard.
+  description: 90 pieces of cardboard.
  components:
  - type: StorageFill
    contents:
      - id: MaterialCardboard
-        amount: 2
+        amount: 3

 - type: entity
  id: CrateMaterialPaper
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -90,6 +90,119 @@
      - id: WeaponRevolverMateba
        prob: 0.0001

+- type: entity
+  parent: CrateGenericSteel
+  id: CrateCrusherDagger
+  name: crusher dagger crate
+  description: Contains 4 crusher daggers for use by salvage.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage:
+        id: WeaponCrusherDagger
+        amount: 4
+
+# Salvage rewards
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateSeismicCharge
+  name: seismic charge crate
+  description: Contains 6 seismic charges for use by salvage.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage:
+        id: SeismicCharge
+        amount: 6
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateDoubleEmergencyTank
+  name: double emergency tank crate
+  description: Contains 2 double emergency oxygen tanks and 2 double emergency nitrogen tanks
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: DoubleEmergencyOxygenTankFilled
+          amount: 2
+        - id: DoubleEmergencyNitrogenTankFilled
+          amount: 2
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateCrusher
+  name: crusher crate
+  description: Contains 2 crushers for use by salvage.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage:
+        id: WeaponCrusher
+        amount: 2
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateFulton
+  name: fulton crate
+  description: Contains a fulton beacon and 8 fultons.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: FultonBeacon
+        - id: Fulton
+          amount: 8
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateVoidJetpack
+  name: void jetpack crate
+  description: Contains a single void jetpack.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage:
+        id: JetpackVoidFilled
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateSalvageHardsuit
+  name: salvage hardsuit crate
+  description: Contains a salvage hardsuit, breath mask, and oxygen tank.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: ClothingOuterHardsuitSalvage
+        - id: ClothingMaskBreath
+        - id: OxygenTankFilled
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateCrusherGlaive
+  name: crusher glaive crate
+  description: Contains a crusher glaive for use by salvage.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage:
+        id: WeaponCrusherGlaive
+
+- type: entity
+  parent: CrateGenericSteel
+  id: CrateSupremeSalvagerCloak
+  name: supreme salvager cloak crate
+  description: Contains a cloak only to be worn by supreme salvagers. Wearing it undeservedly will result in your doom.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage:
+        id: ClothingNeckCloakSalvagerSupreme
+
 - type: entity
  parent: CrateGenericSteel
  id: CratePartsT3
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -63,22 +63,41 @@
  suffix: Filled
  parent: LockerWeldingSupplies
  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHeadHatWelding
-      - id: ClothingHeadHatWelding
-      - id: ClothingHeadHatWelding
-        prob: 0.5
-      - id: Welder
-      - id: Welder
-      - id: WelderMini
-        orGroup: thirdWelder
-      - id: Welder
-        prob: 0.33
-        orGroup: thirdWelder
-      - id: WelderIndustrial
-        prob: 0.33
-        orGroup: thirdWelder
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: FillWelderSupplies
+          rolls: !type:ConstantNumberSelector
+            value: 3
+        - !type:NestedSelector
+          tableId: FillWelderSuppliesMask
+          rolls: !type:ConstantNumberSelector
+            value: 3
+
+- type: entityTable
+  id: FillWelderSupplies
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHeadHatWelding
+    - id: ClothingHeadHatWeldingMaskFlame
+      weight: 0.25
+    - id: ClothingHeadHatWeldingMaskFlameBlue
+      weight: 0.25
+    - id: ClothingHeadHatWeldingMaskPainted
+      weight: 0.25
+
+- type: entityTable
+  id: FillWelderSuppliesMask
+  table: !type:GroupSelector
+    children:
+    - id: WelderMini
+    - id: Welder
+    - id: WelderIndustrial
+      weight: 0.25
+    - id: WelderIndustrialAdvanced
+      weight: 0.05

 - type: entity
  id: LockerAtmosphericsFilledHardsuit
@@ -96,6 +115,7 @@
      - id: HolofanProjector
      - id: RCD
      - id: RCDAmmo
+      - id: AirGrenade

 - type: entity
  id: LockerAtmosphericsFilled
@@ -112,6 +132,7 @@
      - id: HolofanProjector
      - id: RCD
      - id: RCDAmmo
+      - id: AirGrenade

 - type: entity
  id: LockerEngineerFilledHardsuit
@@ -126,6 +147,7 @@
      - id: ClothingShoesBootsMag
      - id: RCD
      - id: RCDAmmo
+      - id: MetalFoamGrenade

 - type: entity
  id: LockerEngineerFilled
@@ -139,6 +161,7 @@
      - id: trayScanner
      - id: RCD
      - id: RCDAmmo
+      - id: MetalFoamGrenade

 - type: entity
  id: ClosetRadiationSuitFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -9,6 +9,7 @@
    - id: CargoSaleComputerCircuitboard
    - id: CargoShuttleConsoleCircuitboard
    - id: SalvageMagnetMachineCircuitboard
+    - id: SalvageJobBoardComputerCircuitboard
    - id: CigPackGreen
      prob: 0.50
    - id: ClothingHeadsetAltCargo
@@ -170,6 +171,7 @@
    - id: RCD
    - id: RCDAmmo
    - id: RubberStampCE
+    - id: MetalFoamGrenade

 # Hardsuit table, used for suit storage as well
 - type: entityTable
@@ -388,7 +390,6 @@
  - type: StorageFill
    contents:
    - id: WeaponRevolverDeckard
-    - id: ClothingOuterHardsuitBasic
    - id: JetpackBlue
    - id: SpaceCash1000
    - id: BeachBall
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -34,7 +34,6 @@
  components:
  - type: StorageFill
    contents:
-      - id: CrowbarRed
      - id: VariantCubeBox
      - id: BoxMousetrap
        amount: 2
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -89,18 +89,6 @@
        - id: ClothingMaskBreath

 #HARDSUITS
-#Basic hardsuit
- type: entity
-  id: SuitStorageBasic
-  parent: SuitStorageBase
-  suffix: Basic Hardsuit
-  components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitBasic
-        - id: ClothingMaskBreath
-
 #Engineering hardsuit
 - type: entity
  id: SuitStorageEngi
--- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
+++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
@@ -1,38 +0,0 @@
- type: reagentDispenserInventory
-  id: SodaDispenserInventory
-  inventory:
-  - DrinkCoconutWaterJug
-  - DrinkCoffeeJug
-  - DrinkColaBottleFull
-  - DrinkCreamCartonXL
-  - DrinkDrGibbJug
-  - DrinkEnergyDrinkJug
-  - DrinkGreenTeaJug
-  - DrinkIceJug
-  - DrinkJuiceLimeCartonXL
-  - DrinkJuiceOrangeCartonXL
-  - DrinkLemonLimeJug
-  - DrinkRootBeerJug
-  - DrinkSodaWaterBottleFull
-  - DrinkSpaceMountainWindBottleFull
-  - DrinkSpaceUpBottleFull
-  - DrinkSugarJug
-  - DrinkTeaJug
-  - DrinkTonicWaterBottleFull
-  - DrinkWaterMelonJuiceJug
-
- type: reagentDispenserInventory
-  id: BoozeDispenserInventory
-  inventory:
-  - DrinkAleBottleFullGrowler
-  - DrinkBeerGrowler
-  - DrinkCoffeeLiqueurBottleFull
-  - DrinkCognacBottleFull
-  - DrinkGinBottleFull
-  - DrinkMeadJug
-  - DrinkRumBottleFull
-  - DrinkTequilaBottleFull
-  - DrinkVermouthBottleFull
-  - DrinkVodkaBottleFull
-  - DrinkWhiskeyBottleFull
-  - DrinkWineBottleFull
--- a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml
+++ b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml
@@ -1,26 +0,0 @@
- type: reagentDispenserInventory
-  id: ChemDispenserStandardInventory
-  inventory:
-  - JugAluminium
-  - JugCarbon
-  - JugChlorine
-  - JugCopper
-  - JugEthanol
-  - JugFluorine
-  - JugSugar
-  - JugHydrogen
-  - JugIodine
-  - JugIron
-  - JugLithium
-  - JugMercury
-  - JugNitrogen
-  - JugOxygen
-  - JugPhosphorus
-  - JugPotassium
-  - JugRadium
-  - JugSilicon
-  - JugSodium
-  - JugSulfur
-
- type: reagentDispenserInventory
-  id: EmptyInventory
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -42,3 +42,4 @@
    ClothingUnderSocksBee: 2
  contrabandInventory:
    ClothingNeckScarfStripedLesbianLong: 2
+    ClothingUniformJumpskirtColorRainbow: 2
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1097,6 +1097,26 @@
      components:
      - SurplusBundle

+- type: listing
+  id: UplinkStarterKit
+  name: uplink-starter-kit-name
+  description: uplink-starter-kit-desc
+  productEntity: ClothingBackpackDuffelSyndicateFilledStarterKit
+  cost:
+    Telecrystal: 40
+  categories:
+  - UplinkDisruption
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+        - NukeOpsUplink
+    - !type:BuyerWhitelistCondition
+      blacklist:
+        components:
+        - SurplusBundle
+
+
 - type: listing
  id: UplinkSingarityBeacon
  name: uplink-singularity-beacon-name
--- a/Resources/Prototypes/Datasets/Names/wizard.yml
+++ b/Resources/Prototypes/Datasets/Names/wizard.yml
@@ -2,10 +2,10 @@
  id: NamesWizardFirst
  values:
    prefix: names-wizard-first-dataset-
-    count: 30
+    count: 44

 - type: localizedDataset
  id: NamesWizardLast
  values:
    prefix: names-wizard-last-dataset-
-    count: 46
+    count: 69 #nice
--- a/Resources/Prototypes/DeviceLinking/source_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/source_ports.yml
@@ -25,13 +25,13 @@
  id: Left
  name: signal-port-name-left
  description: signal-port-description-left
-  defaultLinks: [ On, Open, Forward, Trigger, Timer ]
+  defaultLinks: [ On, Open, Reverse, Trigger, Timer ]

 - type: sourcePort
  id: Right
  name: signal-port-name-right
  description: signal-port-description-right
-  defaultLinks: [ On, Open, Reverse, Trigger, Timer ]
+  defaultLinks: [ On, Open, Forward, Trigger, Timer ]

 - type: sourcePort
  id: Middle
@@ -156,3 +156,9 @@
  id: PowerDischarging
  name: signal-port-name-power-discharging
  description: signal-port-description-power-discharging
+
+- type: sourcePort
+  id: ItemDetected
+  name: signal-port-name-item-detected
+  description: signal-port-description-item-detected
+  defaultLinks: [ Toggle, Trigger, Timer ]
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -38,6 +38,14 @@
    spawned:
    - id: MaterialCloth1
      amount: 1
+  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
+    materialComposition:
+      Cloth: 50
+  - type: Tag
+    tags:
+    - ClothMade
+    - Recyclable
+    - WhitelistChameleon

 # gloves that cover the fingertips and have synthetic fibers
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
@@ -28,6 +28,7 @@
    tags:
    - Bandana
    - ClothMade
+    - Recyclable

 - type: entity
  parent: [ClothingHeadBandBase, ClothingMaskBandBlack]
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -22,8 +22,8 @@
          Quantity: 10
  - type: Tag
    tags:
-      - ClothMade
-      - WhitelistChameleon
+    - ClothMade
+    - WhitelistChameleon

 - type: entity
  abstract: true
@@ -35,10 +35,14 @@
    spawned:
    - id: MaterialCloth1
      amount: 1
+  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
+    materialComposition:
+      Cloth: 50
  - type: Tag
    tags:
-      - ClothMade
-      - WhitelistChameleon
+    - ClothMade
+    - Recyclable
+    - WhitelistChameleon

 - type: entity
  abstract: true
@@ -105,6 +109,9 @@
  id: ClothingHeadEVAHelmetBase
  name: base space helmet
  components:
+# SlotBlocker blocked until UI change
+#  - type: SlotBlock
+#    slots: [ears, eyes, mask]
  - type: BreathMask
  - type: Item
    size: Normal
@@ -140,6 +147,9 @@
  name: base hardsuit helmet
  categories: [ HideSpawnMenu ]
  components:
+# SlotBlocker blocked until UI change
+#  - type: SlotBlock
+#    slots: [ears, eyes, mask]
  - type: BreathMask
  - type: Sprite
    state: icon # default state used by most inheritors
@@ -181,11 +191,14 @@
 - type: entity
  abstract: true
  # No parent since it isn't an item
-  # must parent both this and the desired helmet base when using 
+  # must parent both this and the desired helmet base when using
  id: ClothingHeadSuitWithLightBase
  name: base hardsuit helmet with light
  categories: [ HideSpawnMenu ]
  components:
+# SlotBlocker blocked until UI change
+#  - type: SlotBlock
+#    slots: [ears, eyes, mask]
  - type: Sprite
    layers:
    - state: icon
--- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
@@ -65,6 +65,11 @@
  - type: Tag
    tags:
    - WhitelistChameleon
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD 

 - type: entity
  parent: ClothingHeadHatHardhatBase
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -5,24 +5,6 @@
 #Generally, unless you're adding something like caustic damage, you should probably avoid messing with armor here outside of the above scenario.

 #CREW HARDSUITS
-#Standard Hardsuit
- type: entity
-  parent: ClothingHeadHardsuitBase
-  id: ClothingHeadHelmetHardsuitBasic
-  name: basic hardsuit helmet
-  description: A basic-looking hardsuit helmet that provides minor protection against most sources of damage.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/basic.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/basic.rsi
-  - type: HideLayerClothing
-    slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
-
 #Atmospherics Hardsuit
 - type: entity
  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -22,6 +22,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -40,6 +41,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable    
    - WhitelistChameleon

 - type: entity
@@ -55,6 +57,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -97,6 +100,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -113,6 +117,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -129,6 +134,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -145,6 +151,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -232,6 +239,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -288,6 +296,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -304,6 +313,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -342,6 +352,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -358,6 +369,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -419,11 +431,12 @@
    tags:
    - WhitelistChameleon
    - ClothMade
+    - Recyclable
  - type: HideLayerClothing
-    slots:
-    - Hair
-    - HeadTop
-    - HeadSide
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: ClothingHeadHatWizardBase
@@ -445,6 +458,12 @@
  - type: Clothing
    sprite: Clothing/Head/Hats/santahat.rsi
  - type: Appearance
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD
+    slots: []
  - type: Foldable
    canFoldInsideContainer: true
  - type: FoldableClothing
@@ -458,6 +477,7 @@
    - state: icon-nobeard
      map: [ "foldedLayer" ]
      visible: true
+  
    

 - type: entity
@@ -486,8 +506,14 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: ClothingHeadBase
@@ -499,6 +525,11 @@
    sprite: Clothing/Head/Hats/surgcap_green.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/surgcap_green.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: ClothingHeadBase
@@ -510,6 +541,12 @@
    sprite: Clothing/Head/Hats/surgcap_purple.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/surgcap_purple.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD
+

 - type: entity
  parent: ClothingHeadBase
@@ -524,6 +561,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -629,6 +667,7 @@
    tags:
    - WhitelistChameleon
    - ClothMade
+    - Recyclable
  - type: HideLayerClothing
    slots:
    - Hair
@@ -643,6 +682,11 @@
    sprite: Clothing/Head/Hats/wizard_fake.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/wizard_fake.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  abstract: true
@@ -664,6 +708,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -699,6 +744,11 @@
    sprite: Clothing/Head/Hats/pyjamasyndicateblack.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/pyjamasyndicateblack.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
@@ -710,6 +760,11 @@
    sprite: Clothing/Head/Hats/pyjamasyndicatepink.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/pyjamasyndicatepink.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: [ ClothingHeadBase, BaseSyndicateContraband ]
@@ -721,6 +776,11 @@
    sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: ClothingHeadBase
@@ -733,6 +793,11 @@
  - type: Clothing
    sprite: Clothing/Head/Hats/papersack.rsi
  - type: IdentityBlocker
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: ClothingHeadBase
@@ -745,6 +810,11 @@
  - type: Clothing
    sprite: Clothing/Head/Hats/papersacksmile.rsi
  - type: IdentityBlocker
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: ClothingHeadBase
@@ -781,6 +851,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -794,6 +865,11 @@
    sprite: Clothing/Head/Hats/rasta.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/rasta.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: ClothingHeadBase
@@ -825,6 +901,11 @@
      sprite: Clothing/Head/Hats/jester2.rsi
    - type: Clothing
      sprite: Clothing/Head/Hats/jester2.rsi
+    - type: HideLayerClothing
+      layers:
+        Hair: HEAD
+        HeadTop : HEAD
+        HeadSide : HEAD

 - type: entity
  parent: [ClothingHeadBase, BaseCommandContraband]
@@ -839,6 +920,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -976,6 +1058,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - WhitelistChameleon
    - HamsterWearable
  - type: SentienceTarget
@@ -998,6 +1081,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - WhitelistChameleon
    - HamsterWearable

@@ -1011,6 +1095,11 @@
    sprite: Clothing/Head/Hats/gladiator.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/gladiator.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: ClothingHeadBase
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -10,9 +10,9 @@
    tags:
    - WhitelistChameleon
  - type: HideLayerClothing
-    slots:
-    - HeadTop
-    - HeadSide
+    layers:
+      HeadTop : HEAD
+      HeadSide : HEAD

 - type: entity
  parent: ClothingHeadHelmetBase
@@ -42,6 +42,9 @@
    tags:
    - WhitelistChameleon
    - SecurityHelmet
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Mercenary Helmet
 - type: entity
@@ -54,6 +57,9 @@
    sprite: Clothing/Head/Helmets/merc_helmet.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/merc_helmet.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #SWAT Helmet
 - type: entity
@@ -77,6 +83,9 @@
        Caustic: 0.95
  - type: ExplosionResistance
    damageCoefficient: 0.75
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Syndicate SWAT Helmet
 - type: entity
@@ -90,6 +99,9 @@
    sprite: Clothing/Head/Helmets/swat_syndicate.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/swat_syndicate.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Light Riot Helmet
 - type: entity
@@ -109,6 +121,9 @@
        Blunt: 0.8
        Slash: 0.8
        Piercing: 0.95
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Bombsuit Helmet
 - type: entity
@@ -131,11 +146,9 @@
        Slash: 0.95
        Piercing: 0.95
  - type: HideLayerClothing
-    slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    layers:
+      Hair: HEAD
+      Snout: HEAD

 #Janitorial Bombsuit Helmet
 - type: entity
@@ -149,6 +162,9 @@
    sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Cult Helmet
 - type: entity
@@ -169,6 +185,9 @@
        Slash: 0.8
        Piercing: 0.9
        Heat: 0.9
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Space Ninja Helmet
 - type: entity
@@ -187,11 +206,9 @@
  - type: IngestionBlocker
  - type: IdentityBlocker
  - type: HideLayerClothing
-    slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    layers:
+      Hair: HEAD
+      Snout: HEAD

 #Knight Helmet
 - type: entity
@@ -206,6 +223,9 @@
    sprite: Clothing/Head/Helmets/templar.rsi
  - type: IngestionBlocker
  - type: IdentityBlocker
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Thunderdome Helmet
 - type: entity
@@ -218,6 +238,9 @@
    sprite: Clothing/Head/Helmets/thunderdome.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/thunderdome.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Wizard Helmet
 - type: entity
@@ -232,6 +255,9 @@
    sprite: Clothing/Head/Helmets/wizardhelm.rsi
  - type: IngestionBlocker
  - type: IdentityBlocker
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Fire Helmet
 - type: entity
@@ -257,11 +283,9 @@
    - WhitelistChameleon
    - FireHelmet
  - type: HideLayerClothing
-    slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    layers:
+      Hair: HEAD
+      Snout: HEAD

 #Atmos Fire Helmet
 - type: entity
@@ -290,11 +314,9 @@
    - WhitelistChameleon
    - FireHelmet
  - type: HideLayerClothing
-    slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    layers:
+      Hair: HEAD
+      Snout: HEAD
  - type: BreathMask

 #Chitinous Helmet
@@ -315,6 +337,9 @@
        Slash: 0.5
        Piercing: 0.5
        Heat: 0.9
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #ERT HELMETS
 #ERT Leader Helmet
@@ -328,6 +353,9 @@
    sprite: Clothing/Head/Helmets/ert_leader.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/ert_leader.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #ERT Security Helmet
 - type: entity
@@ -340,6 +368,9 @@
    sprite: Clothing/Head/Helmets/ert_security.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/ert_security.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #ERT Medic Helmet
 - type: entity
@@ -352,6 +383,9 @@
    sprite: Clothing/Head/Helmets/ert_medic.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/ert_medic.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #ERT Engineer Helmet
 - type: entity
@@ -364,6 +398,9 @@
    sprite: Clothing/Head/Helmets/ert_engineer.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/ert_engineer.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #ERT Janitor Helmet
 - type: entity
@@ -376,6 +413,9 @@
    sprite: Clothing/Head/Helmets/ert_janitor.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/ert_janitor.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 - type: entity
  parent: [ BaseSyndicateContraband, ClothingHeadHelmetBase ]
@@ -394,8 +434,12 @@
        Slash: 0.85
        Piercing: 0.85
        Heat: 0.85
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Bone Helmet
+#No need to hide the hair on this one
 - type: entity
  parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ]
  id: ClothingHeadHelmetBone
@@ -410,6 +454,7 @@
    graph: BoneHelmet
    node: helmet

+#Ironclad II Helmet
 - type: entity
  parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ]
  id: ClothingHeadHelmetPodWars
@@ -420,6 +465,9 @@
    sprite: Clothing/Head/Helmets/podwars_helmet.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/podwars_helmet.rsi
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 #Justice Helmet
 - type: entity
@@ -490,6 +538,9 @@
  - type: Construction
    graph: HelmetJustice
    node: helmet
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 - type: entity
  parent: ClothingHeadHelmetJustice
@@ -500,6 +551,9 @@
    slots:
      cell_slot:
        name: power-cell-slot-component-slot-name-default
+  - type: HideLayerClothing
+    layers:
+      Hair: HEAD

 - type: entity
  id: ActionToggleJusticeHelm
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -20,11 +20,11 @@
    tags:
    - WhitelistChameleon
  - type: HideLayerClothing
-    slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    layers:
+      Hair: HEAD
+      Snout: HEAD
+      HeadTop: HEAD
+      HeadSide: HEAD

 - type: entity
  parent: ClothingHeadHatHoodBioGeneral
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -32,6 +32,11 @@
    sprite: Clothing/Head/Misc/chickenhead.rsi
  - type: IngestionBlocker
  - type: IdentityBlocker
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - HeadTop
+    - HeadSide

 - type: entity
  parent: ClothingHeadBase
@@ -74,6 +79,12 @@
    slots:
      cell_slot:
        name: power-cell-slot-component-slot-name-default
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - HeadTop
+    - HeadSide
+    - FacialHair

 - type: entity
  parent: ClothingHeadBase
@@ -85,6 +96,9 @@
    sprite: Clothing/Head/Misc/pwig.rsi
  - type: Clothing
    sprite: Clothing/Head/Misc/pwig.rsi
+  - type: HideLayerClothing
+    slots:
+    - HeadTop

 - type: entity
  parent: ClothingHeadBase
@@ -109,6 +123,12 @@
    sprite: Clothing/Head/Misc/richard.rsi
  - type: IngestionBlocker
  - type: IdentityBlocker
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - HeadTop
+    - HeadSide
+    - FacialHair

 - type: entity
  parent: ClothingHeadBase
@@ -122,6 +142,11 @@
    sprite: Clothing/Head/Misc/skubhead.rsi
  - type: IngestionBlocker
  - type: IdentityBlocker
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - HeadTop
+    - HeadSide

 - type: entity
  parent: ClothingHeadBase
@@ -137,6 +162,11 @@
    tags:
    - HamsterWearable
    - WhitelistChameleon
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - HeadTop
+    - HeadSide

 - type: entity
  parent: ClothingHeadBase
@@ -166,6 +196,8 @@
    sprite: Clothing/Head/Misc/fancycrown.rsi
  - type: Clothing
    sprite: Clothing/Head/Misc/fancycrown.rsi
+  - type: TypingIndicatorClothing
+    proto: regal
  - type: MobPrice
    price: 3000
  - type: AddAccentClothing
@@ -244,6 +276,12 @@
    sprite: Clothing/Head/Misc/squiddy.rsi
  - type: IngestionBlocker
  - type: IdentityBlocker
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - HeadTop
+    - HeadSide
+    - FacialHair

 - type: entity
  parent: ClothingHeadBase
@@ -255,6 +293,12 @@
    sprite: Clothing/Head/Misc/red_racoon.rsi
  - type: Clothing
    sprite: Clothing/Head/Misc/red_racoon.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - HeadTop
+    - HeadSide
+    - FacialHair

 - type: entity
  parent: Clothing
@@ -338,3 +382,5 @@
  - type: HideLayerClothing
    slots:
    - Hair
+    - HeadTop
+    - HeadSide
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -69,6 +69,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -80,6 +81,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -224,6 +226,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -235,6 +238,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -315,6 +319,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon

@@ -326,5 +331,6 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
--- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -31,6 +31,7 @@
    tags:
    - Bandana
    - ClothMade
+    - Recyclable
  - type: HideLayerClothing
    slots:
    - Snout
@@ -72,6 +73,7 @@
    tags:
    - WhitelistChameleon
    - ClothMade
+    - Recyclable

 - type: entity
  parent: ClothingMaskBandanaBase
--- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
@@ -39,6 +39,9 @@
    spawned:
    - id: MaterialCloth1
      amount: 1
+  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
+    materialComposition:
+      Cloth: 50
  - type: Food
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
@@ -50,4 +53,5 @@
          Quantity: 10
  - type: Tag
    tags:
-      - ClothMade
+    - ClothMade
+    - Recyclable
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -206,7 +206,10 @@
    - WhitelistChameleon
  - type: HideLayerClothing
    slots:
+    - Hair
    - Snout
+    - HeadTop
+    - HeadSide

 - type: entity
  parent: ClothingMaskClownBase
@@ -219,7 +222,10 @@
    - WhitelistChameleon
  - type: HideLayerClothing
    slots:
+    - Hair
    - Snout
+    - HeadTop
+    - HeadSide

 - type: entity
  parent: ClothingMaskClown
@@ -378,6 +384,8 @@
    slots:
    - Hair
    - Snout
+    - HeadTop
+    - HeadSide
    hideOnToggle: true
  - type: Armor
    modifiers:
@@ -443,6 +451,11 @@
    sprite: Clothing/Mask/squadron.rsi
  - type: Clothing
    sprite: Clothing/Mask/squadron.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - HeadTop
+    - HeadSide
  - type: Armor
    modifiers:
      coefficients:
--- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
@@ -16,6 +16,9 @@
    spawned:
    - id: MaterialCloth1
      amount: 2
+  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
+    materialComposition:
+      Cloth: 100
  - type: Food
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
@@ -28,6 +31,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - WhitelistChameleon

 - type: entity
@@ -39,4 +43,5 @@
    tags:
    - Scarf
    - ClothMade
+    - Recyclable
    - WhitelistChameleon
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -128,9 +128,9 @@

 - type: entity
  parent: ClothingNeckBase
-  id: ClothingNeckCloakMiner
-  name: miner's cloak
-  description: Worn by the most skilled miners, for one who has moved mountains and filled valleys.
+  id: ClothingNeckCloakSalvagerSupreme
+  name: supereme salvager's cloak
+  description: Worn by the most skilled salvagers, for one who has mastered space and made the mining asteroid his domain. They don't just hand these things out, y'know?
  components:
  - type: Sprite
    sprite: Clothing/Neck/Cloaks/miner.rsi
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -191,8 +191,8 @@
 - type: entity
  parent: ClothingNeckPinBase
  id: ClothingNeckAutismPin
-  name: autism pin
-  description: Be autism do crime.
+  name: neurodivergent pin
+  description: Be neurodivergent, do crime.
  components:
  - type: Sprite
    state: autism
@@ -202,8 +202,8 @@
 - type: entity
  parent: ClothingNeckPinBase
  id: ClothingNeckGoldAutismPin
-  name: golden autism pin
-  description: Be autism do warcrime.
+  name: autism pin
+  description: Be autistic, do crime.
  components:
  - type: Sprite
    state: goldautism
--- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
@@ -13,6 +13,7 @@
    - HamsterWearable
    - WhitelistChameleon
    - ClothMade
+    - Recyclable

 - type: entity
  parent: ClothingNeckBase
@@ -38,5 +39,6 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - HamsterWearable
    - WhitelistChameleon
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -105,6 +105,9 @@
  id: ClothingOuterHardsuitBase
  name: base hardsuit
  components:
+# SlotBlocker blocked until UI change
+#  - type: SlotBlock
+#    slots: [innerclothing, feet]
  - type: PressureProtection
    highPressureMultiplier: 0.3
    lowPressureMultiplier: 1000
@@ -149,6 +152,9 @@
  id: ClothingOuterEVASuitBase
  name: base EVA Suit
  components:
+# SlotBlocker blocked until UI change
+#  - type: SlotBlock
+#    slots: [innerclothing, feet]
  - type: PressureProtection
    highPressureMultiplier: 0.6
    lowPressureMultiplier: 1000
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -1,33 +1,6 @@
 #When adding new hardsuits, please try to keep the organization consistent with hardsuit-helmets.yml (if possible.)

 #CREW HARDSUITS
-#Basic Hardsuit
- type: entity
-  parent: ClothingOuterHardsuitBase
-  id: ClothingOuterHardsuitBasic
-  name: basic hardsuit
-  description: A basic, universal hardsuit that protects the wearer against the horrors of life in space. Beats not having a hardsuit, at least.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Hardsuits/basic.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Hardsuits/basic.rsi
-  - type: ExplosionResistance
-    damageCoefficient: 0.9
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Caustic: 0.9
-  - type: ClothingSpeedModifier
-    walkModifier: 0.80
-    sprintModifier: 0.80
-  - type: HeldSpeedModifier
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetHardsuitBasic
-
 #Atmospherics Hardsuit
 - type: entity
  parent: [ClothingOuterHardsuitBase, BaseEngineeringContraband]
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -32,7 +32,7 @@
  parent: ClothingOuterSuitBomb
  id: ClothingOuterSuitJanitorBomb
  name: janitorial bomb suit
-  description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
+  description: Heavy body armor designed to withstand explosions formed from reactions between chemicals.
  categories: [ DoNotMap ]
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -33,6 +33,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - WhitelistChameleon
  - type: StaticPrice
    price: 50
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -22,6 +22,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - WhitelistChameleon
  - type: ProtectedFromStepTriggers

@@ -35,6 +36,9 @@
    spawned:
    - id: MaterialCloth1
      amount: 1
+  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
+    materialComposition:
+      Cloth: 50

 # stuff common to all military boots
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -75,6 +75,7 @@
    footstepSoundCollection:
      collection: FootstepHighHeels
      params:
+        volume: -6
        variation: 0.09

 - type: entity
@@ -215,6 +216,7 @@
      collection: FootstepSpurs
      params:
        variation: 0.09
+        volume: -6

 - type: entity
  parent: ClothingShoesBootsCowboyBrown
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -35,8 +35,7 @@
  parent: ClothingShoesBaseButcherable
  id: ClothingShoeSlippersDuck
  name: ducky slippers
-  # description: You wish these made quacking sounds as you walked.
-  description: Comfy, yet haunted by the ghosts of ducks you fed bread to as a child.
+  description: You wish these made quacking sounds as you walked. It's a good thing they don't, though.
  components:
  - type: Sprite
    sprite: Clothing/Shoes/Misc/duck-slippers.rsi
@@ -44,7 +43,7 @@
    sprite: Clothing/Shoes/Misc/duck-slippers.rsi
  - type: FootstepModifier
    footstepSoundCollection:
-      collection: FootstepDuck
+      collection: FootstepCarpet
      params:
        variation: 0.07
  - type: Construction
@@ -63,7 +62,7 @@
    sprite: Clothing/Shoes/Misc/lizard-slippers.rsi
  - type: FootstepModifier
    footstepSoundCollection:
-      collection: FootstepLizardSlippers
+      collection: FootstepCarpet
      params:
        variation: 0.02
  - type: Construction
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -58,11 +58,12 @@
    sprite: Clothing/Shoes/Specific/clown_banana.rsi
  - type: Clothing
    sprite: Clothing/Shoes/Specific/clown_banana.rsi
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepSlip
-      params:
-        variation: 0.10
+  #- type: FootstepModifier You can add a sound effect when you make one that doesn't sound like a dog dying. -emo
+  #  footstepSoundCollection:
+  #    collection: FootstepSlip
+  #    params:
+  #      volume: -10
+  #      variation: 0.10
  - type: Construction
    graph: BananaClownShoes
    node: shoes
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -14,6 +14,9 @@
    spawned:
    - id: MaterialCloth1
      amount: 3
+  - type: PhysicalComposition # 50% of the amount of cloth you'd obtain upon butchering
+    materialComposition:
+      Cloth: 150
  - type: Food
    requiresSpecialDigestion: true
  - type: SolutionContainerManager
@@ -26,6 +29,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - WhitelistChameleon

 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
@@ -489,3 +489,15 @@
      - state: equipped-INNERCLOTHING
        color: "#cc295f"
      - state: trinkets-equipped-INNERCLOTHING
+
+# Rainbow Jumpskirt
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtColorRainbow
+  name: rainbow jumpskirt
+  description: A multi-colored jumpskirt!
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/rainbow.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/rainbow.rsi
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -334,6 +334,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - PrisonUniform
    - WhitelistChameleon

--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -520,6 +520,7 @@
  - type: Tag
    tags:
    - ClothMade
+    - Recyclable
    - PrisonUniform
    - WhitelistChameleon

--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -213,7 +213,7 @@
 - type: entity
  id: FoamedAluminiumMetal
  name: foamed aluminium metal
-  description: "For sealing hull breaches."
+  description: "Leftover sparse foam from an aluminum foam grenade. Easily destroyed."
  parent: BaseFoamedMetal
  components:
  - type: Sprite
@@ -231,3 +231,27 @@
      state: metal_foam-north
    - map: [ "enum.EdgeLayer.West" ]
      state: metal_foam-west
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: FlimsyMetallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1 # Intentionally very weak to encourage speedy repair, think of it as thin webbing
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  id: ReactionFlash
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: PointLight
+    enabled: true
+    radius: 2
+    energy: 8
+  - type: LightFade
+    duration: 0.5
+  - type: TimedDespawn
+    lifetime: 0.5
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/animals.yml
@@ -0,0 +1,272 @@
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobBee
+  name: Bee Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: 0
+      sprite: Mobs/Animals/bee.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobBee
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobButterfly
+  name: Butterfly Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: butterfly
+      sprite: Mobs/Animals/butterfly.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobButterfly
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCatGeneric
+  name: Generic Cat Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: RandomSpawner
+    prototypes:
+    - MobCat
+    - MobCatCalico
+    - MobCatCaracal
+    - MobCatKitten
+    rarePrototypes:
+    - MobCatSpace
+    rareChance: 0.05
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCatKitten
+  name: Kitten Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCatKitten
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCatSpace
+  name: Space Cat Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCatSpace
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCockroach
+  name: Cockroach Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Animals/cockroach.rsi
+      state: cockroach_icon
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCockroach
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCow
+  name: Cow Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: cow
+      sprite: Mobs/Animals/cow.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCow
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCrab
+  name: Crab Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: crab
+      sprite: Mobs/Animals/crab.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCrab
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobFrog
+  name: Frog Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: frog
+      sprite: Mobs/Animals/frog.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobFrog
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobGoat
+  name: Goat Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: goat
+      sprite: Mobs/Animals/goat.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobGoat
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobGorilla
+  name: Gorilla Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: crawling
+      sprite: Mobs/Animals/gorilla.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobGorilla
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobLizard
+  name: Lizard Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: lizard
+      sprite: Mobs/Animals/lizard.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobLizard
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobMonkey
+  name: Monkey Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: monkey
+      sprite: Mobs/Animals/monkey.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMonkey
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobMouse
+  name: Mouse Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Animals/mouse.rsi
+      state: icon-2
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMouse
+    - MobMouse1
+    - MobMouse2
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobParrot
+  name: Parrot Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: parrot
+      sprite: Mobs/Animals/parrot.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobParrot
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobPenguin
+  name: Penguin Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: penguin
+      sprite: Mobs/Animals/penguin.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobPenguin
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobReindeerBuck
+  name: Reindeer Buck Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: reindeer_buck_still
+      sprite: Mobs/Animals/reindeer_buck.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobReindeerBuck
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobReindeerDoe
+  name: Reindeer Doe Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: reindeer_doe_still
+      sprite: Mobs/Animals/reindeer_doe.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobReindeerDoe
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobSlug
+  name: Slug Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: slug
+      sprite: Mobs/Animals/slug.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSlug
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/carp.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/carp.yml
@@ -0,0 +1,55 @@
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCarp
+  name: Space Carp Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: icon
+      sprite: Mobs/Aliens/Carps/space.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCarp
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCarpHolo
+  name: Holocarp Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: icon
+      sprite: Mobs/Aliens/Carps/holo.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCarpHolo
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCarpMagic
+  name: Magicarp Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: icon
+      sprite: Mobs/Aliens/Carps/magic.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCarpMagic
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobShark
+  name: Space Sharkminnow Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: icon
+      sprite: Mobs/Aliens/Carps/sharkminnow.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobShark
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml
@@ -0,0 +1,265 @@
+- type: entity
+  parent: MarkerBase
+  id: SpawnClownSpider
+  name: clown spider spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: clown
+      sprite: Mobs/Animals/clownspider.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobClownSpider
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobBear
+  name: Space Bear Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: bear
+      sprite: Mobs/Animals/bear.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobBearSpace
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobBehonker
+  name: behonker Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: base
+      sprite: Objects/Weapons/Guns/Battery/behonker_eye.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobBehonkerIce
+    - MobBehonkerPyro
+    - MobBehonkerElectrical
+    - MobBehonkerGrav
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobBoxingKangaroo
+  name: Boxing Kangaroo Spawner
+  suffix: Hostile
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: kangaroo
+      sprite: Mobs/Animals/kangaroo.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobBoxingKangaroo
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobHellspawn
+  name: Hellspawn Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: hellspawn
+      sprite: Markers/mobs.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobHellspawn
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobKangaroo
+  name: Space Kangaroo Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: kangaroo-space
+      sprite: Mobs/Animals/kangaroo.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobKangarooSpace
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobLuminousEntity
+  name: luminous entity spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: luminous_entity
+      sprite: Mobs/Elemental/living_light/luminous_entity.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobLuminousEntity
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobLuminousObject
+  name: luminous object spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: luminous_object
+      sprite: Mobs/Elemental/living_light/luminous_object.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobLuminousObject
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobLuminousPerson
+  name: luminous person spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: luminous_person
+      sprite: Mobs/Elemental/living_light/luminous_person.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobLuminousPerson
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobOreCrab
+  name: ore crab spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: quartz_crab
+      sprite: Mobs/Elemental/orecrab.rsi
+  - type: RandomSpawner
+    prototypes:
+    - MobSpawnCrabUranium
+    - MobSpawnCrabIron
+    - MobSpawnCrabQuartz
+    - MobSpawnCrabSilver
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobPurpleSnake
+  name: Purple Snake Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: purple_snake
+      sprite: Mobs/Aliens/Xenos/purple_snake.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobPurpleSnake
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobSmallPurpleSnake
+  name: Small Purple Snake Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: small_purple_snake
+      sprite: Mobs/Aliens/Xenos/purple_snake.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSmallPurpleSnake
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobSpaceCobra
+  name: Space Cobra Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: spacecobra
+      sprite: Mobs/Animals/spacecobra.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCobraSpace
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobSpaceSpider
+  name: Space Spider Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: spacespider
+      sprite: Mobs/Animals/spacespider.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSpiderSpace
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobWatcherIcewing
+  name: Watcher Icewing Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: unshaded
+      sprite: Mobs/Aliens/Lavaland/watcher.rsi
+      color: deepskyblue
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobWatcherIcewing
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobWatcherLavaland
+  name: Watcher Lavaland Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: unshaded
+      sprite: Mobs/Aliens/Lavaland/watcher.rsi
+      color: red
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobWatcherLavaland
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobWatcherMagmawing
+  name: Watcher Magmawing Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: unshaded
+      sprite: Mobs/Aliens/Lavaland/watcher.rsi
+      color: orangered
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobWatcherMagmawing
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobWatcherPride
+  name: Watcher Pride Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: unshaded
+      sprite: Mobs/Aliens/Lavaland/watcher.rsi
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobWatcherPride
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/misc.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/misc.yml
@@ -0,0 +1,28 @@
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobGingerbreadAI
+  name: gingerbread man Spawner
+  suffix: Ghostrole
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: full
+      sprite: Mobs/Species/Gingerbread/parts.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobGingerbreadAI
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnHonkBot
+  name: honk bot spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: honkbot
+      sprite: Mobs/Silicon/Bots/honkbot.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobHonkBot
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
@@ -0,0 +1,304 @@
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobAlexander
+  name: Alexander Spawner
+  suffix: Chef Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobAlexander
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobBandito
+  name: Bandito Spawner
+  suffix: RD Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobBandito
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCat
+  name: Random Cat Spawner
+  suffix: CMO Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCatRuntime
+    - MobCatException
+    - MobCatFloppa
+    - MobBingus
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCatBingus
+  name: Bingus Spawner
+  suffix: CMO Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobBingus
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCatException
+  name: Exception Spawner
+  suffix: CMO Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCatException
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCatFloppa
+  name: Floppa Spawner
+  suffix: CMO Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCatFloppa
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCatRuntime
+  name: Runtime Spawner
+  suffix: CMO Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCatRuntime
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCorgi
+  name: Corgi Spawner
+  suffix: HoP Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCorgiIan
+    - MobCorgiIanOld
+    - MobCorgiLisa
+    - MobCorgiIanPup
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCorgiMouse
+  name: Dev Mouse Spawner
+  suffix: Dev Map Pet, Admeme
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCorgiMouse
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobCrabAtmos
+  name: Tropico Spawner
+  suffix: Atmos Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCrabAtmos
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobFoxRenault
+  name: Fox Renault Spawner
+  suffix: Captain Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobFoxRenault
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobMcGriff
+  name:  McGriff Spawner
+  suffix: Warden Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMcGriff
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobHamsterHamlet
+  name: Hamster Hamlet Spawner
+  suffix: Bridge Pet (crate)
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: icon-0
+      sprite: Mobs/Animals/hamster.rsi
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - CrateNPCHamlet
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobKangarooWillow
+  name: Willow Spawner
+  suffix: Boxer Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: kangaroo
+      sprite: Mobs/Animals/kangaroo.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobKangarooWillow
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobMonkeyPunpun
+  name: Pun Pun Spawner
+  suffix: Bartender Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: monkey
+      sprite: Mobs/Animals/monkey.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMonkeyPunpun
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobPossumMorty
+  name: Possum Morty Spawner
+  suffix: Morgue Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobPossumMortyOld
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobRaccoonMorticia
+  name: Raccoon Morticia Spawner
+  suffix: QM Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobRaccoonMorticia
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobShiva
+  name: Shiva Spawner
+  suffix: Security Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: shiva
+      sprite: Mobs/Pets/shiva.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSpiderShiva
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobSlothPaperwork
+  name: Sloth Paperwork Spawner
+  suffix: Librarian Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobPaperwork
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobSmile
+  name: Smile Spawner
+  suffix: Science Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSlimesPet
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobWalter
+  name: Walter Spawner
+  suffix: Chemistry Pet
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobWalter
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/slimes.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/slimes.yml
@@ -0,0 +1,77 @@
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobAdultSlimesBlue
+  name: Slimes Spawner Blue
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobAdultSlimesBlue
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobAdultSlimesBlueAngry
+  name: Slimes Spawner Blue Angry
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobAdultSlimesBlueAngry
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobAdultSlimesGreen
+  name: Slimes Spawner Green
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobAdultSlimesGreen
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobAdultSlimesGreenAngry
+  name: Slimes Spawner Green Angry
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobAdultSlimesGreenAngry
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobAdultSlimesYellow
+  name: Slimes Spawner Yellow
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobAdultSlimesYellow
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobAdultSlimesYellowAngry
+  name: Slimes Spawner Yellow Angry
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobAdultSlimesYellowAngry
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/xenos.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/xenos.yml
@@ -0,0 +1,111 @@
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobXenoBurrower
+  name: Xeno Spawner
+  suffix: Burrower
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Xenos/burrower.rsi
+      state: running
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobXeno
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobXenoDrone
+  name: Xeno Spawner
+  suffix: Drone
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Xenos/drone.rsi
+      state: running
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobXenoDrone
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobXenoPraetorian
+  name: Xeno Spawner
+  suffix: Praetorian
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Xenos/praetorian.rsi
+      state: running
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobXenoPraetorian
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobXenoQueen
+  name: Xeno Spawner
+  suffix: Queen
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Xenos/queen.rsi
+      state: running
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobXenoQueen
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobXenoRavager
+  name: Xeno Spawner
+  suffix: Ravager
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Xenos/ravager.rsi
+      state: running
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobXenoRavager
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobXenoRunner
+  name: Xeno Spawner
+  suffix: Runner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Xenos/runner.rsi
+      state: running
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobXenoRunner
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobXenoSpitter
+  name: Xeno Spawner
+  suffix: Spitter
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Xenos/spitter.rsi
+      state: running
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobXenoSpitter
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Mobs/xenos.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Mobs/xenos.yml
@@ -0,0 +1,35 @@
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobXenoEasy
+  name: Xeno Spawner
+  suffix: Easy, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Xenos/drone.rsi
+      state: running
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobXeno
+    - MobXenoDrone
+    - MobXenoRunner
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobXenoHard
+  name: Xeno Spawner
+  suffix: Hard, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Xenos/ravager.rsi
+      state: running
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobXenoPraetorian
+    - MobXenoRavager
+    - MobXenoSpitter
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml
@@ -236,8 +236,7 @@
    - !type:NestedSelector
      tableId: MaintFluffTable
      weight: 5
-      rolls: !type:RangeNumberSelector
-        range: 1, 2
+      rolls: 1, 2

 - type: entity
  parent: MarkerBase
@@ -426,18 +425,16 @@
        children:
        - id: MobSharkSalvage
        - id: MobCarpSalvage
-          amount: !type:ConstantNumberSelector
-            value: 2
+          amount: 2
        - !type:NestedSelector
-          rolls: !type:RangeNumberSelector
-            range: 1, 3
+          rolls: 1, 3
          tableId: SalvageTreasureSpawnerValuable
        - !type:NestedSelector
-          rolls: !type:RangeNumberSelector
-            range: 7, 10
+          rolls: 7, 10
          tableId: TreasureCoinPileRare
      #- id: MobHivebot (solo hivebot spawn)

+
 - type: entity
  parent: MarkerBase
  id: SalvageSpawnerMobMagnet
@@ -525,8 +522,7 @@
      children:
      - id: MobSharkSalvage
      - id: MobCarpSalvage
-        amount: !type:ConstantNumberSelector
-          value: 3
+        amount: 3

 - type: entity
  parent: MarkerBase
@@ -542,7 +538,8 @@
    table: !type:GroupSelector
      children:
      - id: MobGoliath
-        weight: 65
+        weight: 45
      - id: MobHivelord
        weight: 35
-
+      - id: MobBasilisk
+        weight: 20
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -77,6 +77,15 @@
      weight: 0.5
    - id: ScrapMopBucket
      weight: 0.5
+    - !type:GroupSelector
+      weight: 2
+      children:
+      - !type:NestedSelector
+        weight: 3
+        tableId: RandomChemicalBarrel
+      - !type:NestedSelector
+        weight: 1
+        tableId: RandomChemicalBarrelRadioactive

 # Treasure: High-value scatterables that don't do a ton.

--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/smokables.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/smokables.yml
@@ -32,7 +32,7 @@
        state: unlit-icon
  - type: EntityTableSpawner
    table: !type:NestedSelector
-      tableId: SoakedSmokesTable
+      tableId: RandomSoakedSmokeTable

 #Tables
 - type: entityTable
@@ -75,34 +75,6 @@
          weight: 0.5
      - !type:GroupSelector
        children:
-        - id: CigPackMixedMedical
        - id: CigPackMixed
-        - id: CigPackMixedNasty
      - id: CigarGold
        weight: 0.10
-
- type: entityTable
-  id: SoakedSmokesTable
-  table: !type:GroupSelector
-    children:
-      - id: CigaretteOmnizine
-      - id: CigaretteIron
-      - id: CigaretteDylovene
-      - id: CigaretteDermaline
-      - id: CigaretteIpecac
-      - id: CigaretteBicaridine
-      - id: CigaretteDexalin
-      - id: CigarettePax
-      - id: CigaretteBbqSauce
-      - id: CigaretteBlackPepper
-      - id: CigaretteOmnizine
-      - id: CigaretteCapsaicinOil
-      - id: CigaretteBread
-      - id: CigaretteMilk
-      - id: CigaretteBanana
-      - id: CigaretteSpaceDrugs
-      - id: CigaretteMuteToxin
-      - id: CigaretteMold
-      - id: CigaretteLicoxide
-      - id: CigaretteWeldingFuel
-      - id: CigaretteTHC
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -1,925 +0,0 @@
-# Base
-
- type: entity
-  name: Mouse Spawner
-  id: SpawnMobMouse
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - sprite: Mobs/Animals/mouse.rsi
-        state: icon-2
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobMouse
-      - MobMouse1
-      - MobMouse2
-
- type: entity
-  name: Cockroach Spawner
-  id: SpawnMobCockroach
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - sprite: Mobs/Animals/cockroach.rsi
-        state: cockroach_icon
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCockroach
-
- type: entity
-  name: HoP Corgi Spawner
-  id: SpawnMobCorgi
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCorgiIan
-      - MobCorgiIanOld
-      - MobCorgiLisa
-      - MobCorgiIanPup
-
- type: entity
-  name: Dev Mouse Spawner
-  id: SpawnMobCorgiMouse
-  suffix: Admeme
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCorgiMouse
-
- type: entity
-  name: Possum Morty Spawner
-  id: SpawnMobPossumMorty
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobPossumMortyOld
-
- type: entity
-  name: Raccoon Morticia Spawner
-  id: SpawnMobRaccoonMorticia
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobRaccoonMorticia
-
- type: entity
-  name: Fox Renault Spawner
-  id: SpawnMobFoxRenault
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobFoxRenault
-
- type: entity
-  name: Runtime Spawner
-  id: SpawnMobCatRuntime
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCatRuntime
-
- type: entity
-  name: Exception Spawner
-  id: SpawnMobCatException
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCatException
-
- type: entity
-  name: Tropico Spawner
-  id: SpawnMobCrabAtmos
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCrabAtmos
-
- type: entity
-  name: Floppa Spawner
-  id: SpawnMobCatFloppa
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCatFloppa
-
- type: entity
-  name: Bingus Spawner
-  id: SpawnMobCatBingus
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobBingus
-
- type: entity
-  name: Space Cat Spawner
-  id: SpawnMobCatSpace
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCatSpace
-
- type: entity
-  name: Kitten Spawner
-  id: SpawnMobCatKitten
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCatKitten
-
- type: entity
-  name: Cat Spawner
-  id: SpawnMobCat
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobCatRuntime
-      - MobCatException
-      - MobCatFloppa
-      - MobBingus
-
- type: entity
-  name: Generic Cat Spawner
-  id: SpawnMobCatGeneric
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: RandomSpawner
-    prototypes:
-      - MobCat
-      - MobCatCalico
-      - MobCatCaracal
-      - MobCatKitten
-    rarePrototypes:
-      - MobCatSpace
-    rareChance: 0.05
-
- type: entity
-  name: Bandito Spawner
-  id: SpawnMobBandito
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobBandito
-
- type: entity
-  name:  McGriff Spawner
-  id: SpawnMobMcGriff
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobMcGriff
-
- type: entity
-  name: Sloth Paperwork Spawner
-  id: SpawnMobSlothPaperwork
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobPaperwork
-
- type: entity
-  name: Walter Spawner
-  id: SpawnMobWalter
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobWalter
-
- type: entity
-  name: Space Bear Spawner
-  id: SpawnMobBear
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: bear
-      sprite: Mobs/Animals/bear.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobBearSpace
-
- type: entity
-  name: Space Carp Spawner
-  id: SpawnMobCarp
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: icon
-      sprite: Mobs/Aliens/Carps/space.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobCarp
-
- type: entity
-  name: Magicarp Spawner
-  id: SpawnMobCarpMagic
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: icon
-      sprite: Mobs/Aliens/Carps/magic.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobCarpMagic
-
- type: entity
-  name: Holocarp Spawner
-  id: SpawnMobCarpHolo
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: icon
-      sprite: Mobs/Aliens/Carps/holo.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobCarpHolo
-
- type: entity
-  name: Space Sharkminnow Spawner
-  id: SpawnMobShark
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: icon
-      sprite: Mobs/Aliens/Carps/sharkminnow.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobShark
-
- type: entity
-  name: Hamster Hamlet Spawner
-  id: SpawnMobHamsterHamlet
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: icon-0
-        sprite: Mobs/Animals/hamster.rsi
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - CrateNPCHamlet
-
- type: entity
-  name: Alexander Spawner
-  id: SpawnMobAlexander
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobAlexander
-
- type: entity
-  name: Shiva Spawner
-  id: SpawnMobShiva
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: shiva
-        sprite: Mobs/Pets/shiva.rsi
-  - type: ConditionalSpawner
-    prototypes:
-      - MobSpiderShiva
-
- type: entity
-  name: Willow Spawner
-  id: SpawnMobKangarooWillow
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: kangaroo
-      sprite: Mobs/Animals/kangaroo.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobKangarooWillow
-
- type: entity
-  name: Space Kangaroo Spawner
-  id: SpawnMobKangaroo
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: kangaroo-space
-      sprite: Mobs/Animals/kangaroo.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobKangarooSpace
-
- type: entity
-  name: Boxing Kangaroo Spawner
-  id: SpawnMobBoxingKangaroo
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: kangaroo
-      sprite: Mobs/Animals/kangaroo.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobBoxingKangaroo
-
- type: entity
-  name: Space Spider Spawner
-  id: SpawnMobSpaceSpider
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: spacespider
-      sprite: Mobs/Animals/spacespider.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobSpiderSpace
-
- type: entity
-  name: Space Cobra Spawner
-  id: SpawnMobSpaceCobra
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: spacecobra
-      sprite: Mobs/Animals/spacecobra.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobCobraSpace
-
- type: entity
-  name: Slimes Spawner Blue
-  id: SpawnMobAdultSlimesBlue
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobAdultSlimesBlue
-
- type: entity
-  name: Slimes Spawner Blue Angry
-  id: SpawnMobAdultSlimesBlueAngry
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobAdultSlimesBlueAngry
-
- type: entity
-  name: Slimes Spawner Green
-  id: SpawnMobAdultSlimesGreen
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobAdultSlimesGreen
-
- type: entity
-  name: Slimes Spawner Green Angry
-  id: SpawnMobAdultSlimesGreenAngry
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobAdultSlimesGreenAngry
-
- type: entity
-  name: Slimes Spawner Yellow
-  id: SpawnMobAdultSlimesYellow
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobAdultSlimesYellow
-
- type: entity
-  name: Slimes Spawner Yellow Angry
-  id: SpawnMobAdultSlimesYellowAngry
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobAdultSlimesYellowAngry
-
- type: entity
-  name: Smile Spawner
-  id: SpawnMobSmile
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: ai
-  - type: ConditionalSpawner
-    prototypes:
-      - MobSlimesPet
-
- type: entity
-  name: Pun Pun Spawner
-  id: SpawnMobMonkeyPunpun
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: monkey
-      sprite: Mobs/Animals/monkey.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobMonkeyPunpun
-
- type: entity
-  name: behonker Spawner
-  id: SpawnMobBehonker
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: base
-      sprite: Objects/Weapons/Guns/Battery/behonker_eye.rsi
-  - type: ConditionalSpawner
-    prototypes:
-      - MobBehonkerIce
-      - MobBehonkerPyro
-      - MobBehonkerElectrical
-      - MobBehonkerGrav
-
- type: entity
-  name: Monkey Spawner
-  id: SpawnMobMonkey
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: monkey
-      sprite: Mobs/Animals/monkey.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobMonkey
-
- type: entity
-  name: Purple Snake Spawner
-  id: SpawnMobPurpleSnake
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: purple_snake
-      sprite: Mobs/Aliens/Xenos/purple_snake.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobPurpleSnake
-
- type: entity
-  name: Small Purple Snake Spawner
-  id: SpawnMobSmallPurpleSnake
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: small_purple_snake
-      sprite: Mobs/Aliens/Xenos/purple_snake.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobSmallPurpleSnake
-
- type: entity
-  name: Slug Spawner
-  id: SpawnMobSlug
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: slug
-      sprite: Mobs/Animals/slug.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobSlug
-
- type: entity
-  name: Lizard Spawner
-  id: SpawnMobLizard
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: lizard
-      sprite: Mobs/Animals/lizard.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobLizard
-
- type: entity
-  name: Crab Spawner
-  id: SpawnMobCrab
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: crab
-      sprite: Mobs/Animals/crab.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobCrab
-
- type: entity
-  name: Goat Spawner
-  id: SpawnMobGoat
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: goat
-      sprite: Mobs/Animals/goat.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobGoat
-
- type: entity
-  name: Frog Spawner
-  id: SpawnMobFrog
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: frog
-      sprite: Mobs/Animals/frog.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobFrog
-
- type: entity
-  name: Bee Spawner
-  id: SpawnMobBee
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: 0
-      sprite: Mobs/Animals/bee.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobBee
-
- type: entity
-  name: Parrot Spawner
-  id: SpawnMobParrot
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: parrot
-      sprite: Mobs/Animals/parrot.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobParrot
-
- type: entity
-  name: Butterfly Spawner
-  id: SpawnMobButterfly
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: butterfly
-      sprite: Mobs/Animals/butterfly.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobButterfly
-
- type: entity
-  name: Cow Spawner
-  id: SpawnMobCow
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: cow
-      sprite: Mobs/Animals/cow.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobCow
-
- type: entity
-  name: Gorilla Spawner
-  id: SpawnMobGorilla
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: crawling
-      sprite: Mobs/Animals/gorilla.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobGorilla
-
- type: entity
-  name: Penguin Spawner
-  id: SpawnMobPenguin
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: penguin
-      sprite: Mobs/Animals/penguin.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobPenguin
-
-
- type: entity
-  name: Hellspawn Spawner
-  id: SpawnMobHellspawn
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: hellspawn
-      sprite: Markers/mobs.rsi
-  - type: ConditionalSpawner
-    prototypes:
-      - MobHellspawn
-
- type: entity
-  name: ore crab spawner
-  id: SpawnMobOreCrab
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: quartz_crab
-      sprite: Mobs/Elemental/orecrab.rsi
-  - type: RandomSpawner
-    prototypes:
-      - MobSpawnCrabUranium
-      - MobSpawnCrabIron
-      - MobSpawnCrabQuartz
-      - MobSpawnCrabSilver
-
- type: entity
-  name: luminous person spawner
-  id: SpawnMobLuminousPerson
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: luminous_person
-      sprite: Mobs/Elemental/living_light/luminous_person.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobLuminousPerson
-
- type: entity
-  name: luminous object spawner
-  id: SpawnMobLuminousObject
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: luminous_object
-      sprite: Mobs/Elemental/living_light/luminous_object.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobLuminousObject
-
- type: entity
-  name: luminous entity spawner
-  id: SpawnMobLuminousEntity
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: luminous_entity
-      sprite: Mobs/Elemental/living_light/luminous_entity.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobLuminousEntity
-
- type: entity
-  name: clown spider spawner
-  id: SpawnClownSpider
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: clown
-      sprite: Mobs/Animals/clownspider.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobClownSpider
-
- type: entity
-  name: honk bot spawner
-  id: SpawnHonkBot
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: honkbot
-      sprite: Mobs/Silicon/Bots/honkbot.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobHonkBot
-
- type: entity
-  name: gingerbread man Spawner
-  id: SpawnMobGingerbreadAI
-  suffix: Ghostrole
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: green
-      - state: full
-        sprite: Mobs/Species/Gingerbread/parts.rsi
-  - type: ConditionalSpawner
-    prototypes:
-      - MobGingerbreadAI
-
- type: entity
-  name: Reindeer Buck Spawner
-  id: SpawnMobReindeerBuck
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: reindeer_buck_still
-      sprite: Mobs/Animals/reindeer_buck.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobReindeerBuck
-
- type: entity
-  name: Reindeer Doe Spawner
-  id: SpawnMobReindeerDoe
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: reindeer_doe_still
-      sprite: Mobs/Animals/reindeer_doe.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobReindeerDoe
--- a/Resources/Prototypes/Entities/Markers/tile.yml
+++ b/Resources/Prototypes/Entities/Markers/tile.yml
@@ -1,20 +1,8 @@
- type: entity
-  id: BaseRoofMarker
-  abstract: true
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Transform
-    anchored: true
-  - type: Sprite
-    drawdepth: Overdoors
-    sprite: Markers/cross.rsi
-
 - type: entity
  id: RoofMarker
  name: Roof
  suffix: Enabled
-  parent: BaseRoofMarker
+  parent: MarkerBase
  components:
  - type: SetRoof
    value: true
@@ -27,7 +15,7 @@
  id: NoRoofMarker
  name: Roof
  suffix: Disabled
-  parent: BaseRoofMarker
+  parent: MarkerBase
  components:
  - type: SetRoof
    value: false
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -1,6 +1,6 @@
 - type: entity
  parent: [BaseMob, StripableInventoryBase]
-  id: BaseBorgChassis
+  id: BaseBorgChassisNotIonStormable
  name: cyborg
  description: A man-machine hybrid that assists in station activity. They love being asked to state their laws over and over.
  save: false
@@ -83,7 +83,6 @@
    stunTime: 5
  - type: SiliconLawProvider
    laws: Crewsimov
-  - type: IonStormTarget
  - type: Inventory
    templateId: borg
  - type: Hands
@@ -156,7 +155,7 @@
  - type: Vocal
    sounds:
      Unsexed: UnisexSilicon
-    screamAction: null
+    wilhelmProbability: 0
  - type: DamagedSiliconAccent
  - type: UnblockableSpeech
  - type: FootstepModifier
@@ -250,6 +249,13 @@
      flatReductions:
        Heat: 10 # capable of touching light bulbs and stoves without feeling pain!

+- type: entity
+  abstract: true
+  parent: BaseBorgChassisNotIonStormable
+  id: BaseBorgChassis
+  components:
+  - type: IonStormTarget
+
 - type: entity
  abstract: true
  id: BaseBorgTransponder
@@ -279,6 +285,26 @@
    maxIntensity: 20
    canCreateVacuum: false # its for killing the borg not the station

+- type: entity
+  abstract: true
+  parent: BaseBorgTransponder
+  id: BaseXenoborgTransponder
+  components:
+  - type: DeviceNetwork
+    receiveFrequencyId: Xenoborg
+    transmitFrequencyId: Mothership
+  - type: SurveillanceCamera # they act like cameras for the mothership
+    networkSet: true
+    nameSet: True
+    id: Xenoborg
+  - type: Explosive
+    explosionType: Minibomb
+    deleteAfterExplosion: false # let damage threshold gib the borg
+    totalIntensity: 200 # bigger kaboom
+    intensitySlope: 20
+    maxIntensity: 100
+    canCreateVacuum: false
+
 - type: entity
  id: BaseBorgChassisNT
  parent: [BaseBorgChassis, BaseBorgTransponder]
@@ -358,3 +384,115 @@
  - type: IonStormTarget
    chance: 1
  - type: ShowJobIcons
+
+- type: entity
+  parent: BaseBorgChassisNotIonStormable
+  id: BaseXenoborgChassis
+  name: xenoborg
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army.
+  save: false
+  abstract: true
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesXenoborg
+  - type: Sprite
+    sprite: Mobs/Silicon/chassis.rsi
+  - type: MobThresholds
+    thresholds: # slightly tankier than a normal borg
+      0: Alive
+      125: Critical
+      250: Dead
+  - type: EmagSiliconLaw # should xenoborgs be emagable?
+    stunTime: 5
+  - type: SiliconLawProvider
+    laws: XenoborgLawset # custom laws here
+    subverted: true
+  - type: IntrinsicRadioTransmitter # can only use binary and xenoborg channel
+    channels:
+    - Xenoborg
+    - Binary
+  - type: ActiveRadio # but can hear the mothership channel
+    channels:
+    - Mothership
+    - Xenoborg
+    - Binary
+  - type: Repairable
+    doAfterDelay: 13 # 25% more HP, so 30% more time to heal
+  - type: BorgChassis
+    maxModules: 0
+    hasMindState: robot_e
+    noMindState: robot_e_r
+    moduleWhitelist:
+      tags:
+      - XenoborgModuleGeneric
+  - type: TypingIndicator
+    proto: xenoborg
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Xenoborg
+    allowedEmotes:
+    - Laugh
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSiliconXenoborg
+    screamAction: null
+  - type: DamagedSiliconAccent
+  - type: UnblockableSpeech
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepXenoborg
+  # - type: SpamEmitSound # makes a creppy noise randomly
+  #   minInterval: 30
+  #   maxInterval: 45
+  #   sound:
+  #     path: /Audio/Machines/genetics.ogg
+  #     params:
+  #       volume: -8
+  #       maxDistance: 5
+  #       variation: 0.05
+  - type: NpcFactionMember
+    factions:
+    - Xenoborg
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 90
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Machines/warning_buzzer.ogg
+          params:
+            volume: 5
+    - trigger:
+        !type:DamageTrigger
+        damage: 375
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:EmptyContainersBehaviour
+        containers:
+        - borg_brain
+        - borg_module
+        - cell_slot
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: PointLight
+    color: "#0033ff"
+  - type: GuideHelp
+    guides:
+    - Cyborgs
+    - Robotics
+    # TODO: add Xenoborg guide (part 7 spoilers)
+  - type: Access
+    enabled: false
+    tags:
+    - Xenoborg
+  - type: AccessReader
+    access: [["Xenoborg"]]
+  - type: ShowJobIcons # not sure if it is needed
+  - type: InteractionPopup
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
@@ -0,0 +1,333 @@
+- type: entity
+  parent: [ BaseXenoborgChassis, BaseXenoborgTransponder ]
+  id: XenoborgEngi
+  name: engi xenoborg
+  suffix: with brain
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This one seems to be an engineering type, as it has more tools for supporting the other xenoborgs.
+  components:
+  - type: BorgTransponder
+    name: engi xenoborg
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: xenoborg_engi
+  - type: Sprite
+    layers:
+    - state: xenoborg_engi
+    - state: xenoborg_engi_e
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: xenoborg_engi_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    maxModules: 7
+    hasMindState: xenoborg_engi_e
+    noMindState: xenoborg_engi_e_r
+    moduleWhitelist:
+      tags:
+      - XenoborgModuleGeneric
+      - XenoborgModuleEngi
+      - BorgModuleEngineering
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - MMIFilled
+      borg_module:
+      - XenoborgModuleBasic
+      - BorgModuleAdvancedTool
+      - BorgModuleConstruction
+      - BorgModuleRCD
+      - BorgModuleCable
+      - XenoborgModuleAccessBreaker
+      - XenoborgModuleFireExtinguisher
+  - type: ShowHealthBars
+    damageContainers:
+    - Inorganic
+    - Silicon
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+
+- type: entity
+  parent: [ BaseXenoborgChassis, BaseXenoborgTransponder ]
+  id: XenoborgHeavy
+  name: heavy xenoborg
+  suffix: with brain
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This type is has heavy lasers and is covered in thick armor plates. It may be tougher, but its speed matches its brawn.
+  components:
+  - type: BorgTransponder
+    name: heavy xenoborg
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: xenoborg_heavy
+  - type: Sprite
+    layers:
+    - state: xenoborg_heavy
+    - state: xenoborg_heavy_e
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: xenoborg_heavy_l
+      shader: unshaded
+      map: ["light"]
+      visible: false
+  - type: BorgChassis
+    maxModules: 4
+    hasMindState: xenoborg_heavy_e
+    noMindState: xenoborg_heavy_e_r
+    moduleWhitelist:
+      tags:
+      - XenoborgModuleGeneric
+      - XenoborgModuleHeavy
+  - type: MovementSpeedModifier # slower
+    baseWalkSpeed : 1.2
+    baseSprintSpeed : 2.2
+  - type: FlashImmunity
+  - type: MobThresholds # tankier
+    thresholds:
+      0: Alive
+      250: Critical
+      500: Dead
+    stateAlertDict:
+      Alive: BorgHealth
+      Critical: BorgCrit
+      Dead: BorgDead
+    showOverlays: false
+    allowRevives: true
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 190
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Machines/warning_buzzer.ogg
+          params:
+            volume: 5
+    - trigger:
+        !type:DamageTrigger
+        damage: 750
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:EmptyContainersBehaviour
+        containers:
+        - borg_brain
+        - cell_slot
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Repairable
+    doAfterDelay: 25 # more HP, more time to heal
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - MMIFilled
+      borg_module:
+      - XenoborgModuleBasic
+      - XenoborgModuleTool
+      - XenoborgModuleLaser
+      - XenoborgModuleJammer
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+
+- type: entity
+  parent: [ BaseXenoborgChassis, BaseXenoborgTransponder ]
+  id: XenoborgScout
+  name: scout xenoborg
+  suffix: with brain
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This is a scout type, its nimble thrusters allow it to move quickly through space.
+  components:
+  - type: BorgTransponder
+    name: scout xenoborg
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: xenoborg_scout
+  - type: Sprite
+    layers:
+      - state: xenoborg_scout
+      - state: xenoborg_scout_e
+        map: ["enum.BorgVisualLayers.Light"]
+        shader: unshaded
+        visible: false
+      - state: xenoborg_scout_l
+        shader: unshaded
+        map: ["light"]
+        visible: false
+  - type: FootstepModifier # it flies instead of walking
+    footstepSoundCollection:
+      collection: FootstepHoverXenoborg
+  - type: FlashImmunity
+  - type: BorgChassis
+    maxModules: 4
+    hasMindState: xenoborg_scout_e
+    noMindState: xenoborg_scout_e_r
+    moduleWhitelist:
+      tags:
+      - XenoborgModuleGeneric
+      - XenoborgModuleScout
+  - type: MovementSpeedModifier # faster
+    baseWalkSpeed : 3
+    baseSprintSpeed : 6
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - MMIFilled
+      borg_module:
+      - XenoborgModuleBasic
+      - XenoborgModuleTool
+      - XenoborgModuleSword
+      - XenoborgModuleSpaceMovement
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+
+- type: entity
+  parent: [ BaseXenoborgChassis, BaseXenoborgTransponder ]
+  id: XenoborgStealth
+  name: stealth xenoborg
+  suffix: with brain
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This one is a stealth type. Its armor shimmers in the light like no other material you've seen.
+  components:
+  - type: BorgTransponder
+    name: stealth xenoborg
+    sprite:
+      sprite: Mobs/Silicon/chassis.rsi
+      state: xenoborg_stealth
+  - type: Sprite
+    layers:
+      - state: xenoborg_stealth
+      - state: xenoborg_stealth_e
+        map: ["enum.BorgVisualLayers.Light"]
+        shader: unshaded
+        visible: false
+      - state: xenoborg_stealth_l
+        shader: unshaded
+        map: ["light"]
+        visible: false
+  - type: FootstepModifier # it flies instead of walking
+    footstepSoundCollection:
+      collection: FootstepHoverXenoborg
+  - type: BorgChassis
+    maxModules: 5
+    hasMindState: xenoborg_stealth_e
+    noMindState: xenoborg_stealth_e_r
+    moduleWhitelist:
+      tags:
+      - XenoborgModuleGeneric
+      - XenoborgModuleStealth
+  - type: MovementAlwaysTouching # it flies in space with tiny thrusters
+  # - type: SpamEmitSound # longer interval to make the creppy sound
+  #   minInterval: 50
+  #   maxInterval: 150
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - MMIFilled
+      borg_module:
+      - XenoborgModuleBasic
+      - XenoborgModuleTool
+      - XenoborgModuleHypo
+      - XenoborgModuleChameleonProjector
+      - XenoborgModuleCloakDevice
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+
+
+# xenoborgs empty
+- type: entity
+  parent: XenoborgEngi
+  id: XenoborgEngiPrinted
+  suffix: no brain
+  components:
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - MMI
+      borg_module:
+      - XenoborgModuleBasic
+      - BorgModuleAdvancedTool
+      - BorgModuleConstruction
+      - BorgModuleRCD
+      - BorgModuleCable
+      - XenoborgModuleAccessBreaker
+      - XenoborgModuleFireExtinguisher
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHighPrinted
+
+- type: entity
+  parent: XenoborgHeavy
+  id: XenoborgHeavyPrinted
+  suffix: no brain
+  components:
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - MMI
+      borg_module:
+      - XenoborgModuleBasic
+      - XenoborgModuleTool
+      - XenoborgModuleLaser
+      - XenoborgModuleJammer
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHighPrinted
+
+- type: entity
+  parent: XenoborgScout
+  id: XenoborgScoutPrinted
+  suffix: no brain
+  components:
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - MMI
+      borg_module:
+      - XenoborgModuleBasic
+      - XenoborgModuleTool
+      - XenoborgModuleSword
+      - XenoborgModuleSpaceMovement
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHighPrinted
+
+- type: entity
+  parent: XenoborgStealth
+  id: XenoborgStealthPrinted
+  suffix: no brain
+  components:
+  - type: ContainerFill
+    containers:
+      borg_brain:
+      - MMI
+      borg_module:
+      - XenoborgModuleBasic
+      - XenoborgModuleTool
+      - XenoborgModuleHypo
+      - XenoborgModuleChameleonProjector
+      - XenoborgModuleCloakDevice
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHighPrinted
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -61,6 +61,20 @@
    damage:
      types:
        Piercing: 5
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      30: Critical
+      60: Dead
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 120
+      behaviors:
+      - !type:GibBehavior
+        recursive: false
  - type: Tag
    tags:
    - VimPilot
@@ -138,6 +152,15 @@
    rootTask:
      task: SimpleHostileCompound
  - type: ZombieImmune
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 20
+      behaviors:
+      - !type:GibBehavior
+        recursive: false

 - type: entity
  name: bee
@@ -399,7 +422,8 @@
        damageType: Blunt
        damage: 10
      behaviors:
-      - !type:GibBehavior { }
+      - !type:GibBehavior
+        recursive: false
  - type: NonSpreaderZombie
  - type: SentienceTarget
    flavorKind: station-event-random-sentience-flavor-organic
@@ -569,7 +593,8 @@
        damageType: Blunt
        damage: 60
      behaviors:
-      - !type:GibBehavior { }
+      - !type:GibBehavior
+        recursive: false
  - type: FireVisuals
    sprite: Mobs/Effects/onfire.rsi
    normalState: Mouse_burning
@@ -805,6 +830,15 @@
    bloodMaxVolume: 0.1
  - type: MobPrice
    price: 50
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 20
+      behaviors:
+      - !type:GibBehavior
+        recursive: false

 - type: entity
  name: cow
@@ -1226,9 +1260,6 @@
  - type: Vocal
    sounds:
      Unsexed: Kangaroo
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepBounce
  - type: Puller
    needsHands: false
  - type: StaminaDamageOnHit
@@ -1807,6 +1838,15 @@
      Taco: RatTaco
      Burger: RatBurger
      Skewer: RatSkewer
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 60
+      behaviors:
+      - !type:GibBehavior
+        recursive: false

 - type: entity
  parent: MobMouse
@@ -2094,6 +2134,15 @@
  - type: Tag
    tags:
    - VimPilot
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 60
+      behaviors:
+      - !type:GibBehavior
+        recursive: false

 # Would be cool to have some functionality for the parrot to be able to sit on stuff
 - type: entity
@@ -2262,6 +2311,7 @@
        Brute: 5
  - type: Item
    size: Normal
+    sprite: Mobs/Animals/grenadepenguin.rsi
  - type: OnUseTimerTrigger
    delay: 10
    beepSound:
@@ -2753,9 +2803,10 @@
    - VimPilot

 - type: entity
-  name: corgi
+  abstract: true
  parent: [SimpleMobBase, StripableInventoryBase]
-  id: MobCorgi
+  id: MobCorgiBase
+  name: corgi
  description: Finally, a space corgi!
  components:
  - type: Sprite
@@ -2782,6 +2833,22 @@
  - type: Inventory
    speciesId: dog
    templateId: pet
+  - type: InteractionPopup
+    interactSuccessString: petting-success-dog
+    interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/small_dog_bark_happy.ogg
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: MobPrice
+    price: 200
+
+- type: entity
+  parent: MobCorgiBase
+  id: MobCorgi
+  components:
  - type: DamageStateVisuals
    states:
      Alive:
@@ -2796,19 +2863,8 @@
      amount: 2
  - type: ReplacementAccent
    accent: dog
-  - type: InteractionPopup
-    interactSuccessString: petting-success-dog
-    interactFailureString: petting-failure-generic
-    interactSuccessSpawn: EffectHearts
-    interactSuccessSound:
-      path: /Audio/Animals/small_dog_bark_happy.ogg
-  - type: Grammar
-    attributes:
-      gender: epicene
  - type: SentienceTarget
    flavorKind: station-event-random-sentience-flavor-corgi
-  - type: MobPrice
-    price: 200
  - type: Tag
    tags:
    - VimPilot
@@ -3384,6 +3440,15 @@
  - type: FireVisuals
    sprite: Mobs/Effects/onfire.rsi
    normalState: Mouse_burning
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 120
+      behaviors:
+      - !type:GibBehavior
+        recursive: false

 - type: entity
  name: pig
@@ -3638,3 +3703,64 @@
        Base: reindeer_doe_dead
      Dead:
        Base: reindeer_doe_dead
+
+- type: entity
+  parent: MobCorgiBase
+  id: MobCorgiSmart
+  name: smart corgi
+  description: An unusually smart dog.
+  components:
+  # Use corgi sprite, need to add handcuff layer
+  - type: Sprite
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: corgi
+    - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi # Would do a custom dog handcuff sprite but unfortunately handcuffs have their overlay baked-in to the cuff itself so this is mostly filler
+      state: body-overlay-2
+      visible: false
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  # Custom inventory template
+  - type: Inventory
+    speciesId: dog
+    templateId: SmartCorgi
+    displacements:
+      belt:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/corgi.rsi
+            state: belt_displacement
+      ears:
+        sizeMaps:
+          32:
+            sprite: Mobs/Pets/corgi.rsi
+            state: belt_displacement
+  - type: Hands # HANDS!
+  - type: Puller
+  - type: Cuffable # bad dog!
+  - type: BlockWriting # dogs can't write, paws unwieldy; mouth-writing is a myth
+  - type: Stripping
+  - type: ComplexInteraction
+  # Implement custom borgi body type
+  - type: Body
+    prototype: SmartCorgi
+  - type: RotationVisuals
+    defaultRotation: 90
+    horizontalRotation: 180
+  - type: Grammar
+    attributes:
+      gender: epicene # Gender neutral
+      proper: true
+  - type: Tag
+    tags:
+    - VimPilot
+    - CanPilot
+    - DoorBumpOpener
+  - type: StatusIcon # marks them as crew
+    bounds: -0.5,-0.5,0.5,0.5
--- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -81,6 +81,8 @@
        6
      AggroVisionRadius: !type:Single
        10
+      NavSmash: !type:Bool
+        true
  - type: NPCUseActionOnTarget
    actionId: ActionGoliathTentacle
  - type: Tag
@@ -241,6 +243,8 @@
        4
      AggroVisionRadius: !type:Single
        9
+      NavSmash: !type:Bool
+        true
  - type: Butcherable
    spawned:
    - id: FoodHivelordRemains
@@ -293,6 +297,8 @@
        15
      AggroVisionRadius: !type:Single
        15
+      NavSmash: !type:Bool
+        true
  - type: TimedDespawn
    lifetime: 100

@@ -323,6 +329,9 @@
    stage: 1
  - type: StaticPrice
    price: 5000
+  - type: Tag
+    tags:
+    - HivelordRemains

 - type: entity
  id: FoodHivelordRemainsInert
@@ -339,3 +348,80 @@
    size: Normal
  - type: StaticPrice
    price: 500
+  - type: Tag
+    tags:
+    - HivelordRemains
+
+
+- type: entity
+  id: MobBasilisk
+  parent: [ BaseMobAsteroid, MobBloodstream ]
+  name: basilisk
+  description: A territorial beast, covered in a thick shell that absorbs energy. Its stare causes victims to freeze from the inside.
+  components:
+  - type: Sprite
+    sprite: Mobs/Aliens/Asteroid/basilisk.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: basilisk
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: basilisk
+      Dead:
+        Base: basilisk_dead
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 3
+    baseSprintSpeed : 3.5
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      80: Dead
+  - type: MeleeWeapon
+    angle: 0
+    animation: WeaponArcBite
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    damage:
+      types:
+        Slash: 7
+        Piercing: 5
+  - type: Gun
+    fireRate: 0.75
+    selectedMode: SemiAuto
+    showExamineText: false
+    availableModes: [ SemiAuto ]
+    soundGunshot: /Audio/Weapons/Guns/Gunshots/syringe_gun.ogg
+  - type: RechargeBasicEntityAmmo
+    showExamineText: false
+    rechargeCooldown: 0
+    rechargeSound: null
+  - type: BasicEntityAmmoProvider
+    proto: BasiliskRay
+    capacity: 1
+    count: 1
+  - type: Bloodstream
+    bloodMaxVolume: 200
+    chemicalMaxVolume: 0
+  - type: NpcFactionMember
+    factions:
+    - SimpleHostile
+  - type: HTN
+    rootTask:
+      task: BasiliskCompound
+    blackboard:
+      VisionRadius: !type:Single
+        7
+      AggroVisionRadius: !type:Single
+        12
+      NavSmash: !type:Bool
+        true
+  - type: Reflect
+    reflectProb: 1
+    reflects:
+    - Energy
+  - type: Butcherable
+    spawned:
+    - id: DiamondOre1
+      amount: 1
+      maxAmount: 3
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -243,8 +243,7 @@
        - id: FoodMeatFish
          amount: 4
        - id: MaterialToothSharkminnow1
-          amount: 1
-          maxAmount: 3
+          amount: 3
    - type: MeleeWeapon
      damage:
        types:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/hivebot.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/hivebot.yml
@@ -0,0 +1,123 @@
+# Base hivebot
+- type: entity
+  parent: [ BaseSimpleMob, MobCombat, MobRobotic ]
+  id: MobHivebot
+  name: hivebot
+  description: Agitating, mechanized pests.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Aliens/hivebot.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: basic_attack
+  - type: HTN
+    rootTask:
+      task: SimpleHostileCompound
+    blackboard:
+      NavSmash: !type:Bool
+        true
+  - type: NpcFactionMember
+    factions:
+    - SimpleHostile
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.50
+        density: 80
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      20: Dead
+    stateAlertDict:
+      Alive: BorgHealth
+      Dead: BorgDead
+    showOverlays: false
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      10: 0.7
+  - type: MeleeWeapon
+    altDisarm: false
+    angle: 0
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Slash: 6 # Pretty whatever on their own, but their strength is in numbers
+  - type: Tag
+    tags:
+      - DoorBumpOpener
+      - Unimplantable
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 1.5
+    baseSprintSpeed: 2.5
+# Doesn't seem to work for some reason?
+#  - type: PointLight
+#    radius: 1.0
+#    energy: 1
+#    castShadows: false
+#    color: "#bc5858"
+  - type: RotationVisuals
+    horizontalRotation: 90
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Borg
+
+- type: entity
+  parent: MobHivebot
+  id: MobHivebotRanged
+  name: hivebot
+  suffix: Ranged
+  description: Agitating, mechanized pests. This one has a gun.
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: ranged_attack
+  - type: HTN
+    rootTask:
+      task: SimpleRangedHostileCompound
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 0.50
+  - type: BasicEntityAmmoProvider
+    proto: BulletHivebot
+    capacity: 1
+    count: 1
+  - type: Gun
+    fireRate: 0.50
+    useKey: false
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+    soundGunshot: /Audio/Weapons/Guns/Gunshots/smg.ogg
+  - type: MovementSpeedModifier #Slower then normal to make them easier to hit
+    baseWalkSpeed: 1
+    baseSprintSpeed: 2
+
+- type: entity
+  parent: MobHivebotRanged
+  id: MobHivebotStrong
+  name: strong hivebot
+  description: Agitating, mechanized pests. This one looks much stronger then normal.
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: strong_attack
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      60: Dead
+  - type: MovementSpeedModifier #Even slower then the ranged variant, to make them even easier to hit
+    baseWalkSpeed: 0.75
+    baseSprintSpeed: 1.75
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      25: 0.7
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -211,9 +211,7 @@
    group: GenericNumber
  - type: FootstepModifier
    footstepSoundCollection:
-      path: /Audio/Effects/Footsteps/slime1.ogg
-      params:
-        volume: 3
+      collection: FootstepSlime
  - type: Tag
    tags:
      - FootstepSound
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -744,9 +744,7 @@
      200: Dead
  - type: FootstepModifier
    footstepSoundCollection:
-      path: /Audio/Effects/Footsteps/slime1.ogg
-      params:
-        volume: -6
+      collection: FootstepSlime
  - type: Tag
    tags:
    - FootstepSound
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -29,6 +29,8 @@
    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
      state: eyes
      shader: unshaded
+  - type: TypingIndicator
+    proto: regal
  - type: Physics
    bodyType: KinematicController
  - type: Fixtures
@@ -229,6 +231,15 @@
      0: Alive
      15: Critical
      30: Dead
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 60
+      behaviors:
+      - !type:GibBehavior
+        recursive: false
  - type: Stamina
    critThreshold: 60
  - type: MeleeWeapon
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -1,17 +1,67 @@
+# Used for generic robotic entities (like Hivelords)
 - type: entity
  save: false
  abstract: true
  parent: BaseMob
-  id: MobSiliconBase
+  id: MobRobotic
  components:
  - type: Reactive
    groups:
      Acidic: [Touch]
  - type: Damageable
    damageContainer: Inorganic
-  - type: MovementSpeedModifier
-    baseWalkSpeed : 3
-    baseSprintSpeed : 4
+  - type: MovedByPressure
+  - type: Physics
+    bodyType: KinematicController # Same for all inheritors
+  - type: StatusEffects
+    allowed:
+    - Stun
+    - KnockedDown
+    - SlowedDown
+    - Stutter
+    - Electrocution
+  - type: Repairable
+    doAfterDelay: 8
+    fuelCost: 15
+  - type: Pullable
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - SiliconEmotes
+    - Unimplantable
+  - type: MobState
+    allowedStates:
+      - Alive
+      - Dead
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      120: Dead
+    stateAlertDict:
+      Alive: BorgHealth
+      Dead: BorgDead
+    showOverlays: false
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Borg
+  - type: TypingIndicator
+    proto: robot
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSilicon
+  - type: Emoting
+  - type: ZombieImmune
+  - type: ProtectedFromStepTriggers
+  - type: NoSlip
+  - type: Insulated
+
+# Used for bots
+- type: entity
+  save: false
+  abstract: true
+  parent: MobRobotic
+  id: MobSiliconBase
+  components:
  - type: NpcFactionMember
    factions:
    - SimpleNeutral
@@ -30,39 +80,11 @@
    - Heat
    - Shock
    locPrefix: silicon
-  - type: MovedByPressure
-  - type: Physics
-    bodyType: KinematicController # Same for all inheritors
-  - type: StatusEffects
-    allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
-    - Stutter
-    - Electrocution
  - type: NameIdentifier
    group: Silicon
-  - type: Repairable
-    doAfterDelay: 8
-    fuelCost: 15
-  - type: Pullable
-  - type: Tag
-    tags:
-    - DoorBumpOpener
-    - SiliconEmotes
-    - Bot
-    - Unimplantable
-  - type: MobState
-    allowedStates:
-      - Alive
-      - Dead
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      120: Dead
-    stateAlertDict:
-      Alive: BorgHealth
-    showOverlays: false
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 3
+    baseSprintSpeed : 4
  - type: Stamina
    critThreshold: 120
  - type: Destructible
@@ -78,24 +100,20 @@
      behaviors:
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
-  - type: Body
-    prototype: Bot
  - type: GuideHelp
    guides:
    - Robotics
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - SiliconEmotes
+    - Bot
+    - Unimplantable
+  - type: Body
+    prototype: Bot
  - type: Speech
    speechVerb: Robotic
    speechSounds: Pai #couldn't decide if this should be borg or pai sounds so I flipped a coin.
-  - type: TypingIndicator
-    proto: robot
-  - type: Vocal
-    sounds:
-      Unsexed: UnisexSilicon
-  - type: Emoting
-  - type: ZombieImmune
-  - type: ProtectedFromStepTriggers
-  - type: NoSlip
-  - type: Insulated

 - type: entity
  parent: MobSiliconBase
@@ -442,3 +460,5 @@
    channels:
    - Common
    - Supply
+  - type: Puller
+    needsHands: false
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -4,7 +4,6 @@
  - BaseMob
  - MobDamageable
  - MobPolymorphable
-  - MobAtmosExposed
  id: BaseSimpleMob
  suffix: AI
  abstract: true
@@ -40,6 +39,7 @@
  abstract: true
  parent:
  - BaseSimpleMob
+  - MobAtmosExposed
  - MobCombat
  - MobBloodstream
  - MobFlammable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -31,9 +31,7 @@
    baseSprintSpeed: 4
  - type: FootstepModifier
    footstepSoundCollection:
-      path: /Audio/Effects/Footsteps/slime1.ogg
-      params:
-        volume: 3
+      collection: FootstepSlime
  - type: Tag
    tags:
    - FootstepSound
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -162,9 +162,6 @@
  - type: Vocal
    sounds:
      Unsexed: Kangaroo
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepBounce
  - type: ReplacementAccent
    accent: kangaroo
  - type: Butcherable
@@ -433,6 +430,15 @@
      0: Alive
      10: Critical
      20: Dead
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 40
+      behaviors:
+      - !type:GibBehavior
+        recursive: false
  - type: MovementSpeedModifier
    baseWalkSpeed : 2
    baseSprintSpeed : 3
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -42,6 +42,15 @@
    thresholds:
      0: Alive
      15: Dead
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 30
+      behaviors:
+      - !type:GibBehavior
+        recursive: false
  - type: Stamina
    critThreshold: 15
  - type: MovementAlwaysTouching
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -17,11 +17,13 @@
  # traits
  # - LegsParalyzed (you get healed)
  - LightweightDrunk
+  - Muted
  - Narcolepsy
  - Pacified
  - PainNumbness
  - Paracusia
  - PermanentBlindness
+  - Snoring
  - Unrevivable
  # job specific
  - BibleUser
@@ -37,6 +39,7 @@
  - BleatingAccent
  - DamagedSiliconAccent
  - FrenchAccent
+  - FrontalLisp
  - GermanAccent
  - LizardAccent
  - MobsterAccent
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -64,6 +64,7 @@
    tags:
    - BypassInteractionRangeChecks
  - type: PointLight
+    netsync: false
    radius: 6
    castShadows: false
    enabled: false
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -70,10 +70,6 @@
    canShuttle: false
    title: comms-console-announcement-title-station-ai
    color: "#5ed7aa"
-  - type: HolographicAvatar
-    layerData:
-    - sprite: Mobs/Silicon/station_ai.rsi
-      state: default
  - type: ShowJobIcons

 - type: entity
@@ -202,8 +198,11 @@
    layers:
    - state: base
    - state: ai_empty
-      map: ["unshaded"]
      shader: unshaded
+    - state: ai
+      map: ["enum.StationAiVisualState.Key"]
+      shader: unshaded
+      visible: false
  - type: Appearance
  - type: InteractionPopup
    interactSuccessString: petting-success-station-ai
@@ -211,12 +210,6 @@
    messagePerceivedByOthers: petting-success-station-ai-others # Otherwise AI cannot tell its being pet as It's just a brain inside of the core, not the core itself.
    interactSuccessSound:
      path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: GenericVisualizer
-    visuals:
-      enum.StationAiVisualState.Key:
-        unshaded:
-          Empty: { state: ai_empty }
-          Occupied: { state: ai }
  - type: Telephone
    compatibleRanges:
    - Grid
@@ -230,10 +223,12 @@
  - type: StationAiWhitelist
  - type: UserInterface
    interfaces:
-        enum.HolopadUiKey.AiRequestWindow:
-          type: HolopadBoundUserInterface
-        enum.HolopadUiKey.AiActionWindow:
-          type: HolopadBoundUserInterface
+      enum.HolopadUiKey.AiRequestWindow:
+        type: HolopadBoundUserInterface
+      enum.HolopadUiKey.AiActionWindow:
+        type: HolopadBoundUserInterface
+      enum.StationAiCustomizationUiKey.Key:
+        type: StationAiCustomizationBoundUserInterface

 # The job-ready version of an AI spawn.
 - type: entity
@@ -244,12 +239,6 @@
  - type: ContainerSpawnPoint
    containerId: station_ai_mind_slot
    job: StationAi
-  - type: Sprite
-    sprite: Mobs/Silicon/station_ai.rsi
-    layers:
-    - state: base
-    - state: ai
-      shader: unshaded

 # The actual brain inside the core
 - type: entity
@@ -294,6 +283,14 @@
  - type: StartingMindRole
    mindRole: "MindRoleSiliconBrain"
    silent: true
+  - type: StationAiCustomization
+    protoIds:
+      StationAiCoreIconography: StationAiIconAi
+      StationAiHolograms: StationAiHologramFemale
+  - type: HolographicAvatar
+    layerData:
+    - sprite: Mobs/Silicon/holograms.rsi
+      state: ai_female
  - type: NameIdentifier
    group: StationAi

--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -90,8 +90,6 @@
      - map: ["enum.HumanoidVisualLayers.RHand"]
      - map: [ "gloves" ]
      - map: [ "shoes" ]
-      - map: [ "ears" ]
-      - map: [ "eyes" ]
      - map: [ "belt" ]
      - map: [ "id" ]
      - map: [ "outerClothing" ]
@@ -101,6 +99,8 @@
      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
      - map: [ "enum.HumanoidVisualLayers.Hair" ] # Do these need to be here? (arachnid hair arachnid hair)
      - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+      - map: [ "ears" ]
+      - map: [ "eyes" ]
      - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
      - map: [ "mask" ]
      - map: [ "head" ]
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -15,7 +15,6 @@
  # they like eat it idk lol
  - type: Storage
    clickInsert: false
-    openOnActivate: false
    grid:
    - 0,0,1,2
    maxItemSize: Large
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -142,6 +142,10 @@
    solutions:
      drink:
        maxVol: 20
+  - type: SolutionTransfer
+    canChangeTransferAmount: true
+    minTransferAmount: 1
+    maxTransferAmount: 20
  - type: MixableSolution
    solution: drink
  - type: FitsInDispenser
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
@@ -20,9 +20,6 @@
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
-  - type: Tag
-    tags:
-    - VoxFood

 - type: entity
  id: FoodBagel
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -15,7 +15,6 @@
  - type: Tag
    tags:
    - Bread
-    - VoxFood
  - type: SolutionContainerManager
    solutions:
      food:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -26,7 +26,6 @@
  - type: Tag
    tags:
    - Cake
-    - VoxFood
  - type: SecretStash
    maxItemSize: "Normal"
    secretStashName: secret-stash-cake
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -10,7 +10,6 @@
  - type: Tag
    tags:
    - Donut
-    - VoxFood
  - type: Sprite
    sprite: Objects/Consumable/Food/Baked/donut.rsi
  - type: SolutionContainerManager
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -18,9 +18,6 @@
          Quantity: 5
  - type: Item
    size: Tiny
-  - type: Tag
-    tags:
-    - VoxFood

 # Muffins

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -30,7 +30,6 @@
  - type: Tag
    tags:
    - Pie
-    - VoxFood

 - type: entity
  parent: FoodInjectableBase # Not sliceable
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -22,9 +22,6 @@
        reagents:
        - ReagentId: Nutriment
          Quantity: 20
-  - type: Tag
-    tags:
-    - VoxFood

 # Meals

@@ -353,7 +350,7 @@
  description: BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist.
  components:
  - type: Food
-    trash: 
+    trash:
    - FoodKebabSkewer
  - type: FlavorProfile
    flavors:
@@ -615,7 +612,7 @@
  description: Buttery.
  components:
  - type: Food
-    trash: 
+    trash:
    - FoodPlate
  - type: FlavorProfile
    flavors:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
@@ -18,10 +18,7 @@
        reagents:
        - ReagentId: Nutriment
          Quantity: 20
-  - type: Tag
-    tags:
-    - VoxFood
-    
+
 # Noodles

 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -280,7 +280,7 @@
  - type: Extractable
    grindableSolutionName: food
  - type: DamageOnInteract
-    damage: 
+    damage:
      types:
        Heat: 4
        Caustic: 4
@@ -307,7 +307,7 @@
            volume: -5
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
-  - type: DamageOnHit 
+  - type: DamageOnHit
    damage:
      types:
        Blunt: 5 # The nettle will "wilt" after 5 hits.
@@ -1312,6 +1312,7 @@
  - type: Tag
    tags:
    - Vegetable
+    - Mushroom

 # Slices

@@ -1623,6 +1624,9 @@
    entries:
      Taco: Lingzhi
      Burger: Lingzhi
+  - type: Tag
+    tags:
+    - Mushroom

 - type: entity
  name: ambrosia vulgaris
@@ -1844,6 +1848,9 @@
    entries:
      Taco: FlyAmanita
      Burger: FlyAmanita
+  - type: Tag
+    tags:
+    - Mushroom

 - type: entity
  name: gatfruit
--- a/Show More
+++ b/Show More