Fixes many entity prototypes being abstract when they shouldn't be.

2022-04-03 14:07:19 +02:00
parent e1eea793ea
commit 8a1d5376b6
41 changed files with 130 additions and 120 deletions
--- a/Resources/Prototypes/Body/Mechanisms/tests.yml
+++ b/Resources/Prototypes/Body/Mechanisms/tests.yml
@@ -2,7 +2,7 @@
  id: MechanismEMPStriker
  name: "EMP striker"
  description: "When activated, this arm implant will apply a small EMP on the target of a physical strike for 10 watts per use."
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
  - type: Icon
@@ -14,7 +14,7 @@
  id: MechanismHonkModule
  name: "HONK module 3000"
  description: "Mandatory implant for all clowns after the Genevo Convention of 2459."
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
  - type: Icon
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -1,6 +1,7 @@
 - type: entity
  parent: ClothingBackpack
  id: ClothingBackpackFilled
+  noSpawn: true
  components:
  - type: StorageFill
    contents:
@@ -9,7 +10,7 @@
 #This should be temporary, at least until briefcases can spawn in hands.

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpack
  id: ClothingBackpackBriefcaseFilled
  components:
@@ -19,7 +20,7 @@
      - id: BriefcaseBrownFilled

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackClown
  id: ClothingBackpackClownFilled
  components:
@@ -28,7 +29,7 @@
      - id: BoxHug

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSecurity
  id: ClothingBackpackSecurityFilled
  components:
@@ -38,7 +39,7 @@
      - id: Flash

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackMedical
  id: ClothingBackpackMedicalFilled
  components:
@@ -47,7 +48,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackCaptain
  id: ClothingBackpackCaptainFilled
  components:
@@ -58,7 +59,7 @@
      #- name: TelescopicBaton

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackEngineering
  id: ClothingBackpackEngineeringFilled
  components:
@@ -67,7 +68,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackScience
  id: ClothingBackpackScienceFilled
  components:
@@ -76,7 +77,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackHydroponics
  id: ClothingBackpackHydroponicsFilled
  components:
@@ -85,7 +86,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackMime
  id: ClothingBackpackMimeFilled
  components:
@@ -94,7 +95,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackChemistry
  id: ClothingBackpackChemistryFilled
  components:
@@ -103,7 +104,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpack
  id: ClothingBackpackChaplainFilled
  components:
@@ -113,7 +114,7 @@
      - id: Bible

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpack
  id: ClothingBackpackMusicianFilled
  components:
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -1,4 +1,5 @@
 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffel
  id: ClothingBackpackDuffelFilled
  components:
@@ -7,6 +8,7 @@
      - id: BoxSurvival

 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffelClown
  id: ClothingBackpackDuffelClownFilled
  components:
@@ -15,6 +17,7 @@
      - id: BoxHug

 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffelSecurity
  id: ClothingBackpackDuffelSecurityFilled
  components:
@@ -24,6 +27,7 @@
      - id: Flash

 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffelMedical
  id: ClothingBackpackDuffelMedicalFilled
  components:
@@ -32,6 +36,7 @@
      - id: BoxSurvival

 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffelCaptain
  id: ClothingBackpackDuffelCaptainFilled
  components:
@@ -42,6 +47,7 @@
      #- name: TelescopicBaton

 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffelEngineering
  id: ClothingBackpackDuffelEngineeringFilled
  components:
@@ -50,6 +56,7 @@
      - id: BoxSurvival

 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffelScience
  id: ClothingBackpackDuffelScienceFilled
  components:
@@ -58,6 +65,7 @@
      - id: BoxSurvival

 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffelMime
  id: ClothingBackpackDuffelMimeFilled
  components:
@@ -66,6 +74,7 @@
      - id: BoxSurvival

 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffelChemistry
  id: ClothingBackpackDuffelChemistryFilled
  components:
@@ -74,6 +83,7 @@
      - id: BoxSurvival

 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffel
  id: ClothingBackpackDuffelChaplainFilled
  components:
@@ -83,6 +93,7 @@
      - id: Bible

 - type: entity
+  noSpawn: true
  parent: ClothingBackpackDuffel
  id: ClothingBackpackDuffelMusicianFilled
  components:
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -1,5 +1,5 @@
 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchel
  id: ClothingBackpackSatchelFilled
  components:
@@ -8,7 +8,7 @@
      - id: BoxSurvival

 #- type: entity
-#  abstract: true
+#  noSpawn: true
 #  parent: ClothingBackpackSatchelClown
 #  id: ClothingBackpackSatchelClownFilled
 #  components:
