From 5f38b52be8e74c85c1af27e504dd8adc9ef047cf Mon Sep 17 00:00:00 2001
From: VigersRay <VigersRay@gmail.com>
Date: Sat, 27 Jul 2024 10:35:10 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20noSpawn:=20true?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Weapons/Guns/Projectiles/projectiles.yml  | 10 ++--
 Resources/Prototypes/GameRules/roundstart.yml |  4 +-
 Resources/Prototypes/Objectives/traitor.yml   |  2 +-
 .../Entities/Clothing/Back/satchel.yml        |  1 -
 .../_Sunrise/Entities/Clothing/Belt/belts.yml |  2 -
 .../Clothing/Hands/Accessories/watch.yml      |  1 -
 .../Entities/Clothing/Hands/gloves.yml        |  1 -
 .../Clothing/Head/hardsuit-helmets.yml        |  5 +-
 .../_Sunrise/Entities/Clothing/Head/hats.yml  | 11 +----
 .../_Sunrise/Entities/Clothing/Head/hoods.yml |  2 +-
 .../Entities/Clothing/Masks/masks.yml         |  9 ----
 .../Entities/Clothing/Neck/cloaks.yml         | 19 --------
 .../_Sunrise/Entities/Clothing/Neck/misc.yml  |  1 -
 .../Entities/Clothing/OuterClothing/suits.yml | 15 +-----
 .../Entities/Clothing/Shoes/boots.yml         |  2 -
 .../Entities/Clothing/Uniforms/jumpsuits.yml  |  6 +--
 .../Entities/Mobs/Species/humanoid_xeno.yml   |  2 +-
 .../_Sunrise/Entities/Mobs/Species/swine.yml  |  2 +-
 .../Entities/Mobs/Species/vulpkanin.yml       |  2 +-
 .../Entities/Objects/Specific/borg_tools.yml  | 46 +++++++++----------
 .../Entities/Objects/Specific/suntick.yml     |  8 ++--
 .../Ammunition/Projectiles/caseless_rifle.yml |  2 +-
 .../Ammunition/Projectiles/light_rifle.yml    |  2 +-
 .../Guns/Ammunition/Projectiles/magnum.yml    |  2 +-
 .../Guns/Ammunition/Projectiles/pistol.yml    |  2 +-
 .../Guns/Ammunition/Projectiles/rifle.yml     |  2 +-
 .../Weapons/Guns/Projectiles/impact.yml       |  2 +-
 .../Weapons/Guns/Projectiles/impacts.yml      |  2 +-
 .../Weapons/Guns/Projectiles/projectiles.yml  |  6 +--
 .../_Sunrise/Entities/Stations/nanotrasen.yml |  2 +-
 .../_Sunrise/Objectives/traitorObjectives.yml |  2 +-
 .../_Sunrise/PlanetPrison/objective.yml       |  2 +-
 .../_Sunrise/PlanetPrison/roundstart.yml      |  2 +-
 33 files changed, 60 insertions(+), 119 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 6ee22676114..01d05648785 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -986,7 +986,7 @@
   name : syndie plasma
   id: BulletSyndiPlasma
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Reflective
     reflective:
@@ -1028,7 +1028,7 @@
   name : syndie plasma
   id: BulletSyndiPlasma2
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Reflective
     reflective:
@@ -1070,7 +1070,7 @@
   name : syndie plasma
   id: BulletSyndiPlasma3
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Reflective
     reflective:
@@ -1113,7 +1113,7 @@
   name: energy bolt
   id: BulletEnergyGunLaser
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Reflective
     reflective:
@@ -1154,7 +1154,7 @@
   id: BulletRocketNT
   name: rocket
   parent: BaseBulletTrigger
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index d1729371458..a8f553f4157 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -73,7 +73,7 @@
   parent: BaseGameRule
   id: BaseNukeopsRule
   components:
-  - type: RandomMetadata #this generates the random operation name cuz it's cool. 
+  - type: RandomMetadata #this generates the random operation name cuz it's cool.
     nameSegments:
     - operationPrefix
     - operationSuffix
