Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

# Conflicts: # Content.Client/Administration/AdminNameOverlay.cs # Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml # Content.Client/Guidebook/Controls/GuideReagentReaction.xaml # Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs # Content.Client/SubFloor/SubFloorHideSystem.cs # Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs # Content.Server/Antag/AntagSelectionSystem.cs # Content.Server/Cloning/CloningSystem.cs # Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs # Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs # Content.Server/Roles/ParadoxCloneRoleComponent.cs # Content.Shared.Database/LogType.cs # Content.Shared/CCVar/CCVars.Interface.cs # Content.Shared/Cloning/CloningEvents.cs # Content.Shared/Cloning/CloningSettingsPrototype.cs # Content.Shared/Humanoid/NamingSystem.cs # Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs # Content.Shared/Light/Components/SunShadowCycleComponent.cs # Content.Shared/Storage/StorageComponent.cs # Resources/Changelog/Admin.yml # Resources/Changelog/Changelog.yml # Resources/Credits/GitHub.txt # Resources/Locale/en-US/paradox-clone/role.ftl # Resources/Maps/bagel.yml # Resources/Maps/loop.yml # Resources/Prototypes/Chemistry/mixing_types.yml # Resources/Prototypes/Datasets/Names/last.yml # Resources/Prototypes/Entities/Effects/puddle.yml # Resources/Prototypes/Entities/Mobs/Player/clone.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml # Resources/Prototypes/Entities/Objects/Devices/pda.yml # Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Objectives/paradoxClone.yml # Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml # Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi/equipped-EYES-arachnid.png
2025-03-31 12:41:37 +03:00
parent 987f00a493 0c98ad8b38
commit 9d6e023bd0
1137 changed files with 49288 additions and 36602 deletions
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -44,6 +44,8 @@
    - Trash
    - BorgArm
    - BorgLArm
+  - type: Item
+    heldPrefix: borg-arm

 - type: entity
  id: RightArmBorg
@@ -62,6 +64,8 @@
    - Trash
    - BorgArm
    - BorgRArm
+  - type: Item
+    heldPrefix: borg-arm

 - type: entity
  id: LeftLegBorg
@@ -80,6 +84,8 @@
    - Trash
    - BorgLeg
    - BorgLLeg
+  - type: Item
+    heldPrefix: borg-leg

 - type: entity
  id: RightLegBorg
@@ -98,6 +104,8 @@
    - Trash
    - BorgLeg
    - BorgRLeg
+  - type: Item
+    heldPrefix: borg-leg

 - type: entity
  id: LightHeadBorg
@@ -114,6 +122,8 @@
    tags:
    - Trash
    - BorgHead
+  - type: Item
+    heldPrefix: borg-head

 - type: entity
  id: TorsoBorg
@@ -130,3 +140,5 @@
    tags:
    - Trash
    - BorgTorso
+  - type: Item
+    heldPrefix: borg-chest
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -88,6 +88,16 @@
  category: cargoproduct-category-name-fun
  group: market

+- type: cargoProduct
+  id: CrateFunFoamGuns
+  icon:
+    sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi
+    state: icon
+  product: CrateFunFoamGuns
+  cost: 3000
+  category: cargoproduct-category-name-fun
+  group: market
+
 - type: cargoProduct
  id: FunPlushies
  icon:
--- a/Resources/Prototypes/Catalog/Fills/Boxes/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml
@@ -23,11 +23,11 @@
    contents:
    - id: PaperAgrichemManual
    - id: ChemistryEmptyBottle01
-    - id: PotassiumChemistryBottle
-    - id: PhosphorusChemistryBottle
-    - id: NitrogenChemistryBottle
-    - id: HydrogenChemistryBottle
-    - id: EthanolChemistryBottle
+    - id: ChemistryBottlePotassium
+    - id: ChemistryBottlePhosphorus
+    - id: ChemistryBottleNitrogen
+    - id: ChemistryBottleHydrogen
+    - id: ChemistryBottleEthanol
    - id: RadiumChemistryVial
    - id: ChlorineChemistryVial
  - type: Sprite
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -58,7 +58,7 @@
      - id: HydroponicsToolHatchet
      - id: ClothingOuterApronBotanist
      - id: ClothingHandsGlovesLeather
-      - id: EZNutrientChemistryBottle
+      - id: ChemistryBottleEZNutrient
        amount: 2

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -279,6 +279,21 @@
      - id: WeaponWaterPistol
        amount: 4

+- type: entity
+  id: CrateFunFoamGuns
+  parent: CratePlastic
+  name: Foam Force crate
+  description: Contains four Foam Force rifles, some grenades, and extra ammo. It's [REDACTED] or nothing!
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleFoam
+      amount: 4
+    - id: BoxDonkSoftBox
+      amount: 2
+    - id: GrenadeFoamDart
+      amount: 4
+
 - type: entity
  id: CrateFunBoxing
  parent: CrateGenericSteel
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -125,7 +125,7 @@
    - id: HydroponicsToolMiniHoe
    - id: HydroponicsToolSpade
    - id: HydroponicsToolClippers
-    - id: RobustHarvestChemistryBottle
+    - id: ChemistryBottleRobustHarvest

 - type: entity
  id: ClothingBeltSheathFilled
@@ -165,11 +165,11 @@
  components:
  - type: StorageFill
    contents:
-      - id: EpinephrineChemistryBottle
+      - id: ChemistryBottleEpinephrine
        amount: 2
-      - id: EphedrineChemistryBottle
+      - id: ChemistryBottleEphedrine
        amount: 2
-      - id: OmnizineChemistryBottle
+      - id: ChemistryBottleOmnizine
      - id: MedkitCombatFilled

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -6,7 +6,7 @@
  - type: StorageFill
    contents:
      - id: BoxSyringe
-      - id: EpinephrineChemistryBottle
+      - id: ChemistryBottleEpinephrine
        amount: 1
      - id: Brutepack
        amount: 2
@@ -25,7 +25,7 @@
  - type: StorageFill
    contents:
      - id: BoxSyringe
-      - id: EpinephrineChemistryBottle
+      - id: ChemistryBottleEpinephrine
        amount: 1
      - id: Brutepack
        amount: 2
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -101,7 +101,7 @@
      - id: ClothingHandsGlovesLeather
      - id: ClothingOuterApronBotanist
      - id: ClothingHeadBandBotany
-      - id: RobustHarvestChemistryBottle
+      - id: ChemistryBottleRobustHarvest
        prob: 0.3
      - id: ClothingBeltPlant
      - id: PlantBag ##Some maps don't have nutrivend
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -15,3 +15,6 @@

    MagazineBoxRifle: 6
    MagazineBoxRiflePractice: 3
+
+    BoxLethalshot: 6
+    BoxShotgunPractice: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -47,7 +47,7 @@
    DrinkBeerCan: 5
    DrinkWineCan: 5
  contrabandInventory:
-    EthanolChemistryBottle: 3
+    ChemistryBottleEthanol: 3
    DrinkBottleOfNothingFull: 1
  emaggedInventory:
    DrinkPoisonWinebottleFull: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -15,6 +15,7 @@
    ClothingOuterWinterMiner: 2
    ClothingNeckScarfStripedBrown: 3
    ClothingShoesBootsWinterCargo: 2
+    MailBag: 2
  contrabandInventory:
    ToyFigurineCargoTech: 1
    ToyFigurineSalvage: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
@@ -26,7 +26,7 @@
    DrinkLithiumFlask: 1
    StrangePill: 3
  emaggedInventory:
-    ToxinChemistryBottle: 1
+    ChemistryBottleToxin: 1

 - type: vendingMachineInventory
  id: ChemVendInventorySyndicate
@@ -57,8 +57,8 @@
    DrinkLithiumFlask: 1
    StrangePill: 3
  emaggedInventory:
-    PaxChemistryBottle: 3
-    MuteToxinChemistryBottle: 3
-    LeadChemistryBottle: 2
-    ToxinChemistryBottle: 1
-    
+    ChemistryBottlePax: 3
+    ChemistryBottleMuteToxin: 3
+    ChemistryBottleLead: 2
+    ChemistryBottleToxin: 1
+
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -98,4 +98,5 @@
    ClothingUniformJumpskirtTacticool: 1
    ToyFigurinePassenger: 1
    ToyFigurineGreytider: 1
+    ClothingBackpackSatchelSmugglerUnanchored: 1
  # DO NOT ADD MORE, USE UNIFORM DYING
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
@@ -1,7 +1,7 @@
 - type: vendingMachineInventory
  id: DrGibbInventory
  startingInventory:
-    DrinkDrGibbCan: 4
+    DrinkDrGibbCan: 6
    DrinkGrapeCan: 2
    DrinkRootBeerCan: 2
    DrinkIcedTeaCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -5,7 +5,7 @@
    Brutepack: 5
    Ointment: 5
    Bloodpack: 5
-    EpinephrineChemistryBottle: 3
+    ChemistryBottleEpinephrine: 3
    Syringe: 5
    BoxBottle: 3
    ClothingEyesHudMedical: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -12,15 +12,15 @@
    WeedSpray: 20
    PestSpray: 20
    Syringe: 5
-    RobustHarvestChemistryBottle: 3
-    EZNutrientChemistryBottle: 3
+    ChemistryBottleRobustHarvest: 3
+    ChemistryBottleEZNutrient: 3
    Bucket: 3
    DiseaseSwab: 20
    BoxAgrichem: 1
    #TO DO:
    #plant analyzer
  contrabandInventory:
-    UnstableMutagenChemistryBottle: 1
+    ChemistryBottleUnstableMutagen: 1
    Joint: 1
  emaggedInventory:
-    Left4ZedChemistryBottle: 1
+    ChemistryBottleLeft4Zed: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
@@ -1,13 +1,13 @@
 - type: vendingMachineInventory
  id: SmiteInventory
  startingInventory:
-    DrinkLemonLimeCan: 4
-    DrinkLemonLimeCranberryCan: 2
-    DrinkColaCan: 2
-    DrinkSolDryCan: 2
+    DrinkLemonLimeCan: 8
+    DrinkLemonLimeCranberryCan: 6
+    DrinkColaCan: 3
+    DrinkSolDryCan: 3
  contrabandInventory:
-    ToyHammer: 1
    DrinkStarkistCan: 2
+    ToyHammer: 1
  emaggedInventory:
    DrinkNukieCan: 2
    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
@@ -1,14 +1,12 @@
 - type: vendingMachineInventory
  id: SpaceUpInventory
  startingInventory:
-    DrinkSpaceUpCan: 3
-    DrinkSpaceMountainWindCan: 3
+    DrinkSpaceUpCan: 5
+    DrinkSpaceMountainWindCan: 5
    DrinkGrapeCan: 2
    DrinkRootBeerCan: 2
    DrinkIcedTeaCan: 2
    DrinkSolDryCan: 2
-    DrinkLemonLimeCan: 2
-    DrinkLemonLimeCranberryCan: 2
    DrinkFourteenLokoCan: 2
  contrabandInventory:
    DrinkSpaceMountainWindBottleFull: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
@@ -1,7 +1,7 @@
 - type: vendingMachineInventory
  id: StarkistInventory
  startingInventory:
-    DrinkStarkistCan: 4
+    DrinkStarkistCan: 6
    DrinkGrapeCan: 2
    DrinkRootBeerCan: 2
    DrinkIcedTeaCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
@@ -4,7 +4,7 @@
    Brutepack: 3
    Ointment: 3
    Bloodpack: 3
-    EpinephrineChemistryBottle: 3
+    ChemistryBottleEpinephrine: 3
    Syringe: 3
  contrabandInventory:
    PowerCellSmall: 2
--- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
+++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
@@ -47,7 +47,7 @@
  content:
  - StorageImplanter
  - DnaScramblerImplanter
-  - EphedrineChemistryBottle
+  - ChemistryBottleEphedrine
  - SoapOmega
  - Syringe
  - DrinkShaker
@@ -76,8 +76,8 @@
    sprite: Objects/Tanks/anesthetic.rsi
    state: icon
  content:
-  - NocturineChemistryBottle
-  - NocturineChemistryBottle
+  - ChemistryBottleNocturine
+  - ChemistryBottleNocturine
  - HypopenBox
  - NitrousOxideTankFilled

--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -618,7 +618,7 @@
  id: UplinkNocturineChemistryBottle
  name: uplink-nocturine-chemistry-bottle-name
  description: uplink-nocturine-chemistry-bottle-desc
-  productEntity: NocturineChemistryBottle
+  productEntity: ChemistryBottleNocturine
  discountCategory: usualDiscounts
  discountDownTo:
    Telecrystal: 3
@@ -2148,3 +2148,16 @@
    whitelist:
    - Chef
    - Mime
+
+- type: listing
+  id: UplinkSmugglerSatchel
+  name: uplink-smuggler-satchel-name
+  description: uplink-smuggler-satchel-desc
+  productEntity: ClothingBackpackSatchelSmugglerUnanchored
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkDeception
--- a/Resources/Prototypes/Datasets/Names/last.yml
+++ b/Resources/Prototypes/Datasets/Names/last.yml
@@ -1 +0,0 @@
-
--- a/Resources/Prototypes/Datasets/criminal_records.yml
+++ b/Resources/Prototypes/Datasets/criminal_records.yml
@@ -1,24 +1,6 @@
 # "funny" placeholders of extremely minor/non-crimes for wanted reason dialog
- type: dataset
+- type: localizedDataset
  id: CriminalRecordsWantedReasonPlaceholders
  values:
-  - Ate a delicious valid salad
-  - Ate their own shoes
-  - Being a clown
-  - Being a mime
-  - Breathed the wrong way
-  - Broke into evac
-  - Did literally nothing
-  - Did their job
-  - Didn't say hello to me
-  - Drank one too many
-  - Had two toolboxes, that's too many
-  - Lied on common radio
-  - Looked at me funny
-  - Lubed up the entire way to evac
-  - Set AME up on time
-  - Slipped the HoS
-  - Stole the clown's mask
-  - Told an unfunny joke
-  - Wore a gasmask
-  - Wore boxing gloves
+    prefix: placeholders-criminal-records-wanted-reason-
+    count: 20
--- a/Resources/Prototypes/Datasets/figurines.yml
+++ b/Resources/Prototypes/Datasets/figurines.yml
@@ -2,211 +2,211 @@
  id: FigurinesHoP
  values:
    prefix: figurines-hop-
-    count: 2
+    count: 5

 - type: localizedDataset
  id: FigurinesPassenger
  values:
    prefix: figurines-passenger-
-    count: 2
+    count: 5

 - type: localizedDataset
  id: FigurinesGreytider
  values:
    prefix: figurines-greytider-
-    count: 5
+    count: 6

 - type: localizedDataset
  id: FigurinesClown
  values:
    prefix: figurines-clown-
-    count: 5
+    count: 7

 - type: localizedDataset
  id: FigurinesHoloClown
  values:
    prefix: figurines-holoclown-
-    count: 1
+    count: 7

 - type: localizedDataset
  id: FigurinesMime
  values:
    prefix: figurines-mime-
-    count: 5
+    count: 9

 - type: localizedDataset
  id: FigurinesMusician
  values:
    prefix: figurines-musician-
-    count: 2
+    count: 5

 - type: localizedDataset
  id: FigurinesBoxer
  values:
    prefix: figurines-boxer-
-    count: 4
+    count: 5

 - type: localizedDataset
  id: FigurinesCaptain
  values:
    prefix: figurines-captain-
-    count: 3
+    count: 8

 - type: localizedDataset
  id: FigurinesHoS
  values:
    prefix: figurines-hos-
