Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream

# Conflicts: # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Maps/train.yml # Resources/Prototypes/Traits/categories.yml # Resources/Prototypes/Traits/disabilities.yml
2024-07-28 20:58:48 +03:00
parent 0d345c33b9 fce5269fc0
commit fb40f8cd25
302 changed files with 7542 additions and 4673 deletions
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -166,6 +166,8 @@
  name: Morph into Geras
  description:  Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory.
  components:
+  - type: ConfirmableAction
+    popup: gera-transformation-popup
  - type: InstantAction
    itemIconStyle: BigAction
    useDelay: 10 # prevent spam
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: BaseAnimalOrganUnGibbable
  parent: BaseItem
  abstract: true
@@ -34,7 +34,7 @@
  id: OrganAnimalLungs
  parent: BaseAnimalOrgan
  name: lungs
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
@@ -65,7 +65,7 @@
  id: OrganAnimalStomach
  parent: BaseAnimalOrgan
  name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: stomach
@@ -91,7 +91,7 @@
  id: OrganMouseStomach
  parent: OrganAnimalStomach
  name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: SolutionContainerManager
    solutions:
@@ -102,7 +102,7 @@
  id: OrganAnimalLiver
  parent: BaseAnimalOrgan
  name: liver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: liver
@@ -118,7 +118,7 @@
  id: OrganAnimalHeart
  parent: BaseAnimalOrgan
  name: heart
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: heart-on
@@ -135,7 +135,7 @@
  id: OrganAnimalKidneys
  parent: BaseAnimalOrgan
  name: kidneys
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
@@ -1,8 +1,8 @@
- type: entity
+- type: entity
  id: OrganBloodsuckerStomach
  parent: OrganAnimalStomach
  name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Metabolizer
    metabolizerTypes: [ Bloodsucker ]
@@ -11,7 +11,7 @@
  id: OrganBloodsuckerLiver
  parent: OrganAnimalLiver
  name: liver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Metabolizer
    metabolizerTypes: [ Bloodsucker ]
@@ -20,7 +20,7 @@
  id: OrganBloodsuckerHeart
  parent: OrganAnimalHeart
  name: heart
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Metabolizer
    metabolizerTypes: [ Bloodsucker ]
--- a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
@@ -1,8 +1,8 @@
- type: entity
+- type: entity
  id: OrganAnimalRuminantStomach
  parent: OrganAnimalStomach
  name: ruminant stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: SolutionContainerManager
    solutions:
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -105,7 +105,7 @@
  parent: BaseHumanOrgan
  name: liver
  description: "Pairing suggestion: chianti and fava beans."
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: liver
@@ -122,7 +122,7 @@
  parent: BaseHumanOrgan
  name: kidneys
  description: "Filters toxins from the bloodstream."
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -126,7 +126,7 @@
 - type: entity
  id: OrganDionaBrainNymph
  parent: OrganDionaBrain
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: brain
  description: "The source of incredible, unending intelligence. Honk."
  components:
@@ -138,7 +138,7 @@
 - type: entity
  id: OrganDionaStomachNymph
  parent: OrganDionaStomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: stomach
  description: "Gross. This is hard to stomach."
  components:
@@ -148,7 +148,7 @@
 - type: entity
  id: OrganDionaLungsNymph
  parent: OrganDionaLungs
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: lungs
  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
  components:
@@ -159,7 +159,7 @@
 - type: entity
  id: OrganDionaNymphBrain
  parent: MobDionaNymph
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: diona nymph
  suffix: Brain
  description: Contains the brain of a formerly fully-formed Diona. Killing this would kill the Diona forever. You monster.
@@ -171,7 +171,7 @@
 - type: entity
  id: OrganDionaNymphStomach
  parent: MobDionaNymphAccent 
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: diona nymph
  suffix: Stomach
  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
@@ -183,7 +183,7 @@
 - type: entity
  id: OrganDionaNymphLungs
  parent: MobDionaNymphAccent
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: diona nymph
  suffix: Lungs
  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 
--- a/Resources/Prototypes/Body/Organs/moth.yml
+++ b/Resources/Prototypes/Body/Organs/moth.yml
@@ -1,7 +1,7 @@
- type: entity
+- type: entity
  id: OrganMothStomach
  parent: [OrganAnimalStomach, OrganHumanStomach]
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Stomach
    specialDigestible:
--- a/Resources/Prototypes/Body/Organs/reptilian.yml
+++ b/Resources/Prototypes/Body/Organs/reptilian.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: OrganReptilianStomach
  parent: OrganAnimalStomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Stomach
    specialDigestible:
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -36,7 +36,7 @@
  id: HandsAnimal
  name: animal hands
  parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
@@ -50,7 +50,7 @@
  id: LegsAnimal
  name: animal legs
  parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
@@ -64,7 +64,7 @@
  id: FeetAnimal
  name: animal feet
  parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
@@ -77,7 +77,7 @@
  id: TorsoAnimal
  name: animal torso
  parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Body/Parts/rat.yml
+++ b/Resources/Prototypes/Body/Parts/rat.yml
@@ -4,7 +4,7 @@
  id: TorsoRat
  name: "animal torso"
  parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: BodyPart
    partType: Torso
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -502,6 +502,9 @@
      - TemperatureProtection
      tags:
      - Scarf
+    blacklist:
+      components:
+      - ToggleableClothing

 - type: cargoBounty
  id: BountyBattery
