Merge remote-tracking branch 'upstream/master' into ed-04-06-2024-upstream

# Conflicts:
#	Resources/Prototypes/Accents/word_replacements.yml

Resources/Prototypes/Accents/word_replacements.yml

@@ -425,6 +425,9 @@
     chatsan-word-42: chatsan-replacement-42
     chatsan-word-43: chatsan-replacement-43
     chatsan-word-44: chatsan-replacement-44
+    chatsan-word-45: chatsan-replacement-45
+    chatsan-word-46: chatsan-replacement-46
+    chatsan-word-47: chatsan-replacement-47
     #CP14-RU-ChatSanitize-Start
     cp14-chatsan-word-1: cp14-chatsan-replacement-1
     cp14-chatsan-word-2: cp14-chatsan-replacement-2

Resources/Prototypes/Actions/borgs.yml

@@ -2,7 +2,6 @@
   id: ActionViewLaws
   name: View Laws
   description: View the laws that you must follow.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem

Resources/Prototypes/Actions/crit.yml

@@ -3,7 +3,6 @@
   id: ActionCritSuccumb
   name: Succumb
   description: Accept your fate.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
@@ -18,7 +17,6 @@
   id: ActionCritFakeDeath
   name: Fake Death
   description: Pretend to take your final breath while staying alive.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
@@ -34,7 +32,6 @@
   id: ActionCritLastWords
   name: Say Last Words
   description: Whisper your last words to anyone nearby, and then succumb to your fate. You only have 30 characters to work with.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem

Resources/Prototypes/Actions/diona.yml

@@ -2,7 +2,6 @@
   id: DionaGibAction
   name: Gib Yourself!
   description: Split apart into 3 nymphs.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
@@ -16,7 +15,6 @@
   id: DionaReformAction
   name: Reform
   description: Reform back into a whole Diona.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:

Resources/Prototypes/Actions/internals.yml

@@ -2,7 +2,6 @@
   id: ActionToggleInternals
   name: Toggle Internals
   description: Breathe from the equipped gas tank. Also requires equipped breath mask.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:

Resources/Prototypes/Actions/mech.yml

@@ -2,7 +2,6 @@
   id: ActionMechCycleEquipment
   name: Cycle
   description: Cycles currently selected equipment
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
@@ -16,7 +15,6 @@
   id: ActionMechOpenUI
   name: Control Panel
   description: Opens the control panel for the mech
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
@@ -30,7 +28,6 @@
   id: ActionMechEject
   name: Eject
   description: Ejects the pilot from the mech
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem

Resources/Prototypes/Actions/ninja.yml

@@ -3,7 +3,6 @@
   id: ActionToggleNinjaGloves
   name: Toggle ninja gloves
   description: Toggles all glove actions on left click. Includes your doorjack, draining power, stunning enemies, downloading research and calling in a threat.
-  noSpawn: true
   components:
   - type: InstantAction
     priority: -13
@@ -14,7 +13,6 @@
   id: ActionCreateThrowingStar
   name: Create throwing star
   description: Channels suit power into creating a throwing star that deals extra stamina damage.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 0.5
@@ -29,7 +27,6 @@
   id: ActionRecallKatana
   name: Recall katana
   description: Teleports the Energy Katana linked to this suit to its wearer, cost based on distance.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 1
@@ -44,7 +41,6 @@
   id: ActionNinjaEmp
   name: EM Burst
   description: Disable any nearby technology with an electro-magnetic pulse.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
@@ -58,7 +54,6 @@
   id: ActionTogglePhaseCloak
   name: Phase cloak
   description: Toggles your suit's phase cloak. Beware that if you are hit, all abilities are disabled for 5 seconds, including your cloak!
-  noSpawn: true
   components:
   - type: InstantAction
     # have to plan (un)cloaking ahead of time
@@ -71,7 +66,6 @@
   id: ActionEnergyKatanaDash
   name: Katana dash
   description: Teleport to anywhere you can see, if your Energy Katana is in your hand.
-  noSpawn: true
   components:
   - type: WorldTargetAction
     icon:

Resources/Prototypes/Actions/polymorph.yml

@@ -2,14 +2,12 @@
   id: ActionRevertPolymorph
   name: Revert
   description: Revert back into your original form.
-  noSpawn: true
   components:
   - type: InstantAction
     event: !type:RevertPolymorphActionEvent
 
 - type: entity
   id: ActionPolymorph
-  noSpawn: true
   components:
   - type: InstantAction
     event: !type:PolymorphActionEvent
@@ -19,7 +17,6 @@
   id: ActionPolymorphWizardSpider
   name: Spider Polymorph
   description: Polymorphs you into a Spider.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 60
@@ -34,7 +31,6 @@
   id: ActionPolymorphWizardRod
   name: Rod Form
   description: CLANG!
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 60

Resources/Prototypes/Actions/revenant.yml

@@ -2,7 +2,6 @@
   id: ActionRevenantShop
   name: Shop
   description: Opens the ability shop.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/shop.png
@@ -12,7 +11,6 @@
   id: ActionRevenantDefile
   name: Defile
   description: Costs 30 Essence.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/defile.png
@@ -23,7 +21,6 @@
   id: ActionRevenantOverloadLights
   name: Overload Lights
   description: Costs 40 Essence.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/overloadlight.png
@@ -34,7 +31,6 @@
 #  id: ActionRevenantBlight
 #  name: Blight
 #  description: Costs 50 Essence.
-#  noSpawn: true
 #  components:
 #  - type: InstantAction
 #    icon: Interface/Actions/blight.png
@@ -45,7 +41,6 @@
   id: ActionRevenantMalfunction
   name: Malfunction
   description: Costs 60 Essence.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/malfunction.png

Resources/Prototypes/Actions/speech.yml

@@ -2,7 +2,6 @@
   id: ActionConfigureMeleeSpeech
   name: Set Battlecry
   description: Set a custom battlecry for when you attack!
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigItem

Resources/Prototypes/Actions/spider.yml

@@ -2,7 +2,6 @@
   id: ActionSpiderWeb
   name: Spider Web
   description: Spawns a web that slows your prey down.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/web.png
@@ -13,7 +12,6 @@
   id: ActionSericulture
   name: Weave silk
   description: Weave a bit of silk for use in arts and crafts.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/web.png

Resources/Prototypes/Actions/types.yml

@@ -13,7 +13,6 @@
   id: ActionScream
   name: Scream
   description: AAAAAAAAAAAAAAAAAAAAAAAAA
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 10
@@ -25,7 +24,6 @@
   id: ActionTurnUndead
   name: Turn Undead
   description: Succumb to your infection and become a zombie.
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -37,7 +35,6 @@
   id: ActionToggleLight
   name: Toggle Light
   description: Turn the light on and off.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
@@ -48,7 +45,6 @@
   id: ActionOpenStorageImplant
   name: Open Storage Implant
   description: Opens the storage implant embedded under your skin
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigAction
@@ -63,7 +59,6 @@
   id: ActionActivateMicroBomb
   name: Activate Microbomb
   description: Activates your internal microbomb, completely destroying you and your equipment
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -80,7 +75,6 @@
   id: ActionActivateDeathAcidifier
   name: Activate Death-Acidifier
   description: Activates your death-acidifier, completely melting you and your equipment
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -96,7 +90,6 @@
   id: ActionActivateFreedomImplant
   name: Break Free
   description: Activating your freedom implant will free you from any hand restraints
-  noSpawn: true
   components:
   - type: InstantAction
     charges: 3
@@ -112,7 +105,6 @@
   id: ActionOpenUplinkImplant
   name: Open Uplink
   description: Opens the syndicate uplink embedded under your skin
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigAction
@@ -126,7 +118,6 @@
   id: ActionActivateEmpImplant
   name: Activate EMP
   description: Triggers a small EMP pulse around you
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -143,7 +134,6 @@
   id: ActionActivateScramImplant
   name: SCRAM!
   description: Randomly teleports you within a large distance.
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -160,7 +150,6 @@
   id: ActionActivateDnaScramblerImplant
   name: Scramble DNA
   description:  Randomly changes your name and appearance.
-  noSpawn: true
   components:
   - type: InstantAction
     charges: 1
@@ -175,7 +164,6 @@
   id: ActionMorphGeras
   name: Morph into Geras
   description:  Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigAction
@@ -190,7 +178,6 @@
   id: ActionToggleSuitPiece
   name: Toggle Suit Piece
   description: Remember to equip the important pieces of your suit before going into action.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigItem
@@ -201,7 +188,6 @@
   id: ActionCombatModeToggle
   name: "[color=red]Combat Mode[/color]"
   description: Enter combat mode
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -216,7 +202,6 @@
   parent: ActionCombatModeToggle
   name: "[color=red]Combat Mode[/color]"
   description: Enter combat mode
-  noSpawn: true
   components:
   - type: InstantAction
     enabled: false
@@ -227,7 +212,6 @@
   id: ActionChangeVoiceMask
   name: Set name
   description: Change the name others hear to something else.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Interface/Actions/voice-mask.rsi, state: icon }
@@ -237,7 +221,6 @@
   id: ActionVendingThrow
   name: Dispense Item
   description: Randomly dispense an item from your stock.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 30
@@ -247,7 +230,6 @@
   id: ActionArtifactActivate
   name: Activate Artifact
   description: Immediately activates your current artifact node.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
@@ -260,7 +242,6 @@
   id: ActionToggleBlock
   name: Block
   description: Raise or lower your shield.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Objects/Weapons/Melee/shields.rsi, state: teleriot-icon }
@@ -271,7 +252,6 @@
   id: ActionClearNetworkLinkOverlays
   name: Clear network link overlays
   description: Clear network link overlays.
-  noSpawn: true
   components:
   - type: InstantAction
     clientExclusive: true
@@ -285,7 +265,6 @@
   id: ActionAnimalLayEgg
   name: Lay egg
   description: Uses hunger to lay an egg.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Objects/Consumable/Food/egg.rsi, state: icon }
@@ -296,7 +275,6 @@
   id: ActionSleep
   name: Sleep
   description: Go to sleep.
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -308,7 +286,6 @@
   id: ActionWake
   name: Wake up
   description: Stop sleeping.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
