Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)

* NOW THAT'S A LOT OF FILES * categorization --------- Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-25 05:24:00 -07:00
parent e95aaef839
commit 7388b91ef5
118 changed files with 398 additions and 399 deletions
--- a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Presets;
 using Content.Shared.CCVar;
@@ -36,7 +36,7 @@ public sealed class FailAndStartPresetTest
 - type: entity
  id: TestRule
  parent: BaseGameRule
-  noSpawn: true
+  categories: [ GameRules ]
  components:
  - type: GameRule
    minPlayers: 0
@@ -45,7 +45,7 @@ public sealed class FailAndStartPresetTest
 - type: entity
  id: TestRuleTenPlayers
  parent: BaseGameRule
-  noSpawn: true
+  categories: [ GameRules ]
  components:
  - type: GameRule
    minPlayers: 10
--- 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/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/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:
@@ -183,7 +183,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 +198,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 +213,7 @@
 - type: entity
  parent: ClothingHeadHatHoodCarp
  id: ClothingHeadHelmetHardsuitCarp
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PressureProtection
    highPressureMultiplier: 0.6
@@ -251,7 +251,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterDefault
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: default winter coat hood
  components:
  - type: Sprite
@@ -262,7 +262,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterBartender
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: bartender winter coat hood
  components:
  - type: Sprite
@@ -273,7 +273,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 +285,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterCargo
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: cargo winter coat hood
  components:
  - type: Sprite
@@ -296,7 +296,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterCE
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: chief engineer's winter coat hood
  components:
  - type: Sprite
@@ -307,7 +307,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 +319,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterChem
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: chemist winter coat hood
  components:
  - type: Sprite
@@ -330,7 +330,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterCMO
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: chief medical officer's winter coat hood
  components:
  - type: Sprite
@@ -341,7 +341,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterEngineer
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: engineer winter coat hood
  components:
  - type: Sprite
@@ -352,7 +352,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterHOP
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: head of personel's winter coat hood
  components:
  - type: Sprite
@@ -363,7 +363,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterHOS
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: head of security's winter coat hood
  components:
  - type: Sprite
@@ -374,7 +374,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterHydro
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: hydroponics coat hood
  components:
  - type: Sprite
@@ -385,7 +385,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterJani
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: janitor coat hood
  components:
  - type: Sprite
@@ -396,7 +396,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterMed
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: medic coat hood
  components:
  - type: Sprite
@@ -407,7 +407,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterMime
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: mime coat hood
  components:
  - type: Sprite
@@ -418,7 +418,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterMiner
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: miner coat hood
  components:
  - type: Sprite
@@ -429,7 +429,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterPara
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: paramedic coat hood
  components:
  - type: Sprite
@@ -440,7 +440,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterQM
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: quartermaster's coat hood
  components:
  - type: Sprite
@@ -451,7 +451,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterRD
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: research director's coat hood
  components:
  - type: Sprite
@@ -462,7 +462,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterRobo
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: robotics coat hood
  components:
  - type: Sprite
@@ -473,7 +473,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterSci
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: scientist coat hood
  components:
  - type: Sprite
@@ -484,7 +484,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterSec
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: security coat hood
  components:
  - type: Sprite
@@ -495,7 +495,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterSyndie
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: syndicate coat hood
  components:
  - type: Sprite
@@ -506,7 +506,7 @@
 - type: entity
  parent: ClothingHeadHatHoodWinterBase
  id: ClothingHeadHatHoodWinterWarden
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: warden's coat hood
  components:
  - type: Sprite
@@ -517,7 +517,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/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/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/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/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1492,7 +1492,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:
--- 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/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
@@ -68,7 +68,7 @@

 # Nuclear Operative
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: Nuclear Operative
  parent: MobHuman
  id: MobHumanNukeOp
@@ -77,7 +77,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/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/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/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/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/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/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
@@ -2,7 +2,7 @@
  id: BulletCaselessRifle
  name: bullet (.25 caseless)
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletCaselessRiflePractice
  name: bullet (.25 caseless practice)
  parent: BaseBulletPractice
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: PelletClusterRubber
  name: pellet (ball, rubber)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBullet
  components:
  - type: Sprite
@@ -20,7 +20,7 @@
 - type: entity
  id: PelletClusterLethal
  name: pellet (ball, lethal)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBullet
  components:
  - type: Sprite
