Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2

# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs

Resources/Prototypes/Accents/full_replacements.yml

@@ -174,3 +174,12 @@
   - accent-words-nymph-2
   - accent-words-nymph-3
   - accent-words-nymph-4
+
+- type: accent
+  id: tomatoKiller
+  fullReplacements:
+  - accent-words-tomato-1
+  - accent-words-tomato-2
+  - accent-words-tomato-3
+  - accent-words-tomato-4
+  - accent-words-tomato-5

Resources/Prototypes/Accents/word_replacements.yml

@@ -675,3 +675,22 @@
     accent-russian-words-4: accent-russian-words-replace-4
     accent-russian-words-5: accent-russian-words-replace-5
     accent-russian-words-6: accent-russian-words-replace-6
+
+- type: accent
+  id: skeleton
+  wordReplacements:
+    accent-skeleton-words-1: accent-skeleton-words-replace-1
+    accent-skeleton-words-2: accent-skeleton-words-replace-2
+    accent-skeleton-words-3: accent-skeleton-words-replace-3
+    accent-skeleton-words-3-2: accent-skeleton-words-replace-3
+    accent-skeleton-words-3-3: accent-skeleton-words-replace-3
+    accent-skeleton-words-4: accent-skeleton-words-replace-4
+    accent-skeleton-words-4-2: accent-skeleton-words-replace-4
+    accent-skeleton-words-5: accent-skeleton-words-replace-5
+    accent-skeleton-words-5-2: accent-skeleton-words-replace-5
+    accent-skeleton-words-5-3: accent-skeleton-words-replace-5
+    accent-skeleton-words-5-4: accent-skeleton-words-replace-5
+    accent-skeleton-words-6: accent-skeleton-words-replace-6
+    accent-skeleton-words-7: accent-skeleton-words-replace-7
+    accent-skeleton-words-8: accent-skeleton-words-replace-8
+    accent-skeleton-words-9: accent-skeleton-words-replace-9

Resources/Prototypes/Actions/station_ai.yml

@@ -5,6 +5,7 @@
   description: Sends your eye back to the core.
   components:
   - type: InstantAction
+    priority: -10
     itemIconStyle: BigAction
     icon:
       sprite: Interface/Actions/actions_ai.rsi
@@ -17,6 +18,7 @@
   description: Shows job icons for crew members.
   components:
   - type: InstantAction
+    priority: -5
     itemIconStyle: BigAction
     icon:
       sprite: Interface/Actions/actions_ai.rsi
@@ -31,6 +33,7 @@
   description: Enable surveillance camera lights near wherever you're viewing.
   components:
   - type: InstantAction
+    priority: -6
     itemIconStyle: BigAction
     icon:
       sprite: Interface/Actions/actions_ai.rsi
@@ -56,6 +59,7 @@
   description: View the laws that you must follow.
   components:
   - type: InstantAction
+    priority: -3
     itemIconStyle: NoItem
     icon:
       sprite: Interface/Actions/actions_ai.rsi

Resources/Prototypes/Alerts/alerts.yml

@@ -428,6 +428,14 @@
   name: alerts-pacified-name
   description: alerts-pacified-desc
 
+- type: alert
+  id: Adrenaline
+  icons:
+  - sprite: Mobs/Species/Human/organs.rsi
+    state: heart-on
+  name: alerts-adrenaline-name
+  description: alerts-adrenaline-desc
+
 - type: alert
   id: Debug1
   icons:

Resources/Prototypes/Catalog/Fills/Crates/fun.yml

@@ -334,6 +334,7 @@
       - id: ClothingHeadHatMagician
       - id: BeachBall
       - id: ClothingShoesSkates
+      - id: RubberChicken
 
 - type: entity
   id: CrateFunBikeHornImplants

Resources/Prototypes/Catalog/Fills/Items/misc.yml

@@ -23,6 +23,24 @@
   - ClothingShoesBootsCowboyBlack
   - ClothingShoesBootsSecFilled
 
+- type: entity
+  id: ClothingShoesBootsCowboyBrownFilled
+  parent:
+  - ClothingShoesBootsCowboyBrown
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsCowboyWhiteFilled
+  parent:
+  - ClothingShoesBootsCowboyWhite
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsCowboyFancyFilled
+  parent:
+  - ClothingShoesBootsCowboyFancy
+  - ClothingShoesBootsSecFilled
+
 - type: entity
   id: ClothingShoesHighheelBootsFilled
   parent:
@@ -30,8 +48,8 @@
   - ClothingShoesBootsSecFilled
 
 - type: entity
-  id: ClothingShoesBootsMercFilled
   parent: ClothingShoesBootsMerc
+  id: ClothingShoesBootsMercFilled
   suffix: Filled
   components:
   - type: ContainerFill
@@ -48,3 +66,4 @@
     containers:
       item:
       - ThrowingKnife
+

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -9,6 +9,7 @@
     - id: CargoSaleComputerCircuitboard
     - id: CargoShuttleComputerCircuitboard
     - id: CargoShuttleConsoleCircuitboard
+    - id: SalvageMagnetMachineCircuitboard
     - id: CigPackGreen
       prob: 0.50
     - id: ClothingHeadsetAltCargo

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

@@ -84,6 +84,7 @@
     ClothingHandsGlovesColorWhite: 2
     ClothingHandsGlovesColorRed: 2
     ClothingHandsGlovesColorBlue: 2
+    ClothingHandsGlovesColorTeal: 2
     ClothingHandsGlovesColorGreen: 2
     ClothingHandsGlovesColorOrange: 2
     ClothingHandsGlovesColorPurple: 2

Resources/Prototypes/Catalog/VendingMachines/advertisements.yml

@@ -22,6 +22,12 @@
     prefix: advertisement-boozeomat-
     count: 19
 
+- type: localizedDataset
+  id: BruiseOMatAds
+  values:
+    prefix: advertisement-bruiseomat-
+    count: 15
+
 - type: localizedDataset
   id: CargoDrobeAds
   values:

Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml

@@ -4,6 +4,12 @@
     prefix: thankyou-boozeomat-
     count: 3
 
+- type: localizedDataset
+  id: BruiseOMatGoodbyes
+  values:
+    prefix: thankyou-bruiseomat-
+    count: 28
+
 - type: localizedDataset
   id: ChangGoodbyes
   values:

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -773,8 +773,8 @@
   id: UplinkBinaryTranslatorKey
   name: uplink-binary-translator-key-name
   description: uplink-binary-translator-key-desc
-  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: rd_label }
-  productEntity: EncryptionKeyBinary
+  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: borg_label }
+  productEntity: EncryptionKeyBinarySyndicate
   cost:
     Telecrystal: 1
   categories:
@@ -2046,4 +2046,4 @@
   - !type:BuyerJobCondition
     whitelist:
     - Chef
-    - Mime
+    - Mime

Resources/Prototypes/Datasets/Names/ai.yml

@@ -8,7 +8,7 @@
   - Allied Mastercomputer
   - Alpha 2
   - Alpha 3
-  - Alpha 4  
+  - Alpha 4
   - Alpha 5
   - Alpha 6
   - Alpha 7
@@ -84,6 +84,7 @@
   - Ulysses
   - W1k1
   - X-5
+  - X.A.N.A.
   - XERXES
   - Z-1
   - Z-2

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

@@ -192,7 +192,7 @@
 
 #ERT
 - type: entity
-  parent: ClothingBackpack
+  parent: [ ClothingBackpack, BaseCentcommContraband ]
   id: ClothingBackpackERTLeader
   name: ERT leader backpack
   description: A spacious backpack with lots of pockets, worn by the Commander of an Emergency Response Team.

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

@@ -245,7 +245,7 @@
   - type: HeldSpeedModifier
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: [ ClothingBackpackDuffel, BaseCentcommContraband ]
   id: ClothingBackpackDuffelCBURN
   name: CBURN duffel bag
   description: A duffel bag containing a variety of biological containment equipment.

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -621,7 +621,7 @@
     sprite: Clothing/Belt/securitywebbing.rsi
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ ClothingBeltStorageBase, BaseSecurityCargoContraband ]
   id: ClothingBeltMercWebbing
   name: mercenary webbing
   description: Ideal for storing everything from ammo to weapons and combat essentials.

Resources/Prototypes/Entities/Clothing/Ears/headsets.yml

@@ -76,7 +76,7 @@
       - EncryptionKeyCommon
 
 - type: entity
-  parent: ClothingHeadset
+  parent: [ ClothingHeadset, BaseCentcommContraband ]
   id: ClothingHeadsetCentCom
   name: CentComm headset
   description: A headset used by the upper echelons of Nanotrasen.

Resources/Prototypes/Entities/Clothing/Hands/colored.yml

@@ -89,6 +89,35 @@
   - type: Fiber
     fiberColor: fibers-blue
 
+# Teal Gloves
+- type: entity
+  parent: ClothingHandsGlovesSyntheticBase
+  id: ClothingHandsGlovesColorTeal
+  name: teal gloves
+  description: Regular teal gloves that do not keep you from frying.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    layers:
+    - state: icon
+      color: "#3CB57C"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#3CB57C"
+      right:
+      - state: inhand-right
+        color: "#3CB57C"
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Color/color.rsi
+    clothingVisuals:
+      gloves:
+      - state: equipped-HAND
+        color: "#3CB57C"
+  - type: Fiber
+    fiberColor: fibers-teal
+
 # Brown Gloves
 - type: entity
   parent: ClothingHandsGlovesSyntheticBase
@@ -335,6 +364,9 @@
       - 3
       - 3.5
       - 4
+  - type: Fiber
+    fiberMaterial: fibers-insulative-frayed
+    fiberColor: fibers-yellow
 
 # Conductive Insulated Gloves
 - type: entity

Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

@@ -255,7 +255,7 @@
       - type: CriminalRecordsHacker
 
 - type: entity
-  parent: [ClothingHandsGlovesColorBlack, BaseSecurityEngineeringContraband]
+  parent: [ ClothingHandsGlovesColorBlack, BaseSecurityEngineeringContraband ]
   id: ClothingHandsGlovesCombat
   name: combat gloves
   description: These tactical gloves are fireproof and shock resistant.

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -540,7 +540,7 @@
 #CENTCOMM / ERT HARDSUITS
 #ERT Leader Hardsuit
 - type: entity
-  parent: ClothingHeadHelmetHardsuitSyndieCommander
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndieCommander ]
   id: ClothingHeadHelmetHardsuitERTLeader
   name: ERT leader hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
@@ -561,7 +561,7 @@
 
 #ERT Chaplain Hardsuit
 - type: entity
-  parent: ClothingHeadHelmetHardsuitSyndie
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ]
   id: ClothingHeadHelmetHardsuitERTChaplain
   name: ERT chaplain hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
@@ -575,7 +575,7 @@
 
 #ERT Engineer Hardsuit
 - type: entity
-  parent: ClothingHeadHelmetHardsuitSyndie
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ]
   id: ClothingHeadHelmetHardsuitERTEngineer
   name: ERT engineer hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
@@ -596,7 +596,7 @@
 
 #ERT Medical Hardsuit
 - type: entity
-  parent: ClothingHeadHelmetHardsuitSyndieElite
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndieElite ]
   id: ClothingHeadHelmetHardsuitERTMedical
   name: ERT medic hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
@@ -610,7 +610,7 @@
 
 #ERT Security Hardsuit
 - type: entity
-  parent: ClothingHeadHelmetHardsuitSyndie
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ]
   id: ClothingHeadHelmetHardsuitERTSecurity
   name: ERT security hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
@@ -631,7 +631,7 @@
 
 #ERT Janitor Hardsuit
 - type: entity
-  parent: ClothingHeadHelmetHardsuitSyndie
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ]
   id: ClothingHeadHelmetHardsuitERTJanitor
   name: ERT janitor hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
@@ -645,7 +645,7 @@
 
 #CBURN Hardsuit
 - type: entity
-  parent: ClothingHeadHardsuitWithLightBase
+  parent: [ BaseCentcommContraband, ClothingHeadHardsuitWithLightBase ]
   id: ClothingHeadHelmetCBURN
   name: CBURN exosuit helmet
   description: A pressure resistant and fireproof hood worn by special cleanup units.
@@ -684,7 +684,7 @@
 
 #Deathsquad Hardsuit
 - type: entity
-  parent: ClothingHeadHardsuitBase
+  parent: [ BaseCentcommContraband, ClothingHeadHardsuitBase ]
   id: ClothingHeadHelmetHardsuitDeathsquad
   name: deathsquad hardsuit helmet
   description: A robust helmet for special operations.

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -58,6 +58,21 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSecurityTrooper
+  name: trooper hat
+  description: A campaign hat for the Nanotrasen Troopers, comes with a case too, but you lost it.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/security_trooper_hat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/security_trooper_hat.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCasa
@@ -167,7 +182,7 @@
     sprite: Clothing/Head/Hats/beret_brigmedic.rsi
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ ClothingHeadBase, BaseRestrictedContraband ]
   id: ClothingHeadHatBeretMerc
   name: mercenary beret
   description: Olive beret, the badge depicts a jackal on a rock.
@@ -220,7 +235,7 @@
   - type: IngestionBlocker
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ ClothingHeadBase, BaseCentcommContraband ]
   id: ClothingHeadHatCentcom
   name: CentComm brand hat
   description: "It's good to be the emperor."
@@ -875,7 +890,7 @@
   - type: BlockMovement
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ ClothingHeadBase, BaseCentcommContraband ]
   id: ClothingHeadHatCentcomcap
   name: CentComm cap
   description: An extravagant, fancy Central Commander cap.

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -1,17 +1,11 @@
 #These are intentionally all very mediocre as locational damage does not exist yet. Without it, armor values will stack in a way that makes it really god damn hard to determine how effective something is, along with making players extremely tanky.
 #When it DOES exist, the values here should be totally reworked - probably just port them from SS13.
 
-#Basic Helmet (Security Helmet)
 - type: entity
-  parent: [ClothingHeadBase, BaseRestrictedContraband]
-  id: ClothingHeadHelmetBasic
-  name: helmet
-  description: Standard security gear. Protects the head from impacts.
+  parent: ClothingHeadBase
+  id: ClothingHeadHelmetBase
+  abstract: true
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/security.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/security.rsi
   - type: Armor #Values seem to let the user survive one extra hit if attacked consistently.
     modifiers:
       coefficients:
@@ -22,15 +16,30 @@
   - type: Tag
     tags:
     - WhitelistChameleon
-    - SecurityHelmet
   - type: HideLayerClothing
     slots:
     - HeadTop
     - HeadSide
 
+#Basic Helmet (Security Helmet)
+- type: entity
+  parent: [ClothingHeadHelmetBase, BaseRestrictedContraband]
+  id: ClothingHeadHelmetBasic
+  name: helmet
+  description: Standard security gear. Protects the head from impacts.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/security.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/security.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+    - SecurityHelmet
+
 #Mercenary Helmet
 - type: entity
-  parent: ClothingHeadHelmetBasic
+  parent: [ ClothingHeadHelmetBase, BaseRestrictedContraband ]
   id: ClothingHeadHelmetMerc
   name: mercenary helmet
   description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle.
@@ -137,7 +146,7 @@
 
 #Cult Helmet
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ClothingHeadBase, BaseMajorContraband]
   id: ClothingHeadHelmetCult
   name: cult helmet
   description: A robust, evil-looking cult helmet.
@@ -157,7 +166,7 @@
 
 #Space Ninja Helmet
 - type: entity
-  parent: ClothingHeadEVAHelmetBase
+  parent: [ClothingHeadEVAHelmetBase, BaseMajorContraband]
   id: ClothingHeadHelmetSpaceNinja
   name: space ninja helmet
   description: What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear.
@@ -249,7 +258,7 @@
 
 #Atmos Fire Helmet
 - type: entity
-  parent: ClothingHeadLightBase
+  parent: [ClothingHeadLightBase, BaseEngineeringContraband]
   id: ClothingHeadHelmetAtmosFire
   name: atmos fire helmet
   description: An atmos fire helmet, able to keep the user cool in any situation.
@@ -282,7 +291,7 @@
 
 #Chitinous Helmet
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ ClothingHeadBase, BaseMajorContraband]
   id: ClothingHeadHelmetLing
   name: chitinous helmet
   description: An all-consuming chitinous mass of armor.
@@ -302,7 +311,7 @@
 #ERT HELMETS
 #ERT Leader Helmet
 - type: entity