@@ -320,7 +297,6 @@
   id: ActionActivateHonkImplant
   name: Honk
   description: Activates your honking implant, which will produce the signature sound of the clown.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon }
@@ -331,7 +307,6 @@
   id: ActionFireStarter
   name: Ignite
   description: Ignites enemies in a radius around you.
-  noSpawn: true
   components:
   - type: InstantAction
     priority: -1
@@ -343,7 +318,6 @@
   id: ActionToggleEyes
   name: Open/Close eyes
   description: Close your eyes to protect your peepers, or open your eyes to enjoy the pretty lights.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/eyeopen.png
@@ -357,7 +331,6 @@
   id: ActionToggleWagging
   name: action-name-toggle-wagging
   description: action-description-toggle-wagging
-  noSpawn: true
   components:
     - type: InstantAction
       icon: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }

Resources/Prototypes/Catalog/Bounties/bounties.yml

@@ -42,6 +42,9 @@
     whitelist:
       tags:
       - Bread
+    blacklist:
+      tags:
+      - Slice
 
 - type: cargoBounty
   id: BountyCarrot
@@ -533,6 +536,9 @@
     whitelist:
       tags:
       - Meat
+    blacklist:
+      components:
+      - SliceableFood
 
 - type: cargoBounty
   id: BountyFruit

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml

@@ -1,422 +0,0 @@
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackFilled
-  noSpawn: true
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackClown
-  id: ClothingBackpackClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-      - id: CrayonRainbow
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCaptain
-  id: ClothingBackpackCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackEngineering
-  id: ClothingBackpackChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackScience
-  id: ClothingBackpackResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackIan
-  id: ClothingBackpackHOPIanFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCargo
-  id: ClothingBackpackQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackEngineering
-  id: ClothingBackpackEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackAtmospherics
-  id: ClothingBackpackAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackScience
-  id: ClothingBackpackScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackHydroponics
-  id: ClothingBackpackHydroponicsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMime
-  id: ClothingBackpackMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackChemistry
-  id: ClothingBackpackChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-  
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: Lighter
-      - id: CigPackBlack
-      - id: HandLabeler
-      - id: BoxForensicPad
-
-# ERT
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTLeader
-  id: ClothingBackpackERTLeaderFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponDisabler
-        - id: MedicatedSuture
-        - id: RegenerativeMesh
-        - id: BoxZiptie
-        - id: CrowbarRed
-        - id: MagazineMagnum
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackERTSecurityFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponDisabler
-        - id: MedicatedSuture
-        - id: RegenerativeMesh
-        - id: BoxZiptie
-        - id: CrowbarRed
-        - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTMedical
-  id: ClothingBackpackERTMedicalFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalMedical
-        - id: Hypospray
-        - id: MedkitAdvancedFilled
-        - id: CrowbarRed
-        - id: OmnizineChemistryBottle
-        - id: EpinephrineChemistryBottle
-        - id: EpinephrineChemistryBottle
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTEngineer
-  id: ClothingBackpackERTEngineerFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: trayScanner
-        - id: RCD
-        - id: RCDAmmo
-          amount: 2
-        - id: CableMVStack
-        - id: CableHVStack
-        - id: CableApcStack
-        - id: SheetPlasteel
-        - id: SheetSteel
-        - id: SheetGlass
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTJanitor
-  id: ClothingBackpackERTJanitorFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: LightReplacer
-        - id: BoxLightMixed
-        - id: BoxLightMixed
-        - id: Soap
-        - id: CrowbarRed
-        - id: AdvMopItem
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTChaplain
-  id: ClothingBackpackERTChaplainFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: BoxCandle
-        - id: BoxBodyBag
-        - id: DrinkWaterMelonJuiceJug
-        - id: Lantern
-        - id: Lantern
-        - id: Bible
-        - id: CrowbarRed
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: Lighter
-
-# Death Squad
-
-- type: entity
-  noSpawn: false
-  parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackDeathSquadFilled
-  name: death squad backpack
-  description: Holds the kit of CentComm's most feared agents.
-  components:
-    - type: Storage
-      grid:
-      - 0,0,7,6
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponPulseRifle
-        - id: WeaponPulsePistol
-        - id: WeaponRevolverMateba
-        - id: SpeedLoaderMagnumAP
-        - id: SpeedLoaderMagnumAP
-        - id: BoxFlashbang
-        - id: ToolDebug # spanish army knife
-        - id: WelderExperimental
-        - id: Hypospray
-        - id: DeathAcidifierImplanter # crew will try to steal their amazing hardsuits
-        - id: FreedomImplanter
-
-# Cargo
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCargo
-  id: ClothingBackpackCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSalvage
-  id: ClothingBackpackSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-# Pirate
-
-- type: entity
-  parent: ClothingBackpackSatchelLeather
-  id: ClothingBackpackPirateFilled
-  suffix: Filled, Pirate
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: Cutlass
-        - id: WeaponRevolverPirate
-        - id: ClothingEyesEyepatch

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml

@@ -1,275 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelClown
-  id: ClothingBackpackDuffelClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelBrigmedic
-  id: ClothingBackpackDuffelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Flash
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCaptain
-  id: ClothingBackpackDuffelCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelEngineering
-  id: ClothingBackpackDuffelChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelScience
-  id: ClothingBackpackDuffelResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCargo
-  id: ClothingBackpackDuffelQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelEngineering
-  id: ClothingBackpackDuffelEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelAtmospherics
-  id: ClothingBackpackDuffelAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelScience
-  id: ClothingBackpackDuffelScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelHydroponics
-  id: ClothingBackpackDuffelHydroponicsFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMime
-  id: ClothingBackpackDuffelMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelChemistry
-  id: ClothingBackpackDuffelChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-  
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: Lighter
-      - id: CigPackBlack
-      - id: BoxForensicPad
-      - id: HandLabeler
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCargo
-  id: ClothingBackpackDuffelCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSalvage
-  id: ClothingBackpackDuffelSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml

@@ -1,300 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelTools
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Crowbar
-      - id: Wrench
-      - id: Screwdriver
-      - id: Wirecutter
-      - id: Welder
-      - id: Multitool
-
-- type: entity
-  parent: ClothingBackpackSatchelClown
-  id: ClothingBackpackSatchelClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelBrigmedic
-  id: ClothingBackpackSatchelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Flash
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCaptain
-  id: ClothingBackpackSatchelCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelEngineering
-  id: ClothingBackpackSatchelChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelScience
-  id: ClothingBackpackSatchelResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCargo
-  id: ClothingBackpackSatchelQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelEngineering
-  id: ClothingBackpackSatchelEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelAtmospherics
-  id: ClothingBackpackSatchelAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelScience
-  id: ClothingBackpackSatchelScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelHydroponics
-  id: ClothingBackpackSatchelHydroponicsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelChemistry
-  id: ClothingBackpackSatchelChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: BoxForensicPad
-      - id: Lighter
-      - id: CigPackBlack
-      - id: HandLabeler
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCargo
-  id: ClothingBackpackSatchelCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSalvage
-  id: ClothingBackpackSatchelSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMime
-  id: ClothingBackpackSatchelMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelHolding
-  id: ClothingBackpackSatchelHoldingAdmin
-  components:
-  - type: StorageFill
-    contents:
-    - id: GasAnalyzer
-    - id: trayScanner
-    - id: AccessConfiguratorUniversal
-  - type: Unremoveable

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -13,23 +13,6 @@
       - id: Retractor
       - id: Scalpel
 
-- type: entity
-  id: ClothingBackpackDuffelCBURNFilled
-  parent: ClothingBackpackDuffelCBURN
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-    - id: BoxSurvivalEngineering
-    - id: WeaponShotgunDoubleBarreled
-    - id: BoxShotgunIncendiary
-      amount: 2
-    - id: GrenadeFlashBang
-      amount: 2
-    - id: PillAmbuzolPlus
-    - id: PillAmbuzol
-      amount: 4
-
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle
   id: ClothingBackpackDuffelSyndicateFilledMedical
@@ -320,38 +303,6 @@
       - id: PillAmbuzol
         amount: 3
 
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateBundle
-  id: ClothingBackpackDuffelSyndicateOperative
-  name: operative duffelbag
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSyndicate
-      - id: WeaponPistolViper
-      - id: PinpointerSyndicateNuclear
-      - id: DeathAcidifierImplanter
-
-
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateMedicalBundle
-  id: ClothingBackpackDuffelSyndicateOperativeMedic
-  name: operative medic duffelbag
-  description: A large duffel bag for holding extra medical supplies.
-  components:
-  - type: StorageFill
-    contents:
-      - id: SyndiHypo
-      - id: BoxSurvivalSyndicate
-      - id: SawAdvanced
-      - id: Cautery
-      - id: CombatKnife
-      - id: WeaponPistolViper
-      - id: PinpointerSyndicateNuclear
-      - id: HandheldHealthAnalyzer
-      - id: CombatMedipen
-      - id: DeathAcidifierImplanter
-
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle
   id: ClothingBackpackDuffelSyndicateMedicalBundleFilled

Resources/Prototypes/Catalog/VendingMachines/advertisements.yml

@@ -255,3 +255,9 @@
   values:
     prefix: advertisement-virodrobe-
     count: 3
+
+- type: localizedDataset
+  id: MedibotAds
+  values:
+    prefix: advertisement-medibot-
+    count: 9

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -999,7 +999,7 @@
   name: uplink-mobcat-microbomb-name
   description: uplink-mobcat-microbomb-desc
   icon: { sprite: /Textures/Mobs/Pets/cat.rsi, state: syndicat }
-  productEntity: MobCatSyndy
+  productEntity: ReinforcementRadioSyndicateSyndiCat
   cost:
     Telecrystal: 6
   categories:

Resources/Prototypes/Entities/Clothing/Back/backpacks.yml

@@ -257,6 +257,16 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertchaplain.rsi
 
+- type: entity
+  parent: ClothingBackpackERTSecurity
+  id: ClothingBackpackDeathSquad
+  name: death squad backpack
+  description: Holds the kit of CentComm's most feared agents.
+  components:
+    - type: Storage
+      grid:
+      - 0,0,7,6
+
 #Syndicate
 - type: entity
   parent: ClothingBackpack

Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml

@@ -21,7 +21,6 @@
   id: ActionToggleMask
   name: Toggle Mask
   description: Handy, but prevents insertion of pie into your pie hole.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Mask/gas.rsi, state: icon }
@@ -49,4 +48,4 @@
           Quantity: 10
   - type: Tag
     tags:
-      - ClothMade
+      - ClothMade

Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml

@@ -8,7 +8,7 @@
     sprite: Clothing/Neck/Cloaks/centcomcloakformal.rsi
   - type: StealTarget
     stealGroup: HeadCloak # leaving this here because I suppose it might be interesting?
-    
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakCap
@@ -118,7 +118,7 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakAdmin
-  name: admin cloak
+  name: weh cloak
   description: Weh!
   components:
   - type: Sprite

Resources/Prototypes/Entities/Clothing/Neck/misc.yml

@@ -70,7 +70,6 @@
 - type: entity
   id: ActionStethoscope
   name: Listen with stethoscope
-  noSpawn: true
   components:
   - type: EntityTargetAction
     icon:

Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml

@@ -132,7 +132,6 @@
   id: ActionBaseToggleMagboots
   name: Toggle Magboots
   description: Toggles the magboots on and off.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
@@ -141,7 +140,6 @@
 - type: entity
   id: ActionToggleMagboots
   parent: ActionBaseToggleMagboots
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Shoes/Boots/magboots.rsi, state: icon }
@@ -150,7 +148,6 @@
 - type: entity
   id: ActionToggleMagbootsAdvanced
   parent: ActionBaseToggleMagboots
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Shoes/Boots/magboots-advanced.rsi, state: icon }
@@ -159,7 +156,6 @@
 - type: entity
   id: ActionToggleMagbootsSci
   parent: ActionBaseToggleMagboots
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Shoes/Boots/magboots-science.rsi, state: icon }
@@ -168,7 +164,6 @@
 - type: entity
   id: ActionToggleMagbootsSyndie
   parent: ActionBaseToggleMagboots
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi, state: icon }

Resources/Prototypes/Entities/Clothing/Shoes/misc.yml

@@ -128,7 +128,6 @@
   id: ActionToggleSpeedBoots
   name: Toggle Speed Boots
   description: Toggles the speed boots on and off.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -2255,7 +2255,7 @@
     - DoorBumpOpener
     - FootstepSound
   - type: Tool # Open door from xeno.yml.
-    speed: 1.5
+    speedModifier: 1.5
     qualities:
       - Prying
     useSound:

Resources/Prototypes/Entities/Mobs/NPCs/human.yml

@@ -7,7 +7,7 @@
   - type: InputMover
   - type: MobMover
   - type: Loadout
-    prototypes: [PassengerGear]
+    prototypes: [LimitedPassengerGear]
   - type: NpcFactionMember
     factions:
     - NanoTrasen

Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml

@@ -301,7 +301,6 @@
   id: ActionRatKingRaiseArmy
   name: Raise Army
   description: Spend some hunger to summon an allied rat to help defend you.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 4
@@ -314,7 +313,6 @@
   id: ActionRatKingDomain
   name: Rat King's Domain
   description: Spend some hunger to release a cloud of ammonia into the air.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 6
@@ -327,7 +325,6 @@
   id: ActionRatKingOrderStay
   name: Stay
   description: Command your army to stand in place.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 1
@@ -346,7 +343,6 @@
   id: ActionRatKingOrderFollow
   name: Follow
   description: Command your army to follow you around.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 1
@@ -365,7 +361,6 @@
   id: ActionRatKingOrderCheeseEm
   name: Cheese 'Em
   description: Command your army to attack whoever you point at.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 1
@@ -384,7 +379,6 @@
   id: ActionRatKingOrderLoose
   name: Loose
   description: Command your army to act at their own will.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 1

Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

@@ -287,6 +287,8 @@
     interactFailureString: petting-failure-medibot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: Advertise
+    pack: MedibotAds
 
 - type: entity
   parent: MobSiliconBase

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -22,7 +22,7 @@
       NavSmash: !type:Bool
         true
   - type: Tool
-    speed: 1.5
+    speedModifier: 1.5
     qualities:
       - Prying
   - type: Prying

Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

@@ -84,8 +84,7 @@
   - type: Stripping
   - type: SolutionScanner
   - type: IgnoreUIRange
-  - type: ShowRevIcons
-  - type: ShowZombieIcons
+  - type: ShowAntagIcons
   - type: Inventory
     templateId: aghost
   - type: InventorySlots
@@ -97,7 +96,6 @@
   id: ActionAGhostShowSolar
   name: Solar Control Interface
   description: View a solar control interface.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -110,7 +108,6 @@
   id: ActionAGhostShowCommunications
   name: Communications Interface
   description: View a communications interface.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -123,7 +120,6 @@
   id: ActionAGhostShowRadar
   name: Mass Scanner Interface
   description: View a mass scanner interface.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -136,7 +132,6 @@
   id: ActionAGhostShowCargo
   name: Cargo Ordering Interface
   description: View a cargo ordering interface.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -149,7 +144,6 @@
   id: ActionAGhostShowCrewMonitoring
   name: Crew Monitoring Interface
   description: View a crew monitoring interface.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -162,7 +156,6 @@
   id: ActionAGhostShowStationRecords
   name: Station Records Interface
   description: View a station records Interface
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }

Resources/Prototypes/Entities/Mobs/Player/dragon.yml

@@ -203,7 +203,6 @@
   id: ActionSpawnRift
   name: Summon Carp Rift
   description: Summons a carp rift that will periodically spawns carps.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
@@ -217,7 +216,6 @@
   id: ActionDevour
   name: "[color=red]Devour[/color]"
   description: Attempt to break a structure with your jaws or swallow a creature.
-  noSpawn: true
   components:
   - type: EntityTargetAction
     icon: { sprite : Interface/Actions/devour.rsi, state: icon }
@@ -226,7 +224,6 @@
     priority: 1
 
 - type: entity
-  noSpawn: true
   id: ActionDragonsBreath
   name: "[color=orange]Dragon's Breath[/color]"
   description: Spew out flames at anyone foolish enough to attack you!

Resources/Prototypes/Entities/Mobs/Player/guardian.yml

@@ -259,7 +259,6 @@
   id: ActionToggleGuardian
   name: Toggle Guardian
   description: Either manifests the guardian or recalls it back into your body
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/manifest.png

Resources/Prototypes/Entities/Mobs/Player/observer.yml

@@ -53,7 +53,6 @@
   id: ActionGhostBoo
   name: Boo!
   description: Scare your crew members because of boredom!
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/scream.png
@@ -65,7 +64,6 @@
   id: ActionToggleLighting
   name: Toggle All Lighting
   description: Toggle all light rendering to better observe dark areas.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/VerbIcons/light.svg.192dpi.png
@@ -77,7 +75,6 @@
   id: ActionToggleFov
   name: Toggle FoV
   description: Toggles field-of-view in order to see what players see.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/VerbIcons/vv.svg.192dpi.png
@@ -89,7 +86,6 @@
   id: ActionToggleGhosts
   name: Toggle Ghosts
   description: Toggle the visibility of other ghosts.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Mobs/Ghosts/ghost_human.rsi, state: icon }
@@ -101,7 +97,6 @@
   id: ActionToggleGhostHearing
   name: Toggle Ghost Hearing
   description: Toggle between hearing all messages and hearing only radio & nearby messages.
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false

Resources/Prototypes/Entities/Mobs/base.yml

@@ -1,4 +1,4 @@
-# The progenitor. This should only container the most basic components possible.
+# The progenitor. This should only container the most basic components possible.
 # Only put things on here if every mob *must* have it. This includes ghosts.
 - type: entity
   save: false
@@ -43,6 +43,8 @@
   - type: MovementSpeedModifier
   - type: Polymorphable
   - type: StatusIcon
+  - type: RequireProjectileTarget
+    active: False
 
 # Used for mobs that have health and can take damage.
 - type: entity

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml

@@ -80,7 +80,7 @@
   - type: Tool
     qualities:
     - Rolling
-    speed: 0.75 # not as good as a rolling pin but does the job
+    speedModifier: 0.75 # not as good as a rolling pin but does the job
   - type: PhysicalComposition
     materialComposition:
       Glass: 100

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml

@@ -56,7 +56,7 @@
   - type: Tool
     qualities:
     - Rolling
-    speed: 0.25 # its small so takes longer to roll the entire dough flat
+    speedModifier: 0.25 # its small so takes longer to roll the entire dough flat
   - type: SpaceGarbage
   - type: TrashOnSolutionEmpty
     solution: drink

Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml

@@ -54,6 +54,23 @@
     prototype: MobMonkeySyndicateAgentNukeops
     selectablePrototypes: ["SyndicateMonkeyNukeops", "SyndicateKoboldNukeops"]
 
+- type: entity
+  parent: ReinforcementRadioSyndicate
+  id: ReinforcementRadioSyndicateSyndiCat
+  name: syndicat reinforcement radio
+  description: Calls in a faithfully trained cat with a microbomb to assist you.
+  components:
+  - type: GhostRole
+    name: ghost-role-information-SyndiCat-name
+    description: ghost-role-information-SyndiCat-description
+    rules: ghost-role-information-SyndiCat-rules
+    raffle:
+      settings: default
+  - type: GhostRoleMobSpawner
+    prototype: MobCatSyndy
+  - type: EmitSoundOnUse
+    sound: /Audio/Animals/cat_meow.ogg
+
 - type: entity
   parent: ReinforcementRadioSyndicate
   id: ReinforcementRadioSyndicateCyborgAssault # Reinforcement radio exclusive to nukeops uplink

Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml

@@ -49,7 +49,6 @@
 
 # actions
 - type: entity
-  noSpawn: true
   id: ActionDisguiseNoRot
   name: Toggle Rotation
   description: Use this to prevent your disguise from rotating, making it easier to hide in some scenarios.
@@ -59,7 +58,6 @@
     event: !type:DisguiseToggleNoRotEvent
 
 - type: entity