@@ -37,7 +37,7 @@
 - type: entity
  id: PelletClusterIncendiary
  name: pellet (ball, incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBulletIncendiary
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -2,7 +2,7 @@
  id: BulletHeavyRifle
  name: bullet (.20 rifle)
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletMinigun
  name: minigun bullet (.10 rifle)
  parent: BulletHeavyRifle
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -2,7 +2,7 @@
  id: BulletLightRifle
  name: bullet (.20 rifle)
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletLightRiflePractice
  name: bullet (.20 rifle practice)
  parent: BaseBulletPractice
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -24,7 +24,7 @@
  id: BulletLightRifleIncendiary
  parent: BaseBulletIncendiary
  name: bullet (.20 rifle incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -36,7 +36,7 @@
  id: BulletLightRifleUranium
  parent: BaseBulletUranium
  name: bullet (.20 rifle uranium)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -2,7 +2,7 @@
  id: BulletMagnum
  name: bullet (.45 magnum)
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletMagnumPractice
  name: bullet (.45 magnum practice)
  parent: BaseBulletPractice
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -24,7 +24,7 @@
  id: BulletMagnumIncendiary
  parent: BaseBulletIncendiary
  name: bullet (.45 magnum incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -36,7 +36,7 @@
  id: BulletMagnumAP
  name: bullet (.45 magnum armor-piercing)
  parent: BaseBulletAP
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -48,7 +48,7 @@
  id: BulletMagnumUranium
  name: bullet (.45 magnum uranium)
  parent: BaseBulletUranium
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -2,7 +2,7 @@
  id: BulletPistol
  name: bullet (.35 auto)
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletPistolPractice
  name: bullet (.35 auto practice)
  parent: BaseBulletPractice
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -24,7 +24,7 @@
  id: BulletPistolIncendiary
  parent: BaseBulletIncendiary
  name: bullet (.35 auto incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -36,7 +36,7 @@
  id: BulletPistolUranium
  parent: BaseBulletUranium
  name: bullet (.35 auto uranium)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -2,7 +2,7 @@
  id: BulletRifle
  name: bullet (0.20 rifle)
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletRiflePractice
  name: bullet (0.20 rifle practice)
  parent: BaseBulletPractice
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -24,7 +24,7 @@
  id: BulletRifleIncendiary
  parent: BaseBulletIncendiary
  name: bullet (0.20 rifle incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -36,7 +36,7 @@
  id: BulletRifleUranium
  parent: BaseBulletUranium
  name: bullet (0.20 rifle uranium)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: PelletShotgunSlug
  name: pellet (.50 slug)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBullet
  components:
  - type: Sprite
@@ -15,7 +15,7 @@
 - type: entity
  id: PelletShotgunBeanbag
  name: beanbag (.50)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBullet
  components:
  - type: Sprite
@@ -31,7 +31,7 @@
 - type: entity
  id: PelletShotgun
  name: pellet (.50)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBullet
  components:
  - type: Sprite
@@ -45,7 +45,7 @@
 - type: entity
  id: PelletShotgunIncendiary
  name: pellet (.50 incendiary)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBulletIncendiary
  components:
  - type: Sprite
@@ -62,7 +62,7 @@
 - type: entity
  id: PelletShotgunPractice
  name: pellet (.50 practice)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBulletPractice
  components:
  - type: Sprite
@@ -76,7 +76,7 @@
 - type: entity
  id: PelletShotgunImprovised
  name: improvised pellet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBullet
  components:
  - type: Sprite
@@ -92,7 +92,7 @@
 - type: entity
  id: PelletShotgunTranquilizer
  name: pellet (.50 tranquilizer)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBulletPractice
  components:
  - type: Sprite
@@ -119,7 +119,7 @@
 - type: entity
  id: PelletShotgunFlare
  name: pellet (.50 flare)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Physics
    bodyType: Dynamic
@@ -166,7 +166,7 @@
 - type: entity
  id: PelletShotgunUranium
  name: pellet (.50 uranium)
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBullet
  components:
  - type: Sprite
@@ -181,7 +181,7 @@
 - type: entity
  id: PelletGrapeshot #tally fucking ho
  name: grapeshot pellet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBullet
  components:
  - type: Sprite
@@ -200,7 +200,7 @@
  id: PelletGlass
  name: glass shard
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    noRot: false
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -1,7 +1,7 @@
 # Used to animate the hitscan effects because effectsystem doesn't support it
 - type: entity
  id: HitscanEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 2.0
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: BulletImpactEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.25
@@ -18,7 +18,7 @@

 - type: entity
  id: BulletImpactEffectDisabler
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: TimedDespawn
      lifetime: 0.2
@@ -36,7 +36,7 @@

 - type: entity
  id: BulletImpactEffectOrangeDisabler
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.2
@@ -55,7 +55,7 @@

 - type: entity
  id: BulletImpactEffectKinetic
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.2
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -3,7 +3,7 @@
  name: fireball
  description: You better GITTAH WEIGH.
  parent: BulletRocket
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PointLight
    color: "#E25822"
@@ -31,7 +31,7 @@
    fireStacks: 0.35

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: BaseBulletTrigger
  id: ProjectileDragonsBreath
  name: dragon's breath
@@ -68,7 +68,7 @@
  name: fireball
  description: Hovering blob of flame.
  parent: ProjectileFireball
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 30
@@ -82,7 +82,7 @@
 - type: entity
  id: ProjectilePolyboltBase
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
@@ -99,7 +99,7 @@
  parent: ProjectilePolyboltBase
  name: carp polybolt
  description: Nooo, I don't wanna be fish!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PolymorphOnCollide
    polymorph: WizardForcedCarp
@@ -112,7 +112,7 @@
  parent: ProjectilePolyboltBase
  name: monkey polybolt
  description: Nooo, I don't wanna be monkey!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PolymorphOnCollide
    polymorph: WizardForcedMonkey
@@ -125,7 +125,7 @@
  parent: ProjectilePolyboltBase
  name: door polybolt
  description: Nooo, I don't wanna be door!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
@@ -146,7 +146,7 @@
  name: healing bolt
  description: I COMMAND YOU TO LIVE!
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
@@ -166,7 +166,7 @@
  id: BulletInstakillMagic
  name: magical lead cylinder
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  description: This looks familiar.
  components:
  - type: Projectile
@@ -180,7 +180,7 @@
  parent: ProjectilePolyboltBase
  name: cluwne polybolt
  description: knoH KnoH!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PolymorphOnCollide
    polymorph: WizardForcedCluwne
@@ -193,7 +193,7 @@
  parent: BaseBullet
  name: icicle
  description: Brrrrr.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Structures/Specific/Anomalies/ice_anom.rsi
@@ -209,7 +209,7 @@
  id: ProjectilePolyboltBread
  name: bread polybolt
  description: Nooo, I don't wanna be bread!
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PolymorphOnCollide
    polymorph: BreadMorph
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: MuzzleFlashEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 0.4
@@ -69,7 +69,7 @@
 - type: entity
  id: BaseBulletTrigger # Trigger-on-collide bullets
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TriggerOnCollide
    fixtureID: projectile
@@ -93,7 +93,7 @@
  id: BaseBulletPractice
  name: base bullet practice
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -108,7 +108,7 @@
  id: BaseBulletIncendiary
  name: base bullet incendiary
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Projectile
    damage:
@@ -126,7 +126,7 @@
  id: BaseBulletAP
  name: base bullet armor-piercing
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -142,7 +142,7 @@
  id: BaseBulletUranium
  name: base bullet uranium
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -158,7 +158,7 @@
  name: taser bolt
  id: BulletTaser
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: FlyBySound
    sound:
@@ -200,7 +200,7 @@
  name : disabler bolt
  id: BulletDisabler
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Reflective
    reflective:
@@ -243,7 +243,7 @@
  name : disabler bolt practice
  id: BulletDisablerPractice
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: FlyBySound
    sound:
@@ -283,7 +283,7 @@
  name: emitter bolt
  id: EmitterBolt
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Structures/Power/Generation/Singularity/emitter.rsi
@@ -320,7 +320,7 @@
  name: watcher bolt
  id: WatcherBolt
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: FlyBySound
    sound:
@@ -360,7 +360,7 @@
  name: magmawing watcher bolt
  id: WatcherBoltMagmawing
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
@@ -379,7 +379,7 @@
  id: BulletKinetic
  name: kinetic bolt
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  description: Not too bad, but you still don't want to get hit by it.
  components:
  - type: Reflective
@@ -405,7 +405,7 @@
 - type: entity
  id: BulletKineticShuttle
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    noRot: false
@@ -433,7 +433,7 @@
  id: BulletCharge
  name: charge bolt
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  description: Marks a target for additional damage.
  components:
  - type: Reflective
@@ -467,7 +467,7 @@
  parent: BaseBullet
  id: AnomalousParticleDelta
  name: delta particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PointLight
    enabled: true
@@ -508,7 +508,7 @@
 - type: entity
  parent: AnomalousParticleDelta
  id: AnomalousParticleDeltaStrong
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: AnomalousParticle
    particleType: Delta
@@ -521,7 +521,7 @@
  parent: AnomalousParticleDelta
  id: AnomalousParticleEpsilon
  name: epsilon particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PointLight
    enabled: true
@@ -538,7 +538,7 @@
 - type: entity
  parent: AnomalousParticleEpsilon
  id: AnomalousParticleEpsilonStrong
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: AnomalousParticle
    particleType: Epsilon
@@ -551,7 +551,7 @@
  parent: AnomalousParticleDelta
  id: AnomalousParticleZeta
  name: zeta particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PointLight
    enabled: true
@@ -568,7 +568,7 @@
 - type: entity
  parent: AnomalousParticleZeta
  id: AnomalousParticleZetaStrong
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: AnomalousParticle
    particleType: Zeta
@@ -581,7 +581,7 @@
  parent: AnomalousParticleDelta
  id: AnomalousParticleOmegaStrong
  name: omega particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PointLight
    enabled: true
@@ -610,7 +610,7 @@
  parent: AnomalousParticleDelta
  id: AnomalousParticleSigma
  name: sigma particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: PointLight
    enabled: true
@@ -628,7 +628,7 @@
  parent: AnomalousParticleSigma
  id: AnomalousParticleSigmaStrong
  name: sigma particles
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: AnomalousParticle
    particleType: Sigma
@@ -638,7 +638,7 @@
  id: BulletRocket
  name: rocket
  parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -660,7 +660,7 @@
  id: BulletWeakRocket
  name: weak rocket
  parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -682,7 +682,7 @@
  id: BulletGrenadeBaton
  name: baton grenade
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -702,7 +702,7 @@
  id: BulletGrenadeBlast
  name: blast grenade
  parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -719,7 +719,7 @@
  id: BulletGrenadeFlash
  name: flash grenade
  parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -738,7 +738,7 @@
  id: BulletGrenadeFrag
  name: frag grenade
  parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -755,7 +755,7 @@
  id: BulletGrenadeEMP
  name: EMP rocket
  parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -776,7 +776,7 @@
  id: BulletCap
  name: cap bullet
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Fun/toys.rsi
@@ -792,7 +792,7 @@
  id: BulletAcid
  name: acid spit
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Projectile
      damage:
@@ -808,7 +808,7 @@
 - type: entity
  id: BulletWaterShot
  name: water
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Clickable
  - type: Physics
@@ -851,7 +851,7 @@
  id: BulletCannonBall
  name: cannonball
  parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -872,7 +872,7 @@
 - type: entity
  id: GrapplingHook
  name: grappling hook
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: EmbeddableProjectile
      deleteOnRemove: true
@@ -908,7 +908,7 @@
  name : disabler bolt smg
  id: BulletDisablerSmg
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Reflective
    reflective:
@@ -951,7 +951,7 @@
  name: tesla gun lightning
  id: TeslaGunBullet
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: TimedDespawn
    lifetime: 5
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -83,7 +83,7 @@

 - type: entity
  id: GrenadeFlashEffect
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: PointLight
      enabled: true
@@ -125,7 +125,7 @@
  description: Go out on your own terms!
  parent: GrenadeBase
  id: SelfDestructSeq
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: ExplodeOnTrigger
  - type: Explosive
--- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
@@ -25,7 +25,7 @@
    - BaseStationSiliconLawCrewsimov
    - BaseStationAllEventsEligible
    - BaseStationNanotrasen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Transform

@@ -35,7 +35,7 @@
    - BaseStation
    - BaseStationAlertLevels
    - BaseStationNanotrasen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Transform

@@ -46,6 +46,6 @@
  - BaseStationJobsSpawning
  - BaseStationRecords
  - BaseStationNanotrasen
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Transform
--- a/Resources/Prototypes/Entities/Stations/syndicate.yml
+++ b/Resources/Prototypes/Entities/Stations/syndicate.yml
@@ -11,6 +11,6 @@
  parent:
  - BaseStation
  - BaseStationSyndicate
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Transform
--- a/Resources/Prototypes/Entities/Stations/test.yml
+++ b/Resources/Prototypes/Entities/Stations/test.yml
@@ -6,6 +6,6 @@
    - BaseStationJobsSpawning
    - BaseStationRecords
    - BaseStationAlertLevels
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Transform
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -61,7 +61,7 @@

 - type: entity
  id: DisposalHolder
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: disposal holder
  components:
  - type: DisposalHolder
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
@@ -3,7 +3,7 @@
  description: Accelerated particles.
  id: ParticlesProjectile
  parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
    - type: Sprite
      layers:
@@ -54,7 +54,7 @@
  description: Accelerated negative particles.
  id: AntiParticlesProjectile
  parent: ParticlesProjectile
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -108,7 +108,7 @@
    mediumVoltageNode: ame

 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  parent: AmeController
  id: AmeControllerUnanchored
  suffix: Unanchored
--- a/Show More
+++ b/Show More