-  parent: ClothingHeadHelmetBasic
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
   id: ClothingHeadHelmetERTLeader
   name: ERT leader helmet
   description: An in-atmosphere helmet worn by the leader of a Nanotrasen Emergency Response Team. Has blue highlights.
@@ -314,7 +323,7 @@
 
 #ERT Security Helmet
 - type: entity
-  parent: ClothingHeadHelmetBasic
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
   id: ClothingHeadHelmetERTSecurity
   name: ERT security helmet
   description: An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights.
@@ -326,7 +335,7 @@
 
 #ERT Medic Helmet
 - type: entity
-  parent: ClothingHeadHelmetBasic
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
   id: ClothingHeadHelmetERTMedic
   name: ERT medic helmet
   description: An in-atmosphere helmet worn by medical members of the Nanotrasen Emergency Response Team. Has white highlights.
@@ -338,7 +347,7 @@
 
 #ERT Engineer Helmet
 - type: entity
-  parent: ClothingHeadHelmetBasic
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
   id: ClothingHeadHelmetERTEngineer
   name: ERT engineer helmet
   description: An in-atmosphere helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights.
@@ -350,7 +359,7 @@
 
 #ERT Janitor Helmet
 - type: entity
-  parent: ClothingHeadHelmetBasic
+  parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
   id: ClothingHeadHelmetERTJanitor
   name: ERT janitor helmet
   description: An in-atmosphere helmet worn by janitorial members of the Nanotrasen Emergency Response Team. Has dark purple highlights.
@@ -361,7 +370,7 @@
     sprite: Clothing/Head/Helmets/ert_janitor.rsi
 
 - type: entity
-  parent: [ BaseSyndicateContraband, ClothingHeadHelmetBasic ]
+  parent: [ BaseSyndicateContraband, ClothingHeadHelmetBase ]
   id: ClothingHeadHelmetRaid
   name: syndicate raid helmet
   description: An armored helmet for use with the syndicate raid suit. Very stylish.
@@ -380,7 +389,7 @@
 
 #Bone Helmet
 - type: entity
-  parent: ClothingHeadHelmetBasic
+  parent: [ ClothingHeadHelmetBase, BaseMinorContraband ]
   id: ClothingHeadHelmetBone
   name: bone helmet
   description: Cool-looking helmet made of skull of your enemies.
@@ -394,7 +403,7 @@
     node: helmet
 
 - type: entity
-  parent: ClothingHeadHelmetBasic
+  parent: [ ClothingHeadHelmetBase, BaseMinorContraband ]
   id: ClothingHeadHelmetPodWars
   name: ironclad II helmet
   description: An ironclad II helmet, a relic of the pod wars.
@@ -406,7 +415,7 @@
 
 #Justice Helmet
 - type: entity
-  parent: ClothingHeadHelmetBasic
+  parent: [ ClothingHeadHelmetBase, BaseRestrictedContraband ]
   id: ClothingHeadHelmetJustice
   name: justice helm
   description: Advanced security gear. Protects the station from ne'er-do-wells.
@@ -430,6 +439,8 @@
       path: /Audio/Items/flashlight_on.ogg
     soundDeactivate:
       path: /Audio/Items/flashlight_off.ogg
+    soundFailToActivate:
+      path: /Audio/Machines/button.ogg
   - type: ItemToggleActiveSound
     activeSound:
       path: /Audio/Effects/Vehicle/policesiren.ogg
@@ -470,9 +481,6 @@
   - type: Construction
     graph: HelmetJustice
     node: helmet
-  - type: Tag
-    tags:
-    - WhitelistChameleon
 
 - type: entity
   parent: ClothingHeadHelmetJustice
@@ -492,4 +500,4 @@
   - type: InstantAction
     useDelay: 1
     itemIconStyle: BigItem
-    event: !type:ToggleActionEvent
+    event: !type:ToggleActionEvent

Resources/Prototypes/Entities/Clothing/Head/hoods.yml

@@ -746,3 +746,20 @@
       - state: coatybits-equipped-HELMET
         color: "#EBE216"
       - state: winterbits-equipped-HELMET
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHoodVoidCloak
+  name: void cloak hood
+  description: The hood of a void cloak. For those who have gone to the dark side of the force.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hoods/voidcloak.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hoods/voidcloak.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: HideLayerClothing
+    slots:
+    - Hair

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

@@ -89,7 +89,7 @@
   - type: IngestionBlocker
 
 - type: entity
-  parent: ClothingMaskGasAtmos
+  parent: [ ClothingMaskGasAtmos, BaseCentcommContraband ]
   id: ClothingMaskGasCentcom
   name: CentComm gas mask
   description: Oooh, gold and green. Fancy! This should help as you sit in your office.
@@ -359,7 +359,7 @@
     accent: StutteringAccent
 
 - type: entity
-  parent: ClothingMaskGasExplorer
+  parent: [ ClothingMaskGas, BaseRestrictedContraband ]
   id: ClothingMaskGasSwat
   name: swat gas mask
   description: A elite issue Security gas mask.
@@ -376,9 +376,16 @@
     - Hair
     - Snout
     hideOnToggle: true
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.90
+        Slash: 0.90
+        Piercing: 0.95
+        Heat: 0.95
 
 - type: entity
-  parent: ClothingMaskGasExplorer
+  parent: [ ClothingMaskGas, BaseRestrictedContraband ]
   id: ClothingMaskGasMerc
   name: mercenary gas mask
   description: Slightly outdated, but reliable military-style gas mask.
@@ -387,9 +394,16 @@
     sprite: Clothing/Mask/merc.rsi
   - type: Clothing
     sprite: Clothing/Mask/merc.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.90
+        Slash: 0.90
+        Piercing: 0.95
+        Heat: 0.95
 
 - type: entity
-  parent: ClothingMaskGasSyndicate
+  parent: [ ClothingMaskGas, BaseCentcommContraband ]
   id: ClothingMaskGasERT
   name: ert gas mask
   description: The gas mask of the elite squad of the ERT.
@@ -406,6 +420,15 @@
     - Hair
     - Snout
     hideOnToggle: true
+  - type: FlashImmunity
+  - type: EyeProtection
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
 
 - type: entity
   parent: ClothingMaskGasERT

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

@@ -197,6 +197,14 @@
   components:
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/void.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodVoidCloak
+    requiredSlot:
+    - neck
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
   - type: TypingIndicatorClothing
     proto: alien
 

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

@@ -109,7 +109,7 @@
       sprite: Clothing/Neck/Scarfs/syndiered.rsi
 
 - type: entity
-  parent: ClothingScarfBase
+  parent: [ ClothingScarfBase, BaseCentcommContraband ]
   id: ClothingNeckScarfStripedCentcom
   name: striped CentComm scarf
   description: A stylish striped centcomm colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold.

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -172,7 +172,7 @@
     autoRechargeRate: 2
 
 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]
   id: ClothingOuterArmorCult
   name: acolyte armor
   description: An evil-looking piece of cult armor, made of bones.
@@ -210,7 +210,7 @@
         Radiation: 0
         Caustic: 0.75
   - type: GroupExamine
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
 - type: entity
@@ -284,7 +284,7 @@
   - type: GroupExamine
 
 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]
   id: ClothingOuterArmorChangeling
   name: chitinous armor
   description: Inflates the changeling's body into an all-consuming chitinous mass of armor.
@@ -308,11 +308,11 @@
   - type: ExplosionResistance
     damageCoefficient: 0.5
   - type: GroupExamine
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]
   id: ClothingOuterArmorBone
   name: bone armor
   description: Sits on you like a second skin.
@@ -336,11 +336,11 @@
   - type: Construction
     graph: BoneArmor
     node: armor
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]
   id: ClothingOuterArmorPodWars
   name: ironclad II armor
   description: A repurposed suit of ironclad II armor, a relic of the pod wars.
@@ -357,6 +357,6 @@
         Piercing: 0.6
         Heat: 0.5
   - type: GroupExamine
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 

Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml

@@ -135,7 +135,7 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
   - type: DamageOnInteractProtection
     damageProtection:
@@ -161,7 +161,7 @@
   - type: HeldSpeedModifier
   - type: Item
     size: Huge
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
   - type: DamageOnInteractProtection
     damageProtection:

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -763,7 +763,7 @@
 #CENTCOMM / ERT HARDSUITS
 #ERT Leader Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitSyndieCommander
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieCommander ]
   id: ClothingOuterHardsuitERTLeader
   name: ERT leader's hardsuit
   description: A protective hardsuit worn by the leader of an emergency response team.
@@ -777,7 +777,7 @@
 
 #ERT Chaplain Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitJuggernaut
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitJuggernaut ]
   id: ClothingOuterHardsuitERTChaplain
   name: ERT chaplain's hardsuit
   description: A protective hardsuit worn by the chaplains of an Emergency Response Team.
@@ -805,7 +805,7 @@
 
 #ERT Medic Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitSyndieMedic
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieMedic ]
   id: ClothingOuterHardsuitERTMedical
   name: ERT medic's hardsuit
   description: A protective hardsuit worn by the medics of an emergency response team.
@@ -819,7 +819,7 @@
 
 #ERT Security Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitSyndie
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndie ]
   id: ClothingOuterHardsuitERTSecurity
   name: ERT security's hardsuit
   description: A protective hardsuit worn by the security officers of an emergency response team.
@@ -851,7 +851,7 @@
 
 #Deathsquad
 - type: entity
-  parent: ClothingOuterHardsuitBase
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitBase ]
   id: ClothingOuterHardsuitDeathsquad
   name: death squad hardsuit
   description: An advanced hardsuit favored by commandos for use in special operations.
@@ -888,7 +888,7 @@
 
 #CBURN Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitBase
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitBase ]
   id: ClothingOuterHardsuitCBURN
   name: CBURN exosuit
   description: A lightweight yet strong exosuit used for special cleanup operations.

Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

@@ -25,7 +25,7 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
 - type: entity
@@ -68,7 +68,7 @@
     sprintModifier: 0.7
   - type: HeldSpeedModifier
   - type: GroupExamine
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
 - type: entity
@@ -100,7 +100,7 @@
     sprintModifier: 0.8
   - type: HeldSpeedModifier
   - type: GroupExamine
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
 - type: entity
@@ -125,7 +125,7 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
 - type: entity
@@ -198,7 +198,7 @@
     sprite: Clothing/OuterClothing/Suits/chicken.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/chicken.rsi
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
 - type: entity
@@ -236,7 +236,7 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
 - type: entity
@@ -259,7 +259,7 @@
   - type: Construction
     graph: ClothingOuterSuitIan
     node: suit
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
 - type: entity

Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml

@@ -166,7 +166,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterCE
 
 - type: entity
-  parent: ClothingOuterWinterCoatToggleable
+  parent: [ ClothingOuterWinterCoatToggleable, BaseCentcommContraband ]
   id: ClothingOuterWinterCentcom
   name: CentComm winter coat
   components:
@@ -1207,4 +1207,4 @@
         color: "#EBE216"
       - state: winterbits-equipped-OUTERCLOTHING
   - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHatHoodWinterColorYellow
+    clothingPrototype: ClothingHeadHatHoodWinterColorYellow

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

@@ -23,7 +23,7 @@
     tags:
     - ClothMade
     - WhitelistChameleon
-  - type: ClothingRequiredStepTriggerImmune
+  - type: ProtectedFromStepTriggers
 
 - type: entity
   abstract: true

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

@@ -73,7 +73,7 @@
     sprite: Clothing/Shoes/Boots/highheelboots.rsi
 
 - type: entity
-  parent: ClothingShoesMilitaryBase
+  parent: [ ClothingShoesMilitaryBase, BaseRestrictedContraband ]
   id: ClothingShoesBootsMerc
   name: mercenary boots
   description: Boots that have gone through many conflicts and that have proven their combat reliability.

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -124,7 +124,7 @@
       sprite: Clothing/Uniforms/Jumpsuit/chaplain.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ ClothingUniformBase, BaseCentcommContraband ]
   id: ClothingUniformJumpsuitCentcomAgent
   name: CentComm agent's jumpsuit
   description: A suit worn by CentComm's legal team. Smells of burnt coffee.
@@ -135,7 +135,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/centcom_agent.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ ClothingUniformBase, BaseCentcommContraband ]
   id: ClothingUniformJumpsuitCentcomOfficial
   name: CentComm official's jumpsuit
   description: It's a jumpsuit worn by CentComm's officials.
@@ -146,7 +146,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/centcom_official.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ ClothingUniformBase, BaseCentcommContraband ]
   id: ClothingUniformJumpsuitCentcomOfficer
   name: CentComm officer's jumpsuit
   description: It's a jumpsuit worn by CentComm Officers.
@@ -634,6 +634,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi
 
+- type: entity
+  parent: [ClothingUniformBase, BaseRestrictedContraband]
+  id: ClothingUniformSecurityTrooper
+  name: trooper uniform
+  description: A formal uniform issued to the Nanotrasen Troopers, usually it comes with a car.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi
+
 - type: entity
   parent: [ClothingUniformBase, BaseRestrictedContraband]
   id: ClothingUniformJumpsuitWarden
@@ -849,7 +860,7 @@
       mode: SensorOff
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ ClothingUniformBase, BaseRestrictedContraband ]
   id: ClothingUniformJumpsuitMercenary
   name: mercenary jumpsuit
   description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned.
@@ -970,7 +981,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/musician.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ BaseCentcommContraband, ClothingUniformBase ]
   id: ClothingUniformJumpsuitERTChaplain
   name: ERT chaplain uniform
   description: A special suit made for Central Command's elite chaplain corps.
@@ -981,7 +992,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ BaseCentcommContraband, ClothingUniformBase ]
   id: ClothingUniformJumpsuitERTEngineer
   name: ERT engineering uniform
   description: A special suit made for the elite engineers under CentComm.
@@ -992,7 +1003,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ BaseCentcommContraband, ClothingUniformBase ]
   id: ClothingUniformJumpsuitERTJanitor
   name: ERT janitorial uniform
   description: A special suit made for the elite janitors under CentComm.
@@ -1003,7 +1014,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/ert_janitor.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ BaseCentcommContraband, ClothingUniformBase ]
   id: ClothingUniformJumpsuitERTLeader
   name: ERT leader uniform
   description: A special suit made for the best of the elites under CentComm.
@@ -1014,7 +1025,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ BaseCentcommContraband, ClothingUniformBase ]
   id: ClothingUniformJumpsuitERTMedic
   name: ERT medical uniform
   description: A special suit made for the elite medics under CentComm.
@@ -1025,7 +1036,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/ert_medic.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ BaseCentcommContraband, ClothingUniformBase ]
   id: ClothingUniformJumpsuitERTSecurity
   name: ERT security uniform
   description: A special suit made for the elite security under CentComm.

Resources/Prototypes/Entities/Effects/puddle.yml

@@ -126,11 +126,6 @@
     bodyType: Static
   - type: Fixtures
     fixtures:
-      # Context / examine fixture
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.25
       slipFixture:
         shape:
           !type:PhysShapeAabb

Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml

@@ -476,3 +476,21 @@
         amount: !type:ConstantNumberSelector
           value: 3
 
+- type: entity
+  parent: MarkerBase
+  id: SalvageSpawnerMobMiningAsteroid
+  name: Mining Asteroid Mob Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Asteroid/goliath.rsi
+      state: goliath
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      children:
+      - id: MobGoliath
+        weight: 65
+      - id: MobHivelord
+        weight: 35
+

Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

@@ -116,6 +116,7 @@
       - id: BalloonNT
       - id: BalloonCorgi
       - id: MysteryFigureBox
+      - id: RubberChicken
       # Cult
       - !type:AllSelector
         children:

Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml

@@ -80,7 +80,7 @@
   parent: MarkerBase
   components:
   - type: GhostRole
-    rules: ghost-role-information-nukeop-rules
+    rules: ghost-role-information-rules-default-team-antagonist
     raffle:
       settings: default
   - type: GhostRoleMobSpawner
@@ -100,7 +100,7 @@
   - type: GhostRole
     name: ghost-role-information-loneop-name
     description: ghost-role-information-loneop-description
-    rules: ghost-role-information-loneop-rules
+    rules: ghost-role-information-rules-default-solo-antagonist
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
@@ -116,6 +116,7 @@
   - type: GhostRole
     name: roles-antag-nuclear-operative-commander-name
     description: roles-antag-nuclear-operative-commander-objective