-    count: 3
+    count: 5

 - type: localizedDataset
  id: FigurinesWarden
  values:
    prefix: figurines-warden-
-    count: 4
+    count: 6

 - type: localizedDataset
  id: FigurinesDetective
  values:
    prefix: figurines-detective-
-    count: 2
+    count: 5

 - type: localizedDataset
  id: FigurinesSecurity
  values:
    prefix: figurines-security-
-    count: 4
+    count: 10

 - type: localizedDataset
  id: FigurinesLawyer
  values:
    prefix: figurines-lawyer-
-    count: 2
+    count: 5

 - type: localizedDataset
  id: FigurinesCargoTech
  values:
    prefix: figurines-cargotech-
-    count: 3
+    count: 6

 - type: localizedDataset
  id: FigurinesSalvage
  values:
    prefix: figurines-salvage-
-    count: 1
+    count: 6

 - type: localizedDataset
  id: FigurinesQM
  values:
    prefix: figurines-qm-
-    count: 7
+    count: 9

 - type: localizedDataset
  id: FigurinesCE
  values:
    prefix: figurines-ce-
-    count: 5
+    count: 6

 - type: localizedDataset
  id: FigurinesEngineer
  values:
    prefix: figurines-engineer-
-    count: 3
+    count: 7

 - type: localizedDataset
  id: FigurinesAtmosTech
  values:
    prefix: figurines-atmostech-
-    count: 5
+    count: 7

 - type: localizedDataset
  id: FigurinesRD
  values:
    prefix: figurines-rd-
-    count: 2
+    count: 6

 - type: localizedDataset
  id: FigurinesScientist
  values:
    prefix: figurines-scientist-
-    count: 5
+    count: 6

 - type: localizedDataset
  id: FigurinesCMO
  values:
    prefix: figurines-cmo-
-    count: 2
+    count: 5

 - type: localizedDataset
  id: FigurinesChemist
  values:
    prefix: figurines-chemist-
-    count: 1
+    count: 6

 - type: localizedDataset
  id: FigurinesParamedic
  values:
    prefix: figurines-paramedic-
-    count: 2
+    count: 5

 - type: localizedDataset
  id: FigurinesDoctor
  values:
    prefix: figurines-doctor-
-    count: 3
+    count: 5

 - type: localizedDataset
  id: FigurinesLibrarian
  values:
    prefix: figurines-librarian-
-    count: 2
+    count: 14

 - type: localizedDataset
  id: FigurinesChaplain
  values:
    prefix: figurines-chaplain-
-    count: 3
+    count: 6

 - type: localizedDataset
  id: FigurinesChef
  values:
    prefix: figurines-chef-
-    count: 1
+    count: 6

 - type: localizedDataset
  id: FigurinesBartender
  values:
    prefix: figurines-bartender-
-    count: 2
+    count: 7

 - type: localizedDataset
  id: FigurinesBotanist
  values:
    prefix: figurines-botanist-
-    count: 2
+    count: 5

 - type: localizedDataset
  id: FigurinesJanitor
  values:
    prefix: figurines-janitor-
-    count: 2
+    count: 9

 - type: localizedDataset
  id: FigurinesNukie
  values:
    prefix: figurines-nukie-
-    count: 4
+    count: 5

 - type: localizedDataset
  id: FigurinesNukieElite
  values:
    prefix: figurines-nukie-elite-
-    count: 3
+    count: 6

 - type: localizedDataset
  id: FigurinesNukieCommander
  values:
    prefix: figurines-nukie-commander-
-    count: 1
+    count: 5

 - type: localizedDataset
  id: FigurinesFootsoldier
@@ -218,31 +218,31 @@
  id: FigurinesWizard
  values:
    prefix: figurines-wizard-
-    count: 1
+    count: 4

 - type: localizedDataset
  id: FigurinesSpaceDragon
  values:
    prefix: figurines-space-dragon-
-    count: 1
+    count: 5

-# - type: localizedDataset # TODO add something
-#   id: FigurinesQueen
-#   values:
-#     prefix: figurines-queen-
-#     count: 0
+- type: localizedDataset
+  id: FigurinesQueen
+  values:
+    prefix: figurines-queen-
+    count: 6

 - type: localizedDataset
  id: FigurinesRatKing
  values:
    prefix: figurines-rat-king-
-    count: 3
+    count: 6

 - type: localizedDataset
  id: FigurinesRatServant
  values:
    prefix: figurines-rat-servant-
-    count: 2
+    count: 5

 - type: localizedDataset
  id: FigurinesMouse
@@ -254,7 +254,7 @@
  id: FigurinesSlime
  values:
    prefix: figurines-slime-
-    count: 3
+    count: 4

 - type: localizedDataset
  id: FigurinesHamlet
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -278,6 +278,10 @@
    sprite: Clothing/Back/Backpacks/syndicate.rsi
  - type: ExplosionResistance
    damageCoefficient: 0.1
+  - type: Storage
+    grid:
+    - 0,0,7,3
+    - 8,1,8,3

 #Special
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/smuggler.yml
@@ -0,0 +1,120 @@
+- type: entity
+  abstract: true
+  id: BaseSubfloorAnchorStorage
+  components:
+  - type: Appearance
+  - type: SubFloorHide
+  - type: Anchorable
+  - type: CollideOnAnchor
+  - type: Transform
+    anchored: false
+  - type: AnchoredStorageFilter
+    blacklist:
+      components:
+      - HumanoidAppearance # for forks with felines
+  - type: BlockAnchorOn
+    blacklist:
+      components:
+      - AnchoredStorageFilter
+  - type: Visibility
+    layer: 1
+
+- type: entity
+  abstract: true
+  parent: BaseSubfloorAnchorStorage
+  id: BaseSubfloorAnchorStorageAnchored
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    canCollide: false
+    bodyType: Static
+
+- type: entity
+  parent: [ BaseSubfloorAnchorStorageAnchored, ClothingBackpackSatchel, BaseMinorContraband ]
+  id: ClothingBackpackSatchelSmuggler
+  name: smuggler's satchel
+  suffix: Empty
+  description: A dingy, suspicious looking satchel.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/smuggler.rsi
+    state: icon
+
+- type: entity
+  parent: [ BaseSubfloorAnchorStorage, ClothingBackpackSatchel, BaseMinorContraband ]
+  id: ClothingBackpackSatchelSmugglerUnanchored
+  name: smuggler's satchel
+  suffix: Empty, Unanchored
+  description: A dingy, suspicious looking satchel.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/smuggler.rsi
+    state: icon
+
+- type: entity
+  parent: [ BaseSubfloorAnchorStorageAnchored, BriefcaseSyndie, BaseMinorContraband ]
+  id: BriefcaseSmugglerCash
+  name: smuggler's briefcase
+  suffix: Smuggler, Do Not Map
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: SpaceCash5000
+          amount: !type:RangeNumberSelector
+            range: 1, 11
+
+- type: entity
+  parent: [ BaseSubfloorAnchorStorageAnchored, ClothingBackpackDuffelClown, BaseMinorContraband ]
+  id: ClothingBackpackDuffelClownSmuggler
+  name: smuggler's clown duffel bag
+  suffix: Smuggler, Do Not Map
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: SpeedLoaderCap
+          amount: !type:RangeNumberSelector
+            range: 4, 8
+        - !type:GroupSelector
+          children:
+          - id: RevolverCapGun
+            amount: !type:RangeNumberSelector
+              range: 4, 8
+            weight: 95
+          - id: RevolverCapGunFake
+            amount: !type:RangeNumberSelector
+              range: 1, 8
+            weight: 5
+
+- type: entity
+  parent: ClothingBackpackSatchelSmuggler
+  id: ClothingBackpackSatchelSmugglerFilled
+  suffix: Smuggler, Do Not Map
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/smuggler.rsi
+    state: icon
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:NestedSelector
+        tableId: FillSmugglerBackpack
+
+- type: entity
+  parent: MarkerBase
+  id: RandomSatchelSpawner
+  name: random smuggler's satchel spawner
+  suffix: Do Not Map
+  components:
+  - type: Sprite
+    layers:
+      - sprite: Clothing/Back/Satchels/smuggler.rsi
+        state: icon
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: RandomSatchelTable
--- a/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml
@@ -0,0 +1,671 @@
+#Table
+- type: entityTable
+  id: RandomSatchelTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingBackpackSatchelSmugglerFilled
+      weight: 85
+    - id: BriefcaseSmugglerCash
+      weight: 10
+    - id: ClothingBackpackDuffelClownSmuggler
+      weight: 5
+
+#Table
+- type: entityTable
+  id: FillSmugglerBackpack
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomSatchelTable1
+    - !type:NestedSelector
+      tableId: RandomSatchelTable2
+    - !type:NestedSelector
+      tableId: RandomSatchelTable3
+    - !type:NestedSelector
+      tableId: RandomSatchelTable4
+    - !type:NestedSelector
+      tableId: RandomSatchelTable5
+    - !type:NestedSelector
+      tableId: RandomSatchelTable6
+
+- type: entityTable
+  id: RandomSatchelTable1
+  table: !type:AllSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomSatchelGenericTable
+    - !type:NestedSelector
+      tableId: RandomSatchelFunnyTable
+    - !type:NestedSelector
+      tableId: RandomSatchelClothingTable
+    - !type:NestedSelector
+      tableId: RandomSatchelCannabisTable
+    - !type:NestedSelector
+      tableId: RandomSatchelGizmosTable
+    - !type:NestedSelector
+      tableId: RandomSatchelChemsTable
+
+- type: entityTable
+  id: RandomSatchelFunnyTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 20
+    - id: WhoopieCushion
+    - id: RubberChicken
+    - id: PlasticBanana
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: PillSpaceDrugs
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: StrangePill
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+
+- type: entityTable
+  id: RandomSatchelCannabisTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 4
+    - id: Joint
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: Blunt
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: SmokingPipeFilledCannabis
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: GroundCannabis
+      amount: !type:RangeNumberSelector
+        range: 1, 15
+
+- type: entityTable
+  id: RandomSatchelGizmosTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 40
+    - id: TimerTrigger
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: SignalTrigger
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: VoiceTrigger
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: ProximitySensor
+
+- type: entityTable
+  id: RandomSatchelChemsTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 20
+    - id: ChemistryBottleUnstableMutagen
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: ChemistryBottleLeft4Zed
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: ChemistryBottleEZNutrient
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: ChemistryBottleRobustHarvest
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: ChemistryBottleEpinephrine
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: ChemistryBottleEphedrine
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: ChemistryBottleOmnizine
+    - id: ChemistryBottleCognizine
+    - id: ChemistryBottleToxin
+    - id: ChemistryBottleNocturine
+    - id: VestineChemistryVial
+
+- type: entityTable
+  id: RandomSatchelTable2
+  table: !type:AllSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomSatchelTobaccoTable
+    - !type:NestedSelector
+      tableId: RandomSatchelPartyTable
+    - !type:NestedSelector
+      tableId: RandomSatchelClothingTable
+    - !type:NestedSelector
+      tableId: RandomSatchelPayloadTable
+    - !type:NestedSelector
+      tableId: RandomSatchelCircuitboardsTable
+
+- type: entityTable
+  id: RandomSatchelTobaccoTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 8
+    - id: CigPackSyndicate
+      weight: 0.5
+    - id: CigCartonGreen
+    - id: CigCartonRed
+    - id: CigCartonGreen
+    - id: CigCartonBlack
+    - id: CigarCase
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: CigarGoldCase
+      weight: 0.25
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+
+- type: entityTable
+  id: RandomSatchelPartyTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 2
+    - id: GlowstickBase
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: GlowstickRed
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: GlowstickPurple
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: GlowstickYellow
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: GlowstickBlue
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+
+- type: entityTable
+  id: RandomSatchelClothingTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 3
+    - id: ClothingEyesGlassesOutlawGlasses
+    - id: ClothingEyesEyepatch
+    - id: ClothingHandsGlovesNitrile
+    - id: ClothingHeadHatOutlawHat
+    - id: ClothingMaskItalianMoustache
+    - id: ClothingHandsGlovesCombat
+    - id: ClothingNeckScarfStripedSyndieRed
+
+- type: entityTable
+  id: RandomSatchelPayloadTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 45
+    - id: FlashPayload
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: ChemicalPayload
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: ExplosivePayload
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+
+- type: entityTable
+  id: RandomSatchelCircuitboardsTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 15
+    - id: ChemDispenserMachineCircuitboard
+    - id: SyndicateMicrowaveMachineCircuitboard
+    - id: HydroponicsTrayMachineCircuitboard
+    - id: DawInstrumentMachineCircuitboard
+    - id: PortableGeneratorPacmanMachineCircuitboard
+    - id: PortableGeneratorSuperPacmanMachineCircuitboard
+    - id: HellfireFreezerMachineCircuitBoard
+    - id: HellfireHeaterMachineCircuitBoard
+    - id: ReagentGrinderMachineCircuitboard
+    - id: ReagentGrinderIndustrialMachineCircuitboard
+    - id: BoozeDispenserMachineCircuitboard
+    - id: MiniGravityGeneratorCircuitboard
+    - id: AmmoTechFabCircuitboard
+    - id: CryoPodMachineCircuitboard
+    - id: PowerCageRechargerCircuitboard
+    - id: ShuttleConsoleCircuitboard
+    - id: TurboItemRechargerCircuitboard
+
+- type: entityTable
+  id: RandomSatchelTable3
+  table: !type:AllSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomSatchelPresentsOrToysTable
+    - !type:NestedSelector
+      tableId: RandomSatchelCashTable
+    - !type:NestedSelector
+      tableId: RandomSatchelWeaponTable
+    - !type:NestedSelector
+      tableId: RandomSatchelBurgerTable
+    - !type:NestedSelector
+      tableId: RandomSatchelGenericTable
+    - !type:NestedSelector
+      tableId: RandomSatchelKeysTable
+
+- type: entityTable
+  id: RandomSatchelPresentsOrToysTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 5
+    - id: PresentRandom
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: ToyFigurineHamlet
+    - id: ToyFigurineSpaceDragon
+    - id: ToyFigurineQueen
+    - id: ToyFigurineRatKing
+
+- type: entityTable
+  id: RandomSatchelCashTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 2
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: SpaceCash1000
+      weight: 2
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: SpaceCash2500
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: SpaceCash5000
+      weight: 0.25
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: SpaceCash10000
+      weight: 0.005
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: SpaceCash1000000
+      prob: 0.0001
+    - id: SpaceCash
+      weight: 0.01
+      amount: !type:RangeNumberSelector
+        range: 1, 10
+
+- type: entityTable
+  id: RandomSatchelWeaponTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 100
+    - id: Katana
+    - id: ThrowingStar
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+
+- type: entityTable
+  id: RandomSatchelBurgerTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 10
+    - id: FoodBurgerAppendix
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: FoodBurgerEmpowered
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: FoodBurgerClown
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: FoodBurgerGhost
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+
+- type: entityTable
+  id: RandomSatchelGenericTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 15
+    - id: RemoteSignaller
+    - id: PersonalAI
+    - id: WeaponFlareGun
+    - id: ModularReceiver
+    - id: RifleStock
+    - id: DrinkSpaceGlue
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: DrinkSpaceLube
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: CrazyGlue
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+
+- type: entityTable
+  id: RandomSatchelKeysTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 50
+    - id: EncryptionKeyCommon
+    - id: EncryptionKeyCargo
+    - id: EncryptionKeyService
+    - id: EncryptionKeyRobo
+    - id: EncryptionKeyScience
+    - id: EncryptionKeyMedical
+    - id: EncryptionKeyEngineering
+    - id: EncryptionKeySecurity
+      weight: 0.5
+    - id: EncryptionKeyCommand
+      weight: 0.25
+    - id: EncryptionKeyStationMaster
+      weight: 0.01
+
+- type: entityTable
+  id: RandomSatchelTable4
+  table: !type:AllSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomSatchelMaterialsTable
+    - !type:NestedSelector
+      tableId: RandomSatchelImplantersTable
+    - !type:NestedSelector
+      tableId: RandomSatchelCellsTable
+    - !type:NestedSelector
+      tableId: RandomSatchelSyndicateTable
+    - !type:NestedSelector
+      tableId: RandomSatchelToolsTable
+
+- type: entityTable
+  id: RandomSatchelMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 6
+    - !type:GroupSelector
+      children:
+      - id: MaterialDiamond1
+    - !type:GroupSelector
+      children:
+      - id: MaterialBananium1
+        weight: 2
+      - id: MaterialBananium
+    - !type:GroupSelector
+      children:
+      - id: IngotGold1
+        weight: 2
+      - id: IngotGold
+    - !type:GroupSelector
+      children:
+      - id: IngotSilver1
+        weight: 2
+      - id: IngotSilver
+    - !type:GroupSelector
+      children:
+      - id: SheetPlasma1
+        weight: 2
+      - id: SheetPlasma10
+      - id: SheetPlasma
+        weight: 0.50
+    - !type:GroupSelector
+      children:
+      - id: SheetUranium1
+        weight: 2
+      - id: SheetUranium
+
+- type: entityTable
+  id: RandomSatchelImplantersTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 3
+    - id: LightImplanter
+    - id: BikeHornImplanter
+    - id: SadTromboneImplanter
+
+- type: entityTable
+  id: RandomSatchelCellsTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 15
+    - id: PowerCellHyper
+    - id: PowerCellMicroreactor
+    - id: PowerCellHigh
+
+- type: entityTable
+  id: RandomSatchelSyndicateTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 50
+    - id: Telecrystal1
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: GatfruitSeeds
+    - id: ToySword
+    - id: NukeDiskFake
+    - id: RadioJammer
+    - id: SoapSyndie
+    - id: SingularityToy
+
+- type: entityTable
+  id: RandomSatchelToolsTable
+  table: !type:GroupSelector
+    children:
+    - id: Crowbar
+    - id: Multitool
+    - id: ClothingHandsGlovesColorYellow
+    - id: Screwdriver
+    - id: ClothingHeadHatWeldingMaskFlame
+    - id: WelderExperimental
+      weight: 0.50
+
+- type: entityTable
+  id: RandomSatchelTable5
+  table: !type:AllSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomSatchelAlcoholTable
+    - !type:NestedSelector
+      tableId: RandomSatchelInstrumentTable
+    - !type:NestedSelector
+      tableId: RandomSatchelMedsTable
+    - !type:NestedSelector
+      tableId: RandomSatchelMysteriesTable
+
+- type: entityTable
+  id: RandomSatchelAlcoholTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 5
+    - id: DrinkCognacBottleFull
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: DrinkGildlagerBottleFull
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: DrinkPatronBottleFull
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: DrinkRumBottleFull
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+
+- type: entityTable
+  id: RandomSatchelInstrumentTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 15
+    - id: SeashellInstrument
+    - id: MusicalLungInstrument
+    - id: HelicopterInstrument
+    - id: GunpetInstrument
+    - id: RockGuitarInstrument
+    - id: BassGuitarInstrument
+
+- type: entityTable
+  id: RandomSatchelMedsTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 10
+    - id: SyringeAmbuzol
+    - id: SyringeHyronalin
+    - id: SyringeDermaline
+    - id: SyringeBicaridine
+    - id: SyringeTranexamicAcid
+    - id: SyringeInaprovaline
+    - id: SyringeEphedrine
+    - id: Gauze
+    - id: Bloodpack
+    - id: RegenerativeMesh
+    - id: MedicatedSuture
+    - id: EmergencyMedipen
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: AntiPoisonMedipen
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: BruteAutoInjector
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: BurnAutoInjector
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: SpaceMedipen
+      amount: !type:RangeNumberSelector
+        range: 1, 5
+    - id: Stimpack
+    - id: CombatMedipen
+
+- type: entityTable
+  id: RandomSatchelMysteriesTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 15
+    - id: EggSpider
+      weight: 5
+    - id: ArtifactFragment1
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+      weight: 10
+    - id: AnomalyCorePyroclastic
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: AnomalyCoreGravity
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: AnomalyCoreIce
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: AnomalyCoreFlesh
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: AnomalyCoreLiquid
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: AnomalyCoreBluespace
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: AnomalyCoreElectricity
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: AnomalyCoreFlora
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+    - id: AnomalyCoreShadow
+      amount: !type:RangeNumberSelector
+        range: 1, 3
+
+- type: entityTable
+  id: RandomSatchelTable6
+  table: !type:AllSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomSatchelGearTable
+    - !type:NestedSelector
+      tableId: RandomSatchelGadgetsTable
+    - !type:NestedSelector
+      tableId: CubeTable
+
+- type: entityTable
+  id: RandomSatchelGearTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 8
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: WelderIndustrialAdvanced
+    - id: HandheldStationMap
+    - id: PinpointerStation
+
+- type: entityTable
+  id: RandomSatchelGadgetsTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 30
+    - id: HolofanProjector
+    - id: HoloprojectorField
+    - id: HoloprojectorSecurity
+    - id: DeviceQuantumSpinInverter
+      amount: !type:ConstantNumberSelector
+        value: 2
+    - id: SpectralLocator
+    - id: ArabianLamp
+      weight: 0.50
+    - id: ChameleonProjector
+      weight: 0.25
+
+- type: entityTable
+  id: CubeTable
+  table: !type:GroupSelector
+    children:
+    - id: SpaceCash100
+      weight: 8
+    - id: MonkeyCube
+      amount: !type:RangeNumberSelector
+        range: 1, 10
+    - id: KoboldCube
+      amount: !type:RangeNumberSelector
+        range: 1, 10
+    - id: CowCube
+      amount: !type:RangeNumberSelector
+        range: 1, 10
+    - id: GoatCube
+      amount: !type:RangeNumberSelector
+        range: 1, 10
+    - id: MothroachCube
+      amount: !type:RangeNumberSelector
+        range: 1, 10
+    - id: MouseCube
+      amount: !type:RangeNumberSelector
+        range: 1, 10
+    - id: CockroachCube
+      amount: !type:RangeNumberSelector
+        range: 1, 10
+    - id: SpaceCarpCube
+      amount: !type:RangeNumberSelector
+        range: 1, 10
+    - id: SpaceTickCube
+      amount: !type:RangeNumberSelector
+        range: 1, 10
+    - id: AbominationCube
+      amount: !type:RangeNumberSelector
+        range: 1, 10
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -894,6 +894,8 @@
    sprite: Clothing/Head/Hats/capcap.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/capcap.rsi