@@ -17,7 +17,7 @@
 #      - id: BoxHug

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchelSecurity
  id: ClothingBackpackSatchelSecurityFilled
  components:
@@ -27,7 +27,7 @@
      - id: Flash

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchelMedical
  id: ClothingBackpackSatchelMedicalFilled
  components:
@@ -36,7 +36,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchelCaptain
  id: ClothingBackpackSatchelCaptainFilled
  components:
@@ -47,7 +47,7 @@
      #- name: TelescopicBaton

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchelEngineering
  id: ClothingBackpackSatchelEngineeringFilled
  components:
@@ -56,7 +56,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchelScience
  id: ClothingBackpackSatchelScienceFilled
  components:
@@ -65,7 +65,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchelHydroponics
  id: ClothingBackpackSatchelHydroponicsFilled
  components:
@@ -74,7 +74,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchelChemistry
  id: ClothingBackpackSatchelChemistryFilled
  components:
@@ -83,7 +83,7 @@
      - id: BoxSurvival

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchel
  id: ClothingBackpackSatchelChaplainFilled
  components:
@@ -93,7 +93,7 @@
      - id: Bible

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchel
  id: ClothingBackpackSatchelMusicianFilled
  components:
@@ -104,7 +104,7 @@
        - id: SaxophoneInstrument

 - type: entity
-  abstract: true
+  noSpawn: true
  parent: ClothingBackpackSatchel
  id: ClothingBackpackSatchelDrone
  components:
--- a/Resources/Prototypes/Catalog/Fills/Books/lore.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/lore.yml
@@ -4,7 +4,7 @@
  name: demonomicon
  parent: BookBase
  id: BookDemonomicon
-  abstract: true
+  noSpawn: true
  description: 'Who knows what dark spells may be contained in these horrid pages?'
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -1,5 +1,5 @@
 - type: entity
-  abstract: true
+  noSpawn: true
  parent: Clothing
  id: ClothingHeadset
  name: headset
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
@@ -1,5 +1,5 @@
 - type: entity
-  abstract: true
+  noSpawn: true
  parent: Clothing
  id: ClothingHeadsetAlt
  name: headset
--- a/Resources/Prototypes/Entities/Debugging/clicktest.yml
+++ b/Resources/Prototypes/Entities/Debugging/clicktest.yml
@@ -5,7 +5,7 @@
 # These dots' texture detection should not interfere with the actual bounding box being tested.

 - type: entity
-  abstract: true
+  noSpawn: true
  id: ClickTestBase
  suffix: DEBUG
  components:
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -44,7 +44,7 @@
  id: BulletDebug
  name: bang, ded bullet
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  suffix: DEBUG
  components:
  - type: Tag
--- a/Resources/Prototypes/Entities/Effects/explosion_light.yml
+++ b/Resources/Prototypes/Entities/Effects/explosion_light.yml
@@ -1,9 +1,9 @@
 - type: entity
-  abstract: true
+  noSpawn: true
  id: ExplosionLight
  name: explosion light
  components:
  - type: PointLight
  - type: Tag
    tags:
-    - HideContextMenu
+    - HideContextMenu
--- 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
-  abstract: true
+  noSpawn: true
  description: Looking at this anomaly makes you feel strange, like something is pushing at your eyes.
  components:
  - type: RadiationPulse
--- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml
+++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: WeaponArc
  save: false
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    sprite: Effects/arcs.rsi
--- a/Resources/Prototypes/Entities/Markers/clientsideclone.yml
+++ b/Resources/Prototypes/Entities/Markers/clientsideclone.yml
@@ -1,7 +1,7 @@
 - type: entity
  name: clientsideclone
  id: clientsideclone
-  abstract: true
+  noSpawn: true
  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
-  abstract: true
+  noSpawn: true
  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
-  abstract: true
+  noSpawn: true
  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
-  abstract: true
+  noSpawn: true
  components:
    - type: Sprite
      layers:
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -3,7 +3,7 @@
  save: false
  id: AdminObserver
  name: admin observer
-  abstract: true
+  noSpawn: true
  components:
  - type: Input
    context: "aghost"
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -599,7 +599,7 @@
 # Maybe in some dumb universe you could put liquid back in this and seal it
 # with a lighter or something.
 - type: entity
-  abstract: true
+  noSpawn: true
  parent: BaseItem
  id: FoodCondimentPacketTrash
  name: empty condiment packet
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -95,7 +95,6 @@
  parent: FoodSnackBase
  id: FoodSnackChocolateBar
  description: Tastes like cardboard.
-  abstract: true
  components:
  - type: Sprite
    state: chocolatebar-open