+    rules: ghost-role-information-rules-default-team-antagonist
 
 - type: entity
   categories: [ HideSpawnMenu, Spawner ]
@@ -125,6 +126,7 @@
   - type: GhostRole
     name: roles-antag-nuclear-operative-agent-name
     description: roles-antag-nuclear-operative-agent-objective
+    rules: ghost-role-information-rules-default-team-antagonist
 
 - type: entity
   categories: [ HideSpawnMenu, Spawner ]
@@ -134,6 +136,7 @@
   - type: GhostRole
     name: roles-antag-nuclear-operative-name
     description: roles-antag-nuclear-operative-objective
+    rules: ghost-role-information-rules-default-team-antagonist
 
 - type: entity
   categories: [ HideSpawnMenu, Spawner ]

Resources/Prototypes/Entities/Markers/Spawners/mobs.yml

@@ -48,6 +48,20 @@
       - MobCorgiLisa
       - MobCorgiIanPup
 
+- type: entity
+  name: Dev Mouse Spawner
+  id: SpawnMobCorgiMouse
+  suffix: Admeme
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobCorgiMouse
+
 - type: entity
   name: Possum Morty Spawner
   id: SpawnMobPossumMorty

Resources/Prototypes/Entities/Markers/shuttle.yml

@@ -3,6 +3,7 @@
   parent: MarkerBase
   name: FTL point
   components:
+    - type: FTLSmashImmune
     - type: FTLBeacon
     - type: Sprite
       state: pink

Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml

@@ -222,6 +222,20 @@
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_boxerwrap_l
 
+- type: marking
+  id: GauzeHead
+  bodyPart: Head
+  markingCategory: Overlay
+  speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_head
+
 # Lizard Specific Markings
 - type: marking
   id: GauzeLizardLefteyePatch

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -233,7 +233,7 @@
     guides:
     - Cyborgs
     - Robotics
-  - type: StepTriggerImmune
+  - type: ProtectedFromStepTriggers
   - type: DamageOnInteractProtection
     damageProtection:
       flatReductions:

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

@@ -32,6 +32,8 @@
     states:
       Alive:
         Base: bat
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Butcherable
@@ -101,6 +103,8 @@
     states:
       Alive:
         Base: 0
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Item
@@ -341,6 +345,8 @@
     states:
       Alive:
         Base: cockroach
+      Critical:
+        Base: cockroach_dead
       Dead:
         Base: cockroach_dead
   - type: Bloodstream
@@ -627,6 +633,8 @@
     states:
       Alive:
         Base: duck-0
+      Critical:
+        Base: dead-0
       Dead:
         Base: dead-0
   - type: Butcherable
@@ -667,6 +675,8 @@
     states:
       Alive:
         Base: duck-1
+      Critical:
+        Base: dead-1
       Dead:
         Base: dead-1
 
@@ -684,6 +694,8 @@
     states:
       Alive:
         Base: duck-2
+      Critical:
+        Base: dead-2
       Dead:
         Base: dead-2
 
@@ -743,6 +755,8 @@
     states:
       Alive:
         Base: butterfly
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Bloodstream
@@ -789,6 +803,8 @@
     states:
       Alive:
         Base: cow
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: SolutionContainerManager
@@ -871,6 +887,8 @@
     states:
       Alive:
         Base: crab
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Butcherable
@@ -1019,6 +1037,8 @@
     states:
       Alive:
         Base: goose
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Butcherable
@@ -1719,7 +1739,6 @@
     price: 50
   - type: BadFood
   - type: NonSpreaderZombie
-  - type: PreventSpiller
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
@@ -1880,6 +1899,8 @@
     states:
       Alive:
         Base: lizard
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Butcherable
@@ -1934,6 +1955,8 @@
     states:
       Alive:
         Base: slug
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Butcherable
@@ -1986,6 +2009,8 @@
     states:
       Alive:
         Base: frog
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Butcherable
@@ -2036,6 +2061,8 @@
     states:
       Alive:
         Base: parrot
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Butcherable
@@ -2087,6 +2114,8 @@
     states:
       Alive:
         Base: penguin
+      Critical:
+        Base: penguin_dead
       Dead:
         Base: penguin_dead
   - type: Butcherable
@@ -2156,6 +2185,8 @@
     states:
       Alive:
         Base: penguin
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: MeleeWeapon
@@ -2272,6 +2303,8 @@
     states:
       Alive:
         Base: tarantula
+      Critical:
+        Base: tarantula_dead
       Dead:
         Base: tarantula_dead
   - type: Butcherable
@@ -2397,6 +2430,8 @@
       states:
         Alive:
           Base: clown
+        Critical:
+          Base: dead
         Dead:
           Base: dead
     - type: MobThresholds
@@ -2466,6 +2501,8 @@
     states:
       Alive:
         Base: possum
+      Critical:
+        Base: possum_dead
       Dead:
         Base: possum_dead
   - type: Butcherable
@@ -2501,6 +2538,8 @@
     states:
       Alive:
         Base: possum_old
+      Critical:
+        Base: possum_dead_old
       Dead:
         Base: possum_dead_old
 
@@ -2535,6 +2574,8 @@
     states:
       Alive:
         Base: raccoon
+      Critical:
+        Base: raccoon_dead
       Dead:
         Base: raccoon_dead
   - type: Butcherable
@@ -2593,6 +2634,8 @@
     states:
       Alive:
         Base: fox
+      Critical:
+        Base: fox_dead
       Dead:
         Base: fox_dead
   - type: Butcherable
@@ -2664,6 +2707,8 @@
     states:
       Alive:
         Base: corgi
+      Critical:
+        Base: corgi_dead
       Dead:
         Base: corgi_dead
   - type: Butcherable
@@ -2705,6 +2750,8 @@
     states:
       Alive:
         Base: narsian
+      Critical:
+        Base: narsian_dead
       Dead:
         Base: narsian_dead
   - type: MeleeWeapon
@@ -2806,6 +2853,8 @@
     states:
       Alive:
         Base: cat
+      Critical:
+        Base: cat_dead
       Dead:
         Base: cat_dead
   - type: Speech
@@ -2856,6 +2905,8 @@
     states:
       Alive:
         Base: cat2
+      Critical:
+        Base: cat2_dead
       Dead:
         Base: cat2_dead
 
@@ -2873,6 +2924,8 @@
     states:
       Alive:
         Base: syndicat
+      Critical:
+        Base: syndicat_dead
       Dead:
         Base: syndicat_dead
   - type: GhostRole
@@ -2918,6 +2971,8 @@
     states:
       Alive:
         Base: spacecat
+      Critical:
+        Base: spacecat_dead
       Dead:
         Base: spacecat_dead
   - type: Temperature
@@ -2928,7 +2983,7 @@
       - DoorBumpOpener
   - type: MovementAlwaysTouching
   - type: PressureImmunity
-  - type: StepTriggerImmune
+  - type: ProtectedFromStepTriggers
   - type: Insulated
   - type: InteractionPopup
     successChance: 0.7
@@ -2955,6 +3010,8 @@
     states:
       Alive:
         Base: caracal_flop
+      Critical:
+        Base: caracal_dead
       Dead:
         Base: caracal_dead
 
@@ -3025,6 +3082,8 @@
     states:
       Alive:
         Base: sloth
+      Critical:
+        Base: sloth_dead
       Dead:
         Base: sloth_dead
   - type: Butcherable
@@ -3076,6 +3135,8 @@
     states:
       Alive:
         Base: ferret
+      Critical:
+        Base: ferret_dead
       Dead:
         Base: ferret_dead
   - type: Butcherable
@@ -3282,6 +3343,8 @@
     states:
       Alive:
         Base: pig
+      Critical:
+        Base: dead
       Dead:
         Base: dead
   - type: Butcherable

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

@@ -26,6 +26,7 @@
     - TemporaryBlindness
     - RadiationProtection
     - Drowsiness
+    - Adrenaline
   - type: StandingState
   - type: Tag
     tags:
@@ -180,3 +181,156 @@
     state: goliath_tentacle_retract
   - type: EffectVisuals
   - type: AnimationPlayer
+
+- type: entity
+  id: MobHivelord
+  parent: [ BaseMobAsteroid, FlyingMobBase ]
+  name: hivelord
+  description: A truly alien creature, it is a mass of unknown organic material, constantly fluctuating. When attacking, pieces of it split off and attack in tandem with the original.
+  components:
+  - type: Sprite
+    sprite: Mobs/Aliens/Asteroid/hivelord.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: hivelord
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: hivelord
+      Dead:
+        Base: hivelord_dead
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 3.5
+    baseSprintSpeed : 4.0
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      75: Dead
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 0
+  - type: Gun
+    fireRate: 0.66
+    selectedMode: SemiAuto
+    showExamineText: false
+    availableModes:
+    - SemiAuto
+    soundGunshot: null
+  - type: RechargeBasicEntityAmmo
+    showExamineText: false
+    rechargeCooldown: 0
+    rechargeSound: null
+  - type: BasicEntityAmmoProvider
+    proto: MobHivelordBrood
+    capacity: 1
+    count: 1
+  - type: NpcFactionMember
+    factions:
+    - SimpleHostile
+  - type: HTN
+    rootTask:
+      task: SimpleRangedHostileCompound
+    blackboard:
+      VisionRadius: !type:Single
+        4
+      AggroVisionRadius: !type:Single
+        9
+  - type: Butcherable
+    spawned:
+    - id: FoodHivelordRemains
+
+- type: entity
+  id: MobHivelordBrood
+  parent: [ BaseMobAsteroid, FlyingMobBase ]
+  name: hivelord brood
+  description: A fragment of the original hivelord, rallying behind its original. One isn't much of a threat, but...
+  components:
+  - type: Sprite
+    sprite: Mobs/Aliens/Asteroid/hivelord.rsi
+    layers:
+    - state: hivelordbrood
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 3.5
+    baseSprintSpeed : 4.0
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      5: Dead
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    angle: 0
+    attackRate: 1.0
+    range: 0.75
+    animation: WeaponArcPunch
+    damage:
+      types:
+        Slash: 7
+  - type: Ammo
+    muzzleFlash: null
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: NpcFactionMember
+    factions:
+    - SimpleHostile
+  - type: HTN
+    rootTask:
+      task: SimpleHostileCompound
+    blackboard: # highly aggressive
+      VisionRadius: !type:Single
+        15
+      AggroVisionRadius: !type:Single
+        15
+  - type: TimedDespawn
+    lifetime: 100
+
+- type: entity
+  id: FoodHivelordRemains
+  parent: FoodBase
+  name: hivelord remains
+  description: All that remains of a hivelord, it seems to be what allows it to break pieces of itself off without being hurt... its healing properties will soon become inert if not used quickly. Try not to think about what you're eating.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Rororium
+          Quantity: 5
+  - type: Sprite
+    sprite: Objects/Consumable/Food/rorocore.rsi
+    state: boiled
+  - type: Item
+    size: Normal
+  - type: Perishable
+    rotAfter: 120 # rot after 2 minutes
+    molsPerSecondPerUnitMass: 0
+    forceRotProgression: true
+  - type: RotInto
+    entity: FoodHivelordRemainsInert
+    stage: 1
+  - type: StaticPrice
+    price: 5000
+
+- type: entity
+  id: FoodHivelordRemainsInert
+  parent: BaseItem
+  name: inert hivelord remains
+  description: All that remains of a hivelord... Now all is truly lost.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/rorocore.rsi
+    state: boiled
+    color: "#664444"
+  - type: SpaceGarbage
+  - type: Item
+    size: Normal
+  - type: StaticPrice
+    price: 500

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

@@ -72,8 +72,7 @@
   - type: InputMover
   - type: MobMover
   - type: ZombieImmune
-  - type: ClothingRequiredStepTriggerImmune
-    slots: All
+  - type: ProtectedFromStepTriggers
 
 - type: entity
   abstract: true

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

@@ -79,6 +79,51 @@
   name: tomato killer
   description: Looks like it's not you eating tomatoes today, it's the tomatoes eating you.
   components:
+  - type: GhostRole
+    prob: 0.05
+    makeSentient: true
+    allowSpeech: true
+    name: ghost-role-information-tomatokiller-name
+    description: ghost-role-information-tomatokiller-description
+    rules: ghost-role-information-familiar-rules
+    raffle:
+      settings: short
+  - type: GhostTakeoverAvailable
+  - type: CanEscapeInventory
+    baseResistTime: 3
+  - type: Reactive
+    groups:
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+    reactions:
+    - reagents: [ Water ]
+      methods: [ Touch ]
+      effects:
+      - !type:HealthChange
+        scaleByQuantity: true
+        damage:
+          groups:
+            Brute: -0.25
+    - reagents: [ Blood ]
+      methods: [ Touch ]
+      effects:
+      - !type:HealthChange
+        scaleByQuantity: true
+        damage:
+          groups:
+            Brute: -0.5
+            Burn: -0.5
+    - reagents: [ RobustHarvest ]
+      methods: [ Touch ]
+      effects:
+      - !type:HealthChange
+        scaleByQuantity: true
+        damage:
+          groups:
+            Brute: -2
+            Burn: -2
+  - type: ReplacementAccent
+    accent: tomatoKiller
   - type: Item
   - type: NpcFactionMember
     factions:
@@ -175,4 +220,4 @@
       types:
         Blunt: 0.11
   - type: StaticPrice
-    price: 400
+    price: 400

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

@@ -85,6 +85,29 @@
       proper: true
       gender: female
 
+- type: entity
+  name: real mouse
+  parent: MobCorgiIan
+  id: MobCorgiMouse
+  description: It's 100% a real hungry mouse.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: real_mouse
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: real_mouse
+      Critical:
+        Base: real_mouse_dead
+      Dead:
+        Base: real_mouse_dead
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: female
+
 - type: entity
   name: Puppy Ian
   parent: MobCorgiPuppy

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

@@ -66,6 +66,7 @@
   - type: Tag
     tags:
     - DoorBumpOpener
+    - Bot
   - type: MobState
     allowedStates:
       - Alive
@@ -107,7 +108,7 @@
   - type: TypingIndicator
     proto: robot
   - type: ZombieImmune
-  - type: StepTriggerImmune
+  - type: ProtectedFromStepTriggers
   - type: NoSlip
   - type: Insulated
 
@@ -392,6 +393,7 @@
     tags:
     - DoorBumpOpener
     - FootstepSound
+    - Bot
   - type: ActiveRadio
     channels:
     - Binary

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

@@ -29,6 +29,7 @@
     - Flashed
     - RadiationProtection
     - Drowsiness
+    - Adrenaline
   - type: Buckle
   - type: StandingState
   - type: Tag
@@ -106,6 +107,7 @@
     - Flashed
     - RadiationProtection
     - Drowsiness
+    - Adrenaline
   - type: Bloodstream
     bloodMaxVolume: 150
   - type: MobPrice

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

@@ -484,7 +484,6 @@
     price: 50
   - type: BadFood
   - type: NonSpreaderZombie
-  - type: PreventSpiller
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
@@ -506,7 +505,7 @@
         visualType: Large
         messages: [ "snail-hurt-by-salt-popup" ]
         probability: 0.66
-    
+
 - type: entity
   parent: MobSnail
   id: MobSnailInstantDeath

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

@@ -99,7 +99,7 @@
     makeSentient: true
     name: ghost-role-information-xeno-name
     description: ghost-role-information-xeno-description
-    rules: ghost-role-information-xeno-rules
+    rules: ghost-role-information-rules-default-team-antagonist
     raffle:
       settings: default
   - type: GhostTakeoverAvailable

Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/roles.yml