+  - type: Item
+    sprite: Clothing/Head/Hats/capcap.rsi
  - type: Tag
    tags:
    - ClothMade
@@ -914,6 +916,8 @@
    sprite: Clothing/Head/Hats/comcap.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/comcap.rsi
+  - type: Item
+    sprite: Clothing/Head/Hats/comcap.rsi
  - type: Tag
    tags:
    - ClothMade
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -18,7 +18,7 @@
    - state: icon_flipped
      map: ["foldedLayer"]
      visible: false
-      
+
 - type: entity
  parent: ClothingHeadHeadHatBaseFlippable
  id: ClothingHeadHeadHatBaseFlipped
@@ -98,7 +98,7 @@
  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatQMsoft]
  id: ClothingHeadHatQMsoftFlipped
  name: quartermaster's cap
-    
+
 - type: entity
  parent: ClothingHeadHeadHatBaseFlippable
  id: ClothingHeadHatCorpsoft
@@ -166,7 +166,7 @@
 - type: entity
  parent: ClothingHeadHeadHatBaseFlippable
  id: ClothingHeadHatMimesoft
-  name: mime cap
+  name: white cap
  description: "It's a baseball hat in a tasteless white colour."
  components:
  - type: Sprite
@@ -177,7 +177,7 @@
 - type: entity
  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatMimesoft]
  id: ClothingHeadHatMimesoftFlipped
-  name: mime cap
+  name: white cap

 - type: entity
  parent: ClothingHeadHeadHatBaseFlippable
@@ -285,7 +285,7 @@
  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBizarreSoft]
  id: ClothingHeadHatBizarreSoftFlipped
  name: troublemaker's cap
-    
+
 - type: entity
  parent: ClothingHeadHeadHatBaseFlippable
  id: ClothingHeadHatParamedicsoft
--- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -7,6 +7,7 @@
  - type: Foldable
    canFoldInsideContainer: true
  - type: FoldableClothing
+    foldedEquippedPrefix: "" # folding the bandana will toggles the mask, which adds the toggled prefix. This overrides that prefix.
    foldedSlots:
    - HEAD
    unfoldedSlots:
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -16,8 +16,8 @@
    - HamsterWearable
    - WhitelistChameleon
  - type: HideLayerClothing
-    slots:
-    - Snout
+    layers:
+      Snout: Mask
    hideOnToggle: true

 - type: entity
@@ -687,3 +687,16 @@
  - type: Tag
    tags:
    - WhitelistChameleon
+
+# Entity tables
+- type: entityTable
+  id: AnimalMaskTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingMaskFox
+    - id: ClothingMaskBat
+    - id: ClothingMaskBear
+    - id: ClothingMaskBee
+    - id: ClothingMaskRaven
+    - id: ClothingMaskRat
+    - id: ClothingMaskJackal
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -53,6 +53,8 @@
    sprite: Clothing/Neck/Misc/bling.rsi
  - type: Clothing
    sprite: Clothing/Neck/Misc/bling.rsi
+  - type: Item
+    sprite: Clothing/Neck/Misc/bling.rsi

 - type: entity
  parent: ClothingNeckBase
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -417,7 +417,7 @@
        Caustic: 0.75

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatLabSeniorResearcher
  name: senior researcher lab coat
  description: A suit that protects against minor chemical spills. Has a purple collar and wrist trims.
@@ -432,7 +432,12 @@
        Caustic: 0.75

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabSeniorResearcher]
+  id: ClothingOuterCoatLabSeniorResearcherOpened
+  name: senior researcher lab coat
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatLabSeniorPhysician
  name: senior physician lab coat
  description: A suit that protects against minor chemical spills. Has light blue sleeves and an orange waist trim.
@@ -446,6 +451,11 @@
      coefficients:
        Caustic: 0.75

+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabSeniorPhysician]
+  id: ClothingOuterCoatLabSeniorPhysicianOpened
+  name: senior physician lab coat
+
 - type: entity
  parent: ClothingOuterStorageBase
  id: ClothingOuterCoatSpaceAsshole
@@ -458,7 +468,7 @@
    sprite: Clothing/OuterClothing/Coats/space_asshole.rsi

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatExpensive
  name: expensive coat
  description: Very fluffy pink coat, made out of very expensive fur (clearly).
@@ -467,3 +477,8 @@
    sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi
+
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatExpensive]
+  id: ClothingOuterCoatExpensiveOpened
+  name: expensive coat
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
@@ -18,3 +18,12 @@
      interfaces:
        enum.ChameleonUiKey.Key:
          type: ChameleonBoundUserInterface
+    - type: TemperatureProtection # Same as a basic winter coat.
+      heatingCoefficient: 1.1
+      coolingCoefficient: 0.1
+    - type: Armor
+      modifiers:
+        coefficients:
+          Slash: 0.95
+          Heat: 0.90
+      showArmorOnExamine: false
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -291,7 +291,7 @@
  parent: ClothingUniformBase
  id: ClothingUniformJumpskirtPrisoner
  name: prisoner jumpskirt
-  description: Busted.
+  description: A jumpskirt used for prisoners. It has suit sensors automatically enabled at all times.
  components:
  - type: Sprite
    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -477,7 +477,7 @@
  parent: ClothingUniformBase
  id: ClothingUniformJumpsuitPrisoner
  name: prisoner jumpsuit
-  description: Busted.
+  description: A jumpsuit used for prisoners. It has suit sensors automatically enabled at all times.
  components:
  - type: Sprite
    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -138,6 +138,7 @@
  - type: IconSmooth
    key: puddles
    additionalKeys:
+    - walls
    - CP14wall
    base: splat
    mode: CardinalFlags
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/medical.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/medical.yml
@@ -54,7 +54,7 @@
        - Ointment
        - Gauze
        - EmergencyMedipen
-        - EpinephrineChemistryBottle
+        - ChemistryBottleEpinephrine
        - PillCanisterTricordrazine
        - PillCanisterCharcoal
        - PillCanisterHyronalin
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
@@ -11,33 +11,50 @@
      - state: red
      - sprite: Objects/Consumable/Drinks/ginbottle.rsi
        state: icon
-  - type: RandomSpawner
-  #small item
-    prototypes:
-      - DrinkAbsintheBottleFull
-      - DrinkBlueCuracaoBottleFull
-      - DrinkCognacBottleFull
-      - DrinkGrenadineBottleFull
-      - DrinkGinBottleFull
-      - DrinkGildlagerBottleFull
-      - DrinkCoffeeLiqueurBottleFull
-      - DrinkMelonLiquorBottleFull
-      - DrinkPatronBottleFull
-      - DrinkRumBottleFull
-      - DrinkSakeBottleFull
-      - DrinkTequilaBottleFull
-      - DrinkVermouthBottleFull
-      - DrinkVodkaBottleFull
-      - DrinkWhiskeyBottleFull
-      - DrinkWineBottleFull
-      - DrinkBeerBottleFull
-      - DrinkBeerGrowler
-      - DrinkAleBottleFull
-      - DrinkAleBottleFullGrowler
-      - DrinkChampagneBottleFull
-    chance: 0.8
-    offset: 0.0
-    #rare
-    rarePrototypes:
-      - DrinkPoisonWinebottleFull
-    rareChance: 0.01
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: RandomAllAlcoholTable
+      prob: 0.8
+
+- type: entityTable
+  id: RandomAllAlcoholTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomCommonAlcoholTable
+      weight: 0.95
+    - !type:NestedSelector
+      tableId: RandomRareAlcoholTable
+      weight: 0.05
+
+- type: entityTable
+  id: RandomCommonAlcoholTable
+  table: !type:GroupSelector
+    children:
+    - id: DrinkAbsintheBottleFull
+    - id: DrinkBlueCuracaoBottleFull
+    - id: DrinkCognacBottleFull
+    - id: DrinkGrenadineBottleFull
+    - id: DrinkGinBottleFull
+    - id: DrinkGildlagerBottleFull
+    - id: DrinkCoffeeLiqueurBottleFull
+    - id: DrinkMelonLiquorBottleFull
+    - id: DrinkPatronBottleFull
+    - id: DrinkRumBottleFull
+    - id: DrinkSakeBottleFull
+    - id: DrinkTequilaBottleFull
+    - id: DrinkVermouthBottleFull
+    - id: DrinkVodkaBottleFull
+    - id: DrinkWhiskeyBottleFull
+    - id: DrinkWineBottleFull
+    - id: DrinkBeerBottleFull
+    - id: DrinkBeerGrowler
+    - id: DrinkAleBottleFull
+    - id: DrinkAleBottleFullGrowler
+    - id: DrinkChampagneBottleFull
+
+- type: entityTable
+  id: RandomRareAlcoholTable
+  table: !type:GroupSelector
+    children:
+    - id: DrinkPoisonWinebottleFull
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -124,4 +124,5 @@
      - DrinkShakeRobo
      - DrinkHoochGlass
      - DrinkBeepskySmashGlass