--- a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
@@ -0,0 +1,372 @@
+- type: entity
+  name: Perma Escape Crate Spawner
+  id: CratePermaEscapeSpawner
+  parent: CrateEmptySpawner
+  components:
+  - type: RandomSpawner
+    prototypes:
+    # Please note any duplicates & alphabetize <3
+      - CrateEngineeringMiniJetpack
+      - CratePermaEscapeBureaucracy
+      - CratePermaEscapeEVA
+      - CratePermaEscapeGiftsFromSyndicate
+      - CratePermaEscapeGun
+      - CratePermaEscapeLights
+      - CratePermaEscapeMerc
+      - CrateServiceCustomSmokable
+      - CrateTrashCartFilled
+      - CratePermaEscapeComs # x2
+      - CratePermaEscapeComs
+      - CratePermaEscapeDigging # x2
+      - CratePermaEscapeDigging
+      - CratePermaEscapeMats #x2
+      - CratePermaEscapeMats
+      - CratePermaEscapeTowercap # x2
+      - CratePermaEscapeTowercap
+      - ClosetMaintenanceFilledRandom # x3
+      - ClosetMaintenanceFilledRandom
+      - ClosetMaintenanceFilledRandom
+    rarePrototypes:
+      - MobTick # These need to be killable by one dude with a shovel.
+    rareChance: .30
+    chance: 1
+    offset: 0.0
+
+- type: entity
+  id: CratePermaEscapeDigging
+  parent: CrateGenericSteel
+  suffix: Digging
+  components:
+  - type: StorageFill
+    contents:
+      - id: Shovel
+      - id: Pickaxe
+        prob: 0.90
+      - id: Pickaxe
+        prob: 0.40
+      - id: Pickaxe
+        prob: 0.10
+      - id: Shovel
+        prob: 0.50
+      - id: Shovel
+        prob: 0.20
+      - id: HydroponicsToolSpade
+        prob: 0.10
+      - id: HydroponicsToolHatchet
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeEVA
+  parent: CrateGenericSteel
+  suffix: EVAs
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadHelmetEVALarge
+      - id: ClothingOuterHardsuitEVAPrisoner
+      - id: ClothingHeadHelmetEVALarge
+        prob: 0.80
+      - id: ClothingOuterHardsuitEVAPrisoner
+        prob: 0.80
+      - id: ClothingOuterHardsuitVoidParamed
+        prob: 0.10
+      - id: ClothingOuterRedRacoon
+        prob: 0.10
+      - id: ClothingOuterSanta
+        prob: 0.10
+      - id: ClothingOuterHardsuitSyndicate
+        prob: 0.20
+      - id: EmergencyOxygenTankFilled
+        prob: 0.25
+      - id: EmergencyOxygenTank
+        prob: 0.25
+      - id: OxygenTankFilled
+        prob: 0.05
+        
+- type: entity
+  id: CratePermaEscapeGun
+  parent: CrateGenericSteel
+  suffix: Gun
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolMk58
+      prob: 0.15
+      orGroup: gun
+    - id: FoamCrossbow
+      prob: 0.10
+      orGroup: gun
+    - id: WeaponRifleFoam
+      prob: 0.05
+      orGroup: gun
+    - id: WeaponPistolFlintlock
+      prob: 0.20
+      orGroup: gun
+    - id: WeaponShotgunBlunderbuss
+      prob: 0.10
+      orGroup: gun
+    - id: WeaponShotgunBlunderbuss
+      prob: 0.15
+      orGroup: gun
+    - id: WeaponRevolverPirate
+      prob: 0.15
+      orGroup: gun
+    - id: WeaponProtoKineticAccelerator
+      prob: 0.20
+      orGroup: gun
+
+- type: entity
+  id: CratePermaEscapeBureaucracy
+  parent: CrateGenericSteel
+  suffix: Writing
+  components:
+  - type: StorageFill
+    contents:
+      - id: RubberStampApproved
+      - id: RubberStampDenied
+      - id: Pen
+      - id: Pen
+      - id: Pen
+      - id: BoxFolderBase
+        orGroup: folderA
+      - id: BoxFolderBlack
+        orGroup: folderA
+      - id: BoxFolderBlue
+        orGroup: folderA
+      - id: BoxFolderGreen
+        orGroup: folderA
+      - id: BoxFolderGrey
+        orGroup: folderA
+      - id: BoxFolderRed
+        orGroup: folderA
+      - id: BoxFolderWhite
+        orGroup: folderA
+      - id: BoxFolderYellow
+        orGroup: folderA
+      - id: BoxFolderBase
+        orGroup: folderB
+      - id: BoxFolderBlack
+        orGroup: folderB
+      - id: BoxFolderBlue
+        orGroup: folderB
+      - id: BoxFolderGreen
+        orGroup: folderB
+      - id: BoxFolderGrey
+        orGroup: folderB
+      - id: BoxFolderRed
+        orGroup: folderB
+      - id: BoxFolderWhite
+        orGroup: folderB
+      - id: BoxFolderYellow
+        orGroup: folderB
+      - id: CrayonBox
+        prob: 0.50
+      - id: CrayonBox
+        prob: 0.10
+      - id: ClearPDA # change to visitor one day.
+        prob: 0.10
+      - id: PersonalAI
+
+- type: entity
+  id: CratePermaEscapeLights
+  parent: CrateGenericSteel
+  suffix: Glowsticks
+  components:
+  - type: StorageFill
+    contents:
+      - id: GlowstickBlue
+        prob: 0.50
+      - id: GlowstickBlue
+        prob: 0.20
+      - id: GlowstickBlue
+        prob: 0.05
+      - id: GlowstickBase
+        prob: 0.50
+      - id: GlowstickBase
+        prob: 0.20
+      - id: GlowstickBase
+        prob: 0.05
+      - id: GlowstickPurple
+        prob: 0.50
+      - id: GlowstickPurple
+        prob: 0.20
+      - id: GlowstickPurple
+        prob: 0.05
+      - id: GlowstickRed
+        prob: 0.50
+      - id: GlowstickRed
+        prob: 0.20
+      - id: GlowstickRed
+        prob: 0.05
+      - id: GlowstickYellow
+        prob: 0.50
+      - id: GlowstickYellow
+        prob: 0.20
+      - id: GlowstickYellow
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeMats
+  parent: CrateGenericSteel
+  suffix: Mats
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetSteel
+        orGroup: matA
+      - id: PartRodMetal
+        orGroup: matA
+      - id: SheetSteel
+        orGroup: matB
+      - id: PartRodMetal
+        orGroup: matB
+
+- type: entity
+  id: CratePermaEscapeGiftsFromSyndicate
+  parent: CrateGenericSteel
+  suffix: Syndi Gifts
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingEyesGlassesOutlawGlasses
+      - id: ClothingHeadHatOutlawHat
+      - id: HappyHonkNukieSnacks
+      # - id: BaseUplinkRadio # too spicy I think.
+        # prob: 0.50
+      # - id: Telecrystal
+        # prob: 0.80
+      # - id: Telecrystal
+        # prob: 0.80
+      # - id: Telecrystal
+        # prob: 0.70
+      # - id: Telecrystal
+        # prob: 0.50
+      # - id: Telecrystal
+        # prob: 0.20
+      # - id: Telecrystal
+        # prob: 0.10
+      # - id: Telecrystal
+        # prob: 0.05
+      # - id: Telecrystal
+        # prob: 0.01
+      # - id: Telecrystal5
+        # prob: 0.01
+      - id: CyberPen
+        prob: 0.10
+      - id: CockroachCube
+        orGroup: cube
+      - id: AbominationCube
+        prob: 0.20
+        orGroup: cube
+      - id: SpaceCarpCube
+        prob: 0.20
+        orGroup: cube
+      - id: SyndicateSponge
+        prob: 0.20
+        orGroup: cube
+      - id: MindShieldImplanter
+        prob: 0.20
+      - id: ClothingHandsGlovesConducting # funny
+        prob: 0.30
+      - id: CigPackSyndicate
+        prob: 0.80
+      - id: StimpackMini
+        prob: 0.20
+      - id: StimpackMini
+        prob: 0.10
+      - id: CombatMedipen
+        prob: 0.05
+      - id: MedkitCombatFilled
+        prob: 0.01
+      - id: SoapSyndie
+        prob: 0.15
+      - id: DnaScramblerImplanter
+        prob: 0.005
+
+
+- type: entity
+  id: CratePermaEscapeMerc
+  parent: CrateGenericSteel
+  suffix: Merc
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingUniformJumpsuitMercenary
+      - id: ClothingHeadBandMerc
+        prob: 0.50
+      - id: ClothingHeadHatBeretMerc
+        prob: 0.20
+      - id: ClothingHeadHelmetMerc
+        prob: 0.05
+      - id: ClothingEyesGlassesMercenary
+        prob: 0.20
+      - id: ClothingMaskGasMerc
+        prob: 0.10
+      - id: ClothingHandsGlovesMercFingerless
+        prob: 0.20
+      - id: ClothingHandsMercGlovesCombat
+        prob: 0.05
+      - id: ClothingBackpackMerc
+        prob: 0.50
+      - id: ClothingShoesBootsMerc
+        prob: 0.50
+      - id: ClothingOuterVestWebMerc
+        prob: 0.25
+      - id: ClothingBeltMercWebbing
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeComs
+  parent: CrateGenericSteel
+  suffix: Coms
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetGrey
+        orGroup: coms
+      - id: ClothingHeadsetScience
+        orGroup: coms
+      - id: ClothingHeadsetService
+        orGroup: coms
+      - id: ClothingHeadsetEngineering
+        orGroup: coms
+      - id: ClothingHeadsetMedical
+        orGroup: coms
+      - id: EncryptionKeyCargo
+        prob: 0.05
+      - id: EncryptionKeyScience
+        prob: 0.05
+      - id: EncryptionKeyService
+        prob: 0.05
+      - id: EncryptionKeyMedical
+        prob: 0.05
+      - id: EncryptionKeyEngineering
+        prob: 0.05
+      - id: EncryptionKeySecurity
+        prob: 0.01
+
+- type: entity
+  id: CratePermaEscapeTowercap
+  parent: CrateGenericSteel
+  suffix: Towercap
+  components:
+  - type: StorageFill
+    contents:
+      - id: TowercapSeeds
+      - id: TowercapSeeds
+        prob: 0.80
+      - id: TowercapSeeds
+        prob: 0.50
+      - id: TowercapSeeds
+        prob: 0.20
+      - id: SteelcapSeeds
+        prob: 0.10
+      - id: SteelLog
+      - id: HydroponicsToolHatchet
+        prob: 0.75
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -26,7 +26,7 @@
 - type: entity
  id: CrateSalvageAssortedGoodies
  suffix: Filled, Salvage Random
-  noSpawn: true # You should use SalvageMaterialCrateSpawner instead
+  categories: [ HideSpawnMenu ] # You should use SalvageMaterialCrateSpawner instead
  parent: CrateGenericSteel
  components:
  - type: StorageFill
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
@@ -9,6 +9,6 @@
    ClothingHeadHatVioletwizard: 3
    ClothingOuterWizardViolet: 3
    ClothingShoesWizard: 9
-    #TO DO:
+    #TODO:
    #only missing staff
    #and if wizarditis reagent when hacked if we want this.
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -23,3 +23,5 @@
    ClothingEyesBlindfold: 1
    ClothingShoesBootsCombat: 1
    ClothingShoesBootsWinterSec: 2