@@ -258,7 +258,7 @@
 - type: entity
   id: GreenshiftAnnouncement
   parent: BaseGameRule
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: AnnounceRule  # Sunrise
     enableAnnouncement: true
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index fab166905cb..bba843fe2fe 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -297,7 +297,7 @@
 # Station
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: BaseTraitorStealObjective
   id: PlutoniumCoreStealObjective
   components:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml
index 75b076c6019..9da876317c6 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml
@@ -43,7 +43,6 @@
   id: ClothingBackpackSatchelHoS
   name: сумка главы службы безопасности
   description: Стильная чёрная кожаная сумка.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Back/Satchels/hos.rsi
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
index be2eb4a492a..30be2180e7d 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
@@ -31,7 +31,6 @@
   id: ClothingBeltHoS
   name: пояс службы безопасности
   description: Пояс службы безопасности, но из качественного материала.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Belt/hos.rsi
@@ -65,7 +64,6 @@
 - type: entity
   parent: ClothingBeltMedical
   id: ClothingBeltMedicalCMO
-  noSpawn: true
   name: медицинский пояс главного врача
   description: Стерильный пояс со множеством карманов под таблетки и другие лекарства, подчёркивающий, что лечить нужно со стилем.
   components:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/Accessories/watch.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/Accessories/watch.yml
index 8bc88873f2f..fecd22abf13 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/Accessories/watch.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/Accessories/watch.yml
@@ -3,7 +3,6 @@
   id: ClothingHandsWatchDivine
   name: божественные часы
   description: Эти часы может носить только божественная личность.
-  noSpawn: true
   components:
     - type: Sprite
       sprite: _Sunrise/Entities/Clothing/Hands/Accessories/watch.rsi
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/gloves.yml
index 1090e555bc9..d443bc6a2c9 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/gloves.yml
@@ -31,7 +31,6 @@
   id: ClothingHandsGlovesLeatherHoS
   name: кожаные перчатки
   description: Стильные чёрные кожаные перчатки.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Hands/Gloves/hos.rsi
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml
index 6155f241d00..4f566bc65a3 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetCBURNLeader
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: cburn commander helmet
   description: A pressure resistant and fireproof hood worn by special cleanup units.
   components:
@@ -45,7 +45,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitBlueshield
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: шлем скафандра офицера «синий щит»
   description: Синий.
   components:
@@ -68,6 +68,7 @@
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitPilot
+  categories: [ HideSpawnMenu ]
   name: Шлем скафандра пилота Службы Безопасности
   description: Футуристичный шлем с отличным обзором.
   components:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml
index ca0a7a56dab..e5ca4ed47f2 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml
@@ -133,7 +133,6 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatIAA
-  noSpawn: true
   name: загадочная шляпа
   description: Шляпа в чёрно-белом стиле. Напоминает секретных агентов из фильмов и сериалов.
   components:
@@ -147,7 +146,6 @@
   id: ClothingHeadHatCapUSSPBlack
   name: старая кожаная фуражка СССП
   description: Чёрная фуражка с серым козырьком.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Head/Hats/ussp.rsi
@@ -159,7 +157,6 @@
   id: ClothingHeadHatCapLeatherHoS
   name: кожаная фуражка главы службы безопасности
   description: Довольно старая вещь для этих времён, навевающая старые воспоминания...
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Head/Hats/hoscap.rsi
@@ -169,7 +166,6 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatMagicRD
-  noSpawn: true
   name: фуражка научного руководителя
   description: В ней вам не страшен ни плазменный дождь, ни кислота, капающая из вентиляции. Презентабельный вид причёски останется под защитой науки.
   components:
@@ -188,7 +184,6 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCapQM
-  noSpawn: true
   name: шляпа капитана утилятов
   description: "Шляпа изображена в классическом пиратском стиле и представляется в стандартном для карго отдела цвете. На шляпе написано: АР! Три Кинетических Ускорителя мне в рот и... *остальная часть надписи затëрта*"
   components:
@@ -200,7 +195,6 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatHOP
-  noSpawn: true
   name: фуражка главы персонала
   description: Тёмно-синяя фуражка с позолоченным рантом. Козырек дает отблеск грамотности и внимательности носителя.
   components:
@@ -212,7 +206,6 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadEliteCaptainCap
-  noSpawn: true
   name: федора капитана
   description: синяя федора с золотой лентой.
   components:
@@ -224,7 +217,6 @@
 - type: entity
   parent: ClothingHeadHatHardhatBase
   id: ClothingSpecialHeadHatHardhatCMO
-  noSpawn: true
   name: медицинская шапочка главного врача
   description: Стерильная шапочка с фонариком.
   components:
@@ -236,7 +228,6 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCapCMO
-  noSpawn: true
   name: медицинский берет
   description: Белый берет с красным крестом на центральной части.
   components:
@@ -244,7 +235,7 @@
     sprite: _Sunrise/Entities/Clothing/Head/Hats/cmohat.rsi
   - type: Clothing
     sprite: _Sunrise/Entities/Clothing/Head/Hats/cmohat.rsi
-    
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCapNtrep
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hoods.yml
index a609d376da7..3449c2112b7 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hoods.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: ClothingHeadHatHoodGoliathCloak
   id: ClothingHeadHatHoodBlackCloak
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: капюшон
   description: Закрывает затылок.
   components:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml
index aac0aa265f4..c02052255c1 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml
@@ -16,7 +16,6 @@
   id: ClothingMaskGasAtmosian
   name: противогаз атмосианина
   description: Улучшенный противогаз, используемый атмосианинами. Огнеупорный!
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Mask/atmosian.rsi
@@ -32,7 +31,6 @@
   id: ClothingMaskSkull
   name: маска черепа
   description: Зловещая маска черепа.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Mask/death.rsi
@@ -43,7 +41,6 @@
 - type: entity
   parent: ClothingMaskGasAtmos
   id: ClothingBreathMaskRD
-  noSpawn: true
   name: противогаз с фиолетовым визором
   description: Специальный противогаз главы научно-исследовательского отдела. Имеет ярко-фиолетовый визор из плазменного стекла, через который искать аномалии и вдыхать фрезор будет куда интереснее.
   components:
@@ -57,7 +54,6 @@
 - type: entity
   parent: ClothingMaskGasExplorer
   id: ClothingBreathMaskQM
-  noSpawn: true
   name: противогаз куратора
   description: Пока другие работают, ты смотришь на них и наслаждаешься жизнью. Сделана специально для квартирмейстеров, позволяя более удобно проводить время, не обращая внимания на то, как что-то ест вашего работника.
   components:
@@ -71,7 +67,6 @@
 - type: entity
   parent: ClothingMaskGasAtmos
   id: ClothingMaskIAA
-  noSpawn: true
   name: Элитный противогаз
   description: Черный противогаз с позолоченным элементом над визором из прочного стекла. Вы не обязаны дышать с подсудимыми одним воздухом. Защищает от вспышек.
   components:
@@ -86,7 +81,6 @@
 - type: entity
   parent: ClothingMaskGasAtmos
   id: ClothingEliteMaskGasHOP
-  noSpawn: true
   name: Противогаз главы персонала
   description: Надежный противогаз выполненный в тематическом тёмно-синем цвете. В нём вас будет страшиться весь сервисный отдел.
   components:
@@ -100,7 +94,6 @@
 - type: entity
   parent: ClothingMaskGasAtmos
   id: ClothingEliteMaskGasCaptain
-  noSpawn: true
   name: Противогаз капитана
   description: Сквозь янтарное стекло ситуация на станции кажется менее ужасной.
   components:
@@ -114,7 +107,6 @@
 - type: entity
   parent: ClothingMaskGasAtmos
   id: ClothingBreathMaskCMO
-  noSpawn: true
   name: Медицинский респиратор
   description: Качественный респиратор.
   components:
@@ -128,7 +120,6 @@
 - type: entity
   parent: ClothingMaskGasAtmos
   id: ClothingMaskGasCE
-  noSpawn: true
   name: противогаз старшего инженера
   description: Очень прочный и стильный белый противогаз с зеленой полосой на лобной части. Позволит исправить последствия работы атмосферных техников с купленными дипломами.
   components:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/cloaks.yml