+      - DrinkBacchusBlessing
    rareChance: 0.05
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -251,7 +251,7 @@
    - id: BlueprintSeismicCharge
    - id: WeaponCrusherGlaive
    - id: ClothingOuterHardsuitSalvage
-    - id: OmnizineChemistryBottle
+    - id: ChemistryBottleOmnizine
    - !type:GroupSelector
      children:
      - id: JetpackBlueFilled
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/materials.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/materials.yml
@@ -10,19 +10,10 @@
        - state: red
        - sprite: Objects/Materials/Sheets/metal.rsi
          state: steel_3
-    - type: RandomSpawner
-      rarePrototypes:
-        - SheetPlasteel10
-      rareChance: 0.2
-      prototypes:
-        - SheetSteel
-        - SheetGlass
-        - SheetPlastic
-        - CableApcStack
-        - CableMVStack
-        - CableHVStack
-      chance: 0.8
-      offset: 0.0
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: RandomAllConstructionMaterialsTable
+        prob: 0.8

 - type: entity
  name: materials spawner
@@ -35,13 +26,10 @@
        - state: red
        - sprite: Objects/Materials/materials.rsi
          state: wood_2
-    - type: RandomSpawner
-      prototypes:
-        - MaterialWoodPlank10
-        - MaterialCardboard10
-        - PartRodMetal10
-      chance: 0.8
-      offset: 0.0
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: RandomAllSupplementaryMaterialsTable
+        prob: 0.8

 # High-value materials spawners
 # Maybe these should use the 10-in-stack variants?
@@ -56,15 +44,10 @@
        - state: red
        - sprite: Objects/Materials/Sheets/metal.rsi
          state: plasteel_2
-    - type: RandomSpawner
-      rarePrototypes:
-        - SheetRPGlass
-      rareChance: 0.2
-      prototypes:
-        - SheetPlasteel
-        - SheetRGlass
-      chance: 0.8
-      offset: 0.0
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: RandomAllHighValueConstructionMaterialsTable
+        prob: 0.8

 - type: entity
  name: high-value materials spawner
@@ -76,16 +59,10 @@
        - state: red
        - sprite: Objects/Materials/Sheets/other.rsi
          state: plasma_2
-    - type: RandomSpawner
-      rarePrototypes:
-        - SheetUranium
-      rareChance: 0.2
-      prototypes:
-        - SheetPlasma
-        - IngotGold
-        - IngotSilver
-      chance: 0.8
-      offset: 0.0
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: RandomAllHighValueMaterialsTable
+        prob: 0.8

 # Surplus materials spawner.
 # Intended use case: randomly place in maintenance or in storage areas.
@@ -100,27 +77,10 @@
        - state: red
        - sprite: Objects/Materials/Sheets/metal.rsi
          state: steel_3
-    - type: RandomSpawner
-      rarePrototypes:
-        - SheetUranium1
-        - IngotGold1
-        - IngotSilver1
-      rareChance: 0.1
-      prototypes:
-        - SheetPlasteel10
-        - SheetPlasma1
-        - MaterialWoodPlank10
-        - PartRodMetal10
-        - SheetSteel10
-        - SheetGlass10
-        - MaterialCloth10
-        - MaterialCardboard10
-        - SheetPlastic10
-        - CableApcStack10
-        - CableMVStack10
-        - CableHVStack10
-      chance: 0.9
-      offset: 0.0
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: RandomAllSurplusMaterialTable
+        prob: 0.9

 # Cable coil spawner
 - type: entity
@@ -133,15 +93,169 @@
        - state: red
        - sprite: Objects/Tools/cable-coils.rsi
          state: coilall-30
-    - type: RandomSpawner
-      rarePrototypes:
-        - CableApcStack10
-        - CableMVStack10
-        - CableHVStack10
-      rareChance: 0.1
-      prototypes:
-        - CableApcStack
-        - CableMVStack
-        - CableHVStack
-      chance: 0.9
-      offset: 0.0
+    - type: EntityTableSpawner
+      table: !type:NestedSelector
+        tableId: RandomAllCableCoilTable
+        prob: 0.9
+
+# Entity tables
+## Construction Materials
+- type: entityTable
+  id: RandomAllConstructionMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomCommonConstructionMaterialsTable
+      weight: 0.80
+    - !type:NestedSelector
+      tableId: RandomRareConstructionMaterialsTable
+      weight: 0.20
+
+- type: entityTable
+  id: RandomCommonConstructionMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - id: SheetSteel
+    - id: SheetGlass
+    - id: SheetPlastic
+    - id: CableApcStack
+    - id: CableMVStack
+    - id: CableHVStack
+
+- type: entityTable
+  id: RandomRareConstructionMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - id: SheetPlasteel10
+
+## High value construction materials
+- type: entityTable
+  id: RandomAllHighValueConstructionMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomCommonHighValueConstructionMaterialsTable
+      weight: 0.80
+    - !type:NestedSelector
+      tableId: RandomRareHighValueConstructionMaterialsTable
+      weight: 0.20
+
+- type: entityTable
+  id: RandomCommonHighValueConstructionMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - id: SheetPlasteel
+    - id: SheetRGlass
+
+- type: entityTable
+  id: RandomRareHighValueConstructionMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - id: SheetRPGlass
+
+## High value materials
+- type: entityTable
+  id: RandomAllHighValueMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomCommonHighValueMaterialsTable
+      weight: 0.80
+    - !type:NestedSelector
+      tableId: RandomRareHighValueMaterialsTable
+      weight: 0.20
+
+- type: entityTable
+  id: RandomCommonHighValueMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - id: SheetPlasma
+    - id: IngotGold
+    - id: IngotSilver
+
+- type: entityTable
+  id: RandomRareHighValueMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - id: SheetUranium
+
+## Supplementary Materials
+- type: entityTable
+  id: RandomAllSupplementaryMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomCommonSupplementaryMaterialsTable
+
+- type: entityTable
+  id: RandomCommonSupplementaryMaterialsTable
+  table: !type:GroupSelector
+    children:
+    - id: MaterialWoodPlank10
+    - id: MaterialCardboard10
+    - id: PartRodMetal10
+
+## Surplus Materials
+- type: entityTable
+  id: RandomAllSurplusMaterialTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomCommonSurplusMaterialTable
+      weight: 0.90
+    - !type:NestedSelector
+      tableId: RandomRareSurplusMaterialTable
+      weight: 0.10
+
+- type: entityTable
+  id: RandomCommonSurplusMaterialTable
+  table: !type:GroupSelector
+    children:
+    - id: SheetPlasteel10
+    - id: SheetPlasma1
+    - id: MaterialWoodPlank10
+    - id: PartRodMetal10
+    - id: SheetSteel10
+    - id: SheetGlass10
+    - id: MaterialCloth10
+    - id: MaterialCardboard10
+    - id: SheetPlastic10
+    - id: CableApcStack10
+    - id: CableMVStack10
+    - id: CableHVStack10
+
+- type: entityTable
+  id: RandomRareSurplusMaterialTable
+  table: !type:GroupSelector
+    children:
+    - id: SheetUranium1
+    - id: IngotGold1
+    - id: IngotSilver1
+
+## Cables
+- type: entityTable
+  id: RandomAllCableCoilTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomCommonCableCoilTable
+      weight: 0.90
+    - !type:NestedSelector
+      tableId: RandomRareCableCoilTable
+      weight: 0.10
+
+- type: entityTable
+  id: RandomCommonCableCoilTable
+  table: !type:GroupSelector
+    children:
+    - id: CableApcStack
+    - id: CableMVStack
+    - id: CableHVStack
+
+- type: entityTable
+  id: RandomRareCableCoilTable
+  table: !type:GroupSelector
+    children:
+    - id: CableApcStack10
+    - id: CableMVStack10
+    - id: CableHVStack10
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
@@ -157,4 +157,5 @@
      - PosterLegitSafetyMothHardhat
      - PosterLegitSafetyMothSSD
      - PosterLegitOppenhopper
+      - PosterLegitTyrone
    chance: 1
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -156,6 +156,7 @@
    sounds:
      Unsexed: UnisexSilicon
    screamAction: null
+  - type: DamagedSiliconAccent
  - type: UnblockableSpeech
  - type: FootstepModifier
    footstepSoundCollection:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -457,7 +457,7 @@
    description: ghost-role-information-mothroach-description
    rules: ghost-role-information-freeagent-rules
    mindRoles:
-    - MindRoleGhostRoleFreeAgent
+    - MindRoleGhostRoleFreeAgentHarmless
  - type: Fixtures
    fixtures:
      fix1:
@@ -1649,7 +1649,7 @@
    description: ghost-role-information-mouse-description
    rules: ghost-role-information-freeagent-rules
    mindRoles:
-    - MindRoleGhostRoleFreeAgent
+    - MindRoleGhostRoleFreeAgentHarmless
  - type: GhostTakeoverAvailable
  - type: Speech
    speechSounds: Squeak
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -171,7 +171,7 @@
      description: ghost-role-information-sentient-carp-description
      rules: ghost-role-information-space-dragon-summoned-carp-rules
      mindRoles:
-      - MindRoleGhostRoleTeamAntagonist
+      - MindRoleGhostRoleTeamAntagonistFlock
      raffle:
        settings: short
    - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/entity_tables.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/entity_tables.yml
@@ -0,0 +1,18 @@
+- type: entityTable
+  id: SmallCritterEntityTable
+  table: !type:GroupSelector
+    children:
+    - id: MobMothroach
+    - id: MobCockroach
+    - !type:GroupSelector
+      children:
+      - id: MobMouse
+      - id: MobMouse1
+      - id: MobMouse2
+      - id: MobMouseCancer
+        weight: 0.05
+    - !type:GroupSelector
+      children:
+      - id: MobSnail
+      - id: MobSnailSpeed
+      - id: MobSnailMoth
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -126,9 +126,18 @@
          groups:
            Brute: -2
            Burn: -2
+    - reagents: [ WeedKiller, PlantBGone ]
+      methods: [ Touch ]
+      effects:
+      - !type:HealthChange
+        scaleByQuantity: true
+        damage:
+          types:
+            Heat: 2
  - type: ReplacementAccent
    accent: tomatoKiller
  - type: Item
+  - type: MultiHandedItem
  - type: NpcFactionMember
    factions:
      - SimpleHostile
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -208,7 +208,7 @@
    description: ghost-role-information-honkbot-description
    rules: ghost-role-information-freeagent-rules
    mindRoles:
-    - MindRoleGhostRoleFreeAgent
+    - MindRoleGhostRoleFreeAgentHarmless
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
@@ -242,7 +242,7 @@
    description: ghost-role-information-jonkbot-description
    rules: ghost-role-information-freeagent-rules
    mindRoles:
-    - MindRoleGhostRoleFreeAgent
+    - MindRoleGhostRoleFreeAgentHarmless
    raffle:
      settings: default
  - type: InteractionPopup
@@ -379,7 +379,7 @@
    description: ghost-role-information-mimebot-description
    rules: ghost-role-information-freeagent-rules
    mindRoles:
-    - MindRoleGhostRoleFreeAgent
+    - MindRoleGhostRoleFreeAgentHarmless
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -390,7 +390,7 @@
    description: ghost-role-information-snail-description
    rules: ghost-role-information-freeagent-rules
    mindRoles:
-    - MindRoleGhostRoleFreeAgent
+    - MindRoleGhostRoleFreeAgentHarmless
  - type: GhostTakeoverAvailable
  - type: Emoting
  - type: Sprite
@@ -516,6 +516,9 @@
  id: MobSnailInstantDeath
  suffix: Smite
  components:
+  - type: GhostRole
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
  - type: MobStateActions
    actions:
      Alive:
--- a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
@@ -740,6 +740,8 @@
      name: ghost-role-information-syndie-soldier-teamlead-name
      description: ghost-role-information-syndie-soldier-teamlead-description
      rules: ghost-role-information-rules-team-antagonist
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonist
      raffle:
        settings: default
    - type: Loadout
@@ -758,6 +760,8 @@
      name: ghost-role-information-syndie-soldier-name
      description: ghost-role-information-syndie-soldier-description
      rules: ghost-role-information-rules-team-antagonist
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonist
      raffle:
        settings: default
    - type: Loadout
@@ -794,6 +798,8 @@
      name: ghost-role-information-pirate-name
      description: ghost-role-information-pirate-description
      rules: ghost-role-information-rules-team-antagonist
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonist
      raffle:
        settings: default
    - type: Loadout
@@ -811,6 +817,8 @@
      name: ghost-role-information-pirate-captain-name
      description: ghost-role-information-pirate-captain-description
      rules: ghost-role-information-rules-team-antagonist
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonist
      raffle:
        settings: default
    - type: Loadout
@@ -827,6 +835,8 @@
      name: ghost-role-information-blackmarketeer-name
      description: ghost-role-information-blackmarketeer-description
      rules: ghost-role-information-freeagent-rules
+      mindRoles:
+      - MindRoleGhostRoleFreeAgent
      raffle:
        settings: default
    - type: Loadout
@@ -845,6 +855,8 @@
      name: ghost-role-information-cossack-name
      description: ghost-role-information-cossack-description
      rules: ghost-role-information-freeagent-rules
+      mindRoles:
+      - MindRoleGhostRoleFreeAgent
      raffle:
        settings: default
    - type: Loadout
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -13,6 +13,7 @@
    - BypassInteractionRangeChecks
    - BypassDropChecks
    - NoConsoleSound
+    - SilentStorageUser
  - type: Input
    context: "aghost"
  - type: Ghost
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -4,6 +4,8 @@
 # The datafields of the components are only shallow copied using CopyComp.
 # Subscribe to CloningEvent instead if that is not enough.

+# for basic traits etc.
+# used by the random clone spawner
 - type: cloningSettings
  id: BaseClone
  components:
@@ -27,11 +29,13 @@
  - Clumsy
  - MindShield
  - MimePowers
+  - SpaceNinja
  # accents
  - Accentless
  - BackwardsAccent
  - BarkAccent
  - BleatingAccent
+  - DamagedSiliconAccent
  - FrenchAccent
  - GermanAccent
  - LizardAccent
@@ -56,20 +60,27 @@
  blacklist:
    components:
    - AttachedClothing # helmets, which are part of the suit
+    - HumanoidAppearance # will cause problems for downstream felinids getting cloned as Urists
+    - Implanter # they will spawn full again, but you already get the implant. And we can't do item slot copying yet
    - VirtualItem

+# all antagonist roles
 - type: cloningSettings
  id: Antag
  parent: BaseClone
  components:
  - HeadRevolutionary
  - Revolutionary
+  - NukeOperative

+# for cloning pods
 - type: cloningSettings
  id: CloningPod
  parent: Antag
  forceCloning: false
  copyEquipment: null
+  copyInternalStorage: false
+  copyImplants: false

 # spawner

--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -161,6 +161,9 @@
  components:
  - type: Dragon
    spawnRiftAction: ActionSpawnRift
+  - type: GhostRole
+    mindRoles:
+    - MindRoleDragon
  - type: ActionGun
    action: ActionDragonsBreath
    gunProto: DragonsBreathGun
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -265,7 +265,7 @@
    sweatHeatRegulation: 2000
    shiveringHeatRegulation: 2000
    normalBodyTemperature: 310.15