-  noSpawn: true
   id: ActionDisguiseAnchor
   name: Toggle Anchored
   description: For many objects you will want to be anchored to not be completely obvious.

Resources/Prototypes/Entities/Objects/Fun/darts.yml

@@ -83,10 +83,6 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Appearance
-  - type: SolutionContainerVisuals
-    maxFillLevels: 1
-    fillBaseName: dart
 
 - type: entity
   parent: Dart

Resources/Prototypes/Entities/Objects/Fun/pai.yml

@@ -136,7 +136,6 @@
   id: ActionPAIPlayMidi
   name: Play MIDI
   description: Open your portable MIDI interface to soothe your owner.
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -149,7 +148,6 @@
   id: ActionPAIOpenMap
   name: Open Map
   description: Open your map interface and guide your owner.
-  noSpawn: true
   components:
     - type: InstantAction
       checkCanInteract: false

Resources/Prototypes/Entities/Objects/Materials/shards.yml

@@ -85,7 +85,7 @@
   components:
   - type: Sprite
     color: "#bbeeff"
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
   - type: DamageUserOnTrigger
@@ -120,7 +120,7 @@
     damage:
       types:
         Slash: 4.5
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: PartRodMetal1
@@ -156,7 +156,7 @@
     damage:
       types:
         Slash: 5.5
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: SheetPlasma1
@@ -195,7 +195,7 @@
       types:
         Slash: 4.5
         Radiation: 2
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: SheetUranium1
@@ -230,7 +230,7 @@
   components:
   - type: Sprite
     color: "#e0aa36"
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: SheetBrass1

Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml

@@ -26,6 +26,6 @@
     materialComposition:
       Glass: 50
   - type: SpaceGarbage
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1

Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml

@@ -46,7 +46,7 @@
   - type: Tool
     qualities:
     - Rolling
-    speed: 0.5 # its very big, akward to use
+    speedModifier: 0.5 # its very big, akward to use
   - type: Appearance
   - type: GenericVisualizer
     visuals:

Resources/Prototypes/Entities/Objects/Power/lights.yml

@@ -66,7 +66,7 @@
     materialComposition:
       Glass: 25
   - type: SpaceGarbage
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
 
@@ -273,7 +273,7 @@
   - type: Construction
     graph: CyanLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalCyan
@@ -293,7 +293,7 @@
   - type: Construction
     graph: BlueLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalBlue
@@ -313,7 +313,7 @@
   - type: Construction
     graph: PinkLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalPink
@@ -333,7 +333,7 @@
   - type: Construction
     graph: OrangeLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalOrange
@@ -353,7 +353,7 @@
   - type: Construction
     graph: RedLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalRed
@@ -373,7 +373,7 @@
   - type: Construction
     graph: GreenLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalGreen

Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml

@@ -80,7 +80,6 @@
   id: ActionBibleSummon
   name: Summon familiar
   description: Summon a familiar that will aid you and gain humanlike intelligence once inhabited by a soul.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Head/Hats/witch.rsi, state: icon }

Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml

@@ -178,7 +178,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 1.0
+    speedModifier: 1.0
 # No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.
 
 - type: entity
@@ -200,7 +200,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 0.5
+    speedModifier: 0.5
 
 - type: entity
   name: circular saw
@@ -222,7 +222,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 1.5
+    speedModifier: 1.5
 
 - type: entity
   name: advanced circular saw
@@ -245,4 +245,4 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 2.0
+    speedModifier: 2.0

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -32,7 +32,6 @@
   id: ActionBorgSwapModule
   name: Swap Module
   description: Select this module, enabling you to use the tools it provides.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigItem

Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

@@ -233,6 +233,8 @@
     sprite: Objects/Specific/Chemistry/beaker_cryostasis.rsi
     layers:
       - state: beakernoreact
+  - type: SolutionContainerVisuals
+    maxFillLevels: 0
   - type: SolutionContainerManager
     solutions:
       beaker:
@@ -251,6 +253,8 @@
     sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi
     layers:
       - state: beakerbluespace
+  - type: SolutionContainerVisuals
+    maxFillLevels: 0
   - type: SolutionContainerManager
     solutions:
       beaker:

Resources/Prototypes/Entities/Objects/Tools/cowtools.yml

@@ -21,7 +21,7 @@
     - Cutting
     useSound:
       path: /Audio/Items/wirecutter.ogg
-    speed: 0.05
+    speedModifier: 0.05
   - type: Item
     sprite: Objects/Tools/Cowtools/haycutters.rsi
 
@@ -46,7 +46,7 @@
     - Screwing
     useSound:
       collection: Screwdriver
-    speed: 0.05
+    speedModifier: 0.05
 
 - type: entity
   name: wronch
@@ -69,7 +69,7 @@
     - Anchoring
     useSound:
       path: /Audio/Items/ratchet.ogg
-    speed: 0.05
+    speedModifier: 0.05
 
 - type: entity
   name: cowbar
@@ -93,7 +93,7 @@
     - Prying
     useSound:
       path: /Audio/Items/crowbar.ogg
-    speed: 0.05
+    speedModifier: 0.05
   - type: ToolTileCompatible
   - type: Prying
 
@@ -127,7 +127,7 @@
     size: Small
     sprite: Objects/Tools/Cowtools/cowelder.rsi
   - type: Tool
-    speed: 0.05
+    speedModifier: 0.05
 
 - type: entity
   name: milkalyzer

Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml

@@ -51,7 +51,7 @@
   - type: Tool
     qualities:
     - Rolling
-    speed: 0.6 # fairly unwieldly but nice round surface
+    speedModifier: 0.6 # fairly unwieldly but nice round surface
 
 - type: entity
   parent: GasTankRoundBase

Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml

@@ -21,7 +21,7 @@
   - type: Tool
     qualities:
       - Prying
-    speed: 1.5
+    speedModifier: 1.5
     useSound: /Audio/Items/jaws_pry.ogg
   - type: Prying
     pryPowered: true
@@ -69,7 +69,7 @@
   - type: Tool
     qualities:
       - Prying
-    speed: 3.0
+    speedModifier: 3.0
   - type: MultipleTool
     entries:
       - behavior: Prying

Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml

@@ -62,7 +62,6 @@
   id: ActionToggleJetpack
   name: Toggle jetpack
   description: Toggles the jetpack, giving you movement outside the station.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -304,7 +304,7 @@
   - type: Tool
     qualities:
       - Screwing
-    speed: 1.5
+    speedModifier: 1.5
     useSound: /Audio/Items/drill_use.ogg
   - type: MultipleTool
     statusShowBehavior: true
@@ -479,7 +479,7 @@
   - type: Tool
     qualities:
       - Screwing
-    speed: 1.2 # Kept for future adjustments. Currently 1.2x for balance
+    speedModifier: 1.2 # Kept for future adjustments. Currently 1.2x for balance
     useSound: /Audio/Items/drill_use.ogg
   - type: ToolTileCompatible
   - type: MultipleTool

Resources/Prototypes/Entities/Objects/Tools/welders.yml

@@ -139,7 +139,7 @@
           Quantity: 250
         maxVol: 250
   - type: Tool
-    speed: 1.3
+    speedModifier: 1.3
 
 - type: entity
   name: experimental welding tool
@@ -190,7 +190,7 @@
           Quantity: 50
         maxVol: 50
   - type: Tool
-    speed: 0.7
+    speedModifier: 0.7
   - type: PointLight
     enabled: false
     radius: 1.0

Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml

@@ -26,7 +26,7 @@
   - type: Tool
     qualities:
     - Rolling
-    speed: 0.75 # a bit unwieldly but does the job
+    speedModifier: 0.75 # a bit unwieldly but does the job
   - type: Clothing
     quickEquip: false
     slots:

Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml

@@ -3,7 +3,7 @@
   noSpawn: true
   parent: BaseStructure
   name: bonfire
-  description: What can be better then late evening under the sky with guitar and friends.
+  description: What can be better than a late evening under the sky with guitar and friends?
   components:
   - type: Sprite
     noRot: true

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -73,15 +73,6 @@
     containers:
       board: [ DoorElectronicsHydroponics ]
 
-- type: entity
-  parent: AirlockCommandLocked
-  id: AirlockServiceCaptainLocked
-  suffix: Captain, Locked
-  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsCaptain ]
-
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalLocked

Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml

@@ -89,6 +89,7 @@
     node: crategenericsteel
     containers:
       - entity_storage
+  - type: RequireProjectileTarget
 
 - type: entity
   parent: CrateGeneric

Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml

@@ -25,8 +25,7 @@
   - type: ReagentTank
     tankType: Fuel
   - type: DamageOnToolInteract
-    tools:
-    - Welding
+    tools: Welding
     weldingDamage:
       types:
         Heat: 10
@@ -217,4 +216,3 @@
       fillBaseName: watertank-2-
     - type: ExaminableSolution
       solution: tank
-

Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml

@@ -82,8 +82,7 @@
   - type: ReagentTank
     tankType: Fuel
   - type: DamageOnToolInteract
-    tools:
-    - Welding
+    tools: Welding
     weldingDamage:
       types:
         Heat: 20

Resources/Prototypes/Entities/categories.yml

@@ -2,3 +2,13 @@
   id: Actions
   name: entity-category-name-actions
   hideSpawnMenu: true
+
+- type: entityCategory
+  id: GameRules
+  name: entity-category-name-game-rules
+  hideSpawnMenu: true
+
+- type: entityCategory
+  id: Objectives
+  name: entity-category-name-objectives
+  hideSpawnMenu: true

Resources/Prototypes/GameRules/cargo_gifts.yml

@@ -17,7 +17,6 @@
 - type: entity
   id: GiftsPizzaPartySmall
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 5
@@ -35,7 +34,6 @@
 - type: entity
   id: GiftsPizzaPartyLarge
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 2
@@ -53,7 +51,6 @@
 - type: entity
   id: GiftsEngineering
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 5
@@ -74,7 +71,6 @@
 - type: entity
   id: GiftsVendingRestock
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 4
@@ -95,7 +91,6 @@
 - type: entity
   id: GiftsJanitor
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 6
@@ -113,7 +108,6 @@
 - type: entity
   id: GiftsMedical
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 8
@@ -133,7 +127,6 @@
 - type: entity
   id: GiftsSpacingSupplies
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 4
@@ -153,7 +146,6 @@
 - type: entity
   id: GiftsFireProtection
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 4
@@ -171,7 +163,6 @@
 - type: entity
   id: GiftsSecurityGuns
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 3
@@ -190,7 +181,6 @@
 - type: entity
   id: GiftsSecurityRiot
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 4