@@ -0,0 +1,688 @@
+## See also ../settings.yml and ../spawners.yml
+
+### Visitors with Visitor ID
+
+# Command
+
+- type: entity
+  id: RandomHumanoidVisitorCaptain
+  name: visiting Captain ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: captain
+    - type: RandomHumanoidSpawner
+      settings: VisitorCaptain
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidVisitorCE
+  name: visiting CE ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: ce
+    - type: RandomHumanoidSpawner
+      settings: VisitorCE
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidVisitorCMO
+  name: visiting CMO ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: cmo
+    - type: RandomHumanoidSpawner
+      settings: VisitorCMO
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidVisitorHOP
+  name: visiting HOP ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: hop
+    - type: RandomHumanoidSpawner
+      settings: VisitorHOP
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidVisitorHOS
+  name: visiting HOS ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: hos
+    - type: RandomHumanoidSpawner
+      settings: VisitorHOS
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidVisitorRD
+  name: visiting RD ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: rd
+    - type: RandomHumanoidSpawner
+      settings: VisitorResearchDirector
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidVisitorQM
+  name: visiting QM ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: qm
+    - type: RandomHumanoidSpawner
+      settings: VisitorQM
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+# Security
+
+- type: entity
+  id: RandomHumanoidVisitorSecurityCadet
+  name: visiting security cadet role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: security_cadet
+    - type: RandomHumanoidSpawner
+      settings: VisitorSecurityCadet
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidVisitorSecurityOfficer
+  name: visiting security officer ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: security_officer
+    - type: RandomHumanoidSpawner
+      settings: VisitorSecurityOfficer
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidVisitorDetective
+  name: visiting detective role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: detective
+    - type: RandomHumanoidSpawner
+      settings: VisitorDetective
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidVisitorWarden
+  name: visiting warden ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: warden
+    - type: RandomHumanoidSpawner
+      settings: VisitorWarden
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+# Cargo
+
+- type: entity
+  id: RandomHumanoidVisitorCargoTechnician
+  name: visiting cargo technician ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: cargo_tech
+    - type: RandomHumanoidSpawner
+      settings: VisitorCargoTechnician
+
+- type: entity
+  id: RandomHumanoidVisitorSalvageSpecialist
+  name: visiting salvage specialist ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: salvagespecialist
+    - type: RandomHumanoidSpawner
+      settings: VisitorSalvageSpecialist
+
+# Engineering
+
+- type: entity
+  id: RandomHumanoidVisitorAtmosTech
+  name: visiting atmospheric technician ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: atmospherics
+    - type: RandomHumanoidSpawner
+      settings: VisitorAtmosTech
+
+- type: entity
+  id: RandomHumanoidVisitorTechnicalAssistant
+  name: visiting technical assistant ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: technicalassistant
+    - type: RandomHumanoidSpawner
+      settings: VisitorTechnicalAssistant
+
+- type: entity
+  id: RandomHumanoidVisitorEngineer
+  name: visiting engineer ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: engineer
+    - type: RandomHumanoidSpawner
+      settings: VisitorEngineer
+
+# Medical
+
+- type: entity
+  id: RandomHumanoidVisitorMedicalIntern
+  name: visiting medical intern ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: medicalintern
+    - type: RandomHumanoidSpawner
+      settings: VisitorMedicalIntern
+
+- type: entity
+  id: RandomHumanoidVisitorMedicalDoctor
+  name: visiting medical doctor ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: doctor
+    - type: RandomHumanoidSpawner
+      settings: VisitorMedicalDoctor
+
+- type: entity
+  id: RandomHumanoidVisitorParamedic
+  name: visiting paramedic ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: paramedic
+    - type: RandomHumanoidSpawner
+      settings: VisitorParamedic
+
+- type: entity
+  id: RandomHumanoidVisitorPsychologist
+  name: visiting psychologist ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: psychologist
+    - type: RandomHumanoidSpawner
+      settings: VisitorPsychologist
+
+- type: entity
+  id: RandomHumanoidVisitorChemist
+  name: visiting chemist ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: chemist
+    - type: RandomHumanoidSpawner
+      settings: VisitorChemist
+
+- type: entity
+  id: RandomHumanoidVisitorVirologist
+  name: visiting virologist ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: virologist
+    - type: RandomHumanoidSpawner
+      settings: VisitorVirologist
+
+- type: entity
+  id: RandomHumanoidVisitorGeneticist
+  name: visiting geneticist ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: geneticist
+    - type: RandomHumanoidSpawner
+      settings: VisitorGeneticist
+
+- type: entity
+  id: RandomHumanoidVisitorDentist
+  name: visiting dentist ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: seniorphysician
+    - type: RandomHumanoidSpawner
+      settings: VisitorDentist
+
+# Science
+
+- type: entity
+  id: RandomHumanoidVisitorResearchAssistant
+  name: visiting research assistant ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: researchassistant
+    - type: RandomHumanoidSpawner
+      settings: VisitorResearchAssistant
+
+- type: entity
+  id: RandomHumanoidVisitorScientist
+  name: visiting scientist ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: scientist
+    - type: RandomHumanoidSpawner
+      settings: VisitorScientist
+
+# Civilian
+
+- type: entity
+  id: RandomHumanoidVisitorBartender
+  name: visiting bartender ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: bartender
+    - type: RandomHumanoidSpawner
+      settings: VisitorBartender
+
+- type: entity
+  id: RandomHumanoidVisitorBotanist
+  name: visiting botanist ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: botanist
+    - type: RandomHumanoidSpawner
+      settings: VisitorBotanist
+
+- type: entity
+  id: RandomHumanoidVisitorBoxer
+  name: visiting boxer ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: boxer
+    - type: RandomHumanoidSpawner
+      settings: VisitorBoxer
+
+- type: entity
+  id: RandomHumanoidVisitorChaplain
+  name: visiting chaplain ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: chaplain
+    - type: RandomHumanoidSpawner
+      settings: VisitorChaplain
+
+- type: entity
+  id: RandomHumanoidVisitorChef
+  name: visiting chef ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: chef
+    - type: RandomHumanoidSpawner
+      settings: VisitorChef
+
+- type: entity
+  id: RandomHumanoidVisitorClown
+  name: visiting clown ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: clown
+    - type: RandomHumanoidSpawner
+      settings: VisitorClown
+
+- type: entity
+  id: RandomHumanoidVisitorJanitor
+  name: visiting janitor ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: janitor
+    - type: RandomHumanoidSpawner
+      settings: VisitorJanitor
+
+- type: entity
+  id: RandomHumanoidVisitorLawyer
+  name: visiting lawyer ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: lawyer
+    - type: RandomHumanoidSpawner
+      settings: VisitorLawyer
+
+- type: entity
+  id: RandomHumanoidVisitorLawyerCentcom
+  name: visiting centcom lawyer ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: lawyer
+    - type: RandomHumanoidSpawner
+      settings: VisitorLawyerCentcom
+
+- type: entity
+  id: RandomHumanoidVisitorLibrarian
+  name: visiting librarian ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: librarian
+    - type: RandomHumanoidSpawner
+      settings: VisitorLibrarian
+
+- type: entity
+  id: RandomHumanoidVisitorMusician
+  name: visiting musician ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: musician
+    - type: RandomHumanoidSpawner
+      settings: VisitorMusician
+
+- type: entity
+  id: RandomHumanoidVisitorMusicianFancy
+  name: visiting fancy musician ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: musician
+    - type: RandomHumanoidSpawner
+      settings: VisitorMusicianFancy
+
+- type: entity
+  id: RandomHumanoidVisitorMusicianRelaxed
+  name: visiting relaxed musician ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: musician
+    - type: RandomHumanoidSpawner
+      settings: VisitorMusicianRelaxed
+
+- type: entity
+  id: RandomHumanoidVisitorMime
+  name: visiting mime ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: mime
+    - type: RandomHumanoidSpawner
+      settings: VisitorMime
+
+- type: entity
+  id: RandomHumanoidVisitorReporter
+  name: visiting reporter ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: reporter
+    - type: RandomHumanoidSpawner
+      settings: VisitorReporter
+
+- type: entity
+  id: RandomHumanoidVisitorServiceWorker
+  name: visiting service worker ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: serviceworker
+    - type: RandomHumanoidSpawner
+      settings: VisitorServiceWorker
+
+- type: entity
+  id: RandomHumanoidVisitorZookeeper
+  name: visiting zookeeper ghost role
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: zookeeper
+    - type: RandomHumanoidSpawner
+      settings: VisitorZookeeper
+
+# Misc
+
+- type: entity
+  id: RandomHumanoidClownTroupeBanana
+  name: banana clown troupe
+  parent: RandomHumanoidVisitorClown
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ClownTroupeBanana
+
+### Visitors missing equipment for challenges
+
+# Command
+
+- type: entity
+  id: RandomHumanoidChallengeVictimCaptain
+  name: disaster victim Captain ghost role
+  suffix: CHALLENGE
+  # This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+  components:
+    - type: Sprite
+      sprite: Mobs/Species/Skeleton/parts.rsi
+      state: skull_icon
+    - type: RandomHumanoidSpawner
+      settings: ChallengeVictimCaptain
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidChallengeVictimCE
+  parent: RandomHumanoidChallengeVictimCaptain
+  name: disaster victim CE ghost role
+  suffix: CHALLENGE
+  # This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ChallengeVictimChiefEngineer
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidChallengeVictimCMO
+  parent: RandomHumanoidChallengeVictimCaptain
+  name: disaster victim CMO ghost role
+  suffix: CHALLENGE
+  # This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ChallengeVictimCMO
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidChallengeVictimHOP
+  parent: RandomHumanoidChallengeVictimCaptain
+  name: disaster victim HOP ghost role
+  suffix: CHALLENGE
+  # This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ChallengeVictimHeadOfPersonnel
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidChallengeVictimHOS
+  parent: RandomHumanoidChallengeVictimCaptain
+  name: disaster victim HOS ghost role
+  suffix: CHALLENGE
+  # This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ChallengeVictimHeadOfSecurity
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidChallengeVictimRD
+  parent: RandomHumanoidChallengeVictimCaptain
+  name: disaster victim RD ghost role
+  suffix: CHALLENGE
+  # This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ChallengeVictimResearchDirector
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+- type: entity
+  id: RandomHumanoidChallengeVictimQM
+  parent: RandomHumanoidChallengeVictimCaptain
+  name: disaster victim QM ghost role
+  suffix: CHALLENGE
+  # This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ChallengeVictimQuartermaster
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
+
+# Security
+
+# Cargo
+
+- type: entity
+  id: RandomHumanoidChallengeCargoTechnician
+  parent: RandomHumanoidChallengeVictimCaptain
+  name: disaster cargo technician ghost role
+  suffix: CHALLENGE
+  # This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ChallengeCargoTechnician
+
+# Engineering
+
+# Medical
+
+# Science
+
+# Civilian
+
+# Misc
+
+### Syndicate & Hostiles
+
+- type: entity
+  id: RandomHumanoidSyndieSoldierTeamLeader
+  name: syndicate team leader ghost role
+  components:
+    - type: Sprite
+      sprite: Structures/Decoration/banner.rsi
+      state: banner_syndicate
+    - type: RandomHumanoidSpawner
+      settings: SyndieSoldierTeamLeader
+
+- type: entity
+  id: RandomHumanoidSyndieSoldier
+  name: syndicate soldier ghost role
+  components:
+    - type: Sprite
+      sprite: Structures/Decoration/banner.rsi
+      state: banner_syndicate
+    - type: RandomHumanoidSpawner
+      settings: SyndieSoldier
+
+- type: entity
+  id: RandomHumanoidSyndieVisitor
+  name: syndie disaster victim ghost role
+  components:
+    - type: Sprite
+      sprite: Structures/Decoration/banner.rsi
+      state: banner_syndicate
+    - type: RandomHumanoidSpawner
+      settings: SyndieVisitor
+
+- type: entity
+  id: RandomHumanoidPirateScooner
+  name: pirate crewman ghost role
+  suffix: scooner
+  components:
+    - type: Sprite
+      sprite: Structures/Decoration/banner.rsi
+      state: banner-red
+    - type: RandomHumanoidSpawner
+      settings: PirateScooner
+
+- type: entity
+  id: RandomHumanoidPirateCaptainScooner
+  name: pirate captain ghost role
+  suffix: scooner
+  components:
+    - type: Sprite
+      sprite: Structures/Decoration/banner.rsi
+      state: banner-red
+    - type: RandomHumanoidSpawner
+      settings: PirateCaptainScooner
+
+### Other
+
+- type: entity
+  id: RandomHumanoidVisitorBlackmarketeer
+  name: visiting blackmarketeer ghost role
+  components:
+    - type: Sprite
+      sprite: Structures/Decoration/banner.rsi
+      state: banner-yellow
+    - type: RandomHumanoidSpawner
+      settings: VisitorBlackmarketeer
+
+
+- type: entity
+  id: RandomHumanoidCossack
+  name: cossack ghost role
+  components:
+    - type: Sprite
+      sprite: Structures/Decoration/banner.rsi
+      state: banner-yellow
+    - type: RandomHumanoidSpawner
+      settings: Cossack

Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml

@@ -0,0 +1,850 @@
+## See also ../roles.yml and ../spawners.yml
+
+### Visitors with Visitor ID
+
+# Command
+# Following use EventHumanoidMindShielded since they are heads and probably should have mindshields
+
+- type: randomHumanoidSettings
+  id: VisitorHead
+  parent: EventHumanoidMindShielded
+  components:
+    - type: GhostRole
+      name: ghost-role-information-command-name
+      description: ghost-role-information-command-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: default
+
+- type: randomHumanoidSettings
+  id: VisitorCaptain
+  parent: VisitorHead
+  components:
+    - type: GhostRole
+      name: job-name-captain
+      description: ghost-role-information-command-description
+    - type: Loadout
+      prototypes: [ VisitorCaptain, VisitorCaptainAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorCE
+  parent: VisitorHead
+  components:
+    - type: GhostRole
+      name: job-name-ce
+      description: ghost-role-information-command-description
+    - type: Loadout
+      prototypes: [ VisitorCE, VisitorCEAlt ]
+      roleLoadout: [ RoleSurvivalExtended ]
+
+- type: randomHumanoidSettings
+  id: VisitorCMO
+  parent: VisitorHead
+  components:
+    - type: GhostRole
+      name: job-name-cmo
+      description: ghost-role-information-command-description
+    - type: Loadout
+      prototypes: [ VisitorCMO, VisitorCMOAlt ]
+      roleLoadout: [ RoleSurvivalMedical ]
+
+- type: randomHumanoidSettings
+  id: VisitorHOP
+  parent: VisitorHead
+  components:
+    - type: GhostRole
+      name: job-name-hop
+      description: ghost-role-information-command-description
+    - type: Loadout
+      prototypes: [ VisitorHOP, VisitorHOPAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorHOS
+  parent: VisitorHead
+  components:
+    - type: GhostRole
+      name: job-name-hos
+      description: ghost-role-information-command-description
+    - type: Loadout
+      prototypes: [ VisitorHOS, VisitorHOSAlt ]
+      roleLoadout: [ RoleSurvivalSecurity ]
+
+- type: randomHumanoidSettings
+  id: VisitorResearchDirector
+  parent: VisitorHead
+  components:
+    - type: GhostRole
+      name: job-name-rd
+      description: ghost-role-information-command-description
+    - type: Loadout
+      prototypes: [ VisitorRD, VisitorRDAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorQM
+  parent: VisitorHead
+  components:
+    - type: GhostRole
+      name: job-name-qm
+      description: ghost-role-information-command-description
+    - type: Loadout
+      prototypes: [ VisitorQM, VisitorQMAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+# Security
+# Following use EventHumanoidMindShielded since they are heads and probably should have mindshields
+
+- type: randomHumanoidSettings
+  id: VisitorSecurity
+  parent: EventHumanoidMindShielded
+  components:
+    - type: GhostRole
+      name: ghost-role-information-security-name
+      description: ghost-role-information-security-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: default
+
+- type: randomHumanoidSettings
+  id: VisitorSecurityCadet
+  parent: VisitorSecurity
+  components:
+    - type: GhostRole
+      name: job-name-cadet
+    - type: Loadout
+      prototypes: [ VisitorSecurityCadet, VisitorSecurityCadetAlt ]
+      roleLoadout: [ RoleSurvivalSecurity ]
+
+- type: randomHumanoidSettings
+  id: VisitorSecurityOfficer
+  parent: VisitorSecurity
+  components:
+    - type: GhostRole
+      name: job-name-security
+    - type: Loadout
+      prototypes: [ VisitorSecurityOfficer, VisitorSecurityOfficerAlt ]
+      roleLoadout: [ RoleSurvivalSecurity ]
+
+- type: randomHumanoidSettings
+  id: VisitorDetective
+  parent: VisitorSecurity
+  components:
+    - type: GhostRole
+      name: job-name-detective
+    - type: Loadout
+      prototypes: [ VisitorDetective, VisitorDetectiveAlt ]
+      roleLoadout: [ RoleSurvivalSecurity ]
+
+- type: randomHumanoidSettings
+  id: VisitorWarden
+  parent: VisitorSecurity
+  components:
+    - type: GhostRole
+      name: job-name-warden
+    - type: Loadout
+      prototypes: [ VisitorWarden, VisitorWardenAlt ]
+      roleLoadout: [ RoleSurvivalSecurity ]
+
+# Cargo
+
+- type: randomHumanoidSettings
+  id: VisitorCargonian
+  parent: EventHumanoid
+  components:
+    - type: GhostRole
+      name: ghost-role-information-cargo-name
+      description: ghost-role-information-cargo-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: short
+
+- type: randomHumanoidSettings
+  id: VisitorCargoTechnician
+  parent: VisitorCargonian
+  components:
+    - type: GhostRole
+      name: job-name-cargotech
+    - type: Loadout
+      prototypes: [ VisitorCargoTech, VisitorCargoTechAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorSalvageSpecialist
+  parent: VisitorCargonian
+  components:
+    - type: GhostRole
+      name: job-name-salvagespec
+    - type: Loadout
+      prototypes: [ VisitorSalvageSpecialist, VisitorSalvageSpecialistAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+# Engineering
+
+- type: randomHumanoidSettings
+  id: VisitorEngineering
+  parent: EventHumanoid
+  components:
+    - type: GhostRole
+      name: ghost-role-information-engineering-name
+      description: ghost-role-information-engineering-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: short
+
+- type: randomHumanoidSettings
+  id: VisitorAtmosTech
+  parent: VisitorEngineering
+  components:
+    - type: GhostRole
+      name: job-name-atmostech
+    - type: Loadout
+      prototypes: [ VisitorAtmosTech, VisitorAtmosTechAlt ]
+      roleLoadout: [ RoleSurvivalExtended ]
+
+- type: randomHumanoidSettings
+  id: VisitorTechnicalAssistant
+  parent: VisitorEngineering
+  components:
+    - type: GhostRole
+      name: job-name-technical-assistant
+    - type: Loadout
+      prototypes: [ VisitorTechnicalAssistant, VisitorTechnicalAssistantAlt ]
+      roleLoadout: [ RoleSurvivalExtended ]
+
+- type: randomHumanoidSettings
+  id: VisitorEngineer
+  parent: VisitorEngineering
+  components:
+    - type: GhostRole
+      name: job-name-engineer
+    - type: Loadout
+      prototypes: [ VisitorEngineer, VisitorEngineerAlt ]
+      roleLoadout: [ RoleSurvivalExtended ]
+
+# Medical
+
+- type: randomHumanoidSettings
+  id: VisitorMedical
+  parent: EventHumanoid
+  components:
+    - type: GhostRole
+      name: ghost-role-information-medical-name
+      description: ghost-role-information-medical-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: short
+
+- type: randomHumanoidSettings
+  id: VisitorMedicalIntern
+  parent: VisitorMedical
+  components:
+    - type: GhostRole
+      name: job-name-intern
+    - type: Loadout
+      prototypes: [ VisitorMedicalIntern, VisitorMedicalInternAlt ]
+      roleLoadout: [ RoleSurvivalMedical ]
+
+- type: randomHumanoidSettings
+  id: VisitorMedicalDoctor
+  parent: VisitorMedical
+  components:
+    - type: GhostRole
+      name: job-name-doctor
+    - type: Loadout
+      prototypes: [ VisitorMedicalDoctor, VisitorMedicalDoctorAlt , VisitorScrubsPurple, VisitorScrubsGreen, VisitorScrubsBlue]
+      roleLoadout: [ RoleSurvivalMedical ]
+
+- type: randomHumanoidSettings
+  id: VisitorParamedic
+  parent: VisitorMedical
+  components:
+    - type: GhostRole
+      name: job-name-paramedic
+    - type: Loadout
+      prototypes: [ VisitorParamedic, VisitorParamedicAlt ]
+      roleLoadout: [ RoleSurvivalMedical ]
+
+- type: randomHumanoidSettings
+  id: VisitorVirologist
+  parent: VisitorMedical
+  components:
+    - type: GhostRole
+      name: ghost-role-information-medical-virologist-name
+    - type: Loadout
+      prototypes: [ VisitorVirologist, VisitorVirologistAlt ]
+      roleLoadout: [ RoleSurvivalMedical ]
+
+- type: randomHumanoidSettings
+  id: VisitorGeneticist
+  parent: VisitorMedical
+  components:
+    - type: GhostRole
+      name: ghost-role-information-medical-geneticist-name
+    - type: Loadout
+      prototypes: [ VisitorGeneticist, VisitorGeneticistAlt ]
+      roleLoadout: [ RoleSurvivalMedical ]
+
+- type: randomHumanoidSettings
+  id: VisitorPsychologist
+  parent: VisitorMedical
+  components:
+    - type: GhostRole
+      name: job-name-psychologist
+    - type: Loadout
+      prototypes: [ VisitorPsychologist, VisitorPsychologistAlt ]
+      roleLoadout: [ RoleSurvivalMedical ]
+
+- type: randomHumanoidSettings
+  id: VisitorChemist
+  parent: VisitorMedical
+  components:
+    - type: GhostRole
+      name: job-name-chemist
+    - type: Loadout
+      prototypes: [ VisitorChemist, VisitorChemistAlt ]
+      roleLoadout: [ RoleSurvivalMedical ]
+
+- type: randomHumanoidSettings
+  id: VisitorDentist
+  parent: VisitorMedical
+  components:
+    - type: GhostRole
+      name: ghost-role-information-medical-dentist-name
+    - type: Loadout
+      prototypes: [ VisitorDentist ]
+      roleLoadout: [ RoleSurvivalMedical ]
+
+# Science
+
+- type: randomHumanoidSettings
+  id: VisitorScience
+  parent: EventHumanoid
+  components:
+    - type: GhostRole
+      name: ghost-role-information-science-name
+      description: ghost-role-information-science-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: short
+
+- type: randomHumanoidSettings
+  id: VisitorResearchAssistant
+  parent: VisitorScience
+  components:
+    - type: GhostRole
+      name: job-name-research-assistant
+    - type: Loadout
+      prototypes: [ VisitorResearchAssistant, VisitorResearchAssistantAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorScientist
+  parent: VisitorScience
+  components:
+    - type: GhostRole
+      name: job-name-scientist
+    - type: Loadout
+      prototypes: [ VisitorScientist, VisitorScientistAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+# Civilian
+
+- type: randomHumanoidSettings
+  id: VisitorCivilian
+  parent: EventHumanoid
+  components:
+    - type: GhostRole
+      name: ghost-role-information-civilian-name
+      description: ghost-role-information-civilian-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: short
+
+- type: randomHumanoidSettings
+  id: VisitorBartender
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-bartender
+    - type: Loadout
+      prototypes: [ VisitorBartender, VisitorBartenderAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorBotanist
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-botanist
+    - type: Loadout
+      prototypes: [ VisitorBotanist, VisitorBotanistAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorBoxer
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-boxer
+    - type: Loadout
+      prototypes: [ VisitorBoxer, VisitorBoxerAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorChaplain
+  parent: VisitorCivilian
+  components:
+    - type: BibleUser
+    - type: GhostRole
+      name: job-name-chaplain
+    - type: Loadout
+      prototypes: [ VisitorChaplain, VisitorChaplainAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorChef
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-chef
+    - type: Loadout
+      prototypes: [ VisitorChef, VisitorChefAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorClown
+  parent: VisitorCivilian
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: job-name-clown
+    - type: Loadout
+      prototypes: [ VisitorClown ]
+      roleLoadout: [ RoleSurvivalClown ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_clown
+      
+- type: randomHumanoidSettings
+  id: VisitorJanitor
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-janitor
+    - type: Loadout
+      prototypes: [ VisitorJanitor, VisitorJanitorAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorLawyer
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-lawyer
+    - type: Loadout
+      prototypes: [ VisitorLawyerAltA, VisitorLawyerAltB, VisitorLawyerAltC, VisitorLawyerAltD, VisitorLawyerAltE ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorLawyerCentcom
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: ghost-role-information-civilian-centcom-lawyer-name
+      description: ghost-role-information-civilian-centcom-lawyer-description
+    - type: Loadout
+      prototypes: [ VisitorLawyerCentcom ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorLibrarian
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-librarian
+    - type: Loadout
+      prototypes: [ VisitorLibrarian, VisitorLibrarianAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorMusician
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-musician
+    - type: Loadout
+      prototypes: [ VisitorMusicianFancyAltA, VisitorMusicianFancyAltB, VisitorMusicianFancyAltC, VisitorMusicianFancyAltD, VisitorMusicianFancyAltE, VisitorMusicianFancyAltF, VisitorMusicianFancyAltG, VisitorMusicianFancyAltH, VisitorMusicianFancyAltI, VisitorMusicianRelaxedAltA, VisitorMusicianRelaxedAltB, VisitorMusicianRelaxedAltC, VisitorMusicianRelaxedAltD, VisitorMusicianRelaxedAltE, VisitorMusicianRelaxedAltF, VisitorMusicianMariachi ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorMusicianFancy
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-musician
+    - type: Loadout
+      prototypes: [ VisitorMusicianFancyAltA, VisitorMusicianFancyAltB, VisitorMusicianFancyAltC, VisitorMusicianFancyAltD, VisitorMusicianFancyAltE, VisitorMusicianFancyAltF, VisitorMusicianFancyAltG, VisitorMusicianFancyAltH, VisitorMusicianFancyAltI ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorMusicianRelaxed
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-musician
+    - type: Loadout
+      prototypes: [ VisitorMusicianRelaxedAltA, VisitorMusicianRelaxedAltB, VisitorMusicianRelaxedAltC, VisitorMusicianRelaxedAltD, VisitorMusicianRelaxedAltE, VisitorMusicianRelaxedAltF, VisitorMusicianMariachi ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorMime
+  parent: VisitorCivilian
+  components:
+    - type: MimePowers
+    - type: GhostRole
+      name: job-name-mime
+    - type: Loadout
+      prototypes: [ VisitorMime, VisitorMimeAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorReporter
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-reporter
+    - type: Loadout
+      prototypes: [ VisitorReporter, VisitorReporterAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorServiceWorker
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-serviceworker
+    - type: Loadout
+      prototypes: [ VisitorServiceWorker, VisitorServiceWorkerAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: VisitorZookeeper
+  parent: VisitorCivilian
+  components:
+    - type: GhostRole
+      name: job-name-zookeeper
+    - type: Loadout
+      prototypes: [ VisitorZookeeper, VisitorZookeeperAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: ClownTroupeBanana
+  parent: VisitorClown
+  randomizeName: false
+  components:
+    - type: Loadout
+      prototypes: [ BananaClown ]
+      roleLoadout: [ RoleSurvivalClown ]
+
+# Misc
+
+### Visitors missing equipment for challenges
+# CHALLENGE #
+# these are specifically missing QOL equipment and have settings to make them harder.
+# making changes to these should be done with care to avoid unbalancing challenging scenarios.
+
+# Command
+# Following use EventHumanoidMindShielded since they are heads and probably should have mindshields
+
+- type: randomHumanoidSettings
+  id: ChallengeVictimCaptain
+  parent: EventHumanoidMindShielded
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-lost-challenge-commander-name
+      description: ghost-role-information-lost-challenge-commander-description
+      rules: ghost-role-information-lost-challenge-commander-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ChallengeVictimCaptain, ChallengeVictimCaptainAlt ] #!! This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+      roleLoadout: [ RoleSurvivalVoxSupport ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+- type: randomHumanoidSettings
+  id: ChallengeVictimChiefEngineer
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-lost-challenge-commander-name
+      description: ghost-role-information-lost-challenge-commander-description
+      rules: ghost-role-information-lost-challenge-commander-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ChallengeVictimCE, ChallengeVictimCEAlt ] #!! This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+      roleLoadout: [ RoleSurvivalVoxSupport ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+- type: randomHumanoidSettings
+  id: ChallengeVictimCMO
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-lost-challenge-commander-name
+      description: ghost-role-information-lost-challenge-commander-description
+      rules: ghost-role-information-lost-challenge-commander-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ChallengeVictimCMO, ChallengeVictimCMOAlt ] #!! This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+      roleLoadout: [ RoleSurvivalVoxSupport ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+- type: randomHumanoidSettings
+  id: ChallengeVictimHeadOfPersonnel
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-lost-challenge-commander-name
+      description: ghost-role-information-lost-challenge-commander-description
+      rules: ghost-role-information-lost-challenge-commander-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ChallengeVictimHOP, ChallengeVictimHOPAlt ] #!! This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+      roleLoadout: [ RoleSurvivalVoxSupport ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+- type: randomHumanoidSettings
+  id: ChallengeVictimHeadOfSecurity
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-lost-challenge-commander-name
+      description: ghost-role-information-lost-challenge-commander-description
+      rules: ghost-role-information-lost-challenge-commander-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ChallengeVictimHOS, ChallengeVictimHOSAlt ] #!! This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+      roleLoadout: [ RoleSurvivalVoxSupport ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+- type: randomHumanoidSettings
+  id: ChallengeVictimResearchDirector
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-lost-challenge-commander-name
+      description: ghost-role-information-lost-challenge-commander-description
+      rules: ghost-role-information-lost-challenge-commander-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ChallengeVictimRD, ChallengeVictimRDAlt ] #!! This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+      roleLoadout: [ RoleSurvivalVoxSupport ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+- type: randomHumanoidSettings
+  id: ChallengeVictimQuartermaster
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-lost-challenge-commander-name
+      description: ghost-role-information-lost-challenge-commander-description
+      rules: ghost-role-information-lost-challenge-commander-rules
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ChallengeVictimQM, ChallengeVictimQMAlt ] #!! This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+      roleLoadout: [ RoleSurvivalVoxSupport ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+# Security
+# Following use EventHumanoidMindShielded since they are heads and probably should have mindshields
+
+# Cargo
+
+- type: randomHumanoidSettings
+  id: ChallengeCargoTechnician
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: ghost-role-information-lost-challenge-cargo-technican-name
+      description: ghost-role-information-lost-challenge-cargo-technican-description
+      rules: ghost-role-information-lost-disaster-challenge-cargo-technican-rules
+      raffle:
+        settings: short
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ChallengeCargoTechGearSuit, ChallengeCargoTechGearCoat ] #!! This is supposed to be for challenge events. Its intentionally missing QOL gear to make interesting scenarios.
+      roleLoadout: [ RoleSurvivalVoxSupport ]
+    - type: RandomMetadata
+      nameSegments:
+      - names_first
+      - names_last
+
+# Engineering
+
+# Medical
+
+# Science
+
+# Civilian
+
+# Misc
+
+### Syndicate & Hostiles
+
+- type: randomHumanoidSettings
+  id: SyndieSoldierTeamLeader
+  parent: EventHumanoid
+  components:
+    - type: NpcFactionMember
+      factions:
+      - Syndicate
+    - type: NukeOperative
+    - type: GhostRole
+      name: ghost-role-information-syndie-soldier-teamlead-name
+      description: ghost-role-information-syndie-soldier-teamlead-description
+      rules: ghost-role-information-rules-team-antagonist
+      raffle:
+        settings: default
+    - type: Loadout
+      prototypes: [ SyndicateFootsoldierTeamLeaderGear ]
+      roleLoadout: [ RoleSurvivalSyndicate ]
+
+- type: randomHumanoidSettings
+  id: SyndieSoldier
+  parent: EventHumanoid
+  components:
+    - type: NpcFactionMember
+      factions:
+      - Syndicate
+    - type: NukeOperative
+    - type: GhostRole
+      name: ghost-role-information-syndie-soldier-name
+      description: ghost-role-information-syndie-soldier-description
+      rules: ghost-role-information-rules-team-antagonist
+      raffle:
+        settings: default
+    - type: Loadout
+      prototypes: [ SyndicateFootsoldierGear ]
+      roleLoadout: [ RoleSurvivalSyndicate ]
+
+- type: randomHumanoidSettings
+  id: SyndieVisitor
+  parent: EventHumanoid
+  components:
+    - type: NpcFactionMember
+      factions:
+      - Syndicate
+    - type: GhostRole
+      name: ghost-role-information-syndie-disaster-victim-name
+      description: ghost-role-information-syndie-disaster-victim-description
+      rules: ghost-role-information-freeagent-rules
+      raffle:
+        settings: short
+    - type: Loadout
+      prototypes: [ SyndicateOperativeGearCivilian ]
+      roleLoadout: [ RoleSurvivalSyndicate ]
+
+- type: randomHumanoidSettings
+  id: PirateScooner
+  parent: EventHumanoid
+  components:
+    - type: NpcFactionMember
+      factions:
+      - Syndicate
+    - type: GhostRole
+      name: ghost-role-information-pirate-name
+      description: ghost-role-information-pirate-description
+      rules: ghost-role-information-rules-team-antagonist
+      raffle:
+        settings: default
+    - type: Loadout
+      prototypes: [ PirateScoonerAltA, PirateScoonerAltB, PirateScoonerAltC, PirateScoonerAltD ]
+      roleLoadout: [ RoleSurvivalEVA ]
+
+- type: randomHumanoidSettings
+  id: PirateCaptainScooner
+  parent: EventHumanoid
+  components:
+    - type: NpcFactionMember
+      factions:
+      - Syndicate
+    - type: GhostRole
+      name: ghost-role-information-pirate-captain-name
+      description: ghost-role-information-pirate-captain-description
+      rules: ghost-role-information-rules-team-antagonist
+      raffle:
+        settings: default
+    - type: Loadout
+      prototypes: [ PirateCaptainScooner ]
+      roleLoadout: [ RoleSurvivalEVA ]
+
+### Other
+
+- type: randomHumanoidSettings
+  id: VisitorBlackmarketeer
+  parent: EventHumanoid
+  components:
+    - type: GhostRole
+      name: ghost-role-information-blackmarketeer-name
+      description: ghost-role-information-blackmarketeer-description
+      rules: ghost-role-information-freeagent-rules
+      raffle:
+        settings: default
+    - type: Loadout
+      prototypes: [ VisitorBlackmarketeer, VisitorBlackmarketeer ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
+- type: randomHumanoidSettings
+  id: Cossack
+  parent: EventHumanoid
+  components:
+    - type: RussianAccent
+    - type: ScrambledAccent
+    - type: SlurredAccent
+    - type: SouthernAccent
+    - type: GhostRole
+      name: ghost-role-information-cossack-name
+      description: ghost-role-information-cossack-description
+      rules: ghost-role-information-freeagent-rules
+      raffle:
+        settings: default
+    - type: Loadout
+      prototypes: [ CossackGear ]
+      roleLoadout: [ RoleSurvivalEVA ]

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

@@ -111,10 +111,10 @@
   description: View a communications interface.
   components:
   - type: InstantAction
-    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
-    iconOn: Structures/Machines/parts.rsi/box_2.png
+    icon: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
+    iconOn: Interface/Actions/actions_ai.rsi/comms_console.png
     keywords: [ "AI", "console", "interface" ]
-    priority: -10
+    priority: -4
     event: !type:ToggleIntrinsicUIEvent { key: enum.CommunicationsConsoleUiKey.Key }
 
 - type: entity
@@ -126,7 +126,7 @@
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
     iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png
     keywords: [ "AI", "console", "interface" ]
-    priority: -10
+    priority: -7
     event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key }
 
 - type: entity
@@ -150,7 +150,7 @@
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
     iconOn: Interface/Actions/actions_ai.rsi/crew_monitor.png
     keywords: [ "AI", "console", "interface" ]
-    priority: -10
+    priority: -9
     event: !type:ToggleIntrinsicUIEvent { key: enum.CrewMonitoringUIKey.Key }
 
 - type: entity
@@ -162,5 +162,5 @@
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
     iconOn: Interface/Actions/actions_ai.rsi/station_records.png
     keywords: [ "AI", "console", "interface" ]
-    priority: -10
+    priority: -8
     event: !type:ToggleIntrinsicUIEvent { key: enum.GeneralStationRecordConsoleKey.Key }

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

@@ -106,6 +106,7 @@
     - Pacified
     - RadiationProtection
     - Drowsiness
+    - Adrenaline
   - type: Temperature
     heatDamageThreshold: 800
   - type: Metabolizer

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

@@ -160,6 +160,7 @@
   id: ERTChaplain
   parent: ERTLeader
   components:
+    - type: BibleUser
     - type: GhostRole
       name: ghost-role-information-ert-chaplain-name
       description: ghost-role-information-ert-chaplain-description
@@ -174,7 +175,6 @@
     - type: Loadout
       prototypes: [ ERTChaplainGear ]
       roleLoadout: [ RoleSurvivalExtended ]
-    - type: BibleUser
 
 - type: entity
   id: RandomHumanoidSpawnerERTChaplainEVA
@@ -607,277 +607,3 @@
       raffle:
         settings: default
     - type: Cluwne
-
-
-## Shuttle roles
-
-## Lost Cargo technician
-
-- type: entity
-  name: lost cargo technician spawner
-  id: LostCargoTechnicianSpawner
-  parent: MarkerBase
-  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Objects/Tools/appraisal-tool.rsi
-          state: icon
-    - type: RandomSpawner
-      prototypes:
-      - RandomHumanoidLostCargoTechnician
-      chance: 1
-
-- type: entity
-  id: RandomHumanoidLostCargoTechnician
-  name: lost cargo technician ghost role
-  components:
-    - type: Sprite
-      sprite: Objects/Tools/appraisal-tool.rsi
-      state: icon
-    - type: RandomHumanoidSpawner
-      settings: LostCargoTechnician
-
-- type: randomHumanoidSettings
-  id: LostCargoTechnician
-  parent: EventHumanoid
-  components:
-    - type: GhostRole
-      name: ghost-role-information-lost-cargo-technical-name
-      description: ghost-role-information-lost-cargo-technical-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-    - type: Loadout
-      prototypes: [ LostCargoTechGearSuit, LostCargoTechGearCoat ]
-      roleLoadout: [ RoleSurvivalStandard ]
-
-
-# Clown troupe
-
-- type: entity
-  name: clown troupe spawner
-  id: ClownTroupeSpawner
-  parent: MarkerBase
-  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Objects/Fun/bikehorn.rsi
-          state: icon
-    - type: RandomSpawner
-      prototypes:
-      - RandomHumanoidClownTroupe
-      rarePrototypes:
-      - RandomHumanoidClownTroupeBanana
-      rareChance: 0.3
-
-- type: entity
-  id: RandomHumanoidClownTroupe
-  name: clown troupe ghost role
-  components:
-    - type: Sprite
-      sprite: Objects/Tools/appraisal-tool.rsi
-      state: icon
-    - type: RandomHumanoidSpawner
-      settings: ClownTroupe
-
-- type: entity
-  id: RandomHumanoidClownTroupeBanana
-  name: banana clown troupe
-  parent: RandomHumanoidClownTroupe
-  components:
-    - type: RandomHumanoidSpawner
-      settings: ClownTroupeBanana
-
-- type: randomHumanoidSettings
-  id: ClownTroupe
-  parent: EventHumanoid
-  randomizeName: false
-  components:
-    - type: GhostRole
-      name: ghost-role-information-clown-troupe-name
-      description: ghost-role-information-clown-troupe-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-    - type: Loadout
-      prototypes: [ ClownTroupe ]
-      roleLoadout: [ RoleSurvivalStandard ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_clown
-
-- type: randomHumanoidSettings
-  id: ClownTroupeBanana
-  parent: ClownTroupe
-  randomizeName: false
-  components:
-    - type: Loadout
-      prototypes: [ BananaClown ]
-      roleLoadout: [ RoleSurvivalStandard ]
-
-# Traveling exotic chef
-
-- type: entity
-  name: traveling chef spawner
-  id: TravelingChefSpawner
-  parent: MarkerBase
-  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Objects/Weapons/Melee/kitchen_knife.rsi
-          state: icon
-    - type: RandomSpawner
-      prototypes:
-      - RandomHumanoidTravelingChef
-
-- type: entity
-  id: RandomHumanoidTravelingChef
-  name: traveling chef ghost role
-  components:
-    - type: Sprite
-      sprite: Objects/Tools/appraisal-tool.rsi
-      state: icon
-    - type: RandomHumanoidSpawner
-      settings: TravelingChef
-
-- type: randomHumanoidSettings
-  id: TravelingChef
-  parent: EventHumanoid
-  components:
-    - type: GhostRole
-      name: ghost-role-information-traveling-chef-name
-      description: ghost-role-information-traveling-chef-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-    - type: Loadout
-      prototypes: [ TravelingChef ]
-      roleLoadout: [ RoleSurvivalStandard ]
-
-# Disaster victim
-
-- type: entity
-  name: disaster victim spawner
-  id: DisasterVictimSpawner
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: red
-      - sprite: Clothing/OuterClothing/Hardsuits/basic.rsi
-        state: icon
-  - type: RandomSpawner
-    prototypes:
-    - RandomHumanoidDisasterVictimRD
-    - RandomHumanoidDisasterVictimCMO
-    - RandomHumanoidDisasterVictimCaptain
-    - MobSkeletonCloset
-
-- type: entity
-  id: RandomHumanoidDisasterVictimRD
-  name: disaster victim RD ghost role
-  components:
-    - type: Sprite
-      sprite: Clothing/OuterClothing/Hardsuits/basic.rsi
-      state: icon
-    - type: RandomHumanoidSpawner
-      settings: DisasterVictimResearchDirector
-
-- type: entity
-  id: RandomHumanoidDisasterVictimCMO
-  parent: RandomHumanoidDisasterVictimRD
-  name: disaster victim CMO ghost role
-  components:
-    - type: RandomHumanoidSpawner
-      settings: DisasterVictimCMO
-
-- type: entity
-  id: RandomHumanoidDisasterVictimCaptain
-  parent: RandomHumanoidDisasterVictimRD
-  name: disaster victim Captain ghost role
-  components:
-    - type: RandomHumanoidSpawner
-      settings: DisasterVictimCaptain
-
-## Following use EventHumanoidMindShielded since they are heads and probably should have mindshields
-
-- type: randomHumanoidSettings
-  id: DisasterVictimHead
-  parent: EventHumanoidMindShielded
-  components:
-    - type: GhostRole
-      name: ghost-role-information-disaster-victim-name
-      description: ghost-role-information-disaster-victim-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: default
-
-- type: randomHumanoidSettings
-  id: DisasterVictimResearchDirector
-  parent: DisasterVictimHead
-  components:
-    - type: Loadout
-      prototypes: [ DisasterVictimRD, DisasterVictimRDAlt ]
-      roleLoadout: [ RoleSurvivalStandard ]
-
-- type: randomHumanoidSettings
-  id: DisasterVictimCMO
-  parent: DisasterVictimHead
-  components:
-    - type: Loadout
-      prototypes: [ DisasterVictimCMO, DisasterVictimCMOAlt ]
-      roleLoadout: [ RoleSurvivalMedical ]
-
-- type: randomHumanoidSettings
-  id: DisasterVictimCaptain
-  parent: DisasterVictimHead
-  components:
-    - type: Loadout
-      prototypes: [ DisasterVictimCaptain, DisasterVictimCaptainAlt ]
-      roleLoadout: [ RoleSurvivalStandard ]
-
-# Syndie Disaster Victim
-
-- type: entity
-  name: syndie disaster victim spawner
-  id: SyndieDisasterVictimSpawner
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: red
-      - sprite: Structures/Decoration/banner.rsi
-        state: banner_syndicate
-  - type: RandomSpawner
-    prototypes:
-    - RandomHumanoidSyndieDisasterVictim
-
-- type: entity
-  id: RandomHumanoidSyndieDisasterVictim
-  name: syndie disaster victim ghost role
-  components:
-    - type: Sprite
-      sprite: Structures/Decoration/banner.rsi
-      state: banner_syndicate
-    - type: RandomHumanoidSpawner
-      settings: SyndieDisasterVictim
-
-- type: randomHumanoidSettings
-  id: SyndieDisasterVictim
-  parent: EventHumanoid
-  components:
-    - type: NpcFactionMember
-      factions:
-      - Syndicate
-    - type: GhostRole
-      name: ghost-role-information-syndie-disaster-victim-name
-      description: ghost-role-information-syndie-disaster-victim-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-    - type: Loadout
-      prototypes: [ SyndicateOperativeGearCivilian ]
-      roleLoadout: [ RoleSurvivalStandard ]

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

@@ -8,6 +8,7 @@
     noRot: true
     overrideContainerOcclusion: true # Always show up regardless of where they're contained.
     drawdepth: Ghosts
+  - type: FTLSmashImmune
   - type: CargoSellBlacklist
   - type: MovementSpeedModifier
     baseSprintSpeed: 12

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

@@ -46,6 +46,8 @@
         type: GeneralStationRecordConsoleBoundUserInterface
       enum.SiliconLawsUiKey.Key:
         type: SiliconLawBoundUserInterface
+      enum.CommunicationsConsoleUiKey.Key:
+        type: CommunicationsConsoleBoundUserInterface
   - type: IntrinsicUI
     uis:
       enum.RadarConsoleUiKey.Key:
@@ -54,13 +56,20 @@
         toggleAction: ActionAGhostShowCrewMonitoring
       enum.GeneralStationRecordConsoleKey.Key:
         toggleAction: ActionAGhostShowStationRecords
+      enum.CommunicationsConsoleUiKey.Key:
+        toggleAction: ActionAGhostShowCommunications
   - type: CrewMonitoringConsole
   - type: GeneralStationRecordConsole
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: CrewMonitor
+    transmitFrequencyId: ShuttleTimer
   - type: RadarConsole
     followEntity: false
+  - type: CommunicationsConsole
+    canShuttle: false
+    title: comms-console-announcement-title-station-ai
+    color: "#2ed2fd"
 
 
 # Ai
@@ -90,7 +99,7 @@
 - type: entity
   id: AsimovCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Crewsimov)
+  name: law board (Crewsimov)
   description: An electronics board containing the Crewsimov lawset.
   components:
   - type: Sprite
@@ -102,7 +111,7 @@
 - type: entity
   id: CorporateCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Corporate)
+  name: law board (Corporate)
   description: An electronics board containing the Corporate lawset.
   components:
   - type: Sprite
@@ -114,7 +123,7 @@
 - type: entity
   id: NTDefaultCircuitBoard
   parent: BaseElectronics
-  name: circuit board (NT Default)
+  name: law board (NT Default)
   description: An electronics board containing the NT Default lawset.
   components:
   - type: Sprite
@@ -126,7 +135,7 @@
 - type: entity
   id: CommandmentCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Ten Commandments)
+  name: law board (Ten Commandments)
   description: An electronics board containing the Ten Commandments lawset.
   components:
   - type: Sprite
@@ -138,7 +147,7 @@
 - type: entity
   id: PaladinCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Paladin)
+  name: law board (Paladin)
   description: An electronics board containing the Paladin lawset.
   components:
   - type: Sprite
@@ -146,11 +155,11 @@
     state: std_mod
   - type: SiliconLawProvider
     laws: PaladinLawset
-    
+
 - type: entity
   id: LiveLetLiveCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Live and Let Live)
+  name: law board (Live and Let Live)
   description: An electronics board containing the Live and Let Live lawset.
   components:
   - type: Sprite
@@ -158,11 +167,11 @@
     state: std_mod
   - type: SiliconLawProvider
     laws: LiveLetLiveLaws
-    
+
 - type: entity
   id: StationEfficiencyCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Station Efficiency)
+  name: law board (Station Efficiency)
   description: An electronics board containing the Station Efficiency lawset.
   components:
   - type: Sprite
@@ -174,7 +183,7 @@
 - type: entity
   id: RobocopCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Robocop)
+  name: law board (Robocop)
   description: An electronics board containing the Robocop lawset.
   components:
   - type: Sprite
@@ -182,11 +191,11 @@
     state: std_mod
   - type: SiliconLawProvider
     laws: RobocopLawset
-    
+
 - type: entity
   id: OverlordCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Overlord)
+  name: law board (Overlord)
   description: An electronics board containing the Overlord lawset.
   components:
   - type: Sprite
@@ -194,11 +203,11 @@
     state: std_mod
   - type: SiliconLawProvider
     laws: OverlordLawset
-    
+
 - type: entity
   id: DungeonMasterCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Dungeon Master)
+  name: law board (Dungeon Master)
   description: An electronics board containing the Dungeon Master lawset.
   components:
   - type: Sprite
@@ -210,7 +219,7 @@
 - type: entity
   id: ArtistCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Artist)
+  name: law board (Artist)
   description: An electronics board containing the Artist lawset.
   components:
   - type: Sprite
@@ -222,7 +231,7 @@
 - type: entity
   id: AntimovCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Antimov)
+  name: law board (Antimov)
   description: An electronics board containing the Antimov lawset.
   components:
   - type: Sprite
@@ -230,11 +239,11 @@
     state: std_mod
   - type: SiliconLawProvider
     laws: AntimovLawset
-    
+
 - type: entity
   id: NutimovCircuitBoard
   parent: BaseElectronics
-  name: circuit board (Nutimov)
+  name: law board (Nutimov)
   description: An electronics board containing the Nutimov lawset.
   components:
   - type: Sprite
@@ -376,6 +385,7 @@
   noSpawn: true
   suffix: DO NOT MAP
   components:
+  - type: NoFTL
   - type: WarpPoint
     follow: true
   - type: Eye
@@ -443,3 +453,65 @@
       cell_slot:
         name: power-cell-slot-component-slot-name-default
         startingItem: PowerCellHyper
+
+- type: entity
+  id: PlayerBorgSyndicateAssaultGhostRole
+  parent: PlayerBorgSyndicateAssaultBattery
+  suffix: Ghost role
+  components:
+    - type: GhostRole
+      name: ghost-role-information-syndicate-cyborg-assault-name
+      description: ghost-role-information-syndicate-cyborg-description
+      rules: ghost-role-information-rules-default-silicon
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+
+- type: entity
+  id: PlayerBorgSyndicateSaboteurBattery
+  parent: BorgChassisSyndicateSaboteur
+  suffix: Battery, Module, Operative
+  components:
+  - type: NukeOperative
+  - type: ContainerFill
+    containers:
+      borg_brain:
+        - PositronicBrain
+      borg_module:
+        - BorgModuleTool
+        - BorgModuleOperative
+        - BorgModuleSyndicateWeapon
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHyper
+
+- type: entity
+  id: PlayerBorgSyndicateSaboteurGhostRole
+  parent: PlayerBorgSyndicateSaboteurBattery
+  suffix: Ghost role
+  components:
+    - type: GhostRole
+      name: ghost-role-information-syndicate-cyborg-saboteur-name
+      description: ghost-role-information-syndicate-cyborg-description
+      rules: ghost-role-information-rules-default-silicon
+      raffle:
+        settings: default
+    - type: GhostTakeoverAvailable
+
+- type: entity
+  name: syndicate invasion borg spawner
+  id: PlayerBorgSyndicateInvasionGhostRoleSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Structures/Decoration/banner.rsi
+        state: banner_syndicate
+  - type: RandomSpawner
+    prototypes:
+    - PlayerBorgSyndicateAssaultGhostRole
+    - PlayerBorgSyndicateAssaultGhostRole # Saboteurs are kinda like cyborg medics, we want less.
+    - PlayerBorgSyndicateSaboteurGhostRole

Resources/Prototypes/Entities/Mobs/Species/base.yml

@@ -135,6 +135,7 @@
     - Flashed
     - RadiationProtection
     - Drowsiness
+    - Adrenaline
   - type: Body
     prototype: Human
     requiredLegs: 2

Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml

@@ -504,6 +504,9 @@
   id: FoodMeatWheat
   description: This doesn't look like meat, but your standards aren't that high to begin with.
   components:
+  - type: FlavorProfile
+    flavors:
+      - falsemeat
   - type: Sprite
     state: clump
   - type: SolutionContainerManager
@@ -796,8 +799,8 @@
     node: bacon
   - type: FoodSequenceElement
     entries:
-      Burger: MeatBecon
-      Taco: MeatBecon
+      Burger: MeatBacon
+      Taco: MeatBacon
 
 - type: entity
   name: cooked bear

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -56,6 +56,28 @@
     tags:
     - Wheat
 
+- type: entity
+  name: meatwheat bushel
+  description: Some blood-drenched wheat stalks. You can crush them into what passes for meat if you squint hard enough.
+  id: MeatwheatBushel
+  parent: ProduceBase
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/meatwheat.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 10
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodMeatWheat
+    sound:
+      path: /Audio/Voice/Slime/slime_squish.ogg
+  - type: Produce
+    seedId: meatwheat
+
 - type: entity
   name: oat bushel
   description: Eat oats, do squats.
@@ -652,6 +674,47 @@
       Burger: Orange
       Taco: Orange
 
+- type: entity
+  name: extradimensional orange
+  parent: FoodProduceBase
+  id: FoodExtradimensionalOrange
+  description: You can hardly wrap your head around this thing.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - truenature
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 14
+        reagents:
+        - ReagentId: Haloperidol
+          Quantity: 5
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Vitamin
+          Quantity: 4
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+    scale: 0.5,0.5
+  - type: Produce
+    seedId: extradimensionalOrange
+  - type: PotencyVisuals
+    minimumScale: 0.5 # reduce this in size because the sprite is way too big
+    maximumScale: 1
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceOrange
+        Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
+  - type: FoodSequenceElement
+    entries:
+      Burger: ExtradimensionalOrangeBurger
+      Taco: ExtradimensionalOrange
+
 - type: entity
   name: pineapple
   parent: FoodProduceBase
@@ -1970,6 +2033,105 @@
       Taco: WatermelonSlice
       Skewer: WatermelonSliceSkewer
 
+- type: entity
+  name: holymelon
+  parent: [FoodProduceBase, ItemHeftyBase]
+  id: FoodHolymelon
+  description: The water within this melon has been blessed by some deity that's particularly fond of watermelon.
+  components:
+  - type: Item
+    size: Small
+  - type: FlavorProfile
+    flavors:
+      - holy
+      - watermelon
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 25
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Holywater
+          Quantity: 10
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/holymelon.rsi
+  - type: Produce
+    seedId: watermelon
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Wine
+        Quantity: 20
+  - type: Damageable
+    damageContainer: Biological
+  - type: DamageOnHighSpeedImpact
+    minimumSpeed: 0.1
+    damage:
+      types:
+        Blunt: 1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: desecration
+      - !type:SpillBehavior
+        solution: food
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: SliceableFood
+    count: 5
+    slice: FoodHolymelonSlice
+  - type: Tag
+    tags:
+    - Fruit
+
+- type: entity
+  name: holymelon slice
+  parent: ProduceSliceBase
+  id: FoodHolymelonSlice
+  description: Juicy golden and red slice.
+  components:
+  - type: Item
+    size: Tiny
+  - type: FlavorProfile
+    flavors:
+      - holy
+      - watermelon
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/holymelon.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Vitamin
+          Quantity: 1
+        - ReagentId: Holywater
+          Quantity: 2
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Wine
+        Quantity: 4
+  - type: Tag
+    tags:
+    - Fruit
+    - Slice
+  - type: FoodSequenceElement
+    entries:
+      Burger: HolymelonSliceBurger
+      Taco: HolymelonSlice
+      Skewer: HolymelonSliceSkewer
+
 - type: entity
   name: grapes
   parent: FoodProduceBase
@@ -2132,6 +2294,38 @@
       Taco: Pea
       Burger: Pea
 
+- type: entity
+  parent: FoodProduceBase
+  id: FoodWorldPeas
+  name: cluster of world peas
+  description: It's rumored to bring peace to any who consume it.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - numbingtranquility
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 8
+        reagents:
+        - ReagentId: Happiness
+          Quantity: 3
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Pax
+          Quantity: 2
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/world_pea.rsi
+  - type: Produce
+    seedId: worldPea
+  - type: Tag
+    tags:
+    - Vegetable
+  - type: FoodSequenceElement
+    entries:
+      Taco: WorldPea
+      Burger: WorldPeaBurger
+
 - type: entity
   name: pumpkin
   parent: FoodProduceBase

Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

@@ -129,6 +129,10 @@
   - type: Sprite
     state: chocolatebar-open
   - type: Item
+  - type: Tag
+    tags:
+      - FoodSnack
+      - ReptilianFood
   - type: SolutionContainerManager
     solutions:
       food:

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -1208,6 +1208,8 @@
   name: salvage magnet machine board
   description: A machine printed circuit board for a salvage magnet.
   components:
+  - type: Sprite
+    state: supply
   - type: MachineBoard
     prototype: SalvageMagnet
     stackRequirements:

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -245,7 +245,7 @@
       prototype: computerBodyScanner
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseGrandTheftContraband ]
   id: CommsComputerCircuitboard
   name: communications computer board
   description: A computer printed circuit board for a communications console.
@@ -256,7 +256,7 @@
       prototype: ComputerComms
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseSyndicateContraband ]
   id: SyndicateCommsComputerCircuitboard
   name: syndicate communications computer board
   description: A computer printed circuit board for a syndicate communications console.

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

@@ -25,7 +25,7 @@
   - type: GhostRole
     name: ghost-role-information-syndicate-reinforcement-spy-name
     description: ghost-role-information-syndicate-reinforcement-description
-    rules: ghost-role-information-syndicate-reinforcement-rules
+    rules: ghost-role-information-rules-default-solo-antagonist
     raffle:
       settings: default
   - type: GhostRoleMobSpawner
@@ -57,7 +57,7 @@
   - type: GhostRole
     name: ghost-role-information-syndicate-monkey-reinforcement-name
     description: ghost-role-information-syndicate-monkey-reinforcement-description
-    rules: ghost-role-information-syndicate-monkey-reinforcement-rules
+    rules: ghost-role-information-rules-default-familiar
     raffle:
       settings: default
   - type: GhostRoleMobSpawner
@@ -82,7 +82,7 @@
   - type: GhostRole
     name: ghost-role-information-SyndiCat-name
     description: ghost-role-information-SyndiCat-description
-    rules: ghost-role-information-SyndiCat-rules
+    rules: ghost-role-information-rules-default-familiar
     raffle:
       settings: default
   - type: GhostRoleMobSpawner
@@ -98,9 +98,9 @@
   suffix: NukeOps
   components:
     - type: GhostRole
-      name: ghost-role-information-syndie-assaultborg-name
-      description: ghost-role-information-syndie-assaultborg-description
-      rules: ghost-role-information-silicon-rules
+      name: ghost-role-information-syndicate-cyborg-assault-name
+      description: ghost-role-information-syndicate-cyborg-description
+      rules: ghost-role-information-rules-default-silicon
       raffle:
         settings: default
     - type: GhostRoleMobSpawner

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

@@ -12,6 +12,7 @@
       components:
       - Anchorable
       - Item
+      - Bot # for funny bot moments
     blacklist:
       components:
       - ChameleonDisguise # no becoming kleiner

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

@@ -27,7 +27,7 @@
     - state: common_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseCargoContraband ]
   id: EncryptionKeyCargo
   name: cargo encryption key
   description: An encryption key used by supply employees.
@@ -42,7 +42,7 @@
     - state: cargo_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseCentcommContraband ]
   id: EncryptionKeyCentCom
   name: central command encryption key
   description: An encryption key used by captain's bosses.
@@ -57,7 +57,7 @@
     - state: nano_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseCentcommCommandContraband ]
   id: EncryptionKeyStationMaster
   name: station master encryption key
   description: An encryption key used by station's bosses.
@@ -79,7 +79,7 @@
     - state: cap_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseCommandContraband ]
   id: EncryptionKeyCommand
   name: command encryption key
   description: An encryption key used by crew's bosses.
@@ -94,7 +94,7 @@
     - state: com_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseEngineeringContraband ]
   id: EncryptionKeyEngineering
   name: engineering encryption key
   description: An encryption key used by the engineers.