index 586b9255b98..b48b647bd02 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/cloaks.yml
@@ -19,7 +19,6 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakHOSCloak
-  noSpawn: true
   name: плащ главы службы безопасности
   description: Чёрно-красный плащ ГСБ, символизирует безопасность и жестокость.
   components:
@@ -30,7 +29,6 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakResearchDirector
-  noSpawn: true
   name: плащ светилы науки
   description: Фиолетовый плащ с изображенной спиралью ДНК, демонстрирует ваше всезнание и феноменальность.
   components:
@@ -41,7 +39,6 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingEliteNeckCloakCaptain
-  noSpawn: true
   name: плащ капитана
   description: Большое количество 24 коратного золота, позволяет понять ваш статус издалека.
   components:
@@ -52,7 +49,6 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckEliteCloakCECloak
-  noSpawn: true
   name: плащ старшего инженера
   description: Увесистый, но очень роскошный белый плащ с золотыми лентами. На обратной стороне имеется маленькая этикетка "Поменяйте топливо в ДАМ".
   components:
@@ -63,7 +59,6 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakIAACloak
-  noSpawn: true
   name: плащ агента внутренних дел
   description: Темная накидка на голову из флисовой ткани. Эффектно сочетается с общим стилем агента внутренних дел.
   components:
@@ -74,7 +69,6 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCMOCloak
-  noSpawn: true
   name: плащ главного врача
   description: Его получают только лучшие из лучших. Человек который его носит спас не одну сотню жизней.
   components:
@@ -85,7 +79,6 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakQM
-  noSpawn: true
   name: плащ квартирмейстера
   description: Плащ, готовый пройти с вами сквозь кровь, боль, маты, ксеноморфов или чего-то по экзотичнее. Подчёркивает богатства владельца большим выточенным алмазом, пока вы не узнаете что это ширпотреб.
   components:
@@ -96,7 +89,6 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakHOPCloak
-  noSpawn: true
   name: плащ главы персонала
   description: Плащ Главы персонала. Голубой, с золотыми вставками плащ, напоминающий, кто тут Босс.
   components:
@@ -107,7 +99,6 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakBlackSec
-  noSpawn: true
   name: плащ службы безопасности
   description: Чёрный и загадочный.
   components:
@@ -126,7 +117,6 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakDarthHOSCloak
-  noSpawn: true
   name: мантия Темного Лорда.
   description: Символическая и способная вызвать трепет всем вокруг мантия, которая идеально отображает мрачное величие её владельца.
   components:
@@ -139,7 +129,6 @@
   id: ClothingNeckCloakWhite
   name: наплечник офицера Республиканской армии
   description: Элемент снаряжениия элитного солдата в звании офицера.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Neck/Cloaks/securityofficer.rsi
@@ -150,7 +139,6 @@
   id: ClothingNeckCloakAlpha
   name: плащ Альфа
   description: Плащ, который позволял прятаться от врагов так же успешно, как и оперативнику прятаться от своих заслуг.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Neck/Cloaks/alpha.rsi
@@ -161,7 +149,6 @@
   id: ClothingNeckCloakLima
   name: плащ Лима
   description: Плащ, который позволял прятаться от врагов так же успешно, как и оперативнику прятаться от своих заслуг.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Neck/Cloaks/lima.rsi
@@ -172,7 +159,6 @@
   id: ClothingNeckCloakDelta
   name: плащ Дельта
   description: Плащ, который позволял прятаться от врагов так же успешно, как и оперативнику прятаться от своих заслуг.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Neck/Cloaks/delta.rsi
@@ -183,7 +169,6 @@
   id: ClothingNeckCloakEcho
   name: плащ Эхо
   description: Плащ, который позволял прятаться от врагов так же успешно, как и оперативнику прятаться от своих заслуг.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Neck/Cloaks/echo.rsi
@@ -194,7 +179,6 @@
   id: ClothingNecRepublicBodyguard
   name: мантия Императорского Стража
   description: Элитное обмундирование Императорского Стража.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Neck/Cloaks/republicbodyguard.rsi