Resources/Prototypes/GameRules/events.yml

@@ -2,7 +2,6 @@
   id: BaseStationEvent
   parent: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
     - type: GameRule
       delay:
@@ -13,7 +12,6 @@
   id: BaseStationEventShortDelay
   parent: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
     - type: GameRule
       delay:
@@ -24,7 +22,6 @@
   id: BaseStationEventLongDelay
   parent: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
     - type: GameRule
       delay:
@@ -34,7 +31,6 @@
 - type: entity
   id: AnomalySpawn
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncementColor: "#18abf5"
@@ -47,7 +43,6 @@
 - type: entity
   id: BluespaceArtifact
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: GameRule
     delay:
@@ -64,7 +59,6 @@
 - type: entity
   id: BluespaceLocker
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 2
@@ -76,7 +70,6 @@
 - type: entity
   id: BreakerFlip
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 7
@@ -87,7 +80,6 @@
 - type: entity
   id: BureaucraticError
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-bureaucratic-error-announcement
@@ -99,7 +91,6 @@
 - type: entity
   id: ClericalError
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-clerical-error-announcement
@@ -111,7 +102,6 @@
 - type: entity
   parent: BaseGameRule
   id: ClosetSkeleton
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 5
@@ -123,7 +113,6 @@
 - type: entity
   parent: BaseGameRule
   id: DragonSpawn
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 6.5
@@ -153,7 +142,6 @@
 - type: entity
   parent: BaseGameRule
   id: NinjaSpawn
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 6
@@ -166,7 +154,6 @@
 - type: entity
   parent: BaseGameRule
   id: RevenantSpawn
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 7.5
@@ -180,7 +167,6 @@
 #- type: entity
 #  id: FalseAlarm
 #  parent: BaseGameRule
-#  noSpawn: true
 #  components:
 #  - type: StationEvent
 #    weight: 15
@@ -190,7 +176,6 @@
 - type: entity
   id: GasLeak
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-gas-leak-start-announcement
@@ -203,7 +188,6 @@
 - type: entity
   id: KudzuGrowth
   parent: BaseStationEventLongDelay
-  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 15
@@ -215,7 +199,6 @@
 - type: entity
   id: MeteorSwarm
   parent: BaseStationEventLongDelay
-  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 30
@@ -233,7 +216,6 @@
 - type: entity
   id: MouseMigration
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
@@ -259,7 +241,6 @@
 - type: entity
   id: CockroachMigration
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
@@ -277,7 +258,6 @@
 - type: entity
   id: PowerGridCheck
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 5
@@ -294,7 +274,6 @@
 - type: entity
   id: RandomSentience
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 6
@@ -307,7 +286,6 @@
 - type: entity
   parent: BaseGameRule
   id: SolarFlare
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 8
@@ -336,7 +314,6 @@
 - type: entity
   id: VentClog
   parent: BaseStationEventLongDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-clog-start-announcement
@@ -351,7 +328,6 @@
 - type: entity
   id: SlimesSpawn
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
@@ -373,7 +349,6 @@
 - type: entity
   id: SpiderSpawn
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
@@ -391,7 +366,6 @@
 - type: entity
   id: SpiderClownSpawn
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
@@ -409,7 +383,6 @@
 - type: entity
   id: ZombieOutbreak
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 50
@@ -441,7 +414,6 @@
         prototype: InitialInfected
 
 - type: entity
-  noSpawn: true
   parent: BaseNukeopsRule
   id: LoneOpsSpawn
   components:
@@ -450,6 +422,7 @@
     weight: 5.5
     minimumPlayers: 20
     duration: 1
+  - type: RuleGrids
   - type: LoadMapRule
     preloadedGrid: ShuttleStriker
   - type: NukeopsRule
@@ -475,7 +448,6 @@
         prototype: Nukeops
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorRule
   id: SleeperAgentsRule
   components:
@@ -501,7 +473,6 @@
 - type: entity
   id: MassHallucinations
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 7
@@ -518,7 +489,6 @@
 - type: entity
   id: ImmovableRodSpawn
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-immovable-rod-start-announcement
@@ -556,7 +526,6 @@
       orGroup: rodProto
 
 - type: entity
-  noSpawn: true
   parent: BaseGameRule
   id: IonStorm
   components:
@@ -569,7 +538,6 @@
 - type: entity
   id: MimicVendorRule
   parent: BaseGameRule
-  noSpawn: true
   components:
     - type: StationEvent
       earliestStart: 0

Resources/Prototypes/GameRules/midround.yml

@@ -3,7 +3,6 @@
 - type: entity
   id: Ninja
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: GenericAntagRule
     agentName: ninja-round-end-agent-name
@@ -18,7 +17,6 @@
     threats: NinjaThreats
 
 - type: entity
-  noSpawn: true
   parent: BaseGameRule
   id: Thief
   components:

Resources/Prototypes/GameRules/roundstart.yml

@@ -1,12 +1,20 @@
 - type: entity
   id: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
   - type: GameRule
 
 - type: entity
-  noSpawn: true
+  parent: BaseGameRule
+  id: RespawnDeadRule
+  components:
+  - type: RespawnDeadRule
+    alwaysRespawnDead: true
+  - type: RespawnTracker
+    respawnDelay: 10
+    deleteBody: false
+
+- type: entity
   parent: BaseGameRule
   id: SubGamemodesRule
   components:
@@ -18,7 +26,6 @@
 - type: entity
   id: DeathMatch31
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: DeathMatchRule
     rewardSpawns:
@@ -48,7 +55,6 @@
 - type: entity
   id: InactivityTimeRestart
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: InactivityRule
     inactivityMaxTime: 600
@@ -57,7 +63,6 @@
 - type: entity
   id: MaxTimeRestart
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: MaxTimeRestartRule
     roundMaxTime: 300
@@ -73,11 +78,11 @@
     - operationPrefix
     - operationSuffix
   - type: NukeopsRule
+  - type: RuleGrids
   - type: AntagSelection
   - type: AntagLoadProfileRule
 
 - type: entity
-  noSpawn: true
   parent: BaseNukeopsRule
   id: Nukeops
   components:
@@ -155,7 +160,6 @@
     agentName: traitor-round-end-agent-name
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorRule
   id: Traitor
   components:
@@ -177,7 +181,6 @@
 - type: entity
   id: Revolutionary
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: GameRule
     minPlayers: 15
@@ -202,21 +205,18 @@
 - type: entity
   id: Sandbox
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: SandboxRule
 
 - type: entity
   id: Secret
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: SecretRule
 
 - type: entity
   id: Zombie
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: GameRule
     minPlayers: 20
@@ -249,14 +249,12 @@
 - type: entity
   id: BasicStationEventScheduler
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: BasicStationEventScheduler
 
 - type: entity
   id: RampingStationEventScheduler
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: RampingStationEventScheduler
 
@@ -264,7 +262,6 @@
 - type: entity
   id: BasicRoundstartVariation
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: RoundstartStationVariationRule
     rules:

Resources/Prototypes/GameRules/unknown_shuttles.yml

@@ -1,7 +1,7 @@
-- type: entity
-  id: UnknownShuttleCargoLost
+- type: entity
+  abstract: true
   parent: BaseGameRule
-  noSpawn: true
+  id: BaseUnknownShuttleRule
   components:
   - type: StationEvent
     startAnnouncement: station-event-unknown-shuttle-incoming
@@ -10,65 +10,44 @@
     weight: 5
     reoccurrenceDelay: 30
     duration: 1
+  - type: RuleGrids
+  - type: LoadMapRule
+
+- type: entity
+  parent: BaseUnknownShuttleRule
+  id: UnknownShuttleCargoLost
+  components:
   - type: LoadMapRule
     preloadedGrid: ShuttleCargoLost
 
 - type: entity
+  parent: BaseUnknownShuttleRule
   id: UnknownShuttleTravelingCuisine
-  parent: BaseGameRule
-  noSpawn: true
   components:
-  - type: StationEvent
-    startAnnouncement: station-event-unknown-shuttle-incoming
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
-    weight: 5
-    reoccurrenceDelay: 30
-    duration: 1
   - type: LoadMapRule
     preloadedGrid: TravelingCuisine
 
 - type: entity
+  parent: BaseUnknownShuttleRule
   id: UnknownShuttleDisasterEvacPod
-  parent: BaseGameRule
-  noSpawn: true
   components:
-  - type: StationEvent
-    startAnnouncement: station-event-unknown-shuttle-incoming
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
-    weight: 5
-    reoccurrenceDelay: 30
-    duration: 1
   - type: LoadMapRule
     preloadedGrid: DisasterEvacPod
 
 - type: entity
+  parent: BaseUnknownShuttleRule
   id: UnknownShuttleHonki
-  parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-unknown-shuttle-incoming
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
     weight: 2
-    reoccurrenceDelay: 30
-    duration: 1
   - type: LoadMapRule
     preloadedGrid: Honki
 
 - type: entity
+  parent: BaseUnknownShuttleRule
   id: UnknownShuttleSyndieEvacPod
-  parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-unknown-shuttle-incoming
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
     weight: 2
-    reoccurrenceDelay: 30
-    duration: 1
   - type: LoadMapRule
     preloadedGrid: SyndieEvacPod

Resources/Prototypes/GameRules/variation.yml

@@ -4,7 +4,6 @@
   id: BaseVariationPass
   parent: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
   - type: StationVariationPassRule
 
@@ -13,14 +12,12 @@
 - type: entity
   id: BasicPoweredLightVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: PoweredLightVariationPass
 
 - type: entity
   id: SolidWallRustingVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: WallReplaceVariationPass
   - type: EntityReplaceVariationPass