+  contrabandInventory:
+    ClothingMaskClownSecurity: 1
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -122,7 +122,7 @@
  name: uplink-sniper-bundle-name
  description: uplink-sniper-bundle-desc
  icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base }
-  productEntity: BriefcaseSyndieSniperBundleFilled  
+  productEntity: BriefcaseSyndieSniperBundleFilled
  cost:
    Telecrystal: 12
  categories:
@@ -916,11 +916,11 @@
          - NukeOpsUplink

 - type: listing
-  id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns an agent with the NukeOperative component.
-  name: uplink-reinforcement-radio-name
+  id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns another nuclear operative without the uplink.
+  name: uplink-reinforcement-radio-nukeops-name
  description: uplink-reinforcement-radio-nukeops-desc
  productEntity: ReinforcementRadioSyndicateNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-nukeop }
  cost:
    Telecrystal: 35
  categories:
@@ -1004,7 +1004,7 @@
    Telecrystal: 6
  categories:
    - UplinkAllies
-  
+
 - type: listing
  id: UplinkSyndicatePersonalAI
  name: uplink-syndicate-pai-name
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -63,6 +63,8 @@
  - type: Clothing
    sprite: Clothing/Eyes/Glasses/meson.rsi
  - type: EyeProtection
+  - type: IdentityBlocker
+    coverage: EYES

 - type: entity
  parent: ClothingEyesBase
@@ -194,6 +196,8 @@
  - type: FlashImmunity
  - type: EyeProtection
    protectionTime: 5
+  - type: IdentityBlocker
+    coverage: EYES

 #Make a scanner category when these actually function and we get the trayson
 - type: entity
@@ -211,6 +215,8 @@
      coefficients:
        Heat: 0.95
  - type: GroupExamine
+  - type: IdentityBlocker
+    coverage: EYES

 - type: entity
  parent: ClothingEyesBase
@@ -223,6 +229,8 @@
    - type: Clothing
      sprite: Clothing/Eyes/Glasses/science.rsi
    - type: SolutionScanner
+    - type: IdentityBlocker
+      coverage: EYES

 - type: entity
  parent: ClothingEyesBase
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: ShowSecurityIcons
  abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: ShowJobIcons
  - type: ShowMindShieldIcons
@@ -10,7 +10,7 @@
 - type: entity
  id: ShowMedicalIcons
  abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: ShowHealthBars
    damageContainers:
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -59,7 +59,7 @@
  parent: ClothingHeadBase
  id: ClothingHeadLightBase
  name: base helmet with light
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
@@ -151,7 +151,7 @@
  # No parent since we aren't actually an item.
  id: ClothingHeadHardsuitBase
  name: base hardsuit helmet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: BreathMask
  - type: Sprite
@@ -195,7 +195,7 @@
  parent: ClothingHeadHardsuitBase
  id: ClothingHeadHardsuitWithLightBase
  name: base hardsuit helmet with light
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
@@ -247,7 +247,7 @@
  id: ClothingHeadHatHoodWinterBase
  name: base winter coat hood
  description: A hood, made to keep your head warm.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: icon
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -138,7 +138,7 @@
 - type: entity
  parent: ClothingHeadHardsuitBase
  id: ClothingHeadHelmetHardsuitMaxim
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: salvager maxim helmet
  description: A predication of decay washes over your mind.
  components:
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -89,7 +89,7 @@
 - type: entity
  parent: ClothingHeadBase
  id: ClothingHeadHatHoodChaplainHood
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: chaplain's hood
  description: Maximum piety in this star system.
  components:
@@ -155,6 +155,7 @@
      coefficients:
        Heat: 0.95
        Radiation: 0.65
+  - type: IdentityBlocker
  - type: BreathMask
  - type: HideLayerClothing
    slots:
@@ -183,7 +184,7 @@
 - type: entity
  parent: ClothingHeadBase
  id: ClothingHeadHatHoodIan
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: ian hood
  description: A hood to complete the 'Good boy' look.
  components:
@@ -198,7 +199,7 @@
 - type: entity
  parent: ClothingHeadBase
  id: ClothingHeadHatHoodCarp
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: carp hood
  description: A gnarly hood adorned with plastic space carp teeth.
  components:
@@ -213,7 +214,7 @@
 - type: entity
  parent: ClothingHeadHatHoodCarp
  id: ClothingHeadHelmetHardsuitCarp
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PressureProtection
    highPressureMultiplier: 0.6
@@ -251,7 +252,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterDefault
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: default winter coat hood
  components:
  - type: Sprite
@@ -262,7 +263,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterBartender
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: bartender winter coat hood
  components:
  - type: Sprite
@@ -273,7 +274,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterCaptain
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: captain's winter coat hood
  description: An expensive hood, to keep the captain's head warm.
  components:
@@ -285,7 +286,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterCargo
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: cargo winter coat hood
  components:
  - type: Sprite
@@ -296,7 +297,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterCE
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: chief engineer's winter coat hood
  components:
  - type: Sprite
@@ -307,7 +308,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterCentcom
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: Centcom winter coat hood
  description: A hood for keeping the central comander's head warm.
  components:
@@ -319,7 +320,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterChem
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: chemist winter coat hood
  components:
  - type: Sprite
@@ -330,7 +331,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterCMO
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: chief medical officer's winter coat hood
  components:
  - type: Sprite
@@ -341,7 +342,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterEngineer
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: engineer winter coat hood
  components:
  - type: Sprite
@@ -352,7 +353,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterHOP
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: head of personel's winter coat hood
  components:
  - type: Sprite
@@ -363,7 +364,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterHOS
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: head of security's winter coat hood
  components:
  - type: Sprite
@@ -374,7 +375,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterHydro
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: hydroponics coat hood
  components:
  - type: Sprite
@@ -385,7 +386,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterJani
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: janitor coat hood
  components:
  - type: Sprite
@@ -396,7 +397,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterMed
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: medic coat hood
  components:
  - type: Sprite
@@ -407,7 +408,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterMime
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: mime coat hood
  components:
  - type: Sprite
@@ -418,7 +419,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterMiner
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: miner coat hood
  components:
  - type: Sprite
@@ -429,7 +430,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterPara
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: paramedic coat hood
  components:
  - type: Sprite
@@ -440,7 +441,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterQM
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: quartermaster's coat hood
  components:
  - type: Sprite
@@ -451,7 +452,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterRD
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: research director's coat hood
  components:
  - type: Sprite
@@ -462,7 +463,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterRobo
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: robotics coat hood
  components:
  - type: Sprite
@@ -473,7 +474,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterSci
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: scientist coat hood
  components:
  - type: Sprite
@@ -484,7 +485,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterSec
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: security coat hood
  components:
  - type: Sprite
@@ -495,7 +496,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterSyndie
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: syndicate coat hood
  components:
  - type: Sprite
@@ -506,7 +507,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterWarden
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: warden's coat hood
  components:
  - type: Sprite
@@ -517,7 +518,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterWeb
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: web coat hood
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -205,7 +205,7 @@
    accent: OwOAccent

 - type: entity
-  noSpawn: true
+  categories: [ Actions, HideSpawnMenu ]
  id: ActionBecomeValid
  name: Become Valid
  description: "*notices your killsign* owo whats this"
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -230,6 +230,24 @@
    graph: BananaClownMask
    node: mask

+- type: entity
+  parent: ClothingMaskClown
+  id: ClothingMaskClownSecurity
+  name: security clown wig and mask
+  description: A debatably oxymoronic but protective mask and wig.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/clown_security.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/clown_security.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
+
 - type: entity
  parent: ClothingMaskBase
  id: ClothingMaskJoy
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -113,7 +113,7 @@
    modifiers:
      coefficients:
        Heat: 0.90
-        Radiation: 0.001
+        Radiation: 0.01
  - type: Clothing
    sprite: Clothing/OuterClothing/Suits/rad.rsi
  - type: GroupExamine
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -38,7 +38,7 @@
  parent: ClothingOuterWinterCoat
  id: ClothingOuterWinterCoatToggleable
  name: winter coat with hood
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
  components:
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHatHoodWinterDefault
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -213,6 +213,7 @@
  - type: Tag
    tags:
    - ClownSuit
+    - WhitelistChameleon

 - type: entity
  parent: ClothingUniformJumpsuitClown