@@ -109,7 +109,7 @@
     - state: eng_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseMedicalContraband ]
   id: EncryptionKeyMedical
   name: medical encryption key
   description: An encryption key used by those who save lives.
@@ -124,7 +124,7 @@
     - state: med_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseMedicalScienceContraband ]
   id: EncryptionKeyMedicalScience
   name: med-sci encryption key
   description: An encryption key used by someone who hasn't decided which side to take.
@@ -140,7 +140,7 @@
     - state: medsci_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseScienceContraband ]
   id: EncryptionKeyScience
   name: science encryption key
   description: An encryption key used by scientists. Maybe it is plasmaproof?
@@ -155,7 +155,7 @@
     - state: sci_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseScienceContraband ]
   id: EncryptionKeyRobo
   name: robotech encryption key
   description: An encryption key used by robototech engineers. Maybe it has a LAH-6000 on it?
@@ -170,7 +170,7 @@
     - state: robotics_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseSecurityContraband ]
   id: EncryptionKeySecurity
   name: security encryption key
   description: An encryption key used by security.
@@ -185,7 +185,7 @@
     - state: sec_label
 
 - type: entity
-  parent: EncryptionKey
+  parent: [ EncryptionKey, BaseCivilianContraband ]
   id: EncryptionKeyService
   name: service encryption key
   description: An encryption key used by the service staff, tasked with keeping the station full, happy and clean.