@@ -32,7 +29,6 @@
 - type: entity
   id: ReinforcedWallRustingVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: ReinforcedWallReplaceVariationPass
   - type: EntityReplaceVariationPass
@@ -44,7 +40,6 @@
 - type: entity
   id: BasicTrashVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: EntitySpawnVariationPass
     tilesPerEntityAverage: 35
@@ -105,7 +100,6 @@
 - type: entity
   id: BasicPuddleMessVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: PuddleMessVariationPass
     randomPuddleSolutionFill: RandomFillTrashPuddle
@@ -113,7 +107,6 @@
 - type: entity
   id: BloodbathPuddleMessVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: PuddleMessVariationPass
     tilesPerSpillAverage: 150
@@ -123,7 +116,6 @@
 - type: entity
   id: CutWireVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: CutWireVariationPass
     wireCutChance: 0.01

Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml

@@ -35,7 +35,7 @@
 - type: startingGear
   id: CargoTechnicianBackpack
   equipment:
-    back: ClothingBackpackCargoFilled
+    back: ClothingBackpackCargo
 
 - type: loadout
   id: CargoTechnicianSatchel
@@ -44,7 +44,7 @@
 - type: startingGear
   id: CargoTechnicianSatchel
   equipment:
-    back: ClothingBackpackSatchelCargoFilled
+    back: ClothingBackpackSatchelCargo
 
 - type: loadout
   id: CargoTechnicianDuffel
@@ -53,7 +53,7 @@
 - type: startingGear
   id: CargoTechnicianDuffel
   equipment:
-    back: ClothingBackpackDuffelCargoFilled
+    back: ClothingBackpackDuffelCargo
 
 # OuterClothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml

@@ -82,34 +82,6 @@
   equipment:
     neck: ClothingNeckMantleQM
 
-# Back
-- type: loadout
-  id: QuartermasterBackpack
-  equipment: QuartermasterBackpack
-
-- type: startingGear
-  id: QuartermasterBackpack
-  equipment:
-    back: ClothingBackpackQuartermasterFilled
-
-- type: loadout
-  id: QuartermasterSatchel
-  equipment: QuartermasterSatchel
-
-- type: startingGear
-  id: QuartermasterSatchel
-  equipment:
-    back: ClothingBackpackSatchelQuartermasterFilled
-
-- type: loadout
-  id: QuartermasterDuffel
-  equipment: QuartermasterDuffel
-
-- type: startingGear
-  id: QuartermasterDuffel
-  equipment:
-    back: ClothingBackpackDuffelQuartermasterFilled
-
 # OuterClothing
 - type: loadout
   id: QuartermasterWintercoat

Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml

@@ -6,7 +6,7 @@
 - type: startingGear
   id: SalvageSpecialistBackpack
   equipment:
-    back: ClothingBackpackSalvageFilled
+    back: ClothingBackpackSalvage
 
 - type: loadout
   id: SalvageSpecialistSatchel
@@ -15,7 +15,7 @@
 - type: startingGear
   id: SalvageSpecialistSatchel
   equipment:
-    back: ClothingBackpackSatchelSalvageFilled
+    back: ClothingBackpackSatchelSalvage
 
 - type: loadout
   id: SalvageSpecialistDuffel
@@ -24,7 +24,7 @@
 - type: startingGear
   id: SalvageSpecialistDuffel
   equipment:
-    back: ClothingBackpackDuffelSalvageFilled
+    back: ClothingBackpackDuffelSalvage
 
 # OuterClothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml

@@ -53,7 +53,7 @@
 - type: startingGear
   id: BotanistBackpack
   equipment:
-    back: ClothingBackpackHydroponicsFilled
+    back: ClothingBackpackHydroponics
 
 - type: loadout
   id: BotanistSatchel
@@ -62,7 +62,7 @@
 - type: startingGear
   id: BotanistSatchel
   equipment:
-    back: ClothingBackpackSatchelHydroponicsFilled
+    back: ClothingBackpackSatchelHydroponics
 
 - type: loadout
   id: BotanistDuffel
@@ -71,7 +71,7 @@
 - type: startingGear
   id: BotanistDuffel
   equipment:
-    back: ClothingBackpackDuffelHydroponicsFilled
+    back: ClothingBackpackDuffelHydroponics
 
 # Outer clothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml

@@ -91,34 +91,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitMonasticRobeLight
 
-# Back
-- type: loadout
-  id: ChaplainBackpack
-  equipment: ChaplainBackpack
-
-- type: startingGear
-  id: ChaplainBackpack
-  equipment:
-    back: ClothingBackpackChaplainFilled
-
-- type: loadout
-  id: ChaplainSatchel
-  equipment: ChaplainSatchel
-
-- type: startingGear
-  id: ChaplainSatchel
-  equipment:
-    back: ClothingBackpackSatchelChaplainFilled
-
-- type: loadout
-  id: ChaplainDuffel
-  equipment: ChaplainDuffel
-
-- type: startingGear
-  id: ChaplainDuffel
-  equipment:
-    back: ClothingBackpackDuffelChaplainFilled
-
 # Neck
 - type: loadout
   id: ChaplainNeck

Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

@@ -35,7 +35,7 @@
 - type: startingGear
   id: ClownBackpack
   equipment:
-    back: ClothingBackpackClownFilled
+    back: ClothingBackpackClown
 
 - type: loadout
   id: ClownSatchel
@@ -44,7 +44,7 @@
 - type: startingGear
   id: ClownSatchel
   equipment:
-    back: ClothingBackpackSatchelClownFilled
+    back: ClothingBackpackSatchelClown
 
 - type: loadout
   id: ClownDuffel
@@ -53,7 +53,7 @@
 - type: startingGear
   id: ClownDuffel
   equipment:
-    back: ClothingBackpackDuffelClownFilled
+    back: ClothingBackpackDuffelClown
 
 # Shoes
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml

@@ -97,32 +97,4 @@
 - type: startingGear
   id: LawyerNeck
   equipment:
-    neck: ClothingNeckLawyerbadge
-
-# Backpack
-- type: loadout
-  id: LawyerBackpack
-  equipment: LawyerBackpack
-
-- type: startingGear
-  id: LawyerBackpack
-  equipment:
-    back: ClothingBackpackLawyerFilled
-
-- type: loadout
-  id: LawyerSatchel
-  equipment: LawyerSatchel
-
-- type: startingGear
-  id: LawyerSatchel
-  equipment:
-    back: ClothingBackpackSatchelLawyerFilled
-
-- type: loadout
-  id: LawyerDuffel
-  equipment: LawyerDuffel
-
-- type: startingGear
-  id: LawyerDuffel
-  equipment:
-    back: ClothingBackpackDuffelLawyerFilled
+    neck: ClothingNeckLawyerbadge

Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml

@@ -81,7 +81,7 @@
 - type: startingGear
   id: MimeBackpack
   equipment:
-    back: ClothingBackpackMimeFilled
+    back: ClothingBackpackMime
 
 - type: loadout
   id: MimeSatchel
@@ -90,7 +90,7 @@
 - type: startingGear
   id: MimeSatchel
   equipment:
-    back: ClothingBackpackSatchelMimeFilled
+    back: ClothingBackpackSatchelMime
 
 - type: loadout
   id: MimeDuffel
@@ -99,7 +99,7 @@
 - type: startingGear
   id: MimeDuffel
   equipment:
-    back: ClothingBackpackDuffelMimeFilled
+    back: ClothingBackpackDuffelMime
 
 # Outerclothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml

@@ -1,31 +1,3 @@
-# Back
-- type: loadout
-  id: MusicianBackpack
-  equipment: MusicianBackpack
-
-- type: startingGear
-  id: MusicianBackpack
-  equipment:
-    back: ClothingBackpackMusicianFilled
-
-- type: loadout
-  id: MusicianSatchel
-  equipment: MusicianSatchel
-
-- type: startingGear
-  id: MusicianSatchel
-  equipment:
-    back: ClothingBackpackSatchelMusicianFilled
-
-- type: loadout
-  id: MusicianDuffel
-  equipment: MusicianDuffel
-
-- type: startingGear
-  id: MusicianDuffel
-  equipment:
-    back: ClothingBackpackDuffelMusicianFilled
-
 # Outerclothing
 - type: loadout
   id: MusicianWintercoat

Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml

@@ -75,7 +75,7 @@
 - type: startingGear
   id: CommonBackpack
   equipment:
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
 
 - type: loadout
   id: CommonSatchel
@@ -84,7 +84,7 @@
 - type: startingGear
   id: CommonSatchel
   equipment:
-    back: ClothingBackpackSatchelFilled
+    back: ClothingBackpackSatchel
 
 - type: loadout
   id: CommonDuffel
@@ -93,7 +93,7 @@
 - type: startingGear
   id: CommonDuffel
   equipment:
-    back: ClothingBackpackDuffelFilled
+    back: ClothingBackpackDuffel
 
 # Gloves
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Command/captain.yml

@@ -90,7 +90,7 @@
 - type: startingGear
   id: CaptainBackpack
   equipment:
-    back: ClothingBackpackCaptainFilled
+    back: ClothingBackpackCaptain
 
 - type: loadout
   id: CaptainSatchel
@@ -99,7 +99,7 @@
 - type: startingGear
   id: CaptainSatchel
   equipment:
-    back: ClothingBackpackSatchelCaptainFilled
+    back: ClothingBackpackSatchelCaptain
 
 - type: loadout
   id: CaptainDuffel
@@ -108,7 +108,7 @@
 - type: startingGear
   id: CaptainDuffel
   equipment:
-    back: ClothingBackpackDuffelCaptainFilled
+    back: ClothingBackpackDuffelCaptain
 
 # Outer clothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml

@@ -57,33 +57,6 @@
     neck: ClothingNeckMantleHOP
 
 # Back
-- type: loadout
-  id: HoPBackpack
-  equipment: HoPBackpack
-
-- type: startingGear
-  id: HoPBackpack
-  equipment:
-    back: ClothingBackpackHOPFilled
-
-- type: loadout
-  id: HoPSatchel
-  equipment: HoPSatchel
-
-- type: startingGear
-  id: HoPSatchel
-  equipment:
-    back: ClothingBackpackSatchelHOPFilled
-
-- type: loadout
-  id: HoPDuffel
-  equipment: HoPDuffel
-
-- type: startingGear
-  id: HoPDuffel
-  equipment:
-    back: ClothingBackpackDuffelHOPFilled
-
 - type: loadout
   id: HoPBackpackIan
   equipment: HoPBackpackIan