@@ -206,7 +190,6 @@
   parent: ClothingNeckBase
   id: ClothingNeckKailoRen
   name: чёрная накидка
-  noSpawn: true
   description: Символическая и способная вызывать трепет и страх. Идеально подчеркивает мрачное великие своего владельца.
   components:
   - type: Sprite
@@ -220,7 +203,6 @@
   id: ClothingCloakGamer
   name: легендарный плащ геймера
   description: Его носят самые опытные профессиональные геймеры.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Neck/Cloaks/gamer.rsi
@@ -230,7 +212,6 @@
   id: ClothingCloakAtmosian
   name: плащ атмосианина
   description: Плащ легендарного атмосианина.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Neck/Cloaks/atmosian.rsi
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/misc.yml
index d7a1174d03b..f6a511fc2d6 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Neck/misc.yml
@@ -3,7 +3,6 @@
   id: ClothingNeckSunriseBadge
   name: Значок Санрайзосексуалов
   description: Фирменный значок Санрайз.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Neck/Misc/sunrisebadge.rsi
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml
index 5c2eca29d18..cea7cbf0582 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml
@@ -8,7 +8,7 @@
     sprite: _Sunrise/Clothing/OuterClothing/Coats/kim.rsi
   - type: Clothing
     sprite: _Sunrise/Clothing/OuterClothing/Coats/kim.rsi
-    
+
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterCoatNtrep
@@ -25,7 +25,7 @@
         Blunt: 0.9
         Slash: 0.9
         Piercing: 0.8
-    
+
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterCoatNtrepOpen
@@ -57,7 +57,6 @@
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatCEOvercoatWhite
-  noSpawn: true
   name: пальто старшего инженера
   description: Пальто Старшего Инженера. Роскошное пальто с позолоченными вставками, делающие вид, что защищает вас от каких-либо угроз.
   components:
@@ -69,7 +68,6 @@
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatCMOOvercoat
-  noSpawn: true
   name: лабораторный халат главного врача
   description: На 99% состоит из Нитрила.
   components:
@@ -81,7 +79,6 @@
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatCaptainOvercoat
-  noSpawn: true
   name: капитанская шинель
   description: Селанная специально под замеры действующего капитана и сделанный лучшими швеями NanoTrasen.
   components:
@@ -104,7 +101,6 @@
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterEliteCoatHOP
-  noSpawn: true
   name: шинель главы персонала
   description: Удобное приталенная шинель тёмно-синего цвета с кожаными ремнями. На плечах видны декоративные погоны.
   components:
@@ -116,7 +112,6 @@
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatHOSOvercoatBlack
-  noSpawn: true
   name: бронированная шинель
   description: Чёрная шинель с красными полосками, серебряными заклепками и золотой бляшкой.
   components:
@@ -135,7 +130,6 @@
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatIAA
-  noSpawn: true
   name: пиджак агента внутренних дел
   description: Чёрный пиджак строгого тона с позолоченным креплением под значок. От него веет запахом чернил для ручек и бюрократией.
   components:
@@ -147,7 +141,6 @@
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatQM
-  noSpawn: true
   name: теплое пальто
   description: Удобное пальто созданное из лёгкой ткани дикого лиаруса, место обитания которого является лавовая планета №468, позволяет придерживаться стиля современных времён.
   components:
@@ -159,7 +152,6 @@
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatLabResearchDirector
-  noSpawn: true
   name: халат научного руководителя
   description: Плотный халат, защищающий своего носителя от струи кислоты и плавленой плазмы. Имеет фиолетовые и голубые ленты на плечах и поясе.
   components:
@@ -177,7 +169,6 @@
   id: ClothingOuterCoatHoSOvercoat
   name: бронированная шинель
   description: Довольно старая вещь для этих времён, навевающая старые воспоминания...
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/OuterClothing/hos_overcoat.rsi
@@ -196,7 +187,6 @@
   id: ClothingOuterCoatUSSPOvercoatBlack
   name: бронированная шинель СССП
   description: Старая вещица, прямиком из СССП.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/OuterClothing/ussp.rsi