@@ -133,7 +132,6 @@
  parent: FoodSnackBase
  id: FoodSnackEnergyBar
  description: An energy bar with a lot of punch.
-  abstract: true
  components:
  - type: Sprite
    state: energybar-open
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml
@@ -16,7 +16,7 @@
 - type: entity
  id: BackgammonBoardTabletop
  name: backgammon
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/backgammon_tabletop.rsi
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml
@@ -17,7 +17,7 @@
 - type: entity
  id: CheckerBoardTabletop
  name: checkerboard
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi
@@ -28,7 +28,7 @@
 - type: entity
  id: BaseCheckerPiece
  parent: BaseItem
-  abstract: true
+  noSpawn: true
  components:
  - type: TabletopDraggable
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml
@@ -17,7 +17,7 @@
 - type: entity
  id: ChessBoardTabletop
  name: chessboard
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml
@@ -18,7 +18,7 @@
 - type: entity
  id: ParchisBoardTabletop
  name: parchís
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    sprite: Objects/Fun/Tabletop/parchis_tabletop.rsi
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -53,7 +53,7 @@
  name: extinguisher spray
  id: ExtinguisherSpray
  parent: Vapor
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    sprite: Effects/extinguisherSpray.rsi
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -34,7 +34,7 @@
 - type: entity
  parent: Paper
  id: PaperWritten
-  abstract: true
+  noSpawn: true
  components:
  - type: Paper
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -68,7 +68,7 @@
 - type: entity
  id: Vapor
  name: "vapor"
-  abstract: true
+  noSpawn: true
  components:
  - type: SolutionContainerManager
    solutions:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml
@@ -1,5 +1,5 @@
 - type: entity
-  abstract: true
+  noSpawn: true
  parent: BulletBaseHV
  id: BulletAntiMaterial
  name: bullet (.60 anti-material)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/clrifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/clrifle.yml
@@ -2,7 +2,7 @@
  id: BulletClRifle
  name: bullet (.25 caseless)
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletClRifleFlash
  name: bullet (.25 caseless flash)
  parent: BulletBaseFlash
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -24,7 +24,7 @@
  id: BulletClRifleHV
  name: bullet (.25 caseless high-velocity)
  parent: BulletBaseHV
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -35,7 +35,7 @@
  id: BulletClRiflePractice
  name: bullet (.25 caseless practice)
  parent: BulletBasePractice
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -46,7 +46,7 @@
  id: BulletClRifleRubber
  name: bullet (.25 caseless rubber)
  parent: BulletBaseRubber
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/hrifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/hrifle.yml
@@ -2,7 +2,7 @@
  id: BulletHRifle
  name: bullet (.20 rifle)
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletMinigun
  name: minigun bullet (.10 rifle)
  parent: BulletHRifle
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/lrifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/lrifle.yml
@@ -2,7 +2,7 @@
  id: BulletLRifle
  name: bullet (.20 rifle)
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletLRifleFlash
  name: bullet (.20 rifle flash)
  parent: BulletBaseFlash
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -24,7 +24,7 @@
  id: BulletLRifleHV
  name: bullet (.20 rifle high-velocity)
  parent: BulletBaseHV
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -35,7 +35,7 @@
  id: BulletLRiflePractice
  name: bullet (.20 rifle practice)
  parent: BulletBasePractice
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -46,7 +46,7 @@
  id: BulletLRifleRubber
  name: bullet (.20 rifle rubber)
  parent: BulletBaseRubber
-  abstract: true
+  noSpawn: true
  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 (.40 magnum)
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletMagnumFlash
  name: bullet (.40 magnum flash)
  parent: BulletBaseFlash
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -24,7 +24,7 @@
  id: BulletMagnumHV
  name: bullet (.40 magnum high-velocity)
  parent: BulletBaseHV
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -35,7 +35,7 @@
  id: BulletMagnumPractice
  name: bullet (.40 magnum practice)
  parent: BulletBasePractice
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -46,7 +46,7 @@
  id: BulletMagnumRubber
  name: bullet (.40 magnum rubber)
  parent: BulletBaseRubber
-  abstract: true
+  noSpawn: true
  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: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletPistolFlash
  name: bullet (.35 auto flash)
  parent: BulletBaseFlash
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -24,7 +24,7 @@
  id: BulletPistolHV
  name: bullet (.35 auto high-velocity)
  parent: BulletBaseHV
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -35,7 +35,7 @@
  id: BulletPistolPractice
  name: bullet (.35 auto practice)
  parent: BulletBasePractice
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -46,7 +46,7 @@
  id: BulletPistolRubber
  name: bullet (.35 auto rubber)
  parent: BulletBaseRubber