@@ -94,7 +67,7 @@
 - type: startingGear
   id: HoPBackpackIan
   equipment:
-    back: ClothingBackpackHOPIanFilled
+    back: ClothingBackpackIan
 
 # Outerclothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml

@@ -34,7 +34,7 @@
 - type: startingGear
   id: AtmosphericTechnicianBackpack
   equipment:
-    back: ClothingBackpackAtmosphericsFilled
+    back: ClothingBackpackAtmospherics
 
 - type: loadout
   id: AtmosphericTechnicianSatchel
@@ -43,7 +43,7 @@
 - type: startingGear
   id: AtmosphericTechnicianSatchel
   equipment:
-    back: ClothingBackpackSatchelAtmosphericsFilled
+    back: ClothingBackpackSatchelAtmospherics
 
 - type: loadout
   id: AtmosphericTechnicianDuffel
@@ -52,7 +52,7 @@
 - type: startingGear
   id: AtmosphericTechnicianDuffel
   equipment:
-    back: ClothingBackpackDuffelAtmosphericsFilled
+    back: ClothingBackpackDuffelAtmospherics
 
 # OuterClothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml

@@ -68,34 +68,6 @@
   equipment:
     neck: ClothingNeckMantleCE
 
-# Back
-- type: loadout
-  id: ChiefEngineerBackpack
-  equipment: ChiefEngineerBackpack
-
-- type: startingGear
-  id: ChiefEngineerBackpack
-  equipment:
-    back: ClothingBackpackChiefEngineerFilled
-
-- type: loadout
-  id: ChiefEngineerSatchel
-  equipment: ChiefEngineerSatchel
-
-- type: startingGear
-  id: ChiefEngineerSatchel
-  equipment:
-    back: ClothingBackpackSatchelChiefEngineerFilled
-
-- type: loadout
-  id: ChiefEngineerDuffel
-  equipment: ChiefEngineerDuffel
-
-- type: startingGear
-  id: ChiefEngineerDuffel
-  equipment:
-    back: ClothingBackpackDuffelChiefEngineerFilled
-
 # OuterClothing
 - type: loadout
   id: ChiefEngineerWintercoat

Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml

@@ -118,7 +118,7 @@
 - type: startingGear
   id: StationEngineerBackpack
   equipment:
-    back: ClothingBackpackEngineeringFilled
+    back: ClothingBackpackEngineering
 
 - type: loadout
   id: StationEngineerSatchel
@@ -127,7 +127,7 @@
 - type: startingGear
   id: StationEngineerSatchel
   equipment:
-    back: ClothingBackpackSatchelEngineeringFilled
+    back: ClothingBackpackSatchelEngineering
 
 - type: loadout
   id: StationEngineerDuffel
@@ -136,7 +136,7 @@
 - type: startingGear
   id: StationEngineerDuffel
   equipment:
-    back: ClothingBackpackDuffelEngineeringFilled
+    back: ClothingBackpackDuffelEngineering
 
 # OuterClothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml

@@ -25,7 +25,7 @@
 - type: startingGear
   id: ChemistBackpack
   equipment:
-    back: ClothingBackpackChemistryFilled
+    back: ClothingBackpackChemistry
 
 - type: loadout
   id: ChemistSatchel
@@ -34,7 +34,7 @@
 - type: startingGear
   id: ChemistSatchel
   equipment:
-    back: ClothingBackpackSatchelChemistryFilled
+    back: ClothingBackpackSatchelChemistry
 
 - type: loadout
   id: ChemistDuffel
@@ -43,7 +43,7 @@
 - type: startingGear
   id: ChemistDuffel
   equipment:
-    back: ClothingBackpackDuffelChemistryFilled
+    back: ClothingBackpackDuffelChemistry
 
 # Outer clothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml

@@ -73,34 +73,6 @@
   equipment:
     neck: ClothingNeckMantleCMO
 
-# Back
-- type: loadout
-  id: ChiefMedicalOfficerBackpack
-  equipment: ChiefMedicalOfficerBackpack
-
-- type: startingGear
-  id: ChiefMedicalOfficerBackpack
-  equipment:
-    back: ClothingBackpackCMOFilled
-
-- type: loadout
-  id: ChiefMedicalOfficerSatchel
-  equipment: ChiefMedicalOfficerSatchel
-
-- type: startingGear
-  id: ChiefMedicalOfficerSatchel
-  equipment:
-    back: ClothingBackpackSatchelCMOFilled
-
-- type: loadout
-  id: ChiefMedicalOfficerDuffel
-  equipment: ChiefMedicalOfficerDuffel
-
-- type: startingGear
-  id: ChiefMedicalOfficerDuffel
-  equipment:
-    back: ClothingBackpackDuffelCMOFilled
-
 # Outer clothing
 - type: loadout
   id: ChiefMedicalOfficerLabCoat

Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml

@@ -178,7 +178,7 @@
 - type: startingGear
   id: MedicalDoctorBackpack
   equipment:
-    back: ClothingBackpackMedicalFilled
+    back: ClothingBackpackMedical
 
 - type: loadout
   id: MedicalDoctorSatchel
@@ -187,7 +187,7 @@
 - type: startingGear
   id: MedicalDoctorSatchel
   equipment:
-    back: ClothingBackpackSatchelMedicalFilled
+    back: ClothingBackpackSatchelMedical
 
 - type: loadout
   id: MedicalDoctorDuffel
@@ -196,7 +196,7 @@
 - type: startingGear
   id: MedicalDoctorDuffel
   equipment:
-    back: ClothingBackpackDuffelMedicalFilled
+    back: ClothingBackpackDuffelMedical
 
 # OuterClothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml

@@ -27,34 +27,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtParamedic
 
-# Back
-- type: loadout
-  id: ParamedicBackpack
-  equipment: ParamedicBackpack
-
-- type: startingGear
-  id: ParamedicBackpack
-  equipment:
-    back: ClothingBackpackParamedicFilled
-
-- type: loadout
-  id: ParamedicSatchel
-  equipment: ParamedicSatchel
-
-- type: startingGear
-  id: ParamedicSatchel
-  equipment:
-    back: ClothingBackpackSatchelParamedicFilled
-
-- type: loadout
-  id: ParamedicDuffel
-  equipment: ParamedicDuffel
-
-- type: startingGear
-  id: ParamedicDuffel
-  equipment:
-    back: ClothingBackpackDuffelParamedicFilled
-
 # Outer clothing
 - type: loadout
   id: ParamedicWindbreaker

Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml

@@ -43,34 +43,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtResearchDirector
 
-# Back
-- type: loadout
-  id: ResearchDirectorBackpack
-  equipment: ResearchDirectorBackpack
-
-- type: startingGear
-  id: ResearchDirectorBackpack
-  equipment:
-    back: ClothingBackpackResearchDirectorFilled
-
-- type: loadout
-  id: ResearchDirectorSatchel
-  equipment: ResearchDirectorSatchel
-
-- type: startingGear
-  id: ResearchDirectorSatchel
-  equipment:
-    back: ClothingBackpackSatchelResearchDirectorFilled
-
-- type: loadout
-  id: ResearchDirectorDuffel
-  equipment: ResearchDirectorDuffel
-
-- type: startingGear
-  id: ResearchDirectorDuffel
-  equipment:
-    back: ClothingBackpackDuffelResearchDirectorFilled
-
 # OuterClothing
 - type: loadout
   id: ResearchDirectorLabCoat

Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml

@@ -120,7 +120,7 @@
 - type: startingGear
   id: ScientistBackpack
   equipment:
-    back: ClothingBackpackScienceFilled
+    back: ClothingBackpackScience
 
 - type: loadout
   id: ScientistSatchel
@@ -129,7 +129,7 @@
 - type: startingGear
   id: ScientistSatchel
   equipment:
-    back: ClothingBackpackSatchelScienceFilled
+    back: ClothingBackpackSatchelScience
 
 - type: loadout
   id: ScientistDuffel
@@ -138,7 +138,7 @@
 - type: startingGear
   id: ScientistDuffel
   equipment:
-    back: ClothingBackpackDuffelScienceFilled
+    back: ClothingBackpackDuffelScience
 
 # OuterClothing
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Security/detective.yml

@@ -64,34 +64,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtDetectiveGrey
 
-# Back
-- type: loadout
-  id: DetectiveBackpack
-  equipment: DetectiveBackpack
-
-- type: startingGear
-  id: DetectiveBackpack
-  equipment:
-    back: ClothingBackpackSecurityFilledDetective
-
-- type: loadout
-  id: DetectiveSatchel
-  equipment: DetectiveSatchel
-
-- type: startingGear
-  id: DetectiveSatchel
-  equipment:
-    back: ClothingBackpackSatchelSecurityFilledDetective
-
-- type: loadout
-  id: DetectiveDuffel
-  equipment: DetectiveDuffel
-
-- type: startingGear
-  id: DetectiveDuffel
-  equipment:
-    back: ClothingBackpackDuffelSecurityFilledDetective
-
 # OuterClothing
 - type: loadout
   id: DetectiveArmorVest

Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml

@@ -110,7 +110,7 @@
 - type: startingGear
   id: SecurityBackpack
   equipment:
-    back: ClothingBackpackSecurityFilled
+    back: ClothingBackpackSecurity
 
 - type: loadout
   id: SecuritySatchel
@@ -119,7 +119,7 @@
 - type: startingGear
   id: SecuritySatchel
   equipment:
-    back: ClothingBackpackSatchelSecurityFilled
+    back: ClothingBackpackSatchelSecurity
 
 - type: loadout
   id: SecurityDuffel
@@ -128,7 +128,7 @@
 - type: startingGear
   id: SecurityDuffel
   equipment:
-    back: ClothingBackpackDuffelSecurityFilled
+    back: ClothingBackpackDuffelSecurity
 
 # Belt
 - type: loadout

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -103,9 +103,9 @@
   id: HoPBackpack
   name: loadout-group-hop-backpack
   loadouts:
-  - HoPBackpack
-  - HoPSatchel
-  - HoPDuffel
+  - CommonBackpack
+  - CommonSatchel
+  - CommonDuffel
   - HoPBackpackIan
 
 - type: loadoutGroup
@@ -122,8 +122,8 @@
   loadouts:
   - GreyJumpsuit
   - GreyJumpskirt
-  - RainbowJumpsuit
   - AncientJumpsuit
+  - RainbowJumpsuit
 
 - type: loadoutGroup
   id: PassengerFace
@@ -141,7 +141,7 @@
 
 - type: loadoutGroup
   id: CommonBackpack
-  name: loadout-group-passenger-backpack
+  name: loadout-group-backpack
   loadouts:
   - CommonBackpack
   - CommonSatchel
@@ -247,14 +247,6 @@
   loadouts:
   - LawyerNeck
 
-- type: loadoutGroup
-  id: LawyerBackpack
-  name: loadout-group-lawyer-backpack
-  loadouts:
-  - LawyerBackpack
-  - LawyerSatchel
-  - LawyerDuffel
-
 - type: loadoutGroup
   id: ChaplainHead
   name: loadout-group-chaplain-head
@@ -282,14 +274,6 @@
   - ChaplainRobesLight
   - ChaplainRobesDark
 
-- type: loadoutGroup
-  id: ChaplainBackpack
-  name: loadout-group-chaplain-backpack
-  loadouts:
-  - ChaplainBackpack
-  - ChaplainSatchel
-  - ChaplainDuffel
-
 - type: loadoutGroup
   id: ChaplainOuterClothing
   name: loadout-group-chaplain-outerclothing
@@ -446,14 +430,6 @@
   loadouts:
   - MimeWintercoat
 
-- type: loadoutGroup
-  id: MusicianBackpack
-  name: loadout-group-musician-backpack
-  loadouts:
-  - MusicianBackpack
-  - MusicianSatchel
-  - MusicianDuffel
-
 - type: loadoutGroup
   id: MusicianOuterClothing
   name: loadout-group-musician-outerclothing
@@ -480,14 +456,6 @@
   - QuartermasterTurtleneckSkirt
   - QuartermasterFormalSuit
 
-- type: loadoutGroup
-  id: QuartermasterBackpack
-  name: loadout-group-quartermaster-backpack
-  loadouts:
-  - QuartermasterBackpack
-  - QuartermasterSatchel
-  - QuartermasterDuffel
-
 - type: loadoutGroup
   id: QuartermasterNeck
   name: loadout-group-quartermaster-neck
@@ -586,14 +554,6 @@
   - ChiefEngineerTurtleneck
   - ChiefEngineerTurtleneckSkirt
 
-- type: loadoutGroup
-  id: ChiefEngineerBackpack
-  name: loadout-group-chief-engineer-backpack
-  loadouts:
-  - ChiefEngineerBackpack
-  - ChiefEngineerSatchel
-  - ChiefEngineerDuffel
-
 - type: loadoutGroup
   id: ChiefEngineerNeck
   name: loadout-group-chief-engineer-neck
@@ -725,14 +685,6 @@
   - ResearchDirectorJumpsuit
   - ResearchDirectorJumpskirt
 
-- type: loadoutGroup
-  id: ResearchDirectorBackpack
-  name: loadout-group-research-director-backpack
-  loadouts:
-  - ResearchDirectorBackpack
-  - ResearchDirectorSatchel
-  - ResearchDirectorDuffel
-
 - type: loadoutGroup
   id: ResearchDirectorOuterClothing
   name: loadout-group-research-director-outerclothing
@@ -964,14 +916,6 @@
   - NoirJumpsuit
   - NoirJumpskirt
 
-- type: loadoutGroup
-  id: DetectiveBackpack
-  name: loadout-group-detective-backpack
-  loadouts:
-  - DetectiveBackpack
-  - DetectiveSatchel
-  - DetectiveDuffel
-
 - type: loadoutGroup
   id: DetectiveOuterClothing
   name: loadout-group-detective-outerclothing
@@ -1013,14 +957,6 @@
   - ChiefMedicalOfficerLabCoat
   - ChiefMedicalOfficerWintercoat
 
-- type: loadoutGroup
-  id: ChiefMedicalOfficerBackpack
-  name: loadout-group-chief-medical-officer-backpack
-  loadouts:
-  - ChiefMedicalOfficerBackpack
-  - ChiefMedicalOfficerSatchel
-  - ChiefMedicalOfficerDuffel
-
 - type: loadoutGroup
   id: ChiefMedicalOfficerNeck
   name: loadout-group-chief-medical-officer-neck
@@ -1160,14 +1096,6 @@
   - ParamedicWindbreaker
   - ParamedicWintercoat
 
-- type: loadoutGroup
-  id: ParamedicBackpack
-  name: loadout-group-paramedic-backpack
-  loadouts:
-  - ParamedicBackpack
-  - ParamedicSatchel
-  - ParamedicDuffel
-
 - type: loadoutGroup
   id: ParamedicShoes
   name: loadout-group-paramedic-shoes

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -75,7 +75,7 @@
   groups:
   - LawyerNeck
   - LawyerJumpsuit
-  - LawyerBackpack
+  - CommonBackpack
   - Glasses
   - Trinkets
 
@@ -86,7 +86,7 @@
   - ChaplainMask
   - ChaplainNeck
   - ChaplainJumpsuit
-  - ChaplainBackpack
+  - CommonBackpack
   - ChaplainOuterClothing
   - Glasses
   - Trinkets
@@ -137,7 +137,7 @@
 - type: roleLoadout
   id: JobMusician
   groups:
-  - MusicianBackpack
+  - CommonBackpack
   - MusicianOuterClothing
   - Glasses
   - Trinkets
@@ -149,7 +149,7 @@
   - QuartermasterHead
   - QuartermasterNeck
   - QuartermasterJumpsuit
-  - QuartermasterBackpack
+  - CargoTechnicianBackpack
   - QuartermasterOuterClothing
   - QuartermasterShoes
   - Glasses
@@ -181,7 +181,7 @@
   groups:
   - ChiefEngineerHead
   - ChiefEngineerJumpsuit
-  - ChiefEngineerBackpack
+  - StationEngineerBackpack
   - ChiefEngineerNeck
   - ChiefEngineerOuterClothing
   - ChiefEngineerShoes
@@ -221,7 +221,7 @@
   - ResearchDirectorHead
   - ResearchDirectorNeck
   - ResearchDirectorJumpsuit
-  - ResearchDirectorBackpack
+  - ScientistBackpack
   - ResearchDirectorOuterClothing
   - ScientistGloves
   - ResearchDirectorShoes
@@ -292,7 +292,7 @@
   - DetectiveHead
   - DetectiveNeck
   - DetectiveJumpsuit
-  - DetectiveBackpack
+  - SecurityBackpack
   - DetectiveOuterClothing
   - SecurityShoes
   - Trinkets
@@ -312,7 +312,7 @@
   - MedicalMask
   - ChiefMedicalOfficerJumpsuit
   - MedicalGloves
-  - ChiefMedicalOfficerBackpack
+  - MedicalBackpack
   - ChiefMedicalOfficerOuterClothing
   - ChiefMedicalOfficerNeck
   - ChiefMedicalOfficerShoes
@@ -359,7 +359,7 @@
   - MedicalMask
   - ParamedicJumpsuit
   - MedicalGloves
-  - ParamedicBackpack
+  - MedicalBackpack
   - ParamedicOuterClothing
   - ParamedicShoes
   - Glasses

Resources/Prototypes/Magic/event_spells.yml

@@ -2,7 +2,6 @@
   id: ActionSummonGhosts
   name: Summon Ghosts
   description: Makes all current ghosts permanently invisible
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 120

Resources/Prototypes/Magic/forcewall_spells.yml

@@ -2,7 +2,6 @@
   id: ActionForceWall
   name: Forcewall
   description: Creates a magical barrier.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 10

Resources/Prototypes/Magic/knock_spell.yml

@@ -2,7 +2,6 @@
   id: ActionKnock
   name: Knock
   description: This spell opens nearby doors.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 10

Resources/Prototypes/Magic/projectile_spells.yml

@@ -2,7 +2,6 @@
   id: ActionFireball
   name: Fireball
   description: Fires an explosive fireball towards the clicked location.
-  noSpawn: true
   components:
   - type: Magic
   - type: WorldTargetAction
@@ -29,7 +28,6 @@
   parent: ActionFireball
   name: Fireball II
   description: Fires a fireball, but faster!
-  noSpawn: true
   components:
   - type: WorldTargetAction
     useDelay: 10
@@ -52,7 +50,6 @@
   parent: ActionFireball
   name: Fireball III
   description: The fastest fireball in the west!
-  noSpawn: true
   components:
     - type: WorldTargetAction
       useDelay: 8

Resources/Prototypes/Magic/rune_spells.yml

@@ -2,7 +2,6 @@
   id: ActionFlashRune
   name: Flash Rune
   description: Summons a rune that flashes if used.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 10
@@ -17,7 +16,6 @@
   id: ActionExplosionRune
   name: Explosion Rune
   description: Summons a rune that explodes if used.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 20
@@ -32,7 +30,6 @@
   id: ActionIgniteRune
   name: Ignite Rune
   description: Summons a rune that ignites if used.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 15
@@ -47,7 +44,6 @@
   id: ActionStunRune
   name: Stun Rune
   description: Summons a rune that stuns if used.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 10

Resources/Prototypes/Magic/smite_spells.yml

@@ -2,7 +2,6 @@
   id: ActionSmite
   name: Smite
   description: Instantly gibs a target.
-  noSpawn: true
   components:
   - type: EntityTargetAction
     useDelay: 60

Resources/Prototypes/Magic/spawn_spells.yml

@@ -2,7 +2,6 @@
   id: ActionSpawnMagicarpSpell
   name: Summon Magicarp
   description: This spell summons three Magi-Carp to your aid! May or may not turn on user.
-  noSpawn: true
   components:
   - type: WorldTargetAction
     useDelay: 10