--- a/Resources/Prototypes/Entities/Debugging/clicktest.yml
+++ b/Resources/Prototypes/Entities/Debugging/clicktest.yml
@@ -1,11 +1,11 @@
-# Entities specifically for testing click detection with ClickableComponent.
+# Entities specifically for testing click detection with ClickableComponent.
 #
 # Each entity has a bounding box AND texture equivalent.
 # Note that bounding box versions still have dots on the outside or center to make it possible to... see them.
 # These dots' texture detection should not interfere with the actual bounding box being tested.

 - type: entity
-  noSpawn: true
+  categories: [ Debug, HideSpawnMenu ]
  id: ClickTestBase
  suffix: DEBUG
  components:
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -60,7 +60,7 @@
  id: BulletDebug
  name: bang, ded bullet
  parent: BaseBullet
-  noSpawn: true
+  categories: [ Debug, HideSpawnMenu ]
  suffix: DEBUG
  components:
  - type: Tag
--- a/Resources/Prototypes/Entities/Debugging/tippy.yml
+++ b/Resources/Prototypes/Entities/Debugging/tippy.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: Tippy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    netsync: false
--- a/Resources/Prototypes/Entities/Effects/ambient_sounds.yml
+++ b/Resources/Prototypes/Entities/Effects/ambient_sounds.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: AmbientSoundSourceFlies
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: AmbientSound
    volume: -5
--- a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml
+++ b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: EffectFlashBluespace
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PointLight
    radius: 10.5
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -36,7 +36,7 @@
  parent: BaseFoam
  id: Smoke
  name: smoke
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Occluder
  - type: Sprite
@@ -52,7 +52,7 @@
  parent: BaseFoam
  id: Foam
  name: foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    color: "#ffffffcc"
@@ -83,7 +83,7 @@
 - type: entity
  id: MetalFoam
  name: metal foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: Foam
  components:
  - type: Sprite
@@ -109,7 +109,7 @@
 - type: entity
  id: IronMetalFoam
  name: iron metal foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: MetalFoam
  components:
  - type: SpawnOnDespawn
@@ -118,7 +118,7 @@
 - type: entity
  id: AluminiumMetalFoam
  name: aluminium metal foam
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: MetalFoam
  components:
  - type: SpawnOnDespawn
--- a/Resources/Prototypes/Entities/Effects/emp_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/emp_effects.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: EffectEmpPulse
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.8
@@ -23,7 +23,7 @@

 - type: entity
  id: EffectEmpDisabled
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.4
--- a/Resources/Prototypes/Entities/Effects/exclamation.yml
+++ b/Resources/Prototypes/Entities/Effects/exclamation.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: Exclamation
  name: exclamation
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  save: false
  components:
    - type: Transform
@@ -22,7 +22,7 @@
 - type: entity
  id: WhistleExclamation
  name: exclamation
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: Structures/Storage/closet.rsi
--- a/Resources/Prototypes/Entities/Effects/explosion_light.yml
+++ b/Resources/Prototypes/Entities/Effects/explosion_light.yml
@@ -1,5 +1,5 @@
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  id: ExplosionLight
  name: explosion light
  components:
--- a/Resources/Prototypes/Entities/Effects/hearts.yml
+++ b/Resources/Prototypes/Entities/Effects/hearts.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: EffectHearts
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.85
--- a/Resources/Prototypes/Entities/Effects/lightning.yml
+++ b/Resources/Prototypes/Entities/Effects/lightning.yml
@@ -33,7 +33,7 @@
  name: lightning
  id: Lightning
  parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Lightning
      canArc: true
@@ -42,7 +42,7 @@
  name: spooky lightning
  id: LightningRevenant
  parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: /Textures/Effects/lightning.rsi
@@ -66,7 +66,7 @@
  name: charged lightning
  id: ChargedLightning
  parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: /Textures/Effects/lightning.rsi
@@ -85,7 +85,7 @@
  name: lightning
  id: Spark
  parent: BaseLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: /Textures/Effects/lightning.rsi
@@ -112,7 +112,7 @@
  name: supercharged lightning
  id: SuperchargedLightning
  parent: ChargedLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: /Textures/Effects/lightning.rsi
@@ -138,7 +138,7 @@
  name: hypercharged lightning
  id: HyperchargedLightning
  parent: ChargedLightning
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: /Textures/Effects/lightning.rsi
--- a/Resources/Prototypes/Entities/Effects/mobspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml
@@ -1,7 +1,7 @@
- type: entity
+- type: entity
  id: MobSpawnCrabQuartz
  name: mobspawner quartzcrab
-  noSpawn: True
+  categories: [ HideSpawnMenu, Spawner ]
  components:
  - type: Transform
    anchored: True
@@ -31,7 +31,7 @@
  id: MobSpawnCrabIron
  parent: MobSpawnCrabQuartz
  name: mobspawner ironcrab
-  noSpawn: True
+  categories: [ HideSpawnMenu, Spawner ]
  components:
  - type: Sprite
    sprite: /Textures/Effects/mobspawn.rsi
@@ -43,7 +43,7 @@
  id: MobSpawnCrabSilver
  parent: MobSpawnCrabQuartz
  name: mobspawner silvercrab
-  noSpawn: True
+  categories: [ HideSpawnMenu, Spawner ]
  components:
  - type: Sprite
    sprite: /Textures/Effects/mobspawn.rsi
@@ -55,7 +55,7 @@
  id: MobSpawnCrabUranium
  parent: MobSpawnCrabQuartz
  name: mobspawner uraniumcrab
-  noSpawn: True
+  categories: [ HideSpawnMenu, Spawner ]
  components:
  - type: Sprite
    sprite: /Textures/Effects/mobspawn.rsi
@@ -65,7 +65,7 @@

 - type: entity
  id: EffectAnomalyFloraBulb
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.4
--- a/Resources/Prototypes/Entities/Effects/radiation.yml
+++ b/Resources/Prototypes/Entities/Effects/radiation.yml
@@ -1,7 +1,7 @@
 - type: entity
  name: shimmering anomaly
  id: RadiationPulse
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  description: Looking at this anomaly makes you feel strange, like something is pushing at your eyes.
  components:
  - type: RadiationSource
--- a/Resources/Prototypes/Entities/Effects/rcd.yml
+++ b/Resources/Prototypes/Entities/Effects/rcd.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: EffectRCDBase
  abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Transform
    anchored: True
@@ -19,7 +19,7 @@
 - type: entity
  parent: EffectRCDBase
  id: EffectRCDDeconstructPreview
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: deconstructPreview
@@ -27,7 +27,7 @@
 - type: entity
  parent: EffectRCDBase
  id: EffectRCDConstruct0
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: construct0
@@ -37,7 +37,7 @@
 - type: entity
  parent: EffectRCDBase
  id: EffectRCDConstruct1
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: construct1
@@ -47,7 +47,7 @@
 - type: entity
  parent: EffectRCDBase
  id: EffectRCDConstruct2
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: construct2
@@ -57,7 +57,7 @@
 - type: entity
  parent: EffectRCDBase
  id: EffectRCDConstruct3
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: construct3
@@ -67,7 +67,7 @@
 - type: entity
  parent: EffectRCDBase
  id: EffectRCDConstruct4
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: construct4
@@ -77,7 +77,7 @@
 - type: entity
  parent: EffectRCDBase
  id: EffectRCDDeconstruct2
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: deconstruct2
@@ -87,7 +87,7 @@
 - type: entity
  parent: EffectRCDBase
  id: EffectRCDDeconstruct4
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: deconstruct4
@@ -97,7 +97,7 @@
 - type: entity
  parent: EffectRCDBase
  id: EffectRCDDeconstruct6
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: deconstruct6
@@ -107,7 +107,7 @@
 - type: entity
  parent: EffectRCDBase
  id: EffectRCDDeconstruct8
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: deconstruct8
--- a/Resources/Prototypes/Entities/Effects/shuttle.yml
+++ b/Resources/Prototypes/Entities/Effects/shuttle.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: FtlVisualizerEntity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  description: Visualizer for shuttles arriving. You shouldn't see this!
  components:
  - type: FtlVisualizer
--- a/Resources/Prototypes/Entities/Effects/sparks.yml
+++ b/Resources/Prototypes/Entities/Effects/sparks.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: EffectSparks
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.5
@@ -20,7 +20,7 @@

 - type: entity
  id: EffectTeslaSparks
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.5
--- a/Resources/Prototypes/Entities/Effects/wallspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
  components:
  - type: Transform
    anchored: True