-  abstract: true
+  noSpawn: true
  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)
-  abstract: true
+  noSpawn: true
  parent: BulletBase
  components:
  - type: Sprite
@@ -15,7 +15,7 @@
 - type: entity
  id: PelletShotgunBeanbag
  name: beanbag (.50)
-  abstract: true
+  noSpawn: true
  parent: BulletBase
  components:
  - type: Sprite
@@ -32,7 +32,7 @@
 - type: entity
  id: PelletShotgun
  name: pellet (.50)
-  abstract: true
+  noSpawn: true
  parent: BulletBase
  components:
  - type: Sprite
@@ -46,7 +46,7 @@
 - type: entity
  id: PelletShotgunFlash
  name: pellet (.50 flash)
-  abstract: true
+  noSpawn: true
  parent: BulletBaseFlash
  components:
  - type: Sprite
@@ -60,7 +60,7 @@
 - type: entity
  id: PelletShotgunIncendiary
  name: pellet (.50 incendiary)
-  abstract: true
+  noSpawn: true
  parent: BulletBase
  components:
  - type: Sprite
@@ -81,7 +81,7 @@
 - type: entity
  id: PelletShotgunPractice
  name: pellet (.50 practice)
-  abstract: true
+  noSpawn: true
  parent: BulletBasePractice
  components:
  - type: Sprite
@@ -95,7 +95,7 @@
 - type: entity
  id: PelletShotgunTranquilizer
  name: pellet (.50 tranquilizer)
-  abstract: true
+  noSpawn: true
  parent: BulletBasePractice
  components:
  - type: Sprite
@@ -121,7 +121,7 @@
 - type: entity
  id: PelletShotgunFlare
  name: pellet (.50 flare)
-  abstract: true
+  noSpawn: true
  parent: BulletBase
  components:
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/srifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/srifle.yml
@@ -2,7 +2,7 @@
  id: BulletSRifle
  name: bullet (0.20 rifle)
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -13,7 +13,7 @@
  id: BulletSRifleFlash
  name: bullet (0.20 rifle flash)
  parent: BulletBaseFlash
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -24,7 +24,7 @@
  id: BulletSRifleHV
  name: bullet (0.20 rifle high-velocity)
  parent: BulletBaseHV
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -35,7 +35,7 @@
  id: BulletSRiflePractice
  name: bullet (0.20 rifle practice)
  parent: BulletBasePractice
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -46,7 +46,7 @@
  id: BulletSRifleRubber
  name: bullet (0.20 rifle rubber)
  parent: BulletBaseRubber
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -1,7 +1,7 @@
 - type: entity
  name: red laser
  id: RedLaser
-  abstract: true
+  noSpawn: true
  components:
  - type: Hitscan
    damage:
@@ -14,7 +14,7 @@
 - type: entity
  name: pulse
  id: Pulse
-  abstract: true
+  noSpawn: true
  components:
  - type: Hitscan
    damage:
@@ -27,7 +27,7 @@
 - type: entity
  name: red heavy laser
  id: RedHeavyLaser
-  abstract: true
+  noSpawn: true
  components:
  - type: Hitscan
    spriteName: Objects/Weapons/Guns/Projectiles/heavy_laser.png
@@ -40,7 +40,7 @@
 - type: entity
  name: x-ray laser
  id: XrayLaser
-  abstract: true
+  noSpawn: true
  components:
  - type: Hitscan
    spriteName: Objects/Weapons/Guns/Projectiles/xray.png
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -35,7 +35,7 @@
 - type: entity
  id: TriggerBulletBase # Trigger-on-collide bullets
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: TriggerOnCollide
  - type: Projectile
@@ -57,7 +57,7 @@
  id: BulletBaseFlash
  name: base bullet flash
  parent: TriggerBulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    soundHit:
@@ -72,7 +72,7 @@
  id: BulletBaseHV
  name: base bullet high-velocity
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -83,7 +83,7 @@
  id: BulletBasePractice
  name: base bullet practice
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -94,7 +94,7 @@
  id: BulletBaseRubber
  name: base bullet rubber
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Projectile
    damage:
@@ -111,7 +111,7 @@
  name : taser bolt
  id: BulletTaser
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    noRot: true
@@ -149,7 +149,7 @@
  name: emitter bolt
  id: EmitterBolt
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    color: "#ffff33"
@@ -179,7 +179,7 @@
  id: BulletRocket
  name: rocket
  parent: TriggerBulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    netsync: false
@@ -200,7 +200,7 @@
  id: WeakBulletRocket
  name: weak rocket
  parent: TriggerBulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    netsync: false