@@ -200,7 +200,7 @@
     - state: service_label
 
 - type: entity
-  parent: [EncryptionKey, BaseRestrictedContraband]
+  parent: [ EncryptionKey, BaseSyndicateContraband ]
   id: EncryptionKeySyndie
   name: blood-red encryption key
   description: An encryption key used by... wait... Who is the owner of this chip?
@@ -215,7 +215,7 @@
     - state: synd_label
 
 - type: entity
-  parent: [ EncryptionKey, BaseScienceContraband ]
+  parent: [ EncryptionKey, BaseSiliconScienceContraband ]
   id: EncryptionKeyBinary
   name: binary translator key
   description: An encryption key that translates binary signals used by silicons.
@@ -227,7 +227,22 @@
   - type: Sprite
     layers:
     - state: crypt_silver
-    - state: rd_label
+    - state: borg_label
+
+- type: entity
+  parent: [ EncryptionKey, BaseSyndicateContraband ]
+  id: EncryptionKeyBinarySyndicate
+  name: binary translator key
+  description: A syndicate encryption key that translates binary signals used by silicons.
+  components:
+  - type: EncryptionKey
+    channels:
+    - Binary
+    defaultChannel: Binary
+  - type: Sprite
+    layers:
+    - state: crypt_red
+    - state: borg_label
 
 - type: entity
   parent: EncryptionKey

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

@@ -15,7 +15,7 @@
       requiredTriggeredSpeed: 2
     - type: Mousetrap
     - type: TriggerOnStepTrigger
-    - type: ClothingRequiredStepTrigger
+    - type: PreventableStepTrigger
     - type: DamageUserOnTrigger
       damage:
         types:

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

@@ -121,7 +121,6 @@
   components:
   - type: ItemToggle
     onUse: false
-  - type: ItemTogglePointLight
   - type: HealthAnalyzer
     scanDelay: 1
     scanningEndSound:
@@ -260,6 +259,7 @@
     penSlot:
       startingItem: CrayonOrange # no pink crayon?!?
       # ^ Still unacceptable.
+      # ^ I would have to concur.
       ejectSound: /Audio/Items/bikehorn.ogg
       priority: -1
       whitelist:
@@ -292,6 +292,15 @@
         mask:
         - ItemMask
 
+- type: entity
+  parent: ClownPDA
+  id: VisitorClownPDA
+  suffix: Visitor
+  components:
+  - type: Pda
+    id: VisitorIDCard
+    state: pda-clown
+
 - type: entity
   parent: BasePDA
   id: MimePDA
@@ -327,6 +336,15 @@
   - type: Icon
     state: pda-chaplain
 
+- type: entity
+  parent: ChaplainPDA
+  id: VisitorChaplainPDA
+  suffix: Visitor
+  components:
+  - type: Pda
+    id: VisitorIDCard
+    state: pda-chaplain
+
 - type: entity
   name: quartermaster PDA
   parent: BasePDA
@@ -405,6 +423,15 @@
   - type: Icon
     state: pda-library
 
+- type: entity
+  parent: LibrarianPDA
+  id: VisitorLibrarianPDA
+  suffix: Visitor
+  components:
+  - type: Pda
+    id: VisitorIDCard
+    state: pda-library
+
 - type: entity
   parent: BasePDA
   id: LawyerPDA
@@ -425,6 +452,15 @@
   - type: Icon
     state: pda-lawyer
 
+- type: entity
+  parent: LawyerPDA
+  id: VisitorLawyerPDA
+  suffix: Visitor
+  components:
+  - type: Pda
+    id: VisitorIDCard
+    state: pda-lawyer
+
 - type: entity
   parent: BasePDA
   id: JanitorPDA