@@ -29,7 +29,7 @@
 - type: entity
  id: WallSpawnAsteroidUraniumCrab
  parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
  components:
  - type: SpawnOnDespawn
    prototype: AsteroidRockUraniumCrab
@@ -37,7 +37,7 @@
 - type: entity
  id: WallSpawnAsteroidUranium
  parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
  components:
  - type: SpawnOnDespawn
    prototype: AsteroidRockUranium
@@ -45,7 +45,7 @@
 - type: entity
  id: WallSpawnAsteroidQuartzCrab
  parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
  components:
  - type: SpawnOnDespawn
    prototype: AsteroidRockQuartzCrab
@@ -53,7 +53,7 @@
 - type: entity
  id: WallSpawnAsteroidQuartz
  parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
  components:
  - type: SpawnOnDespawn
    prototype: AsteroidRockQuartz
@@ -61,7 +61,7 @@
 - type: entity
  id: WallSpawnAsteroidSilverCrab
  parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
  components:
  - type: SpawnOnDespawn
    prototype: AsteroidRockSilverCrab
@@ -69,7 +69,7 @@
 - type: entity
  id: WallSpawnAsteroidSilver
  parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
  components:
  - type: SpawnOnDespawn
    prototype: AsteroidRockSilver
@@ -77,7 +77,7 @@
 - type: entity
  id: WallSpawnAsteroidIronCrab
  parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
  components:
  - type: SpawnOnDespawn
    prototype: AsteroidRockTinCrab
@@ -85,7 +85,7 @@
 - type: entity
  id: WallSpawnAsteroidIron
  parent: WallSpawnAsteroid
-  noSpawn: True
+  categories: [ HideSpawnMenu ]
  components:
  - type: SpawnOnDespawn
    prototype: AsteroidRockTin
--- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml
+++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml
@@ -1,7 +1,7 @@
 - type: entity
  # Just fades out with no movement animation
  id: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: TimedDespawn
      lifetime: 2.0
@@ -18,7 +18,7 @@
 - type: entity
  # Plays the state animation then disappears with no fade or swing
  id: WeaponArcAnimated
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: Effects/arcs.rsi
@@ -34,7 +34,7 @@
 - type: entity
  id: WeaponArcThrust
  parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: WeaponArcVisuals
      animation: Thrust
@@ -42,7 +42,7 @@
 - type: entity
  id: WeaponArcSlash
  parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: WeaponArcVisuals
      animation: Slash
@@ -51,7 +51,7 @@
 - type: entity
  id: WeaponArcBite
  parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: WeaponArcVisuals
      fadeOut: false
@@ -63,7 +63,7 @@
 - type: entity
  id: WeaponArcClaw
  parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: WeaponArcVisuals
      fadeOut: false
@@ -75,7 +75,7 @@
 - type: entity
  id: WeaponArcDisarm
  parent: WeaponArcAnimated
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: WeaponArcVisuals
      fadeOut: false
@@ -87,7 +87,7 @@
 - type: entity
  id: WeaponArcFist
  parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      state: fist
@@ -95,7 +95,7 @@
 - type: entity
  id: WeaponArcPunch
  parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: WeaponArcVisuals
      fadeOut: false
@@ -107,7 +107,7 @@
 - type: entity
  id: WeaponArcKick
  parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: WeaponArcVisuals
      fadeOut: false
@@ -119,7 +119,7 @@
 - type: entity
  id: WeaponArcSmash
  parent: WeaponArcStatic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: WeaponArcVisuals
      fadeOut: false
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
@@ -78,5 +78,6 @@
      - FoodMeatRatdoubleKebab
      - FoodMeatSnakeKebab
      - FoodPizzaArnoldSlice
+      - FoodPizzaUraniumSlice
      - FoodTacoRat
    rareChance: 0.05
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -73,7 +73,7 @@
        state: narsian

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
  id: SpawnPointGhostNukeOperative
  name: ghost role spawn point
  suffix: nukeops
@@ -93,7 +93,7 @@
        state: radiation

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
  parent: BaseAntagSpawner
  id: SpawnPointLoneNukeOperative
  components:
@@ -109,7 +109,7 @@
        state: radiation

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
  parent: SpawnPointLoneNukeOperative
  id: SpawnPointNukeopsCommander
  components:
@@ -118,7 +118,7 @@
    description: roles-antag-nuclear-operative-commander-objective

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
  parent: SpawnPointLoneNukeOperative
  id: SpawnPointNukeopsMedic
  components:
@@ -127,7 +127,7 @@
    description: roles-antag-nuclear-operative-agent-objective

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
  parent: SpawnPointLoneNukeOperative
  id: SpawnPointNukeopsOperative
  components:
@@ -136,7 +136,7 @@
    description: roles-antag-nuclear-operative-objective

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
  parent: BaseAntagSpawner
  id: SpawnPointGhostDragon
  components:
@@ -151,7 +151,7 @@
      state: alive

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu, Spawner ]
  parent: BaseAntagSpawner
  id: SpawnPointGhostSpaceNinja
  components:
--- a/Resources/Prototypes/Entities/Markers/clientsideclone.yml
+++ b/Resources/Prototypes/Entities/Markers/clientsideclone.yml
@@ -1,7 +1,7 @@
 - type: entity
  name: clientsideclone
  id: clientsideclone
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
  - type: AnimationPlayer
--- a/Resources/Prototypes/Entities/Markers/construction_ghost.yml
+++ b/Resources/Prototypes/Entities/Markers/construction_ghost.yml
@@ -1,7 +1,7 @@
 - type: entity
  name: construction ghost
  id: constructionghost
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    color: '#3F38'
--- a/Resources/Prototypes/Entities/Markers/drag_shadow.yml
+++ b/Resources/Prototypes/Entities/Markers/drag_shadow.yml
@@ -1,7 +1,7 @@
 - type: entity
  name: drag shadow
  id: dragshadow
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Markers/hover_entity.yml
+++ b/Resources/Prototypes/Entities/Markers/hover_entity.yml
@@ -1,7 +1,7 @@
 - type: entity
  name: hover entity
  id: hoverentity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      layers:
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -99,6 +99,11 @@
    doAfterDelay: 10
    allowSelfRepair: false
  - type: BorgChassis
+  - type: LockingWhitelist
+    blacklist:
+      components:
+      - BorgChassis
+      - RoboticsConsole
  - type: WiresPanel
  - type: ActivatableUIRequiresPanel
  - type: NameIdentifier
@@ -113,7 +118,9 @@
    cellSlotId: cell_slot
    fitsInCharger: true
  - type: ItemToggle
+    activated: false # gets activated when a mind is added
    onUse: false # no item-borg toggling sorry
+    toggleLight: false
  - type: AccessToggle
  # TODO: refactor movement to just be based on toggle like speedboots but for the boots themselves
  # TODO: or just have sentient speedboots be fast idk
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -265,6 +265,7 @@
    access: [["Medical"], ["Command"], ["Research"]]
  - type: Inventory
    templateId: borgDutch
+  - type: SolutionScanner
  - type: FootstepModifier
    footstepSoundCollection:
      collection: FootstepHoverBorg
@@ -363,7 +364,7 @@

 - type: entity
  id: BorgChassisSyndicateMedical
-  parent: BaseBorgChassisSyndicate
+  parent: [BaseBorgChassisSyndicate, ShowMedicalIcons]
  name: syndicate medical cyborg
  description: A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities.
  components:
@@ -397,6 +398,12 @@
      interactFailureString: petting-failure-syndicate-cyborg
      interactSuccessSound:
        path: /Audio/Ambience/Objects/periodic_beep.ogg
+    - type: SolutionScanner
+    - type: FootstepModifier
+      footstepSoundCollection:
+        collection: FootstepHoverBorg
+        params:
+          volume: -6

 - type: entity
  id: BorgChassisSyndicateSaboteur
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1250,6 +1250,17 @@
    tags:
    - VimPilot
    - DoorBumpOpener
+  - type: Reactive
+    groups:
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+    reactions:
+    - reagents: [ Water, SpaceCleaner ]
+      methods: [ Touch ]
+      effects:
+      - !type:WashCreamPieReaction
+
+

 - type: entity
  name: monkey
@@ -1283,6 +1294,7 @@
    clumsySound:
      path: /Audio/Animals/monkey_scream.ogg