@@ -223,7 +223,7 @@
  id: BulletGrenadeBaton
  name: baton grenade
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    netsync: false
@@ -244,7 +244,7 @@
  id: BulletGrenadeBlast
  name: blast grenade
  parent: TriggerBulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    netsync: false
@@ -260,7 +260,7 @@
  id: BulletGrenadeFlash
  name: flash grenade
  parent: BulletBaseFlash
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    netsync: false
@@ -274,7 +274,7 @@
  id: BulletGrenadeFrag
  name: frag grenade
  parent: TriggerBulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    netsync: false
@@ -289,7 +289,7 @@
  id: BulletFoam
  name: foam dart
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    netsync: false
@@ -307,7 +307,7 @@
  id: BulletCap
  name: cap bullet
  parent: BulletBase
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    netsync: false
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: SolarPanelBasePhysSprite
-  abstract: true
+  noSpawn: true
  name: solar panel
  placement:
    mode: SnapgridCenter
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -391,7 +391,7 @@
  parent: GasCanisterBrokenBase
  id: StorageCanisterBroken
  name: broken storage canister
-  abstract: true
+  noSpawn: true
  components:
    - type: Sprite
      state: yellow-1
@@ -400,7 +400,7 @@
  parent: GasCanisterBrokenBase
  id: AirCanisterBroken
  name: broken air canister
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    state: grey-1
@@ -409,7 +409,7 @@
  parent: GasCanisterBrokenBase
  id: OxygenCanisterBroken
  name: broken oxygen canister
-  abstract: true
+  noSpawn: true
  components:
  - type: Sprite
    state: blue-1
@@ -418,7 +418,7 @@
  parent: GasCanisterBrokenBase
  id: NitrogenCanisterBroken
  name: broken nitrogen canister
-  abstract: true
+  noSpawn: true
  components:
    - type: Sprite
      state: red-1
@@ -427,7 +427,7 @@
  parent: GasCanisterBrokenBase
  id: CarbonDioxideCanisterBroken
  name: broken carbon dioxide canister
-  abstract: true
+  noSpawn: true
  components:
    - type: Sprite
      state: black-1
@@ -436,7 +436,7 @@
  parent: GasCanisterBrokenBase
  id: PlasmaCanisterBroken
  name: broken plasma canister
-  abstract: true
+  noSpawn: true
  components:
    - type: Sprite
      state: orange-1
@@ -445,7 +445,7 @@
  parent: GasCanisterBrokenBase
  id: TritiumCanisterBroken
  name: broken tritium canister
-  abstract: true
+  noSpawn: true
  components:
    - type: Sprite
      state: green-1
@@ -454,7 +454,7 @@
  parent: GasCanisterBrokenBase
  id: WaterVaporCanisterBroken
  name: broken water vapor canister
-  abstract: true
+  noSpawn: true
  components:
    - type: Sprite
      state: water_vapor-1
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -31,7 +31,7 @@
 - type: entity
  id: LargeBarSign
  name: large bar sign
-  abstract: true
+  noSpawn: true
  components:
  - type: Clickable
  - type: InteractionOutline
--- a/Resources/Prototypes/Entities/Virtual/electrocution.yml
+++ b/Resources/Prototypes/Entities/Virtual/electrocution.yml
@@ -2,7 +2,7 @@
 - type: entity
  id: VirtualElectrocutionLoadHVPower
  name: ELECTROCUTION ENTITY YOU SHOULD NOT SEE THIS
-  abstract: true
+  noSpawn: true
  components:
  - type: NodeContainer
    nodes:
@@ -17,7 +17,7 @@
 - type: entity
  id: VirtualElectrocutionLoadMVPower
  name: ELECTROCUTION ENTITY YOU SHOULD NOT SEE THIS
-  abstract: true
+  noSpawn: true
  components:
  - type: NodeContainer
    nodes:
@@ -32,7 +32,7 @@
 - type: entity
  id: VirtualElectrocutionLoadApc
  name: ELECTROCUTION ENTITY YOU SHOULD NOT SEE THIS
-  abstract: true
+  noSpawn: true
  components:
  - type: NodeContainer
    nodes:
--- a/Resources/Prototypes/Entities/Virtual/virtual_item.yml
+++ b/Resources/Prototypes/Entities/Virtual/virtual_item.yml
@@ -2,7 +2,7 @@
 - type: entity
  id: HandVirtualItem
  name: VIRTUAL ITEM YOU SHOULD NOT SEE THIS
-  abstract: true
+  noSpawn: true
  components:
  - type: Item
  - type: HandVirtualItem