-    thermalRegulationTemperatureThreshold: 25
+    thermalRegulationTemperatureThreshold: 2
  #- type: Perishable #CP14 - disable rotting
  - type: Butcherable
    butcheringType: Spike # TODO human.
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -146,6 +146,17 @@
          32:
            sprite: Mobs/Species/Vox/displacement.rsi
            state: shoes
+  - type: Hands
+    leftHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: Mobs/Species/Vox/displacement.rsi
+          state: hand_l
+    rightHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: Mobs/Species/Vox/displacement.rsi
+          state: hand_r

 - type: entity
  parent: BaseSpeciesDummy
@@ -196,3 +207,14 @@
          32:
            sprite: Mobs/Species/Vox/displacement.rsi
            state: shoes
+  - type: Hands
+    leftHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: Mobs/Species/Vox/displacement.rsi
+          state: hand_l
+    rightHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: Mobs/Species/Vox/displacement.rsi
+          state: hand_r
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -157,7 +157,7 @@
    sweatHeatRegulation: 2000
    shiveringHeatRegulation: 2000
    normalBodyTemperature: 310.15
-    thermalRegulationTemperatureThreshold: 25
+    thermalRegulationTemperatureThreshold: 2
  - type: MovedByPressure

 # Used for mobs that require regular atmospheric conditions.
@@ -173,7 +173,7 @@
    sweatHeatRegulation: 500
    shiveringHeatRegulation: 500
    normalBodyTemperature: 310.15
-    thermalRegulationTemperatureThreshold: 25
+    thermalRegulationTemperatureThreshold: 2
  - type: Temperature
    heatDamageThreshold: 325
    coldDamageThreshold: 260
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2526,3 +2526,20 @@
    - type: Icon
      sprite: Objects/Consumable/Drinks/bloodglass.rsi
      state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkBacchusBlessing
+  suffix: bacchus blessing
+  description: You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BacchusBlessing
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/bacchusblessing.rsi
+    state: icon
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -664,6 +664,9 @@
    - Meat
  - type: Sprite
    state: meatball
+  - type: Construction
+    graph: MeatMeatballCooked
+    node: start

 - type: entity
  name: slimeball
@@ -1178,6 +1181,9 @@
    entries:
      Burger: MeatBall
      Taco: MeatBall
+  - type: Construction
+    graph: MeatMeatballCooked
+    node: meatball cooked

 - type: entity
  name: boiled snail
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
@@ -57,6 +57,10 @@
  id: FoodNoodlesCopy
  description: You probably shouldn't try this, you always hear people talking about how bad it is...
  components:
+  - type: Food
+    trash:
+    - FoodPlateSmall
+    - FoodPlateSmall
  - type: FlavorProfile
    flavors:
      - copypasta
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -44,6 +44,8 @@
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/wheat.rsi
+  - type: Item
+    heldPrefix: produce
  - type: SolutionContainerManager
    solutions:
      food:
@@ -64,6 +66,8 @@
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/meatwheat.rsi
+  - type: Item
+    heldPrefix: produce
  - type: SolutionContainerManager
    solutions:
      food:
@@ -108,6 +112,8 @@
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/sugarcane.rsi
+  - type: Item
+    heldPrefix: produce
  - type: SolutionContainerManager
    solutions:
      food:
@@ -125,6 +131,8 @@
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/papercane.rsi
+  - type: Item
+    heldPrefix: produce
  - type: SolutionContainerManager
  - type: Produce
    seedId: papercane
@@ -159,6 +167,8 @@
        Quantity: 5
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: laughinPea
  - type: Tag
@@ -173,6 +183,8 @@
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/towercap.rsi
+  - type: Item
+    heldPrefix: produce
  - type: SolutionContainerManager
  - type: MeleeWeapon
    damage:
@@ -190,6 +202,8 @@
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/steelcap.rsi
+  - type: Item
+    heldPrefix: produce
  - type: SolutionContainerManager
  - type: MeleeWeapon
    damage:
@@ -289,6 +303,8 @@
          Quantity: 2
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/banana.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: banana
  - type: Extractable
@@ -329,6 +345,8 @@
          Quantity: 2
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/mimana.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: mimana
  - type: Extractable
@@ -474,6 +492,8 @@
          Quantity: 3
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/carrot.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: carrots
  - type: Extractable
@@ -508,6 +528,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/cabbage.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: cabbage
  - type: Tag
@@ -570,6 +592,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/lemon.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: lemon
  - type: Extractable
@@ -606,6 +630,8 @@
          Quantity: 16
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/lemoon.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: lemoon
  - type: Extractable
@@ -632,6 +658,8 @@
      - sour
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/lime.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: lime
  - type: Extractable
@@ -659,6 +687,8 @@
      - orange
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/orange.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: orange
  - type: Extractable
@@ -697,6 +727,8 @@
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
    scale: 0.5,0.5
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: extradimensionalOrange
  - type: PotencyVisuals
@@ -737,6 +769,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/pineapple.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: pineapple
  - type: Extractable
@@ -771,6 +805,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/potato.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: potato
  - type: Extractable
@@ -810,6 +846,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/tomato.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: tomato
  - type: Extractable
@@ -867,6 +905,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/blue_tomato.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: blueTomato
  - type: Extractable
@@ -914,6 +954,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/blood_tomato.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: bloodTomato
  - type: Extractable
@@ -965,6 +1007,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/eggplant.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: eggplant
  - type: Tag
@@ -1030,6 +1074,8 @@
          Quantity: 13
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: goldenApple
  - type: Extractable
@@ -1167,6 +1213,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/onion.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: onion
  - type: SliceableFood
@@ -1198,6 +1246,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/onion_red.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: onionred
  - type: SliceableFood
@@ -1221,6 +1271,8 @@
          Quantity: 5
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/chanterelle.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: chanterelle
  - type: Tag
@@ -1358,6 +1410,8 @@
            Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/chili.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: chili
  - type: Tag
@@ -1392,6 +1446,8 @@
            Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/chilly.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: chilly
  - type: FoodSequenceElement
@@ -1420,6 +1476,8 @@
          Quantity: 10
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/aloe.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: aloe
  - type: Extractable
@@ -1521,6 +1579,8 @@
          Quantity: 20
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/lingzhi.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: lingzhi
  - type: Extractable
@@ -1557,6 +1617,8 @@
          Quantity: 2
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: ambrosiaVulgaris
  - type: Extractable
@@ -1598,6 +1660,8 @@
          Quantity: 10
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: ambrosiaDeus
  - type: Extractable
@@ -1632,6 +1696,8 @@
          Quantity: 25
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/galaxythistle.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: galaxythistle
  - type: Extractable
@@ -1733,6 +1799,8 @@
          Quantity: 5
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/fly_amanita.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: flyAmanita
  - type: Extractable
@@ -1796,6 +1864,8 @@
          Quantity: 5
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/capfruit.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: realCapfruit
  - type: Food
@@ -1829,6 +1899,8 @@
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/rice.rsi
+  - type: Item
+    heldPrefix: produce
  - type: SolutionContainerManager
    solutions:
      food:
@@ -1879,6 +1951,8 @@
      - violets
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+  - type: Item
+    heldPrefix: produce
  - type: SolutionContainerManager
    solutions:
      food:
@@ -1940,6 +2014,7 @@
  components:
  - type: Item
    size: Small
+    heldPrefix: produce
  - type: FlavorProfile
    flavors:
      - watermelon
@@ -2041,6 +2116,7 @@
  components:
  - type: Item
    size: Small
+    heldPrefix: produce
  - type: FlavorProfile
    flavors:
      - holy
@@ -2156,6 +2232,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/grape.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: grape
  - type: Extractable
@@ -2187,6 +2265,8 @@
          Quantity: 4
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/berries.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: berries
  - type: Extractable
@@ -2288,6 +2368,8 @@
          Quantity: 2
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/pea.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: pea
  - type: Tag
@@ -2320,6 +2402,8 @@
          Quantity: 2
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/world_pea.rsi
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: worldPea
  - type: Tag
@@ -2338,6 +2422,7 @@
  components:
  - type: Item
    size: Small
+    heldPrefix: produce
  - type: FlavorProfile
    flavors:
      - pumpkin
@@ -2387,6 +2472,7 @@
  components:
  - type: Item
    size: Small
+    heldPrefix: produce
  - type: FlavorProfile
    flavors:
      - bluepumpkin
@@ -2570,6 +2656,8 @@
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi
    state: produce
+  - type: Item
+    heldPrefix: produce
  - type: Produce
    seedId: anomalyBerry
  - type: Food
--- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
+++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
@@ -125,29 +125,35 @@
  id: PackageUncommonEntityTable
  table: !type:GroupSelector
    children:
-    # Fluff
    - !type:NestedSelector
      tableId: MaintFluffTable
      weight: 0.4
      rolls: !type:RangeNumberSelector
        range: 1, 2
-    # Plushies
    - !type:NestedSelector
      tableId: AllPlushiesTable
      weight: 0.4
-    # Weapons
    - !type:NestedSelector
-      tableId: MaintWeaponTable
-      weight: 0.1
-    # Syndie Loot
-    - !type:NestedSelector
-      tableId: SyndieMaintLoot
-      weight: 0.1
+      tableId: RandomAllAlcoholTable
+      weight: 0.2
+      rolls: !type:RangeNumberSelector
+        range: 2, 3

 - type: entityTable # TODO: Add more variety!
  id: PackageRareEntityTable
  table: !type:GroupSelector
    children:
-    - id: MedkitAdvancedFilled
-    - id: MobMothroach
-    - id: PipeBomb
+    - id: MedkitAdvancedFilled # TODO: Replace with PackageRareGeneralBundlesTable for when something doesn't fit with a department. (Like a bundle of bed sheets, dunno)
+    - id: PipeBomb # TODO: PackageRarePunishmentTable, including things like pipebombs and other potentially harmful things (the pipebomb should also get primed when unpacked)
+    - !type:NestedSelector
+      tableId: SmallCritterEntityTable
+    #- !type:NestedSelector # TODO: Uncomment after all the rare department bundles are done (medical, security, etc...)
+    #  tableId: PackageRareDepartmentBundlesTable
+    - !type:NestedSelector
+      tableId: AnimalMaskTable
+    - !type:NestedSelector
+      tableId: MaintWeaponTable
+      weight: 0.5
+    - !type:NestedSelector
+      tableId: SyndieMaintLoot
+      weight: 0.5
--- a/Resources/Prototypes/Entities/Objects/Deliveries/package_rare_tables.yml
+++ b/Resources/Prototypes/Entities/Objects/Deliveries/package_rare_tables.yml
@@ -0,0 +1,182 @@
+# Basically all different loot tables that the mail can choose from
+
+# Loot tables
+- type: entityTable
+  id: PackageRareDepartmentBundlesTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: PackageRareMedicalBundlesTable
+    - !type:NestedSelector
+      tableId: PackageRareEngineeringBundlesTable
+
+# Package Bundles
+## Basically items that should always spawn together, specific to packages
+
+### Medical
+# General table that contains all medical packages
+- type: entityTable
+  id: PackageRareMedicalBundlesTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: PackageMedicalTopicalBundle
+    - !type:NestedSelector
+      tableId: PackageMedicalChemicalBundle
+    - !type:NestedSelector
+      tableId: PackageMedicalClothingBundle
+    - !type:NestedSelector
+      tableId: PackageMedicalReagentBottleBundle
+
+# Topicals
+- type: entityTable
+  id: PackageMedicalTopicalBundle
+  table: !type:AllSelector
+    children:
+    - id: Gauze1
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: Brutepack1
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: Bloodpack1
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: Ointment1
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+
+# Beakers, vials, etc
+- type: entityTable
+  id: PackageMedicalChemicalBundle
+  table: !type:AllSelector
+    children:
+    - id: Beaker
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: LargeBeaker
+      amount: !type:RangeNumberSelector
+        range: 0, 1
+    - id: Syringe
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: BaseChemistryEmptyVial
+      amount: !type:RangeNumberSelector
+        range: 0, 2
+
+# Medical clothing
+- type: entityTable
+  id: PackageMedicalClothingBundle
+  table: !type:AllSelector
+    children:
+    - !type:GroupSelector
+      children:
+      - id: ClothingUniformJumpskirtMedicalDoctor
+      - id: ClothingUniformJumpsuitMedicalDoctor
+    - !type:GroupSelector
+      children:
+      - id: ClothingBackpackMedical
+      - id: ClothingBackpackDuffelMedical
+      - id: ClothingBackpackSatchelMedical
+    - !type:GroupSelector
+      children:
+      - id: ClothingHandsGlovesNitrile
+      - id: ClothingHandsGlovesLatex
+    - !type:AllSelector
+      prob: 0.5
+      children:
+      - id: ClothingShoesBootsWinterMed
+      - id: ClothingOuterWinterMed
+    - !type:GroupSelector
+      children:
+      - id: ClothingEyesHudMedical
+      - id: ClothingEyesEyepatchHudMedical
+    - id: ClothingBeltMedical
+    - id: ClothingShoesColorWhite
+
+# Random reagents
+- type: entityTable
+  id: PackageMedicalReagentBottleBundle
+  table: !type:AllSelector
+    children:
+    - !type:NestedSelector
+      tableId: BasicReagentBottlesTable
+      rolls: !type:RangeNumberSelector
+        range: 3, 4
+
+### Engineering
+
+# General table that contains all engineering packages
+- type: entityTable
+  id: PackageRareEngineeringBundlesTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: PackageEngineeringMaterialBundle
+    - !type:NestedSelector
+      tableId: PackageEngineeringRCDBundle
+    - !type:NestedSelector
+      tableId: PackageEngineeringClothingBundle
+
+# Random building materials
+- type: entityTable
+  id: PackageEngineeringMaterialBundle
+  table: !type:AllSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomAllConstructionMaterialsTable
+      rolls: !type:RangeNumberSelector
+        range: 2, 3
+    - !type:NestedSelector
+      tableId: RandomAllSupplementaryMaterialsTable
+      rolls: !type:RangeNumberSelector
+        range: 2, 3
+
+# RCD, very high value but I feel like the rarity justifies it
+- type: entityTable
+  id: PackageEngineeringRCDBundle
+  table: !type:AllSelector
+    children:
+    - !type:GroupSelector
+      children:
+      - id: RCD
+      - id: RCDEmpty
+    - id: RCDAmmo
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+
+# Engineer clothing
+- type: entityTable
+  id: PackageEngineeringClothingBundle
+  table: !type:AllSelector
+    children:
+    - !type:GroupSelector
+      children:
+      - id: ClothingUniformJumpskirtEngineering
+      - id: ClothingUniformJumpsuitEngineering
+      - id: ClothingUniformJumpsuitAtmos
+      - id: ClothingUniformJumpskirtAtmos
+    - !type:GroupSelector
+      children:
+      - id: ClothingBackpackAtmospherics
+      - id: ClothingBackpackEngineering
+      - id: ClothingBackpackDuffelAtmospherics
+      - id: ClothingBackpackDuffelEngineering
+      - id: ClothingBackpackSatchelAtmospherics
+      - id: ClothingBackpackSatchelEngineering
+    - !type:AllSelector
+      prob: 0.5
+      children:
+      - id: ClothingShoesBootsWinterEngi
+      - !type:GroupSelector
+        children:
+        - id: ClothingOuterWinterEngi
+        - id: ClothingOuterWinterAtmos
+    - !type:GroupSelector
+      children:
+      - id: ClothingBeltUtility
+      - id: ClothingBeltUtilityEngineering
+    - id: ClothingShoesBootsMag
+      prob: 0.5
+    - id: ClothingHandsGlovesColorYellow
+    - id: ClothingShoesColorYellow
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -33,15 +33,17 @@
  name: protolathe machine board
  description: A machine printed circuit board for a protolathe.
  components:
-    - type: MachineBoard
-      prototype: Protolathe
-      stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
-      tagRequirements:
-        GlassBeaker:
-          amount: 2
-          defaultPrototype: Beaker
+  - type: Sprite
+    state: science
+  - type: MachineBoard
+    prototype: Protolathe
+    stackRequirements:
+      MatterBin: 2
+      Manipulator: 2
+    tagRequirements:
+      GlassBeaker:
+        amount: 2
+        defaultPrototype: Beaker

 - type: entity
  parent: BaseMachineCircuitboard
@@ -49,6 +51,8 @@
  name: hyper convection protolathe machine board
  description: A machine printed circuit board for a hyper convection protolathe.
  components:
+  - type: Sprite
+    state: science
  - type: MachineBoard
    prototype: ProtolatheHyperConvection
    stackRequirements:
@@ -67,11 +71,13 @@
  name: biocube fabricator machine board
  description: A machine printed circuit board for a biocube fabricator.
  components:
-    - type: MachineBoard
-      prototype: Biofabricator
-      stackRequirements:
-        MatterBin: 4
-        Glass: 1
+  - type: Sprite
+    state: service
+  - type: MachineBoard
+    prototype: Biofabricator
+    stackRequirements:
+      MatterBin: 4
+      Glass: 1

 - type: entity
  id: SecurityTechFabCircuitboard
@@ -573,17 +579,19 @@
  name: biomass reclaimer machine board
  description: A machine printed circuit board for a biomass reclaimer.
  components:
-    - type: MachineBoard
-      prototype: BiomassReclaimer
-      stackRequirements:
-        MatterBin: 2
-        Manipulator: 1
-        Steel: 5
-      tagRequirements:
-        Knife:
-          amount: 2
-          defaultPrototype: KitchenKnife
-          examineName: construction-insert-info-examine-name-knife
+  - type: Sprite
+    state: medical
+  - type: MachineBoard
+    prototype: BiomassReclaimer
+    stackRequirements:
+      MatterBin: 2
+      Manipulator: 1
+      Steel: 5
+    tagRequirements:
+      Knife:
+        amount: 2
+        defaultPrototype: KitchenKnife
+        examineName: construction-insert-info-examine-name-knife

 - type: entity
  id: HydroponicsTrayMachineCircuitboard
@@ -792,12 +800,14 @@
  id: DawInstrumentMachineCircuitboard
  name: digital audio workstation machine board
  components:
-    - type: MachineBoard
-      prototype: DawInstrument
-      stackRequirements:
-        Glass: 1
-        Cable: 1
-      tagRequirements:
+  - type: Sprite
+    state: service
+  - type: MachineBoard
+    prototype: DawInstrument
+    stackRequirements:
+      Glass: 1
+      Cable: 1
+    tagRequirements:
 #      One instrument to bring them all and in the darkness bind them...
       KeyedInstrument:
          amount: 1
@@ -845,6 +855,8 @@
  parent: BaseMachineCircuitboard
  name: thruster machine board
  components:
+  - type: Sprite
+    state: supply
  - type: MachineBoard
    prototype: Thruster
    stackRequirements:
@@ -856,6 +868,8 @@
  parent: BaseMachineCircuitboard
  name: gyroscope machine board
  components:
+  - type: Sprite
+    state: supply
  - type: MachineBoard
    prototype: Gyroscope
    stackRequirements:
@@ -925,11 +939,13 @@
  name: hotplate machine board
  description: A machine printed circuit board for a hotplate.
  components:
-    - type: MachineBoard
-      prototype: ChemistryHotplate
-      stackRequirements:
-        Capacitor: 2
-        Glass: 1
+  - type: Sprite
+    state: medical
+  - type: MachineBoard
+    prototype: ChemistryHotplate
+    stackRequirements:
+      Capacitor: 2
+      Glass: 1

 - type: entity
  parent: BaseMachineCircuitboard
@@ -937,6 +953,8 @@
  name: electric grill machine board
  description: A machine printed circuit board for an electric grill.
  components:
+  - type: Sprite
+    state: service
  - type: MachineBoard
    prototype: KitchenElectricGrill
    stackRequirements:
@@ -1106,10 +1124,12 @@
  name: surveillance camera router board
  description: A machine printed circuit board for a surveillance camera router.
  components:
-    - type: MachineBoard
-      prototype: SurveillanceCameraRouterConstructed
-      stackRequirements:
-        Cable: 1
+  - type: Sprite
+    state: security
+  - type: MachineBoard
+    prototype: SurveillanceCameraRouterConstructed
+    stackRequirements:
+      Cable: 1

 - type: entity
  id: SurveillanceCameraWirelessRouterCircuitboard
@@ -1117,11 +1137,13 @@
  name: surveillance camera wireless router board
  description: A machine printed circuit board for a surveillance camera wireless router.
  components:
-    - type: MachineBoard
-      prototype: SurveillanceCameraWirelessRouterConstructed
-      stackRequirements:
-        Cable: 2
-        Glass: 1
+  - type: Sprite
+    state: service
+  - type: MachineBoard
+    prototype: SurveillanceCameraWirelessRouterConstructed
+    stackRequirements:
+      Cable: 2
+      Glass: 1

 - type: entity
  id: SurveillanceWirelessCameraMovableCircuitboard
@@ -1129,11 +1151,13 @@
  name: movable wireless camera board
  description: A machine printed circuit board for a movable wireless camera.
  components:
-    - type: MachineBoard
-      prototype: SurveillanceWirelessCameraMovableConstructed
-      stackRequirements:
-        Glass: 2
-        Cable: 2
+  - type: Sprite
+    state: service
+  - type: MachineBoard
+    prototype: SurveillanceWirelessCameraMovableConstructed
+    stackRequirements:
+      Glass: 2
+      Cable: 2

 - type: entity
  id: SurveillanceWirelessCameraAnchoredCircuitboard
@@ -1141,11 +1165,13 @@
  name: wireless camera board
  description: A machine printed circuit board for a wireless camera.
  components:
-    - type: MachineBoard
-      prototype: SurveillanceWirelessCameraAnchoredConstructed
-      stackRequirements:
-        Cable: 2
-        Glass: 1
+  - type: Sprite
+    state: service
+  - type: MachineBoard
+    prototype: SurveillanceWirelessCameraAnchoredConstructed
+    stackRequirements:
+      Cable: 2
+      Glass: 1

 - type: entity
  id: GasRecyclerMachineCircuitboard
@@ -1153,6 +1179,8 @@
  name: gas recycler board
  description: A printed circuit board for a gas recycler.
  components:
+  - type: Sprite
+    state: engineering
  - type: MachineBoard
    prototype: GasRecycler
    stackRequirements:
@@ -1229,11 +1257,13 @@
  name: telecommunication server machine board
  description: A machine printed circuit board for an telecommunication server.
  components:
-    - type: MachineBoard
-      prototype: TelecomServer
-      stackRequirements:
-        Steel: 1
-        Cable: 2
+  - type: Sprite
+    state: engineering
+  - type: MachineBoard
+    prototype: TelecomServer
+    stackRequirements:
+      Steel: 1
+      Cable: 2

 - type: entity
  parent: BaseMachineCircuitboard
@@ -1257,6 +1287,8 @@
  name: mini gravity generator machine board
  description: A machine printed circuit board for a mini gravity generator.
  components:
+  - type: Sprite
+    state: supply
  - type: MachineBoard
    prototype: GravityGeneratorMini
    stackRequirements:
@@ -1300,6 +1332,8 @@
  name: jukebox machine board
  description: A machine printed circuit board for a jukebox.
  components:
+  - type: Sprite
+    state: service
  - type: MachineBoard
    prototype: Jukebox
    stackRequirements:
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -178,7 +178,7 @@
  description: A computer printed circuit board for a surveillance wireless camera monitor.
  components:
  - type: Sprite
-    state: cpu_security
+    state: cpu_service
  - type: ComputerBoard
    prototype: ComputerSurveillanceWirelessCameraMonitor

--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml
@@ -9,6 +9,7 @@
    layers:
    - state: camera_bug
  - type: Item
+    sprite: Objects/Devices/camera_bug.rsi
  - type: ActivatableUI
    requireActiveHand: false
    inHandsOnly: true
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -16,6 +16,25 @@
      state: book_icon
  - type: NotekeeperCartridge

+
+- type: entity
+  parent: BaseItem
+  id: NanoTaskCartridge
+  name: NanoTask cartridge
+  description: A program that allows you to keep a list of tasks to do.
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/cartridge.rsi
+    state: cart-nav
+  - type: Cartridge
+    programName: nano-task-program-name
+    icon:
+      sprite: Interface/Misc/program_icons.rsi
+      state: nano_task
+  - type: UIFragment
+    ui: !type:NanoTaskUi
+  - type: NanoTaskCartridge
+
 - type: entity
  parent: BaseItem
  id: NewsReaderCartridge
--- a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
@@ -28,5 +28,7 @@
    - state: icon
      color: green
  - type: HandTeleporter
+    allowPortalsOnDifferentGrids: true
+    allowPortalsOnDifferentMaps: true
    firstPortalPrototype: PortalGatewayBlue
    secondPortalPrototype: PortalGatewayOrange
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -80,6 +80,7 @@
    preinstalled:
      - CrewManifestCartridge
      - NotekeeperCartridge
+      - NanoTaskCartridge
      - NewsReaderCartridge
    cartridgeSlot:
      priority: -1
@@ -121,6 +122,25 @@
  - type: Speech
    speechVerb: Robotic

+- type: entity
+  parent: BasePDA
+  id: BaseWidePDA
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/pda.rsi
+    layers:
+    - map: [ "enum.PdaVisualLayers.Base" ]
+      state: "pda"
+    - state: "light_overlay_wide"
+      map: [ "enum.PdaVisualLayers.Flashlight" ]
+      shader: "unshaded"
+      visible: false
+    - state: "id_overlay_wide"
+      map: [ "enum.PdaVisualLayers.IdLight" ]
+      shader: "unshaded"
+      visible: false
+
 - type: entity
  parent: BasePDA
  id: BaseSecurityPDA
@@ -130,6 +150,7 @@
    preinstalled:
    - CrewManifestCartridge
    - NotekeeperCartridge
+    - NanoTaskCartridge
    - NewsReaderCartridge
    - WantedListCartridge

@@ -143,6 +164,7 @@
    preinstalled:
      - CrewManifestCartridge
      - NotekeeperCartridge
+      - NanoTaskCartridge
      - NewsReaderCartridge
      - MedTekCartridge

@@ -492,6 +514,7 @@
    preinstalled:
      - CrewManifestCartridge
      - NotekeeperCartridge
+      - NanoTaskCartridge
      - NewsReaderCartridge
      - AstroNavCartridge

@@ -514,7 +537,7 @@
    state: pda-bartender

 - type: entity
-  parent: BasePDA
+  parent: BaseWidePDA
  id: LibrarianPDA
  name: librarian PDA
  description: Smells like books.
@@ -840,6 +863,7 @@
    preinstalled:
    - CrewManifestCartridge
    - NotekeeperCartridge
+    - NanoTaskCartridge
    - NewsReaderCartridge
    - WantedListCartridge
    - LogProbeCartridge
@@ -908,6 +932,7 @@
    preinstalled:
      - CrewManifestCartridge
      - NotekeeperCartridge
+      - NanoTaskCartridge
      - NewsReaderCartridge
      - MedTekCartridge
      - WantedListCartridge
@@ -932,6 +957,7 @@
    preinstalled:
      - CrewManifestCartridge
      - NotekeeperCartridge
+      - NanoTaskCartridge
      - NewsReaderCartridge
      - LogProbeCartridge
      - WantedListCartridge
@@ -1054,6 +1080,7 @@
    uiKey: enum.PdaUiKey.Key
    preinstalled:
      - NotekeeperCartridge
+      - NanoTaskCartridge

 - type: entity
  parent: BaseSecurityPDA
@@ -1080,6 +1107,7 @@
    preinstalled:
      - CrewManifestCartridge
      - NotekeeperCartridge
+      - NanoTaskCartridge
      - NewsReaderCartridge
      - MedTekCartridge
      - WantedListCartridge
@@ -1250,6 +1278,7 @@
    preinstalled:
    - CrewManifestCartridge
    - NotekeeperCartridge
+    - NanoTaskCartridge
    - NewsReaderCartridge
    - WantedListCartridge
    - LogProbeCartridge
@@ -1277,6 +1306,7 @@
    preinstalled:
    - CrewManifestCartridge
    - NotekeeperCartridge
+    - NanoTaskCartridge
    - NewsReaderCartridge
    - WantedListCartridge
    - MedTekCartridge
@@ -1423,6 +1453,7 @@
    uiKey: enum.PdaUiKey.Key
    preinstalled:
      - NotekeeperCartridge
+      - NanoTaskCartridge
      - MedTekCartridge

 - type: entity
@@ -1457,7 +1488,7 @@
        type: ChameleonBoundUserInterface

 - type: entity
-  parent: BasePDA
+  parent: BaseWidePDA
  id: WizardPDA
  name: wizard PDA
  description: You hear faint whispers coming from it.
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -34,6 +34,8 @@
        type: NavMapBeaconBoundUserInterface
  - type: Item
    size: Small
+  - type: Visibility
+    layer: 1
  - type: SubFloorHide
  - type: Anchorable
  - type: Construction
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -18,7 +18,7 @@
    tags:
    - Figurine
  - type: UseDelay
-    delay: 10
+    delay: 5
  - type: TriggerOnActivate
  - type: TriggerOnSignal
  - type: Speech
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -358,7 +358,9 @@
    speechVerb: Reptilian # for pais (In the secret stash)
  - type: Tag
    tags:
-      - PlushieLizard
+    - ClothMade
+    - Payload
+    - PlushieLizard

 - type: entity
  parent: PlushieLizard
@@ -789,6 +791,8 @@
  components:
  - type: Sprite
    state: plushie_snake
+  - type: Item
+    heldPrefix: plushiesnake
  - type: EmitSoundOnUse
    sound:
      path: /Audio/Items/Toys/rattle.ogg
@@ -812,6 +816,13 @@
    wideAnimationRotation: 180
    soundHit:
      path: /Audio/Items/Toys/rattle.ogg
+  - type: Clothing
+    quickEquip: false
+    equippedPrefix: plushiesnake
+    slots:
+    - NECK
+  - type: Speech
+    speechVerb: Reptilian # for pais (In the secret stash)

 - type: entity
  parent: BasePlushie
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -63,7 +63,7 @@
          visible: false
    - type: Item
      sprite: Objects/Specific/Medical/implanter.rsi
-      heldPrefix: 0
+      heldPrefix: implanter
      size: Small
    - type: Appearance
    - type: GenericVisualizer
@@ -130,6 +130,7 @@
  components:
    - type: Item
      sprite: Objects/Specific/Medical/syndi_implanter.rsi
+      heldPrefix: implanter
    - type: Sprite
      sprite: Objects/Specific/Medical/syndi_implanter.rsi
      state: implanter1
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -196,6 +196,21 @@
    headerImagePath: "/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png"
    headerMargin: 0.0, 12.0, 0.0, 0.0