@@ -208,7 +198,6 @@
   id: ClothingOuterAtmosianBomberJacket
   name: куртка-бомбер атмосианина
   description: Плотная, поношенная куртка-бомбер атмосианина.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/OuterClothing/atmosian.rsi
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml
index 3e4a126d638..c1bdfe73896 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml
@@ -34,7 +34,6 @@
   id: ClothingShoesUSSPBlack
   name: кожаные ботинки СССП
   description: Старая вещица, прямиком из СССП.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Shoes/ussp.rsi
@@ -43,7 +42,6 @@
 
 - type: entity
   parent: ClothingShoesBaseButcherable
-  noSpawn: true
   id: ClothingShoesEliteCaptain
   name: капитанские ботинки
   description: Конструкция ботинок имеет смягчающий эффект который даёт комфорт капитанского уровня.
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml
index 61ef843e6ff..cd2ed743dbb 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -63,7 +63,7 @@
     sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/ntrep.rsi
   - type: Clothing
     sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/ntrep.rsi
-    
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitNtrepFormal
@@ -122,7 +122,6 @@
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitIAA
-  noSpawn: true
   name: рубашка с галстуком
   description: Костюм из льняной белой рубашки с синим галстуком и брюк. Выглядит роскошно.
   components:
@@ -136,7 +135,6 @@
   id: ClothingUniformJumpsuitHoSOld
   name: старый комбинезон главы службы безопасности
   description: Довольно старая вещь для этих времён, навевающая старые воспоминания...
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Unoforms/Jumpsuit/hos.rsi
@@ -148,7 +146,6 @@
   id: ClothingUniformJumpsuitUSSPBlack
   name: старый комбинезон СССП
   description: Старая вещица, прямиком из СССП.
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Unoforms/Jumpsuit/ussp.rsi
@@ -160,7 +157,6 @@
   id: ClothingUniformJumpsuitSkeleton
   name: комбинезон скелета
   description: Черный комбинезон с напечатанным на нем белым узором из костей. Жуть!
-  noSpawn: true
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Clothing/Unoforms/Jumpsuit/skeleton.rsi
diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml
index a8e45394166..a548d69d191 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml
@@ -131,7 +131,7 @@
 - type: entity
   parent: BaseSpeciesDummy
   id: MobXenoDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HumanoidAppearance
     species: HumanoidXeno
diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml
index 78aecb3f215..2f34d205f88 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml
@@ -56,7 +56,7 @@
   name: Urist McHands
   parent: MobHumanDummy
   id: MobSwineDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: A dummy swine meant to be used in character setup.
   components:
   - type: HumanoidAppearance
diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml
index c9c7b9796d8..0aae7c033b3 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml
@@ -26,7 +26,7 @@
   name: Urist McHands
   parent: MobHumanDummy
   id: MobVulpkaninDummy
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description: A dummy fox meant to be used in character setup.
   components:
   - type: HumanoidAppearance
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/borg_tools.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/borg_tools.yml
index 7dd063f3936..57b06aa7d81 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/borg_tools.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/borg_tools.yml
@@ -3,7 +3,7 @@
   id: PowerCellRobotTool
   name: robot tool power cell
   description: A small cell that self recharges. Used in robot tools.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: BatterySelfRecharger
     autoRecharge: true
@@ -14,7 +14,7 @@
   parent: WeaponDisabler
   id: WeaponDisablerBorg
   description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: BatterySelfRecharger
     autoRecharge: true
@@ -25,7 +25,7 @@
   parent: Stunbaton
   id: StunbatonBorg
   description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: BatterySelfRecharger
     autoRecharge: true
@@ -36,7 +36,7 @@
   id: HoloprojectorSecurityBorg
   name: holobarrier robot projector
   description: Creates a solid but fragile holographic barrier.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: ItemSlots
     slots:
@@ -50,7 +50,7 @@
   parent: BaseWeaponBatterySmall
   id: WeaponLaserBorg
   description: This laser for security robot.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   #- type: AlterLevelGunBlocker #FIXMEVIGERS
   - type: Item
@@ -83,7 +83,7 @@
   parent: Flash
   id: FlashBorg
   description: An ultrabright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. Useless when burnt out.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/flash.rsi