+
 - type: entity
  name: monkey
  id: MobBaseSyndicateMonkey
@@ -1492,7 +1504,7 @@
 - type: entity
  name: guidebook monkey
  parent: MobMonkey
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  id: MobGuidebookMonkey
  description: A hopefully helpful monkey whose only purpose in life is for you to click on. Does this count as having a monkey give you a tutorial?
  components:
@@ -2143,11 +2155,13 @@
    states:
      Alive:
        Base: snake
+      Critical:
+        Base: dead
      Dead:
        Base: dead
  - type: Butcherable
    spawned:
-    - id: FoodMeat
+    - id: FoodMeatSnake
      amount: 1
  - type: InteractionPopup
    successChance: 0.6
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -162,7 +162,7 @@
  id: MobRatServant
  parent: [ SimpleMobBase, MobCombat ]
  description: He's da mini rat. He don't make da roolz.
-  noSpawn: true #Must be configured to a King or the AI breaks.
+  categories: [ HideSpawnMenu ] #Must be configured to a King or the AI breaks.
  components:
  - type: CombatMode
  - type: MovementSpeedModifier
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -148,7 +148,7 @@
  description: A geras of a slime - the name is ironic, isn't it?
  id: MobSlimesGeras
  parent: BaseMobAdultSlimes
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  # they portable...
  - type: MovementSpeedModifier
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -378,6 +378,10 @@
        Base: dead_purple_snake
      Dead:
        Base: dead_purple_snake
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatSnake
+      amount: 4
  - type: Grammar
    attributes:
      proper: true
@@ -444,5 +448,9 @@
        Base: dead_small_purple_snake
      Dead:
        Base: dead_small_purple_snake
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatSnake
+      amount: 2
  - type: SolutionTransfer
    maxTransferAmount: 1
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -2,7 +2,7 @@
  parent: [MobObserver, InventoryBase]
  id: AdminObserver
  name: admin observer
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: ContentEye
    maxZoom: 8.916104, 8.916104
--- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -15,7 +15,7 @@
 # Reformed Diona
 - type: entity
  parent: MobDiona
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  id: MobDionaReformed
  name: Reformed Diona
  components:
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -154,7 +154,7 @@
    - MinorAntagonists

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  id: DragonsBreathGun
  name: dragon's lung
  description: For dragon's breathing
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -62,13 +62,17 @@
  id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
  suffix: Human, NukeOps
  components:
-    - type: Loadout
-      prototypes: [SyndicateOperativeGearReinforcementNukeOps]
    - type: NukeOperative
+    - type: RandomMetadata
+      nameSegments:
+      - nukeops-role-operator
+      - SyndicateNamesNormal
+    - type: Loadout
+      prototypes: [SyndicateOperativeGearFullNoUplink]

 # Nuclear Operative
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: Nuclear Operative
  parent: MobHuman
  id: MobHumanNukeOp
@@ -77,7 +81,7 @@
    - type: RandomHumanoidAppearance

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: MobHuman
  id: MobHumanLoneNuclearOperative
  name: Lone Operative
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -3,7 +3,7 @@
  id: MobObserver
  name: observer
  description: Boo!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: CargoSellBlacklist
  - type: Sprite
--- a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml
@@ -1,7 +1,7 @@
 - type: entity
  parent: MobObserver
  id: ReplayObserver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  save: false
  components:
  - type: MovementSpeedModifier
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -117,7 +117,7 @@
 - type: entity
  parent: BaseSpeciesDummy
  id: MobArachnidDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: HumanoidAppearance
    species: Arachnid
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -111,7 +111,7 @@
 - type: entity
  parent: BaseSpeciesDummy
  id: MobDionaDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: HumanoidAppearance
    species: Diona
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -67,7 +67,7 @@
 - type: entity
  parent: BaseSpeciesDummy
  id: MobDwarfDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    scale: 1, 0.8
--- a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
@@ -52,7 +52,7 @@
 - type: entity
  parent: BaseSpeciesDummy
  id: MobGingerbreadDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: HumanoidAppearance
    species: Gingerbread
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -32,7 +32,7 @@
 - type: entity
  parent: BaseSpeciesDummy
  id: MobHumanDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Inventory
    femaleDisplacements:
@@ -40,5 +40,4 @@
        sizeMaps:
          32:
            sprite: Mobs/Species/Human/displacement.rsi
-            state: jumpsuit-female
-
+            state: jumpsuit-female
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -120,7 +120,7 @@
 - type: entity
  parent: BaseSpeciesDummy
  id: MobMothDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: HumanoidAppearance
    species: Moth
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -73,7 +73,7 @@
 - type: entity
  parent: BaseSpeciesDummy
  id: MobReptilianDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  description: A dummy reptilian meant to be used in character setup.
  components:
  - type: HumanoidAppearance
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -113,7 +113,7 @@
 - type: entity
  parent: BaseSpeciesDummy
  id: MobSkeletonPersonDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: HumanoidAppearance
    species: Skeleton
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -120,7 +120,7 @@
 - type: entity
  parent: MobHumanDummy
  id: MobSlimePersonDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: HumanoidAppearance
    species: SlimePerson
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -127,7 +127,7 @@
 - type: entity
  parent: BaseSpeciesDummy
  id: MobVoxDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: HumanoidAppearance
    species: Vox
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -257,14 +257,12 @@

 - type: entity
  name: blueberry pancake
-  parent: FoodBakedBase
+  parent: FoodBakedPancake
  id: FoodBakedPancakeBb
  description: A fluffy and delicious blueberry pancake.
  components:
  - type: Stack
-    stackType: Pancake
-    count: 1
-    composite: true
+    stackType: PancakeBb
    layerStates:
    - pancakesbb1
    - pancakesbb2
@@ -281,7 +279,6 @@
    - state: pancakesbb3
      map: ["pancakesbb3"]
      visible: false
-  - type: Appearance
  - type: Tag
    tags:
    - Pancake
@@ -289,14 +286,12 @@

 - type: entity
  name: chocolate chip pancake
-  parent: FoodBakedBase
+  parent: FoodBakedPancake
  id: FoodBakedPancakeCc
  description: A fluffy and delicious chocolate chip pancake.
  components:
  - type: Stack
-    stackType: Pancake
-    count: 1
-    composite: true
+    stackType: PancakeCc
    layerStates:
    - pancakescc1
    - pancakescc2
@@ -313,7 +308,6 @@
    - state: pancakescc3
      map: ["pancakescc3"]
      visible: false
-  - type: Appearance
  - type: SolutionContainerManager
    solutions:
      food:
@@ -323,9 +317,6 @@
          Quantity: 5
        - ReagentId: Theobromine
          Quantity: 1
-  - type: Tag
-    tags:
-    - Pancake

 - type: entity
  name: waffles
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -547,3 +547,76 @@
        - ReagentId: Vitamin
          Quantity: 1
 # Tastes like stale crust, rancid cheese, mushroom.
+
+- type: entity
+  name: spicy rock pizza
+  parent: FoodPizzaBase
+  id: FoodPizzaUranium
+  description: Spicy pizza covered in peppers and uranium.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - spicy
+    - cheesy
+    - oily
+    - bread
+  - type: Sprite
+    layers:
+    - state: uranium-pizza
+  - type: SliceableFood
+    slice: FoodPizzaUraniumSlice
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
+  - type: PointLight
+    enabled: true
+    radius: 2
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 40
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 20
+        - ReagentId: Radium
+          Quantity: 4
+        - ReagentId: Uranium
+          Quantity: 16
+
+- type: entity
+  name: slice of spicy rock pizza
+  parent: FoodPizzaSliceBase
+  id: FoodPizzaUraniumSlice
+  description: A glowing slice of spicy rock pizza.
+  components:
+  - type: FlavorProfile
+    flavors:
+    - spicy
+    - cheesy
+    - oily
+    - bread
+  - type: Sprite
+    layers:
+    - state: uranium-slice
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
+    - Slice
+  - type: PointLight
+    enabled: true
+    radius: 2
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2.5
+        - ReagentId: Radium
+          Quantity: 0.5
+        - ReagentId: Uranium
+          Quantity: 2
+
+# Tastes like crust, tomato, cheese, radiation.
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -669,7 +669,7 @@
  id: FoodMealHappyHonkClown
  parent: HappyHonk
  suffix: random food spawner meal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: StorageFill
    contents:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -95,6 +95,21 @@
  - type: Produce
    seedId: sugarcane