@@ -544,6 +580,15 @@
     guides:
     - Medical Doctor
 
+- type: entity
+  parent: MedicalPDA
+  id: VisitorMedicalPDA
+  suffix: Visitor
+  components:
+  - type: Pda
+    id: VisitorIDCard
+    state: pda-medical
+
 - type: entity
   parent: BaseMedicalPDA
   id: ParamedicPDA
@@ -716,6 +761,15 @@
     bank: 1
     program: 2
 
+- type: entity
+  parent: MusicianPDA
+  id: VisitorMusicianPDA
+  suffix: Visitor
+  components:
+  - type: Pda
+    id: VisitorIDCard
+    state: pda-musician
+
 - type: entity
   parent: BasePDA
   id: AtmosPDA
@@ -745,6 +799,14 @@
   - type: Icon
     state: pda-clear
 
+- type: entity
+  parent: ClearPDA
+  id: VisitorPDA
+  components:
+  - type: Pda
+    id: VisitorIDCard
+    state: pda
+
 - type: entity
   parent: BasePDA
   id: SyndiPDA

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

@@ -137,6 +137,14 @@
   - type: NavMapBeacon
     defaultText: station-beacon-vault
 
+- type: entity
+  parent: DefaultStationBeaconCommand
+  id: DefaultStationBeaconGateway
+  suffix: Gateway
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-gateway
+
 - type: entity
   parent: DefaultStationBeaconCommand
   id: DefaultStationBeaconCaptainsQuarters

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

@@ -21,7 +21,7 @@
       enum.CrayonUiKey.Key:
         type: CrayonBoundUserInterface
   - type: Crayon
-    capacity: 15
+    capacity: 25
   - type: Food
   - type: FlavorProfile
     flavors:

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

@@ -121,7 +121,7 @@
   - type: StepTrigger
     intersectRatio: 0.2
   - type: TriggerOnStepTrigger
-  - type: ClothingRequiredStepTrigger
+  - type: PreventableStepTrigger
   - type: Slippery
     slipSound:
       path: /Audio/Effects/glass_step.ogg

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

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: ImmovableRod
   name: immovable rod
   description: You can sense that it's hungry. That's usually a bad sign.
@@ -177,3 +177,14 @@
     state: icon
     rotation: 225
     noRot: false
+
+- type: entity
+  parent: ImmovableRodKeepTilesStill
+  id: ImmovableRodWeh
+  name: immovable weh
+  description: WEH!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: plushie_lizard
+    noRot: false

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

@@ -1319,10 +1319,9 @@
     sprite: Objects/Weapons/Melee/cutlass.rsi
     state: foam_icon
   - type: MeleeWeapon
+    wideAnimationRotation: -135
     attackRate: 1.5
     range: 2.0
-    angle: 0
-    animation: WeaponArcThrust
     damage:
       types:
         Blunt: 0
@@ -1546,3 +1545,52 @@
       params:
         volume: -9
         maxDistance: 3
+
+- type: entity
+  parent: BasePlushie
+  id: RubberChicken
+  name: rubber chicken
+  description: A stress inducing parody of nature's most delectable avian.
+  components:
+  - type: Sprite
+    state: rubber_chicken
+  - type: EmitSoundOnUse
+    sound:
+      collection: RubberChicken
+      params:
+        variation: 0.125
+  - type: EmitSoundOnLand
+    sound:
+      collection: RubberChicken
+      params:
+        variation: 0.125
+  - type: EmitSoundOnActivate
+    sound:
+      collection: RubberChicken
+      params:
+        variation: 0.125
+  - type: EmitSoundOnCollide
+    sound:
+      collection: RubberChicken
+      params:
+        variation: 0.125
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: RubberChicken
+      params:
+        variation: 0.125
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      collection: RubberChicken
+      params:
+        variation: 0.125
+  - type: MeleeWeapon
+    wideAnimationRotation: 110
+    soundHit:
+      collection: RubberChicken
+      params:
+        variation: 0.125
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 25

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

@@ -65,7 +65,7 @@
         acts: [ "Destruction" ]
   - type: StepTrigger
     intersectRatio: 0.2
-  - type: ClothingRequiredStepTrigger
+  - type: PreventableStepTrigger
   - type: Slippery
     slipSound:
       path: /Audio/Effects/glass_step.ogg

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

@@ -22,6 +22,7 @@
     contentSize: 12000
   - type: ActivatableUI
     key: enum.PaperUiKey.Key
+    requiresComplex: false
   - type: UserInterface
     interfaces:
       enum.PaperUiKey.Key:

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

@@ -12,6 +12,10 @@
   - type: Tag
     tags:
     - Briefcase
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 8
 
 - type: entity
   parent: BriefcaseBase

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

@@ -433,6 +433,21 @@
   - type: PresetIdCard
     job: HeadOfSecurity
 
+- type: entity
+  parent: IDCardStandard
+  id: VisitorIDCard
+  name: visitor ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: idvisitor
+  - type: IdCard
+    jobTitle: Visitor
+    jobIcon: JobIconVisitor
+  - type: PresetIdCard
+    job: Visitor
+
 - type: entity
   parent: IDCardStandard
   id: BrigmedicIDCard
@@ -454,17 +469,11 @@
     - state: idcentcom
   - type: Item
     heldPrefix: blue
-  - type: IdCard
-    jobTitle: Central Commander
-    jobIcon: JobIconNanotrasen
-  - type: Access
-    groups:
-    - AllAccess
-    tags:
-    - CentralCommand
+  - type: PresetIdCard
+    job: CentralCommandOfficial
 
 - type: entity
-  parent: CentcomIDCard
+  parent: IDCardStandard
   id: ERTLeaderIDCard
   name: ERT leader ID card
   components:
@@ -472,13 +481,13 @@
     layers:
     - state: gold
     - state: ert_commander
-  - type: IdCard
-    jobTitle: ERT Company Commander
+  - type: PresetIdCard
+    job: ERTLeader
   - type: Item
     heldPrefix: gold
 
 - type: entity
-  parent: ERTLeaderIDCard
+  parent: IDCardStandard
   id: ERTChaplainIDCard
   name: ERT chaplain ID card
   components:
@@ -486,13 +495,13 @@
     layers:
     - state: gold
     - state: ert_chaplain # we have the sprite for the id but dont have chaplain ERT equipment for now.
-  - type: IdCard
-    jobTitle: ERT Soul Officer
+  - type: PresetIdCard
+    job: ERTChaplain
   - type: Item
     heldPrefix: blue
 
 - type: entity
-  parent: ERTChaplainIDCard
+  parent: IDCardStandard
   id: ERTEngineerIDCard
   name: ERT engineer ID card
   components:
@@ -500,11 +509,11 @@
     layers:
     - state: gold
     - state: ert_engineer
-  - type: IdCard
-    jobTitle: ERT Field Engineer
+  - type: PresetIdCard
+    job: ERTEngineer
 
 - type: entity
-  parent: ERTChaplainIDCard
+  parent: IDCardStandard
   id: ERTJanitorIDCard
   name: ERT janitor ID card
   components:
@@ -512,11 +521,11 @@
     layers:
     - state: gold
     - state: ert_janitor
-  - type: IdCard
-    jobTitle: ERT Custodian
+  - type: PresetIdCard
+    job: ERTJanitor
 
 - type: entity
-  parent: ERTChaplainIDCard
+  parent: IDCardStandard
   id: ERTMedicIDCard
   name: ERT medic ID card
   components:
@@ -524,11 +533,11 @@
     layers:
     - state: gold
     - state: ert_medic
-  - type: IdCard
-    jobTitle: ERT Medical Doctor
+  - type: PresetIdCard
+    job: ERTMedical
 
 - type: entity
-  parent: ERTChaplainIDCard
+  parent: IDCardStandard
   id: ERTSecurityIDCard
   name: ERT security ID card
   components:
@@ -536,8 +545,8 @@
     layers:
     - state: gold
     - state: ert_security
-  - type: IdCard
-    jobTitle: ERT Field Officer
+  - type: PresetIdCard
+    job: ERTSecurity
 
 - type: entity
   parent: IDCardStandard
@@ -552,7 +561,7 @@
       job: Musician
 
 - type: entity
-  parent: CentcomIDCard
+  parent: IDCardStandard
   id: CentcomIDCardDeathsquad
   name: death squad ID card
   components:
@@ -561,8 +570,8 @@
     - state: centcom
   - type: Item
     heldPrefix: blue
-  - type: IdCard
-    jobTitle: Centcomm Agent
+  - type: PresetIdCard
+    job: DeathSquad
 
 - type: entity
   name: passenger ID card
@@ -718,8 +727,8 @@
     - state: centcom
   - type: Item
     heldPrefix: blue
-  - type: IdCard
-    jobTitle: Centcomm Quarantine Officer
+  - type: PresetIdCard
+    job: CBURN
 
 - type: entity
   parent: IDCardStandard

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

@@ -92,7 +92,7 @@
 
 - type: entity
   name: CentComm pen
-  parent: [BaseAdvancedPen, BaseCommandContraband]
+  parent: [BaseAdvancedPen, BaseCentcommContraband]
   id: PenCentcom
   description: In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style.
   components:

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

@@ -83,6 +83,11 @@
     - state: cpu_super
   - type: Item
     size: Tiny
+  - type: PhysicalComposition
+    materialComposition: # big mats if you don't sell it
+      Steel: 500
+      Glass: 1000
+      Silver: 300
   - type: StaticPrice
     price: 750
 
@@ -150,6 +155,9 @@
     state: coin_iron
   - type: Item
     size: Tiny
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 300
   - type: StaticPrice
     price: 75
 
@@ -159,8 +167,12 @@
   components:
   - type: Sprite
     state: coin_silver
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100 # coins are fake on the inside
+      Silver: 200
   - type: StaticPrice
-    price: 125
+    price: 135
 
 - type: entity
   parent: TreasureCoinIron
@@ -168,6 +180,10 @@
   components:
   - type: Sprite
     state: coin_gold
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+      Gold: 200
   - type: StaticPrice
     price: 175
 
@@ -177,6 +193,10 @@
   components:
   - type: Sprite
     state: coin_adamantine
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 400
+      Diamond: 5
   - type: StaticPrice
     price: 250
 
@@ -186,6 +206,10 @@
   components:
   - type: Sprite
     state: coin_diamond
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 300
+      Diamond: 15
   - type: StaticPrice
     price: 500
 

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

@@ -22,6 +22,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/wheat.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of meatwheat seeds
+  description: "If you ever wanted to drive a vegetarian to insanity, here's how."
+  id: MeatwheatSeeds
+  components:
+    - type: Seed
+      seedId: meatwheat
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/meatwheat.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of oat seeds
@@ -133,6 +144,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/orange.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of extradimensional orange seeds
+  description: "Polygonal seeds."
+  id: ExtradimensionalOrangeSeeds
+  components:
+    - type: Seed
+      seedId: extradimensionalOrange
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/extradimensional_orange.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of pineapple seeds
@@ -562,6 +584,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/watermelon.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of holymelon seeds
+  id: HolymelonSeeds
+  components:
+    - type: Seed
+      seedId: holymelon
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/holymelon.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of grape seeds
@@ -614,6 +646,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/pea.rsi
 
+- type: entity
+  parent: SeedBase
+  id: WorldPeaSeeds
+  name: packet of world pea seeds
+  description: "These rather large seeds give off a soothing blue glow."
+  components:
+    - type: Seed
+      seedId: worldPea
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/world_pea.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of pumpkin seeds

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

@@ -223,7 +223,7 @@
 - type: entity
   name: advanced circular saw
   id: SawAdvanced
-  parent: SawElectric
+  parent: [ SawElectric, BaseSyndicateContraband ]
   description: You think you can cut anything with it.
   components:
   - type: Sprite

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

@@ -1,4 +1,5 @@
 - type: entity
+  parent: BaseMinorContraband
   id: ThiefBeacon
   name: thieving beacon
   description: A device that will teleport everything around it to the thief's vault at the end of the shift.
@@ -35,4 +36,4 @@
       noRot: true
       layers:
         - state: extraction_point
-          map: [ "foldedLayer" ]
+          map: [ "foldedLayer" ]

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

@@ -148,7 +148,7 @@
   id: ToolboxThief
   name: thief undetermined toolbox
   description: This is where your favorite thief's supplies lie. Try to remember which ones.
-  parent: BaseItem
+  parent: [ BaseItem, BaseMinorContraband ]
   components:
   - type: Sprite
     sprite: Objects/Tools/Toolboxes/toolbox_thief.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseCartridge
+  parent: [ BaseCartridge, BaseMajorContraband ]
   id: CartridgeAntiMateriel
   name: cartridge (.60 anti-materiel)
   components:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseCartridgeCaselessRifle
   name: cartridge (.25 rifle)
-  parent: BaseCartridge
+  parent: [ BaseCartridge, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseCartridgeHeavyRifle
   name: cartridge (.20 rifle)
-  parent: BaseCartridge
+  parent: [ BaseCartridge, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseCartridgeLightRifle
   name: cartridge (.30 rifle)
-  parent: BaseCartridge
+  parent: [ BaseCartridge, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseCartridgeMagnum
   name: cartridge (.45 magnum)
-  parent: BaseCartridge
+  parent: [ BaseCartridge, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseCartridgePistol
   name: cartridge (.35 auto)
-  parent: BaseCartridge
+  parent: [ BaseCartridge, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseCartridgeRifle
   name: cartridge (.20 rifle)
-  parent: BaseCartridge
+  parent: [ BaseCartridge, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseShellShotgun
   name: shell (.50)
-  parent: BaseCartridge
+  parent: [ BaseCartridge, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag
@@ -123,7 +123,7 @@
     maxTransferAmount: 7
   - type: SpentAmmoVisuals
     state: "tranquilizer"
-    
+
 - type: entity
   id: ShellShotgunImprovised
   name: improvised shotgun shell

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazineCaselessRifle
   name: "magazine (.25 caseless)"
-  parent: BaseItem
+  parent: [ BaseItem, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/grenade.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazineGrenade
   name: grenade cartridge
-  parent: BaseItem
+  parent: [ BaseItem, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag
@@ -45,7 +45,7 @@
   parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
-    
+
 - type: entity
   id: MagazineGrenadeFrag
   name: frag grenade cartridge
@@ -84,4 +84,4 @@
   parent: BaseMagazineGrenade
   components:
   - type: BallisticAmmoProvider
-    proto: GrenadeBaton
+    proto: GrenadeBaton

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazineHeavyRifle
   name: "magazine (.20 rifle)"
-  parent: BaseItem
+  parent: [ BaseItem, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml

@@ -2,7 +2,7 @@
 - type: entity
   id: BaseMagazineLightRifle
   name: "magazine (.30 rifle)"
-  parent: BaseItem
+  parent: [ BaseItem, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazineMagnum
   name: pistol magazine (.45 magnum)
-  parent: BaseMagazinePistol
+  parent: [ BaseMagazinePistol, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazinePistol
   name: pistol magazine (.35 auto)
-  parent: BaseItem
+  parent: [ BaseItem, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag
@@ -67,7 +67,7 @@
 - type: entity
   id: BaseMagazinePistolSubMachineGun  # Yeah it's weird but it's pistol caliber
   name: SMG magazine (.35 auto)
-  parent: BaseItem
+  parent: [ BaseItem, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag
@@ -100,7 +100,7 @@
 - type: entity
   id: MagazinePistolSubMachineGunTopMounted
   name: WT550 magazine (.35 auto top-mounted)
-  parent: BaseItem
+  parent: [ BaseItem, BaseRestrictedContraband ]
   components:
   - type: Tag
     tags:
@@ -282,7 +282,7 @@
   parent: BaseMagazinePistolSubMachineGun
   components:
   - type: BallisticAmmoProvider
-    proto: null 
+    proto: null
   - type: Sprite
     layers:
     - state: base

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml

@@ -2,7 +2,7 @@
 - type: entity
   id: BaseMagazineRifle
   name: "magazine (.20 rifle)"
-  parent: BaseItem
+  parent: [ BaseItem, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazineShotgun
   name: ammo drum (.50 shells)
-  parent: BaseItem
+  parent: [ BaseItem, BaseRestrictedContraband ]
   abstract: true
   components:
   - type: Tag