@@ -105,7 +105,7 @@
   parent: BaseItem
   description: A borg version of hypospray that automatically regenerates epinephrine.
   id: HyposprayBorgStandard
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/hypospray.rsi
@@ -133,7 +133,7 @@
   id: HyposprayBorgPeace
   name: pax cyborg hypospray
   description: A cyborg version of hypospray that automatically regenerates pax.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
     solutions:
@@ -151,7 +151,7 @@
   id: HyposprayBorgMedical
   name: medical robot hypospray
   description: A hypospray that can switch through several reagents.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
     solutions:
@@ -182,7 +182,7 @@
   id: WeaponProtoKineticAcceleratorBorg
   parent: WeaponProtoKineticAcceleratorBase
   description: Fires low-damage kinetic bolts at a short range.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
@@ -208,7 +208,7 @@
   id: HyposprayBorgSyndi
   name: gorlax robot hypospray
   description: A hypospray that can switch through several reagents.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/syndihypo.rsi
@@ -239,7 +239,7 @@
   id: HolofanProjectorBorg
   name: holofan robot projector
   description: Stop suicidal passengers from killing everyone during atmos emergencies.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: HolosignProjector
     signProto: HoloFan
@@ -261,7 +261,7 @@
   name: machine gun borg
   id: LightMachineGunBorg
   parent: BaseItem
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   description:
   components:
   - type: Sprite
@@ -307,7 +307,7 @@
   parent: WeaponLauncherChinaLake
   id: WeaponLauncherChinaLakeBorg
   description: PLOOP
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Gun
     fireRate: 1
@@ -335,7 +335,7 @@
   name: fire extinguisher borg
   description: fire extinguisher borg
   parent: FireExtinguisher
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: SolutionRegeneration
       solution: spray
@@ -349,7 +349,7 @@
   name: space cleaner
   description: BLAM!-brand non-foaming space cleaner!
   parent: SprayBottleSpaceCleaner
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: SolutionRegeneration
     solution: spray
@@ -362,7 +362,7 @@
   name: borg crowbar
   parent: Crowbar
   id: CrowbarBorg
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Objects/Tools/items_cyborg.rsi
@@ -372,7 +372,7 @@
   name: borg wrench
   parent: Wrench
   id: WrenchBorg
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Objects/Tools/items_cyborg.rsi
@@ -382,7 +382,7 @@
   name: borg screwdriver
   parent: BaseItem
   id: ScrewdriverBorg
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Objects/Tools/items_cyborg.rsi
@@ -415,7 +415,7 @@
   name: borg wirecutter
   parent: BaseItem
   id: WirecutterBorg
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Objects/Tools/items_cyborg.rsi
@@ -453,7 +453,7 @@
   name: borg welder
   parent: Welder
   id: WelderBorg
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: _Sunrise/Entities/Objects/Tools/items_cyborg.rsi
@@ -614,7 +614,7 @@
   name: Гипоспрей киборга диверсанта
   parent: BaseItem
   id: HyposprayBorgSyndie
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/hypospray.rsi
@@ -674,7 +674,7 @@
   id: HandheldCrewMonitorBorg
   name: handheld robot crew monitor
   description: A hand-held crew monitor that runs off of your own power cells, which displays the status of the crew suit sensors.
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: ItemSlots
     slots:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/suntick.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/suntick.yml
index fbebbae9b79..6a2e2bccf6c 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/suntick.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/suntick.yml
@@ -2,7 +2,7 @@
   name: Сантики
   parent: BaseItem
   id: Suntick
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   suffix: 20 ST
   description: Невероятно привлекательные и прекрасные монетки, которые открывают двери в мир маленького милого магазинчика.
   components:
@@ -27,7 +27,7 @@
   parent: Suntick
   id: Suntick1
   suffix: 1 ST
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: Сантик
   description: Невероятно привлекательные и прекрасные монетки, которые открывают двери в мир маленького милого магазинчика.
   components:
@@ -38,7 +38,7 @@
   parent: Suntick
   id: Suntick5
   suffix: 5 ST
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   name: Сантик
   description: Невероятно привлекательные и прекрасные монетки, которые открывают двери в мир маленького милого магазинчика.
   components:
@@ -48,7 +48,7 @@
 - type: entity
   parent: Suntick
   id: Suntick10
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   suffix: 10 ST
   name: Сантик
   description: Невероятно привлекательные и прекрасные монетки, которые открывают двери в мир маленького милого магазинчика.
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
index faf9b98e037..536a9249487 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
@@ -2,7 +2,7 @@
   id: BulletCaselessRifleRubber
   name: bullet (.25 caseless rubber)
   parent: BaseBulletRubber
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
index f2879b3e81a..4725fd0d5fd 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -2,7 +2,7 @@
   id: BulletLightRifleRubber
   name: bullet (.20 rifle rubber)
   parent: BaseBulletRubber
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index 54c09601cc5..e4e8f9a998d 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -2,7 +2,7 @@
   id: BulletMagnumRubber
   name: bullet (.45 magnum rubber)
   parent: BaseBulletRubber
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
index 8187536d081..9a15912dd3a 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -2,7 +2,7 @@
   id: BulletPistolRubber
   name: bullet (.35 auto rubber)
   parent: BaseBulletRubber
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
index ecdec3e3e0e..0bd3d66ba94 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -2,7 +2,7 @@
   id: BulletRifleRubber
   name: bullet (0.20 rifle rubber)
   parent: BaseBulletRubber
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Projectile
     damage:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impact.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impact.yml
index 936ac9856ec..869da03ded5 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impact.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impact.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BulletImpactEffectRedDisabler
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.2
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml
index 039a0a39f96..0e27cb592a9 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BulletImpactEffectSyndiPlasma
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
     lifetime: 0.2
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 6846a01be7f..aaa2a592a76 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -2,7 +2,7 @@
   id: BulletAcid2
   name: acid spit
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
     - type: Projectile
       damage:
@@ -20,7 +20,7 @@
   name: EMP impulse
   parent: BaseBulletTrigger
   id: BulletEMP
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Effects/emp.rsi
@@ -42,7 +42,7 @@
   id: BaseBulletRubber
   name: base bullet rubber
   parent: BaseBullet
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
diff --git a/Resources/Prototypes/_Sunrise/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/_Sunrise/Entities/Stations/nanotrasen.yml
index 9fc274023bb..94bc7d48ddc 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Stations/nanotrasen.yml
@@ -7,6 +7,6 @@
   - BaseStationNanotrasen
   - BaseStationSiliconLawCrewsimov
   - PrisonStationAlertLevels
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: Transform
diff --git a/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml b/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml
index 01e3265206d..ec2f7592e16 100644
--- a/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml
+++ b/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml
@@ -1,5 +1,5 @@
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: [BaseTraitorObjective, BaseLivingObjective]
   id: HijackShuttleObjective
   name: Hijack emergency shuttle
diff --git a/Resources/Prototypes/_Sunrise/PlanetPrison/objective.yml b/Resources/Prototypes/_Sunrise/PlanetPrison/objective.yml
index bd76c4552d5..3e7b31aa57a 100644
--- a/Resources/Prototypes/_Sunrise/PlanetPrison/objective.yml
+++ b/Resources/Prototypes/_Sunrise/PlanetPrison/objective.yml
@@ -11,7 +11,7 @@
       - PlanetPrisonerRole
 
 - type: entity
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   parent: [BasePlanetPrisonerObjective, BaseLivingObjective]
   id: PlanetPrisonerEscapeObjective
   name: Сбежать с планетарной тюрьмы.
diff --git a/Resources/Prototypes/_Sunrise/PlanetPrison/roundstart.yml b/Resources/Prototypes/_Sunrise/PlanetPrison/roundstart.yml
index f56f7176101..10c14820188 100644
--- a/Resources/Prototypes/_Sunrise/PlanetPrison/roundstart.yml
+++ b/Resources/Prototypes/_Sunrise/PlanetPrison/roundstart.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: PlanetPrison
   parent: BaseGameRule
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
   components:
   - type: PlanetPrisonRule