+- type: entity
+  name: papercane roll
+  description: Why do we even need to grow paper?
+  id: Papercane
+  parent: ProduceBase
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/papercane.rsi
+  - type: SolutionContainerManager
+  - type: Produce
+    seedId: papercane
+  - type: Log
+    spawnedPrototype: SheetPaper1
+    spawnCount: 2
+
 - type: entity
  parent: FoodProduceBase
  id: FoodLaughinPeaPod
@@ -869,6 +884,42 @@
    tags:
    - Fruit

+- type: entity
+  name: golden apple
+  parent: FoodProduceBase
+  id: FoodGoldenApple
+  description: It should be shaped like a cube, shouldn't it?
+  components:
+  - type: FlavorProfile
+    flavors:
+      - apple
+      - metallic
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 4
+        - ReagentId: DoctorsDelight
+          Quantity: 13
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+  - type: Produce
+    seedId: goldenApple
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceApple
+        Quantity: 10
+      - ReagentId: Gold
+        Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
+
 - type: entity
  name: cocoa pod
  parent: FoodProduceBase
@@ -1411,6 +1462,71 @@
    - Galaxythistle
    - Fruit # Probably?

+- type: entity
+  name: glasstle
+  parent: FoodProduceBase
+  id: FoodGlasstle
+  description: A fragile crystal plant with lot of spiky thorns. 
+  components:
+  - type: Item
+    size: Small
+    sprite: Objects/Specific/Hydroponics/glasstle.rsi
+    heldPrefix: produce  
+  - type: FlavorProfile
+    flavors:
+      - sharp
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Razorium
+          Quantity: 15
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/glasstle.rsi
+  - type: Produce
+    seedId: glasstle
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Damageable 
+    damageContainer: Inorganic
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+          params:
+            volume: -4
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: DamageOnHit 
+    damage:
+      types:
+        Blunt: 10
+  - type: MeleeWeapon
+    wideAnimationRotation: 60
+    damage:
+      types:
+        Slash: 15
+    soundHit:
+        path: /Audio/Weapons/bladeslice.ogg
+  - type: Tag
+    tags:
+    - Galaxythistle
+
+
 - type: entity
  name: fly amanita
  parent: FoodProduceBase
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -483,7 +483,7 @@
 # Trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseItem
  id: FoodPacketTrash
  description: This is rubbish.
@@ -506,7 +506,7 @@
    price: 0

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketBoritosTrash
  name: boritos bag
@@ -515,7 +515,7 @@
    state: boritos-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketCnDsTrash
  name: C&Ds bag
@@ -524,7 +524,7 @@
    state: cnds-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketCheesieTrash
  name: cheesie honkers
@@ -533,7 +533,7 @@
    state: cheesiehonkers-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketChipsTrash
  name: chips
@@ -542,7 +542,7 @@
    state: chips-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketChocolateTrash
  name: chocolate wrapper
@@ -551,7 +551,7 @@
    state: chocolatebar-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketEnergyTrash
  name: energybar wrapper
@@ -560,7 +560,7 @@
    state: energybar-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketPistachioTrash
  name: pistachios packet
@@ -569,7 +569,7 @@
    state: pistachio-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketPopcornTrash
  name: popcorn box
@@ -578,7 +578,7 @@
    state: popcorn-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketRaisinsTrash
  name: 4no raisins
@@ -587,7 +587,7 @@
    state: raisins-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketSemkiTrash
  name: semki packet
@@ -596,7 +596,7 @@
    state: semki-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketSusTrash
  name: sus jerky
@@ -605,7 +605,7 @@
    state: susjerky-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketSyndiTrash
  name: syndi-cakes box
@@ -614,7 +614,7 @@
    state: syndicakes-trash

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketCupRamenTrash
  name: empty cup ramen
@@ -623,7 +623,7 @@
    state: ramen

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketChowMeinTrash
  name: empty chow mein box
@@ -632,7 +632,7 @@
    state: chinese1

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketDanDanTrash
  name: empty dan dan box
@@ -641,7 +641,7 @@
    state: chinese2

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodCookieFortune
  name: cookie fortune
@@ -654,7 +654,7 @@
    descriptionSegments: [CookieFortuneDescriptions]

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: FoodPacketTrash
  id: FoodPacketMRETrash
  name: MRE wrapper
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -423,7 +423,7 @@

 - type: entity
  id: PresentTrash
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseItem
  name: wrapping paper
  description: Carefully folded, taped, and tied with a bow. Then ceremoniously ripped apart and tossed on the floor.
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -35,12 +35,16 @@
 - type: entity
  parent: ReinforcementRadio
  id: ReinforcementRadioSyndicateNukeops # Reinforcement radio exclusive to nukeops uplink
+  name: nuclear operative radio
+  description: Call in a nuclear operative of questionable quality, instantly! Basic nukeop equipment provided.
  suffix: NukeOps
  components:
  - type: GhostRole
-    name: ghost-role-information-syndicate-reinforcement-name
-    description: ghost-role-information-syndicate-reinforcement-description
-    rules: ghost-role-information-syndicate-reinforcement-rules
+    name: ghost-role-information-nukeop-reinforcement-name
+    description: ghost-role-information-nukeop-reinforcement-description
+    rules: ghost-role-information-nukeop-reinforcement-rules
+    raffle:
+      settings: default
  - type: GhostRoleMobSpawner
    prototype: MobHumanSyndicateAgentNukeops

--- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
@@ -22,7 +22,7 @@
      entity: ChameleonDisguise

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseMob
  id: ChameleonDisguise
  name: Urist McKleiner
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml
@@ -18,7 +18,7 @@
  id: BackgammonBoardTabletop
  name: backgammon
  parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/backgammon_tabletop.rsi
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
@@ -31,7 +31,7 @@
  id: BaseBoardTabletop
  name: baseboard
  abstract: true
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml
@@ -24,7 +24,7 @@
  id: *checkerboard
  name: checkerboard
  parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
@@ -20,7 +20,7 @@
  id: ChessBoardTabletop
  name: chessboard
  parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml
@@ -86,7 +86,7 @@
  parent: BaseBoardTabletop
  id: GrassBoardTabletop
  name: grass battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi
@@ -98,7 +98,7 @@
  parent: BaseBoardTabletop
  id: MoonBoardTabletop
  name: grass battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/Battlemaps/moonbm_tabletop.rsi
@@ -108,7 +108,7 @@
  parent: BaseBoardTabletop
  id: SandBoardTabletop
  name: sand battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/Battlemaps/sandbm_tabletop.rsi
@@ -118,7 +118,7 @@
  parent: BaseBoardTabletop
  id: SnowBoardTabletop
  name: snow battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/Battlemaps/snowbm_tabletop.rsi
@@ -128,7 +128,7 @@
  parent: BaseBoardTabletop
  id: ShipBoardTabletop
  name: ship battlemap
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/Battlemaps/shipbm_tabletop.rsi
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml
@@ -20,7 +20,7 @@
  id: ParchisBoardTabletop
  name: parchís
  parent: BaseBoardTabletop
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/parchis_tabletop.rsi
--- a/Resources/Prototypes/Entities/Objects/Misc/buffering.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/buffering.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: BufferingIcon
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Misc/buffering.rsi
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -76,7 +76,7 @@
  name: extinguisher spray
  id: ExtinguisherSpray
  parent: Vapor
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Effects/extinguisherSpray.rsi
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -252,7 +252,7 @@
 - type: entity
  parent: Paper
  id: PaperWritten
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -17,7 +17,7 @@
  id: SadTromboneImplant
  name: sad trombone implant
  description: This implant plays a sad tune when the user dies.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      whitelist:
@@ -37,7 +37,7 @@
  id: LightImplant
  name: light implant
  description: This implant emits light from the user's skin on activation.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      implantAction: ActionToggleLight
@@ -59,7 +59,7 @@
  id: BikeHornImplant
  name: bike horn implant
  description: This implant lets the user honk anywhere at any time.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      implantAction: ActionActivateHonkImplant
@@ -80,7 +80,7 @@
  id: TrackingImplant
  name: tracking implant
  description: This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Security radio channel.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      whitelist:
@@ -110,7 +110,7 @@
  id: StorageImplant
  name: storage implant
  description: This implant grants hidden storage within a person's body using bluespace technology.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      implantAction: ActionOpenStorageImplant