+- type: entity
+  id: PaperNanoTaskItem
+  parent: Paper
+  name: NanoTask item
+  description: A printed NanoTask item. Can be inserted into your PDA to add it to your tasks.
+  components:
+  - type: Tag
+    tags:
+    - Document
+    - Trash
+    - Paper
+  - type: StaticPrice
+    price: 0
+  - type: NanoTaskPrinted
+
 - type: entity
  id: PaperCargoBountyManifest
  parent: PaperCargoInvoice
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml
@@ -0,0 +1,30 @@
+- type: entity
+  name: mail bag
+  id: MailBag
+  parent: BaseStorageItem
+  description: A bag for carrying mail around the station. Made from tanned space bear hide.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Cargo/mail_bag.rsi
+    state: icon
+  - type: Clothing
+    sprite: Objects/Specific/Cargo/mail_bag.rsi
+    quickEquip: false
+    slots:
+    - belt
+  - type: Item
+    size: Ginormous
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,4,3
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      components:
+      - Paper
+      - Delivery
+      tags:
+      - Document
+      - Paper
+  - type: Dumpable
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
@@ -6,6 +6,8 @@
  id: HandheldCrewMonitor
  description: A hand-held crew monitor displaying the status of suit sensors.
  components:
+  - type: Item
+    heldPrefix: scanner
  - type: Sprite
    sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
    state: scanner
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -118,6 +118,8 @@
    - Brutepack
  - type: Sprite
    state: brutepack
+  - type: Item
+    heldPrefix: brutepack
  - type: Healing
    damageContainers:
      - Biological
@@ -200,6 +202,8 @@
  id: Bloodpack
  suffix: Full
  components:
+  - type: Item
+    heldPrefix: bloodpack
  - type: Tag
    tags:
    - Bloodpack
@@ -222,6 +226,15 @@
  - type: StackPrice
    price: 10

+- type: entity
+  parent: Bloodpack
+  id: Bloodpack1
+  suffix: Single
+  components:
+  - type: Stack
+    stackType: Bloodpack
+    count: 1
+
 - type: entity
  parent: Bloodpack
  id: Bloodpack10Lingering
@@ -241,6 +254,8 @@
        - SecBeltEquip
    - type: Sprite
      state: tourniquet
+    - type: Item
+      heldPrefix: tourniquet
    - type: Healing
      damageContainers:
        - Biological
@@ -268,6 +283,8 @@
    - Gauze
  - type: Sprite
    state: gauze
+  - type: Item
+    heldPrefix: gauze
  - type: Construction
    graph: Gauze
    node: gauze
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -14,6 +14,7 @@
        visible: true
        map: [ "enum.PowerDeviceVisualLayers.Powered" ]
  - type: Item
+    heldPrefix: analyzer
    storedRotation: -90
  - type: ActivatableUI
    key: enum.HealthAnalyzerUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -104,6 +104,17 @@
      map: ["enum.SolutionContainerLayers.Fill"]
  - type: Item
    sprite: Objects/Specific/Medical/medipen.rsi
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#439822"
+      - state: base-colorB-inhand-left
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#439822"
+      - state: base-colorB-inhand-right
    size: Tiny
  - type: SolutionContainerManager
    solutions:
@@ -166,6 +177,18 @@
  id: AntiPoisonMedipen
  description: A rapid dose of anti-poison. Contains ultravasculine and epinephrine.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#573d9e"
+      - state: base-colorB-inhand-left
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#573d9e"
+      - state: base-colorB-inhand-right
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
@@ -193,6 +216,18 @@
  id: BruteAutoInjector
  description: A rapid dose of bicaridine and tranexamic acid, intended for combat applications.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#c73333"
+      - state: base-colorB-inhand-left
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#c73333"
+      - state: base-colorB-inhand-right
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
@@ -225,6 +260,18 @@
  id: BurnAutoInjector
  description: A rapid dose of dermaline and leporazine, intended for combat applications.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#427485"
+      - state: base-colorB-inhand-left
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#427485"
+      - state: base-colorB-inhand-right
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
@@ -257,6 +304,18 @@
  id: RadAutoInjector
  description: A rapid dose of anti-radiation. Contains arithrazine and bicaridine.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#e3832f"
+      - state: base-colorB-inhand-left
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#e3832f"
+      - state: base-colorB-inhand-right
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
@@ -289,6 +348,18 @@
  id: PunctAutoInjector
  description: A rapid dose of puncturase and tranexamic acid, intended for combat applications.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#c7be5d"
+      - state: base-colorB-inhand-left
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#c7be5d"
+      - state: base-colorB-inhand-right
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
@@ -321,6 +392,18 @@
  id: PyraAutoInjector
  description: A rapid dose of pyrazine and dermaline, intended for combat applications.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#c7a45d"
+      - state: base-colorB-inhand-left
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#c7a45d"
+      - state: base-colorB-inhand-right
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
@@ -353,6 +436,18 @@
  id: AirlossAutoInjector
  description: A rapid dose of saline and dexalin plus, intended to get someone up quickly.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#5d81c7"
+      - state: base-colorB-inhand-left
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#5d81c7"
+      - state: base-colorB-inhand-right
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
@@ -385,6 +480,18 @@
  id: SpaceMedipen
  description: Contains a mix of chemicals that protect you from the deadly effects of space.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#a84597"
+      - state: base-colorB-inhand-left
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#a84597"
+      - state: base-colorB-inhand-right
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
@@ -418,6 +525,20 @@
  id: Stimpack
  description: Contains enough hyperzine for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#9a040e"
+      - state: base-colorB-inhand-left
+        color: "#c62933"
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#9a040e"
+      - state: base-colorB-inhand-right
+        color: "#c62933"
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
@@ -450,6 +571,20 @@
  id: StimpackMini
  description: A microinjector of hyperzine that give you about 15 seconds of the chemical's effects.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#9a040e"
+      - state: base-colorB-inhand-left
+        color: "#c62933"
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#9a040e"
+      - state: base-colorB-inhand-right
+        color: "#c62933"
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
@@ -477,6 +612,18 @@
  id: CombatMedipen
  description: A single-use medipen containing chemicals that regenerate most types of damage.
  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-needle-inhand-left
+      - state: base-colorA-inhand-left
+        color: "#5bcaca"
+      - state: base-colorB-inhand-left
+      right:
+      - state: base-needle-inhand-right
+      - state: base-colorA-inhand-right
+        color: "#5bcaca"
+      - state: base-colorB-inhand-right
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
    layers:
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -6,6 +6,7 @@
  components:
  - type: Item
    size: Small
+    heldPrefix: bag
  - type: Sprite
    drawdepth: SmallObjects # I guess body bags need appear above a coroner's table?
    sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -7,6 +7,23 @@
  components:
  - type: Item
    storedRotation: -90
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#8FCBCB"
+      - state: base-module-inhand-left
+        color: "#A1A1A1"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#7D7D7D"
+      right:
+      - state: base-icon-inhand-right
+        color: "#8FCBCB"
+      - state: base-module-inhand-right
+        color: "#A1A1A1"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#7D7D7D"
  - type: Sprite
    sprite: Objects/Specific/Robotics/borgmodule.rsi
  - type: BorgModule
@@ -49,6 +66,22 @@
  - type: Tag
    tags:
    - BorgModuleCargo
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#EBD8B7"
+      - state: base-module-inhand-left
+        color: "#613D1D"
+      - state: base-stripes-inhand-left
+        color: "#593718"
+      right:
+      - state: base-icon-inhand-right
+        color: "#EBD8B7"
+      - state: base-module-inhand-right
+        color: "#613D1D"
+      - state: base-stripes-inhand-right
+        color: "#593718"

 - type: entity
  id: BaseBorgModuleEngineering
@@ -58,6 +91,24 @@
  - type: Tag
    tags:
    - BorgModuleEngineering
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#8FCBCB"
+      - state: base-module-inhand-left
+        color: "#BA3939"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#DEC343"
+      right:
+      - state: base-icon-inhand-right
+        color: "#8FCBCB"
+      - state: base-module-inhand-right
+        color: "#BA3939"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#DEC343"

 - type: entity
  id: BaseBorgModuleJanitor
@@ -67,6 +118,24 @@
  - type: Tag
    tags:
    - BorgModuleJanitor
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#CFA2E4"
+      - state: base-module-inhand-left
+        color: "#753186"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#404040"
+      right:
+      - state: base-icon-inhand-right
+        color: "#CFA2E4"
+      - state: base-module-inhand-right
+        color: "#753186"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#404040"

 - type: entity
  id: BaseBorgModuleMedical
@@ -76,6 +145,51 @@
  - type: Tag
    tags:
    - BorgModuleMedical
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#EEF5F5"
+      - state: base-module-inhand-left
+        color: "#5A96BB"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#C3C3C3"
+      right:
+      - state: base-icon-inhand-right
+        color: "#EEF5F5"
+      - state: base-module-inhand-right
+        color: "#5A96BB"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#C3C3C3"
+
+- type: entity
+  id: BaseBorgModuleScience
+  parent: BaseBorgModule
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - BorgModuleScience
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#FFAEB6"
+      - state: base-module-inhand-left
+        color: "#9C0DE1"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#C3C3C3"
+      right:
+      - state: base-icon-inhand-right
+        color: "#FFAEB6"
+      - state: base-module-inhand-right
+        color: "#9C0DE1"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#C3C3C3"

 - type: entity
  id: BaseBorgModuleService
@@ -85,24 +199,79 @@
  - type: Tag
    tags:
    - BorgModuleService
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#F3F3F3"
+      - state: base-module-inhand-left
+        color: "#3A3A3A"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#313131"
+      right:
+      - state: base-icon-inhand-right
+        color: "#F3F3F3"
+      - state: base-module-inhand-right
+        color: "#3A3A3A"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#313131"

 - type: entity
  id: BaseBorgModuleSyndicate
  parent: BaseBorgModule
  abstract: true
  components:
-    - type: Tag
-      tags:
-        - BorgModuleSyndicate
+  - type: Tag
+    tags:
+    - BorgModuleSyndicate
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#FF0000"
+      - state: base-module-inhand-left
+        color: "#891417"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#7B0F12"
+      right:
+      - state: base-icon-inhand-right
+        color: "#FF0000"
+      - state: base-module-inhand-right
+        color: "#891417"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#7B0F12"
+      

 - type: entity
  id: BaseBorgModuleSyndicateAssault
  parent: BaseBorgModule
  abstract: true
  components:
-    - type: Tag
-      tags:
-        - BorgModuleSyndicateAssault
+  - type: Tag
+    tags:
+    - BorgModuleSyndicateAssault
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#FF0000"
+      - state: base-module-inhand-left
+        color: "#891417"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#7B0F12"
+      right:
+      - state: base-icon-inhand-right
+        color: "#FF0000"
+      - state: base-module-inhand-right
+        color: "#891417"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#7B0F12"

 # generic modules
 - type: entity
@@ -427,7 +596,7 @@
 # todo: if science ever gets their own custom robot, add more "sci" modules.
 - type: entity
  id: BorgModuleArtifact
-  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
  name: artifact cyborg module
  components:
  - type: Sprite
@@ -442,7 +611,7 @@

 - type: entity
  id: BorgModuleAnomaly
-  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
  name: anomaly cyborg module
  components:
  - type: Sprite
@@ -565,6 +734,24 @@
    - EnergyDaggerLoud
  - type: BorgModuleIcon
    icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module }
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#FF0000"
+      - state: base-module-inhand-left
+        color: "#891417"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#7B0F12"
+      right:
+      - state: base-icon-inhand-right
+        color: "#FF0000"
+      - state: base-module-inhand-right
+        color: "#891417"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#7B0F12"

 - type: entity
  id: BorgModuleOperative
@@ -634,3 +821,21 @@
        - SelfDestructSeq
    - type: BorgModuleIcon
      icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module }
+    - type: Item
+      inhandVisuals:
+        left:
+        - state: base-icon-inhand-left
+          color: "#FF0000"
+        - state: base-module-inhand-left
+          color: "#891417"
+        - state: base-part-inhand-left
+        - state: base-stripes-inhand-left
+          color: "#7B0F12"
+        right:
+        - state: base-icon-inhand-right
+          color: "#FF0000"
+        - state: base-module-inhand-right
+          color: "#891417"
+        - state: base-part-inhand-right
+        - state: base-stripes-inhand-right
+          color: "#7B0F12"
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -336,6 +336,7 @@
    - SpaceUpInventory
    - SodaInventory
    - DrGibbInventory
+    - SmiteInventory 
  - type: Sprite
    layers:
    - state: base
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -16,10 +16,10 @@
  - type: Sprite
    sprite: Objects/Specific/Chemistry/bottle.rsi
    layers:
-      - state: bottle-1
-      - state: bottle-1-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
+    - state: bottle-1
+    - state: bottle-1-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
  - type: Appearance
  - type: SolutionContainerVisuals
    maxFillLevels: 6
@@ -105,10 +105,10 @@
  components:
  - type: Sprite
    layers:
-      - state: bottle-2
-      - state: bottle-2-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
+    - state: bottle-2
+    - state: bottle-2-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
  - type: SolutionContainerVisuals
    fillBaseName: bottle-2-

@@ -118,10 +118,10 @@
  components:
  - type: Sprite
    layers:
-      - state: bottle-3
-      - state: bottle-3-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
+    - state: bottle-3
+    - state: bottle-3-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
  - type: SolutionContainerVisuals
    fillBaseName: bottle-3-

@@ -131,10 +131,10 @@
  components:
  - type: Sprite
    layers:
-      - state: bottle-4
-      - state: bottle-4-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
+    - state: bottle-4
+    - state: bottle-4-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
  - type: SolutionContainerVisuals
    fillBaseName: bottle-4-

@@ -148,7 +148,7 @@
    - Bottle

 - type: entity
-  id: EpinephrineChemistryBottle
+  id: ChemistryBottleEpinephrine
  suffix: epinephrine
  parent: BaseChemistryBottleFilled
  components:
@@ -163,7 +163,7 @@
          Quantity: 30

 - type: entity
-  id: RobustHarvestChemistryBottle
+  id: ChemistryBottleRobustHarvest
  suffix: robust harvest
  parent: BaseChemistryBottleFilled
  components:
@@ -178,7 +178,7 @@
          Quantity: 30

 - type: entity
-  id: EZNutrientChemistryBottle
+  id: ChemistryBottleEZNutrient
  suffix: ez nutrient
  parent: BaseChemistryBottleFilled
  components:
@@ -193,7 +193,7 @@
          Quantity: 30

 - type: entity
-  id: Left4ZedChemistryBottle
+  id: ChemistryBottleLeft4Zed
  suffix: left-4-zed
  parent: BaseChemistryBottleFilled
  components:
@@ -208,7 +208,7 @@
          Quantity: 30

 - type: entity
-  id: UnstableMutagenChemistryBottle
+  id: ChemistryBottleUnstableMutagen
  suffix: unstable mutagen
  parent: BaseChemistryBottleFilled
  components:
@@ -223,82 +223,7 @@
          Quantity: 30

 - type: entity
-  id: PotassiumChemistryBottle
-  suffix: potassium
-  parent: BaseChemistryBottleFilled
-  components:
-  - type: Label
-    currentLabel: reagent-name-potassium
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Potassium
-          Quantity: 30
-
- type: entity
-  id: NitrogenChemistryBottle
-  suffix: nitrogen
-  parent: BaseChemistryBottleFilled
-  components:
-  - type: Label
-    currentLabel: reagent-name-nitrogen
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Nitrogen
-          Quantity: 30
-
- type: entity
-  id: PhosphorusChemistryBottle
-  suffix: phosphorus
-  parent: BaseChemistryBottleFilled
-  components:
-  - type: Label
-    currentLabel: reagent-name-phosphorus
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Phosphorus
-          Quantity: 30
-
- type: entity
-  id: HydrogenChemistryBottle
-  suffix: hydrogen
-  parent: BaseChemistryBottleFilled
-  components:
-  - type: Label
-    currentLabel: reagent-name-hydrogen
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Hydrogen
-          Quantity: 30
-
- type: entity
-  id: EthanolChemistryBottle
-  suffix: ethanol
-  parent: BaseChemistryBottleFilled
-  components:
-  - type: Label
-    currentLabel: reagent-name-ethanol
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Ethanol
-          Quantity: 30
-
- type: entity
-  id: NocturineChemistryBottle
+  id: ChemistryBottleNocturine
  suffix: nocturine
  parent: BaseChemistryBottleFilled
  components:
@@ -313,7 +238,7 @@
          Quantity: 30

 - type: entity
-  id: EphedrineChemistryBottle
+  id: ChemistryBottleEphedrine
  suffix: ephedrine
  parent: BaseChemistryBottleFilled
  components:
@@ -328,7 +253,7 @@
          Quantity: 30

 - type: entity
-  id: OmnizineChemistryBottle
+  id: ChemistryBottleOmnizine
  suffix: omnizine
  parent: BaseChemistryBottleFilled
  components:
@@ -344,7 +269,7 @@

 - type: entity
  parent: BaseChemistryBottleFilled
-  id: CognizineChemistryBottle
+  id: ChemistryBottleCognizine
  suffix: cognizine
  components:
  - type: Label
@@ -358,7 +283,7 @@
          Quantity: 30

 - type: entity
-  id: PaxChemistryBottle
+  id: ChemistryBottlePax
  suffix: pax
  parent: BaseChemistryBottleFilled
  components:
@@ -369,11 +294,11 @@
      drink:
        maxVol: 30
        reagents:
-          - ReagentId: Pax
-            Quantity: 30
+        - ReagentId: Pax
+          Quantity: 30

 - type: entity
-  id: MuteToxinChemistryBottle
+  id: ChemistryBottleMuteToxin
  suffix: mute toxin
  parent: BaseChemistryBottleFilled
  components:
@@ -384,11 +309,11 @@
      drink:
        maxVol: 30
        reagents:
-          - ReagentId: MuteToxin
-            Quantity: 30
+        - ReagentId: MuteToxin
+          Quantity: 30

 - type: entity
-  id: LeadChemistryBottle
+  id: ChemistryBottleLead
  suffix: lead
  parent: BaseChemistryBottleFilled
  components:
@@ -399,11 +324,11 @@
      drink:
        maxVol: 30
        reagents:
-          - ReagentId: Lead
-            Quantity: 30
+        - ReagentId: Lead
+          Quantity: 30

 - type: entity
-  id: ToxinChemistryBottle
+  id: ChemistryBottleToxin
  suffix: toxin
  parent: BaseChemistryBottleFilled
  components:
@@ -414,5 +339,332 @@
      drink:
        maxVol: 30
        reagents:
-          - ReagentId: Toxin
-            Quantity: 30
+        - ReagentId: Toxin
+          Quantity: 30
+
+# Base reagent bottles
+- type: entity
+  id: ChemistryBottleAluminium
+  suffix: aluminium
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-aluminium
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleCarbon
+  suffix: carbon
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-carbon
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleChlorine
+  suffix: chlorine
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-chlorine
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Chlorine
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleCopper
+  suffix: copper
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-copper
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Copper
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleEthanol
+  suffix: ethanol
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-ethanol
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Ethanol
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleFluorine
+  suffix: fluorine
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-fluorine
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Fluorine
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleHydrogen
+  suffix: hydrogen
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-hydrogen
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Hydrogen
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleIodine
+  suffix: iodine
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-iodine
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Iodine
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleIron
+  suffix: iron
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-iron
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Iron
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleLithium
+  suffix: lithium
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-lithium
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Lithium
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleMercury
+  suffix: mercury
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-mercury
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mercury
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleNitrogen
+  suffix: nitrogen
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-nitrogen
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nitrogen
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleOxygen
+  suffix: oxygen
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-oxygen
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Oxygen
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottlePhosphorus
+  suffix: phosphorus
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-phosphorus
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Phosphorus
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottlePotassium
+  suffix: potassium
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-potassium
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Potassium
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleRadium
+  suffix: radium
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-radium
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Radium
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleSilicon
+  suffix: silicon
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-silicon
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleSodium
+  suffix: sodium
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-sodium
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Sodium
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleSugar
+  suffix: sugar
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-sugar
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleSulfur
+  suffix: sulfur
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-sulfur
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Sulfur
+          Quantity: 30
+
+# Entity tables
+- type: entityTable
+  id: BasicReagentBottlesTable
+  table: !type:GroupSelector
+    children:
+    - id: ChemistryBottleAluminium
+    - id: ChemistryBottleCarbon
+    - id: ChemistryBottleChlorine
+    - id: ChemistryBottleCopper
+    - id: ChemistryBottleEthanol
+    - id: ChemistryBottleFluorine
+    - id: ChemistryBottleHydrogen
+    - id: ChemistryBottleIodine
+    - id: ChemistryBottleIron
+    - id: ChemistryBottleLithium
+    - id: ChemistryBottleMercury
+    - id: ChemistryBottleNitrogen
+    - id: ChemistryBottleOxygen
+    - id: ChemistryBottlePhosphorus
+    - id: ChemistryBottlePotassium
+    - id: ChemistryBottleRadium
+    - id: ChemistryBottleSilicon
+    - id: ChemistryBottleSodium
+    - id: ChemistryBottleSugar
+    - id: ChemistryBottleSulfur
--- a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
@@ -5,7 +5,6 @@
  description: A hand-held mass scanner.
  components:
  - type: Item
-    size: Normal
    sprite: Objects/Tools/handheld_mass_scanner.rsi
  - type: Sprite
    sprite: Objects/Tools/handheld_mass_scanner.rsi
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
@@ -15,7 +15,7 @@
    - state: fuel
    - state: wires
  - type: Item
-    sprite: Objects/Consumable/Drinks/cola.rsi
+    sprite: Objects/Weapons/Bombs/ied.rsi
  - type: OnUseTimerTrigger
    delay: 5
    examinable: false
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
@@ -52,6 +52,8 @@
    slots:
    - HEAD
    quickEquip: false
+    equipDelay: 3
+    unequipDelay: 6
  - type: OnUseTimerTrigger
    delay: 10
    delayOptions: [10, 30, 60, 120, 300]
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -34,7 +34,7 @@
 - type: entity
  parent: AmmoProviderShotgunShell
  id: BoxBeanbag
-  name: shell box (beanbag)
+  name: ammunition box (.50 beanbag)
  components:
    - type: BallisticAmmoProvider
      proto: ShellShotgunBeanbag
@@ -51,7 +51,7 @@
      - state: beanbag

 - type: entity
-  name: shell box (lethal)
+  name: ammunition box (.50 pellet)
  parent: AmmoProviderShotgunShell
  id: BoxLethalshot
  components:
@@ -66,7 +66,7 @@
      - state: lethal

 - type: entity
-  name: shell box (slug)
+  name: ammunition box (.50 slug)
  parent: AmmoProviderShotgunShell
  id: BoxShotgunSlug
  components:
@@ -85,7 +85,7 @@
      - state: slug

 - type: entity
-  name: shell box (flare)
+  name: ammunition box (.50 flare)
  parent: AmmoProviderShotgunShell
  id: BoxShotgunFlare
  components:
@@ -104,7 +104,7 @@
      - state: flare

 - type: entity
-  name: shell box (incendiary)
+  name: ammunition box (.50 incendiary)
  parent: AmmoProviderShotgunShell
  id: BoxShotgunIncendiary
  components:
@@ -123,7 +123,7 @@
      - state: incendiary

 - type: entity
-  name: shell box (uranium)
+  name: ammunition box (.50 uranium)
  parent: AmmoProviderShotgunShell
  id: BoxShotgunUranium
  components:
@@ -142,7 +142,7 @@
      - state: uranium

 - type: entity
-  name: shell box (practice)
+  name: ammunition box (.50 practice)
  parent: AmmoProviderShotgunShell
  id: BoxShotgunPractice
  components:
@@ -161,7 +161,7 @@
      - state: practice

 - type: entity
-  name: shell box (tranquilizer)
+  name: ammunition box (.50 tranquilizer)
  parent: AmmoProviderShotgunShell
  id: BoxShellTranquilizer
  components:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -73,7 +73,7 @@

 - type: entity
  id: ShellShotgun
-  name: shell (.50)
+  name: shell (.50 pellet)
  parent: [ BaseShellShotgun, BaseSecurityContraband ]
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -16,7 +16,7 @@
    tags:
      - HideContextMenu
  - type: AnimationPlayer
-  
+
 - type: entity
  parent: MuzzleFlashEffect
  id: MuzzleFlashEffectOmnilaser
@@ -30,7 +30,7 @@
      map: ["enum.EffectLayers.Unshaded"]
      sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
      state: omnilaser_flash
-  
+
 - type: entity
  parent: MuzzleFlashEffect
  id: MuzzleFlashEffectHeavyLaser
@@ -262,7 +262,7 @@
    impactEffect: BulletImpactEffectDisabler
    damage:
      types:
-        Heat: 5
+        Heat: 0
    soundHit:
      collection: WeakHit
    forceSound: true
@@ -302,7 +302,7 @@
    impactEffect: BulletImpactEffectDisabler
    damage:
      types:
-        Heat: 1
+        Heat: 0
    soundHit:
      collection: WeakHit
    forceSound: true
@@ -972,7 +972,7 @@
    impactEffect: BulletImpactEffectDisabler
    damage:
      types:
-        Heat: 2
+        Heat: 0
    soundHit:
      collection: WeakHit
    forceSound: true
@@ -1154,4 +1154,4 @@
  - type: ProjectileSpread
    proto: BulletDisablerSmg
    count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
-    spread: 9
+    spread: 9
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -54,6 +54,7 @@
    state: icon
  - type: Item
    size: Normal
+    sprite: Objects/Weapons/Melee/incomplete_bat.rsi
  - type: Construction
    graph: WoodenBat
    node: incompleteBat
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -114,7 +114,7 @@

 - type: entity
  name: survival knife
-  parent: [CombatKnife, BaseSecurityCargoContraband]
+  parent: [BaseSecurityCargoContraband, CombatKnife]
  id: SurvivalKnife
  description: Weapon of first and last resort for combatting space carp.
  components:
@@ -129,7 +129,7 @@

 - type: entity
  name: kukri knife
-  parent: [CombatKnife, BaseSecurityCargoContraband]
+  parent: [BaseSecurityCargoContraband, CombatKnife]
  id: KukriKnife
  description: Professionals have standards. Be polite. Be efficient. Have a plan to kill everyone you meet.
  components:
--- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
@@ -8,6 +8,7 @@
      noRot: true
    - type: Item
      size: Normal
+      heldPrefix: rollerbed
    - type: Sprite
      sprite: Structures/Furniture/rollerbeds.rsi
      noRot: true
@@ -88,6 +89,8 @@
  parent: RollerBed
  description: A run-down rollerbed. Used to carry patients around.
  components:
+  - type: Item
+    heldPrefix: cheap_rollerbed
  - type: Sprite
    layers:
    - state: cheap_rollerbed
@@ -116,6 +119,8 @@
  parent: RollerBed
  description: A robust looking rollerbed used for emergencies.
  components:
+  - type: Item
+    heldPrefix: emergency_rollerbed
  - type: Sprite
    layers:
    - state: emergency_rollerbed
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -273,7 +273,7 @@
        fix1:
          shape:
            !type:PhysShapeAabb
-            bounds: "-0.2,0.5,0.2,0.35"
+            bounds: "-0.1,0.5,0.1,0.255"
          density: 190
          mask:
          - TabletopMachineMask
--- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
@@ -13,7 +13,15 @@
          !type:PhysShapeCircle
          radius: 0.25
        mask:
-        - SubfloorMask
+        - Impassable
+        - HighImpassable
+        - MidImpassable
+      fix2:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.25
+        mask:
+        - MachineLayer
        layer:
        - LowImpassable
        hard: false
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -115,6 +115,7 @@
  components:
  - type: Microwave
    cookTimeMultiplier: 0.5
+    baseHeatMultiplier: 200
    capacity: 10
    canMicrowaveIdsSafely: false
    explosionChance: 0.3
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -39,6 +39,9 @@
  - type: Rotatable
  - type: Transform
    noRot: false
+  - type: SubFloorHide
+    visibleLayers:
+    - enum.SubfloorLayers.FirstLayer
  - type: Sprite
    sprite: Structures/Piping/Atmospherics/pump.rsi
    layers:
@@ -95,6 +98,9 @@
    - type: Rotatable
    - type: Transform
      noRot: false
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
    - type: Sprite
      sprite: Structures/Piping/Atmospherics/pump.rsi
      layers:
@@ -149,6 +155,9 @@
  placement:
    mode: SnapgridCenter
  components:
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
    - type: Sprite
      sprite: Structures/Piping/Atmospherics/pump.rsi
      layers:
@@ -184,6 +193,9 @@
    mode: SnapgridCenter
  components:
    # TODO ATMOS: Give unique sprite.
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
    - type: Sprite
      sprite: Structures/Piping/Atmospherics/pump.rsi
      layers:
@@ -237,6 +249,9 @@
    mode: SnapgridCenter
  components:
  - type: StationAiWhitelist
+  - type: SubFloorHide
+    visibleLayers:
+    - enum.SubfloorLayers.FirstLayer
  - type: Sprite
    sprite: Structures/Piping/Atmospherics/pump.rsi
    layers:
@@ -300,6 +315,9 @@
  placement:
    mode: SnapgridCenter
  components:
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
    - type: Sprite
      sprite: Structures/Piping/Atmospherics/gascanisterport.rsi
      layers:
@@ -334,6 +352,9 @@
  placement:
    mode: SnapgridCenter
  components:
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
    - type: Sprite
      drawdepth: FloorObjects
      sprite: Structures/Piping/Atmospherics/vent.rsi
@@ -501,6 +522,9 @@
  id: HeatExchangerBend
  suffix: Bend
  components:
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
    - type: Sprite
      layers:
      - sprite: Structures/Piping/Atmospherics/pipe.rsi
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -7,6 +7,8 @@
  placement:
    mode: SnapgridCenter
  components:
+  - type: Visibility
+    layer: 1
  - type: Item
    size: Normal
  - type: Transform
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -35,6 +35,9 @@
  placement:
    mode: SnapgridCenter
  components:
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
    - type: Sprite
      sprite: Structures/Piping/Atmospherics/gasfilter.rsi
      layers:
@@ -84,6 +87,9 @@
  placement:
    mode: SnapgridCenter
  components:
+  - type: SubFloorHide
+    visibleLayers:
+    - enum.SubfloorLayers.FirstLayer
  - type: Sprite
    sprite: Structures/Piping/Atmospherics/gasfilter.rsi
    layers:
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -36,6 +36,9 @@
      tags:
        - GasVent
        - Unstackable
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
    - type: Sprite
      drawdepth: FloorObjects
      sprite: Structures/Piping/Atmospherics/vent.rsi
@@ -83,6 +86,9 @@
  placement:
    mode: SnapgridCenter
  components:
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
    - type: Sprite
      drawdepth: FloorObjects
      sprite: Structures/Piping/Atmospherics/vent.rsi
@@ -120,6 +126,9 @@
      tags:
        - GasScrubber
        - Unstackable
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
    - type: Sprite
      drawdepth: FloorObjects
      sprite: Structures/Piping/Atmospherics/scrubber.rsi
--- a/Show More
+++ b/Show More