@@ -134,7 +134,7 @@
  id: FreedomImplant
  name: freedom implant
  description: This implant lets the user break out of hand restraints up to three times before ceasing to function anymore.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      implantAction: ActionActivateFreedomImplant
@@ -147,7 +147,7 @@
  id: UplinkImplant
  name: uplink implant
  description: This implant lets the user access a hidden Syndicate uplink at will.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: SubdermalImplant
    implantAction: ActionOpenUplinkImplant
@@ -167,7 +167,7 @@
  id: EmpImplant
  name: EMP implant
  description: This implant creates an electromagnetic pulse when activated.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      implantAction: ActionActivateEmpImplant
@@ -182,7 +182,7 @@
  id: ScramImplant
  name: scram implant
  description: This implant randomly teleports the user within a large radius when activated.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      implantAction: ActionActivateScramImplant
@@ -194,7 +194,7 @@
  id: DnaScramblerImplant
  name: DNA scrambler implant
  description: This implant lets the user randomly change their appearance and name once.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      implantAction: ActionActivateDnaScramblerImplant
@@ -209,7 +209,7 @@
  id: MicroBombImplant
  name: micro-bomb implant
  description: This implant detonates the user upon activation or upon death.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      permanent: true
@@ -239,7 +239,7 @@
  id: MacroBombImplant
  name: macro-bomb implant
  description: This implant creates a large explosion on death after a preprogrammed countdown.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      permanent: true
@@ -274,7 +274,7 @@
  id: DeathAcidifierImplant
  name: death-acidifier implant
  description: This implant melts the user and their equipment upon death.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: SubdermalImplant
    permanent: true
@@ -298,7 +298,7 @@
  id: DeathRattleImplant
  name: death rattle implant
  description: This implant will inform the Syndicate radio channel should the user fall into critical condition or die.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: SubdermalImplant
      permanent: true
@@ -318,7 +318,7 @@
  id: MindShieldImplant
  name: mindshield implant
  description: This implant will ensure loyalty to Nanotrasen and prevent mind control devices.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
   - type: SubdermalImplant
     permanent: true
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -163,6 +163,16 @@
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/sugarcane.rsi

+- type: entity
+  parent: SeedBase
+  name: packet of papercane seeds
+  id: PapercaneSeeds
+  components:
+    - type: Seed
+      seedId: papercane
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/papercane.rsi
+
 - type: entity
  parent: SeedBase
  name: packet of tower cap spores
@@ -243,6 +253,16 @@
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/apple.rsi

+- type: entity
+  parent: SeedBase
+  name: packet of golden apple seeds
+  id: GoldenAppleSeeds
+  components:
+    - type: Seed
+      seedId: goldenApple
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/golden_apple.rsi
+
 - type: entity
  parent: SeedBase
  name: packet of corn seeds
@@ -427,6 +447,17 @@
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/galaxythistle.rsi

+- type: entity
+  parent: SeedBase
+  name: packet of glasstle seeds
+  description: "Scars of gloomy nights."
+  id: GlasstleSeeds
+  components:
+    - type: Seed
+      seedId: glasstle
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/glasstle.rsi
+
 - type: entity
  parent: SeedBase
  name: packet of fly amanita spores
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -144,7 +144,7 @@
 - type: entity
  name: soaplet
  id: SoapletSyndie
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: Soap
  description: A tiny piece of syndicate soap.
  components:
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -104,7 +104,7 @@
 - type: entity
  id: Vapor
  name: "vapor"
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: SolutionContainerManager
    solutions:
@@ -136,7 +136,7 @@
 - type: entity
  id: BigVapor
  parent: Vapor
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Effects/chempuff.rsi
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -88,7 +88,7 @@
  name: jug
  suffix: carbon
  id: JugCarbon
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-carbon
@@ -104,7 +104,7 @@
  name: jug
  suffix: iodine
  id: JugIodine
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-iodine
@@ -120,7 +120,7 @@
  name: jug
  suffix: fluorine
  id: JugFluorine
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-fluorine
@@ -136,7 +136,7 @@
  name: jug
  suffix: chlorine
  id: JugChlorine
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-chlorine
@@ -152,7 +152,7 @@
  name: jug
  suffix: aluminium
  id: JugAluminium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-aluminium
@@ -168,7 +168,7 @@
  name: jug
  suffix: phosphorus
  id: JugPhosphorus
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-phosphorus
@@ -184,7 +184,7 @@
  name: jug
  suffix: sulfur
  id: JugSulfur
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-sulfur
@@ -200,7 +200,7 @@
  name: jug
  suffix: silicon
  id: JugSilicon
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-silicon
@@ -216,7 +216,7 @@
  name: jug
  suffix: hydrogen
  id: JugHydrogen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-hydrogen
@@ -232,7 +232,7 @@
  name: jug
  suffix: lithium
  id: JugLithium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-lithium
@@ -248,7 +248,7 @@
  name: jug
  suffix: sodium
  id: JugSodium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-sodium
@@ -264,7 +264,7 @@
  name: jug
  suffix: potassium
  id: JugPotassium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-potassium
@@ -280,7 +280,7 @@
  name: jug
  suffix: radium
  id: JugRadium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-radium
@@ -296,7 +296,7 @@
  name: jug
  suffix: iron
  id: JugIron
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-iron
@@ -312,7 +312,7 @@
  name: jug
  suffix: copper
  id: JugCopper
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-copper
@@ -328,7 +328,7 @@
  name: jug
  suffix: gold
  id: JugGold
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-gold
@@ -344,7 +344,7 @@
  name: jug
  suffix: mercury
  id: JugMercury
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-mercury
@@ -360,7 +360,7 @@
  name: jug
  suffix: silver
  id: JugSilver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-silver
@@ -376,7 +376,7 @@
  name: jug
  suffix: ethanol
  id: JugEthanol
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-ethanol
@@ -392,7 +392,7 @@
  name: jug
  suffix: sugar
  id: JugSugar
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-sugar
@@ -408,7 +408,7 @@
  name: jug
  suffix: nitrogen
  id: JugNitrogen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-nitrogen
@@ -424,7 +424,7 @@
  name: jug
  suffix: oxygen
  id: JugOxygen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-oxygen
@@ -440,7 +440,7 @@
  name: jug
  suffix: Plant-B-Gone
  id: JugPlantBGone
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-plant-b-gone
@@ -456,7 +456,7 @@
  name: jug
  suffix: welding fuel
  id: JugWeldingFuel
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Label
      currentLabel: reagent-name-welding-fuel
--- a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
@@ -87,7 +87,7 @@

 - type: entity
  id: FultonEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: fulton effect
  components:
  - type: TimedDespawn
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -115,7 +115,7 @@
  name: light pulse test
  parent: BaseItem
  id: LightBehaviourTest1
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: Objects/Misc/glowstick.rsi
@@ -146,7 +146,7 @@
  name: color cycle test
  parent: BaseItem
  id: LightBehaviourTest2
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: Objects/Misc/glowstick.rsi
@@ -178,7 +178,7 @@
  name: multi-behaviour light test
  parent: BaseItem
  id: LightBehaviourTest3
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: Objects/Misc/glowstick.rsi
@@ -218,7 +218,7 @@
  name: light fade in test
  parent: BaseItem
  id: LightBehaviourTest4
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: Objects/Misc/glowstick.rsi
@@ -249,7 +249,7 @@
  name: light pulse radius test
  parent: BaseItem
  id: LightBehaviourTest5
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: Objects/Misc/glowstick.rsi
@@ -280,7 +280,7 @@
  name: light randomize radius test
  parent: BaseItem
  id: LightBehaviourTest6
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      sprite: Objects/Misc/glowstick.rsi
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: JetpackEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 2
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -155,10 +155,10 @@
    state: icon
  - type: ThiefUndeterminedBackpack
    possibleSets:
-    # - TO DO Thief pinpointer needed
+    # TODO Thief pinpointer needed
    - ChemistrySet
    - ToolsSet
-    - ChameleonSet # - TO DO Chameleon stump PR needed
+    - ChameleonSet # TODO Chameleon stump PR needed
    - SyndieSet
    - SleeperSet
    - CommunicatorSet
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -52,7 +52,7 @@

 - type: entity
  id: HotPotatoEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.6
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
@@ -1,5 +1,5 @@
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBullet
  id: BulletAntiMateriel
  name: bullet (.60 anti-materiel)
--- a/Show More
+++ b/Show More