Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo

Merged master into branch
2025-06-16 06:01:18 -04:00
parent 76f105cd3a 00b68d4c10
commit 0202166406
2325 changed files with 235471 additions and 1173496 deletions
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -30,6 +30,10 @@
    delay: 0.5
  - type: ExplosionResistance
    damageCoefficient: 0.9
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+    - Backpack

 - type: entity
  parent: ClothingBackpack
@@ -282,6 +286,8 @@
    grid:
    - 0,0,7,3
    - 8,1,8,3
+  - type: StaticPrice
+    price: 1000

 #Special
 - type: entity
@@ -381,14 +387,14 @@
    - 0,0,0,3
    - 0,0,2,0
    - 0,3,2,3
-    - 2,1,2,1
-    - 4,0,4,2
-    - 6,0,6,2
-    - 5,1,5,1
-    - 5,3,5,3
-    - 9,0,9,1
-    - 8,2,8,3
-    - 10,2,10,3
+    - 2,2,2,2
+    - 4,1,4,3
+    - 6,1,6,3
+    - 5,2,5,2
+    - 5,0,5,0
+    - 9,2,9,3
+    - 8,0,8,1
+    - 10,0,10,1

 - type: entity
  parent: ClothingBackpack
--- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
@@ -75,3 +75,26 @@
    solution: tank
  - type: ExaminableSolution
    solution: tank
+
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBagPet
+  name: pet bag
+  description: A small bag designed for use by pets and small animals.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Specific/petbag.rsi
+  - type: Storage
+    grid:
+    - 1,0,2,0
+    - 0,1,2,3
+    - 6,0,7,0
+    - 6,1,8,3
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+    - CorgiWearable
+    - PetOnly
+  - type: Construction
+    graph: ClothingBagPet
+    node: bagPet
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -80,6 +80,10 @@
            - Multitool
    sprite: Clothing/Belt/belt_overlay.rsi
  - type: Appearance
+  - type: Tag
+    tags:
+    - UtilityBelt
+    - WhitelistChameleon

 - type: entity
  parent: ClothingBeltStorageBase
@@ -612,6 +616,8 @@
        - Gun
        - BallisticAmmoProvider
        - CartridgeAmmo
+  - type: StaticPrice
+    price: 500

 - type: entity
  parent: ClothingBeltSecurity
@@ -658,6 +664,8 @@
    sprite: Clothing/Belt/militarywebbing.rsi
  - type: ExplosionResistance
    damageCoefficient: 0.1
+  - type: StaticPrice
+    price: 500

 - type: entity
  parent: ClothingBeltMilitaryWebbing
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -124,6 +124,8 @@
    sprite: Clothing/Eyes/Glasses/outlawglasses.rsi
  - type: VisionCorrection
  - type: IdentityBlocker
+  - type: StaticPrice
+    price: 500

 - type: entity
  parent: ClothingEyesBase
@@ -281,7 +283,7 @@
  - type: FlashImmunity
  - type: EyeProtection
    protectionTime: 5
-  - type: BlackAndWhiteOverlay
+  - type: NoirOverlay
  - type: Tag
    tags:
    - HamsterWearable
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -44,6 +44,7 @@
  - type: Tag
    tags:
    - HudMedical
+    - WhitelistChameleon

 - type: entity
  parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityContraband]
@@ -58,6 +59,7 @@
  - type: Tag
    tags:
    - HudSecurity
+    - WhitelistChameleon

 - type: entity
  parent: [ClothingEyesBase, BaseCommandContraband]
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -156,7 +156,7 @@
  - type: Fiber
    fiberMaterial: fibers-nitrile
  - type: FingerprintMask
-####
+
 - type: entity
  parent: ClothingHandsButcherable
  id: ClothingHandsGlovesLeather
@@ -216,14 +216,14 @@
    sprite: Clothing/Hands/Gloves/spaceninja.rsi
    layers:
    - state: icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
  - type: Clothing
    sprite: Clothing/Hands/Gloves/spaceninja.rsi
  - type: Appearance
  - type: GenericVisualizer
    visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
          True: {state: icon-green}
          False: {state: icon}
  - type: Insulated
@@ -417,7 +417,11 @@
      enum.MeleeSpeechUiKey.Key:
        type: MeleeSpeechBoundUserInterface
  - type: StaticPrice
-    price: 0
+    price: 2500
+  - type: Tag
+    tags:
+    - Kangaroo
+    - WhitelistChameleon

 - type: entity
  parent: [ClothingHandsBase, BaseSecurityContraband]
@@ -476,6 +480,7 @@
  - type: Tag
    tags:
    - WhitelistChameleon
+    - Kangaroo

 - type: entity
  parent: [ClothingHandsKnuckleDusters, BaseMinorContraband] #Craftable version of base knuckledusters
@@ -494,6 +499,7 @@
  - type: Tag
    tags:
    - WhitelistChameleon
+    - Kangaroo

 - type: entity
  parent: [ClothingHandsBase, BaseGrandTheftContraband]
@@ -520,6 +526,7 @@
  - type: Tag
    tags:
    - WhitelistChameleon
+    - Kangaroo
  - type: StealTarget
    stealGroup: ClothingHandsKnuckleDustersQM

@@ -547,6 +554,9 @@
  - type: Tag
    tags:
    - WhitelistChameleon
+    - Kangaroo
+  - type: StaticPrice
+    price: 2000

 - type: entity
  name: stun knuckle dusters
@@ -558,15 +568,15 @@
    sprite: Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi
    layers:
    - state: knuckleduster_off
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
  - type: Clothing
    sprite: Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi
    equippedPrefix: on
  - type: Appearance
  - type: GenericVisualizer
    visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
          True: {state: knuckleduster_on}
          False: {state: knuckleduster_off}
  - type: ToggleClothing
@@ -638,5 +648,5 @@
      collection: Punch
    animation: WeaponArcFist
  - type: Tag
-    tags: [] # ignore "WhitelistChameleon" tag
-
+    tags:
+    - Kangaroo
--- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
@@ -29,6 +29,7 @@
    - Bandana
    - ClothMade
    - Recyclable
+    - WhitelistChameleon

 - type: entity
  parent: [ClothingHeadBandBase, ClothingMaskBandBlack]
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -62,7 +62,9 @@
  - type: Item
    heldPrefix: off
    size: Normal
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
+    spriteLayer: light
+  - type: ItemTogglePointLight
  - type: PointLight
    enabled: false
    radius: 3
@@ -109,8 +111,9 @@
  id: ClothingHeadEVAHelmetBase
  name: base space helmet
  components:
-  - type: SlotBlock
-    slots: [ears, eyes, mask]
+# SlotBlocker blocked until UI change
+#  - type: SlotBlock
+#    slots: [ears, eyes, mask]
  - type: BreathMask
  - type: Item
    size: Normal
@@ -146,8 +149,9 @@
  name: base hardsuit helmet
  categories: [ HideSpawnMenu ]
  components:
-  - type: SlotBlock
-    slots: [ears, eyes, mask]
+# SlotBlocker blocked until UI change
+#  - type: SlotBlock
+#    slots: [ears, eyes, mask]
  - type: BreathMask
  - type: Sprite
    state: icon # default state used by most inheritors
@@ -194,8 +198,9 @@
  name: base hardsuit helmet with light
  categories: [ HideSpawnMenu ]
  components:
-  - type: SlotBlock
-    slots: [ears, eyes, mask]
+# SlotBlocker blocked until UI change
+#  - type: SlotBlock
+#    slots: [ears, eyes, mask]
  - type: Sprite
    layers:
    - state: icon
@@ -204,7 +209,9 @@
      map: [ "light" ]
  - type: Clothing
    equippedPrefix: off
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
+    spriteLayer: light
+  - type: ItemTogglePointLight
  - type: PointLight
    enabled: false
    radius: 3
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -37,6 +37,8 @@
    sprite: Clothing/Head/Helmets/eva_syndicate.rsi
  - type: Clothing
    sprite: Clothing/Head/Helmets/eva_syndicate.rsi
+  - type: StaticPrice
+    price: 500 # Suit is 1000

 #Cosmonaut Helmet
 - type: entity
@@ -74,7 +76,7 @@
    sprite: Clothing/Head/Hardsuits/paramedhelm.rsi
  - type: HandheldLight
    addPrefix: false
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
    spriteLayer: light
    clothingVisuals:
      head:
--- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
@@ -25,22 +25,22 @@
    radiatingBehaviourId: radiating
  - type: LightBehaviour
    behaviours:
-      - !type:FadeBehaviour
-        id: radiating
-        interpolate: Linear
-        maxDuration: 2.0
-        startValue: 3.0
-        endValue: 2.0
-        isLooped: true
-        reverseWhenFinished: true
-      - !type:PulseBehaviour
-        id: blinking
-        interpolate: Nearest
-        maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
-        isLooped: true
-  - type: ToggleableLightVisuals
+    - !type:FadeBehaviour
+      id: radiating
+      interpolate: Linear
+      maxDuration: 2.0
+      startValue: 3.0
+      endValue: 2.0
+      isLooped: true
+      reverseWhenFinished: true
+    - !type:PulseBehaviour
+      id: blinking
+      interpolate: Nearest
+      maxDuration: 1.0
+      minValue: 0.1
+      maxValue: 2.0
+      isLooped: true
+  - type: ToggleableVisuals
    spriteLayer: light
    inhandVisuals:
      left:
@@ -50,6 +50,7 @@
    clothingVisuals:
      head:
      - state: on-equipped-HELMET
+  - type: ItemTogglePointLight
  - type: PowerCellSlot
    cellSlotId: cell_slot
  - type: ItemSlots
@@ -65,11 +66,6 @@
  - type: Tag
    tags:
    - WhitelistChameleon
-  - type: HideLayerClothing
-    layers:
-      Hair: HEAD
-      HeadTop : HEAD
-      HeadSide : HEAD 

 - type: entity
  parent: ClothingHeadHatHardhatBase
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -24,7 +24,7 @@
      map: [ "light" ]
  - type: HandheldLight
    addPrefix: false
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
    spriteLayer: light
    clothingVisuals:
      head:
@@ -90,7 +90,7 @@
      map: [ "light" ]
  - type: HandheldLight
    addPrefix: false
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
    clothingVisuals:
      head:
      - state: equipped-head-light
@@ -150,7 +150,7 @@
      map: [ "light" ]
  - type: HandheldLight
    addPrefix: false
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
    clothingVisuals:
      head:
      - state: equipped-head-light
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -400,6 +400,8 @@
    sprite: Clothing/Head/Hats/outlawhat.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/outlawhat.rsi
+  - type: StaticPrice
+    price: 500

 - type: entity
  parent: ClothingHeadBase
@@ -1331,3 +1333,36 @@
    sprite: Clothing/Head/Hats/solidheadband.rsi
  - type: Clothing
    sprite: Clothing/Head/Hats/solidheadband.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadPropellerHat
+  name: propeller hat
+  description: You're the bestest boy.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/propellerhat.rsi
+    layers:
+    - state: icon
+      map: [ "enum.ToggleableVisuals.Layer" ]
+  - type: Clothing
+    equippedPrefix: off
+    sprite: Clothing/Head/Hats/propellerhat.rsi
+  - type: ToggleableVisuals
+    spriteLayer: enum.ToggleableVisuals.Layer
+    clothingVisuals:
+      head:
+      - state: on-equipped-HELMET
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
+          True: {state: icon-on}
+          False: {state: icon}
+  - type: ItemToggle
+    predictable: true
+    soundActivate:
+      path: /Audio/Items/flashlight_on.ogg
+    soundDeactivate:
+      path: /Audio/Items/flashlight_off.ogg
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -508,7 +508,8 @@
    action: ActionToggleJusticeHelm
    mustEquip: false
  - type: ItemTogglePointLight
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
+    spriteLayer: light
    clothingVisuals:
      head:
      - state: on-equipped-HELMET
@@ -556,11 +557,13 @@
      Hair: HEAD

 - type: entity
+  parent: BaseAction
  id: ActionToggleJusticeHelm
  name: Toggle Justice Helm
  description: Toggles the justice helm on and off.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 1
    itemIconStyle: BigItem
+  - type: InstantAction
    event: !type:ToggleActionEvent
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -196,6 +196,8 @@
    sprite: Clothing/Head/Misc/fancycrown.rsi
  - type: Clothing
    sprite: Clothing/Head/Misc/fancycrown.rsi
+  - type: TypingIndicatorClothing
+    proto: regal
  - type: MobPrice
    price: 3000
  - type: AddAccentClothing
@@ -216,6 +218,8 @@
    sprite: Clothing/Head/Hats/catears.rsi
  - type: AddAccentClothing
    accent: OwOAccent
+  - type: StaticPrice
+    price: 15000

 - type: entity
  parent: [ClothingHeadHatCatEars, BaseToggleClothing]
@@ -240,13 +244,10 @@
    accent: OwOAccent

 - type: entity
-  categories: [ Actions, HideSpawnMenu ]
+  parent: BaseToggleAction
  id: ActionBecomeValid
  name: Become Valid
  description: "*notices your killsign* owo whats this"
-  components:
-  - type: InstantAction
-    event: !type:ToggleActionEvent

 - type: entity
  parent: ClothingHeadBase
@@ -279,7 +280,7 @@
    - Hair
    - HeadTop
    - HeadSide
-    - FacialHair 
+    - FacialHair

 - type: entity
  parent: ClothingHeadBase
--- a/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml
@@ -0,0 +1,85 @@
+# Separate yml file for scrap helmet since it has so many construction steps.
+# Listed from first step of crafting to the final helmet
+
+- type: entity
+  name: wired bucket
+  parent: BaseItem
+  id: WiredBucketBase
+  description: A bucket with attached wiring to better serve as a chinstrap.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/scrap_helmet.rsi
+    state: construction-1
+  - type: Item
+    size: Normal
+    sprite: Clothing/Head/Helmets/scrap_helmet.rsi
+  - type: Construction
+    graph: scraphelmet
+    node: wiredbucket
+
+- type: entity
+  name: sliced bucket
+  parent: BaseItem
+  id: SlicedBucketBase
+  description: A bucket with a vision slit cut into the side.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/scrap_helmet.rsi
+    state: construction-2
+  - type: Item
+    size: Normal
+    sprite: Clothing/Head/Helmets/scrap_helmet.rsi
+  - type: Construction
+    graph: scraphelmet
+    node: slicedbucket
+
+- type: entity
+  name: steel bucket
+  parent: BaseItem
+  id: SteelBucketBase
+  description: A bucket that's had steel welded onto it's exterior. It requires better shaping before it can be worn comfortably.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/scrap_helmet.rsi
+    state: construction-3
+  - type: Item
+    size: Normal
+    sprite: Clothing/Head/Helmets/scrap_helmet.rsi
+  - type: Construction
+    graph: scraphelmet
+    node: steelbucket
+
+# The helmet itself
+- type: entity
+  parent: [ClothingHeadHelmetBase, BaseMajorContraband]
+  id: ClothingHeadHelmetScrap #When we get the tech for it this bad boy needs to be given a vision reduction when equipped. 1-2 tiles less than normal should be good.
+  name: scrap helmet
+  description: A cobbled-together helmet made from cabling, steel, and a bucket.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/scrap_helmet.rsi
+  - type: Item
+    size: Normal
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/scrap_helmet.rsi
+    equipSound: /Audio/Effects/metal_scrape2.ogg
+    unequipSound: /Audio/Effects/metal_scrape1.ogg
+    equipDelay: 3
+    unequipDelay: 3 #shorter on the helmet.
+  - type: IngestionBlocker
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - Snout
+    - HeadTop
+    - HeadSide
+  - type: Construction
+    graph: scraphelmet
+    node: scraphelmet
--- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
@@ -20,13 +20,15 @@
  - type: Mask

 - type: entity
+  parent: BaseAction
  id: ActionToggleMask
  name: Toggle Mask
  description: Handy, but prevents insertion of pie into your pie hole.
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Clothing/Mask/gas.rsi, state: icon }
    iconOn: Interface/Default/blocked.png
+  - type: InstantAction
    event: !type:ToggleMaskEvent

 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -206,10 +206,7 @@
    - WhitelistChameleon
  - type: HideLayerClothing
    slots:
-    - Hair
    - Snout
-    - HeadTop
-    - HeadSide

 - type: entity
  parent: ClothingMaskClownBase
@@ -222,10 +219,7 @@
    - WhitelistChameleon
  - type: HideLayerClothing
    slots:
-    - Hair
    - Snout
-    - HeadTop
-    - HeadSide

 - type: entity
  parent: ClothingMaskClown
@@ -650,6 +644,24 @@
  - type: Clothing
    sprite: Clothing/Mask/scaredmime.rsi

+- type: entity
+  parent: [ClothingMaskMime, BaseSecurityContraband]
+  id: ClothingMaskMimeSecurity
+  name: security mime mask
+  description: You have the right to remain silent.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/mime_security.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/mime_security.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
+
 - type: entity
  parent: ClothingMaskBase
  id: ClothingMaskItalianMoustache
--- a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml
@@ -18,6 +18,9 @@
    unequipSound: 
  - type: Spillable
    solution: absorbed
+    spillWhenThrown: false
+  - type: DrainableSolution
+    solution: absorbed
  - type: Absorbent
    pickupAmount: 15
  - type: SolutionContainerManager
--- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
@@ -12,6 +12,7 @@
  - type: Tag
    tags:
      - Medal
+      - WhitelistChameleon

 - type: entity
  parent: ClothingNeckBase
@@ -28,6 +29,7 @@
  - type: Tag
    tags:
      - Medal
+      - WhitelistChameleon

 - type: entity
  parent: ClothingNeckBase
@@ -42,6 +44,7 @@
  - type: Tag
    tags:
      - Medal
+      - WhitelistChameleon

 - type: entity
  parent: ClothingNeckBase
@@ -56,6 +59,7 @@
  - type: Tag
    tags:
      - Medal
+      - WhitelistChameleon

 - type: entity
  parent: ClothingNeckBase
@@ -70,6 +74,7 @@
  - type: Tag
    tags:
      - Medal
+      - WhitelistChameleon

 - type: entity
  parent: ClothingNeckBase
@@ -84,6 +89,7 @@
  - type: Tag
    tags:
      - Medal
+      - WhitelistChameleon

 - type: entity
  parent: ClothingNeckBase
@@ -98,6 +104,7 @@
  - type: Tag
    tags:
      - Medal
+      - WhitelistChameleon

 - type: entity
  parent: ClothingNeckBase
@@ -114,3 +121,4 @@
  - type: Tag
    tags:
      - Medal
+      - WhitelistChameleon
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -8,20 +8,20 @@
    sprite: Clothing/Neck/Misc/headphones.rsi
    layers:
    - state: icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
  - type: Clothing
    equippedPrefix: off
    sprite: Clothing/Neck/Misc/headphones.rsi
-  - type: ToggleableLightVisuals
-    spriteLayer: enum.ToggleVisuals.Layer
+  - type: ToggleableVisuals
+    spriteLayer: enum.ToggleableVisuals.Layer
    clothingVisuals:
      neck:
      - state: on-equipped-NECK
  - type: Appearance
  - type: GenericVisualizer
    visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
          True: {state: icon-on}
          False: {state: icon}
  - type: ItemToggle
@@ -50,17 +50,20 @@
  - type: Stethoscope

 - type: entity
+  parent: BaseAction
  id: ActionStethoscope
  name: Listen with stethoscope
  components:
-  - type: EntityTargetAction
+  - type: Action
    icon:
      sprite: Clothing/Neck/Misc/stethoscope.rsi
      state: icon
-    event: !type:StethoscopeActionEvent
-    checkCanInteract: false
    priority: -1
    itemIconStyle: BigAction
+    checkCanInteract: false
+  - type: TargetAction
+  - type: EntityTargetAction
+    event: !type:StethoscopeActionEvent

 - type: entity
  parent: ClothingNeckBase
--- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
@@ -96,6 +96,8 @@
      sprite: Clothing/Neck/Scarfs/syndiegreen.rsi
    - type: Clothing
      sprite: Clothing/Neck/Scarfs/syndiegreen.rsi
+    - type: StaticPrice
+      price: 500

 - type: entity
  parent: [ ClothingScarfBase, BaseSyndicateContraband ]
@@ -107,6 +109,8 @@
      sprite: Clothing/Neck/Scarfs/syndiered.rsi
    - type: Clothing
      sprite: Clothing/Neck/Scarfs/syndiered.rsi
+    - type: StaticPrice
+      price: 500

 - type: entity
  parent: [ ClothingScarfBase, BaseCentcommContraband ]
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -160,6 +160,8 @@
        Heat: 0.9
  - type: ExplosionResistance
    damageCoefficient: 0.9
+  - type: StaticPrice
+    price: 1500

 #Elite web vest
 - type: entity
@@ -188,6 +190,8 @@
    damageCoefficient: 0.5
  - type: FireProtection
    reduction: 0.85
+  - type: StaticPrice
+    price: 2500

 #Mercenary web vest
 - type: entity
@@ -237,13 +241,13 @@
        Caustic: 0.5
  - type: ExplosionResistance
    damageCoefficient: 0.35
-  #- type: StaminaResistance
-  #  damageCoefficient: 0.45
+  - type: StaminaResistance
+    damageCoefficient: 0.45
  - type: ClothingSpeedModifier
    walkModifier: 0.9
    sprintModifier: 0.9
  #Shoulder mounted flashlight
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
    spriteLayer: light
    clothingVisuals:
      outerClothing:
@@ -252,6 +256,7 @@
      outerClothing-vox:
      - state: equipped-OUTERCLOTHING-light-vox
        shader: unshaded
+  - type: ItemTogglePointLight
  - type: Appearance
  - type: HandheldLight
    addPrefix: false
@@ -418,7 +423,7 @@
        Heat: 0.9
        Radiation: 0.8
  - type: ClothingSpeedModifier
-    walkModifier: 0.7
+    walkModifier: 0.65
    sprintModifier: 0.65
  - type: HeldSpeedModifier
  - type: ExplosionResistance
@@ -445,6 +450,7 @@
        Piercing: 0.4
  - type: ClothingSpeedModifier
    walkModifier: 0.8
+    sprintModifier: 0.8
  - type: HeldSpeedModifier
  - type: ExplosionResistance
    damageCoefficient: 0.4
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -105,8 +105,9 @@
  id: ClothingOuterHardsuitBase
  name: base hardsuit
  components:
-  - type: SlotBlock
-    slots: [innerclothing, feet]
+# SlotBlocker blocked until UI change
+#  - type: SlotBlock
+#    slots: [innerclothing, feet]
  - type: PressureProtection
    highPressureMultiplier: 0.3
    lowPressureMultiplier: 1000
@@ -114,7 +115,7 @@
    heatingCoefficient: 0.01
    coolingCoefficient: 0.01
  - type: ClothingSpeedModifier
-    walkModifier: 0.4
+    walkModifier: 0.6
    sprintModifier: 0.6
  - type: HeldSpeedModifier
  - type: Item
@@ -151,8 +152,9 @@
  id: ClothingOuterEVASuitBase
  name: base EVA Suit
  components:
-  - type: SlotBlock
-    slots: [innerclothing, feet]
+# SlotBlocker blocked until UI change
+#  - type: SlotBlock
+#    slots: [innerclothing, feet]
  - type: PressureProtection
    highPressureMultiplier: 0.6
    lowPressureMultiplier: 1000
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
@@ -17,7 +17,7 @@
    zombificationResistanceCoefficient: 0.35
  - type: GroupExamine
  - type: ClothingSpeedModifier
-    walkModifier: 1
+    walkModifier: 0.95
    sprintModifier: 0.95

 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -92,7 +92,7 @@
        Radiation: 0.3 #salv is supposed to have radiation hazards in the future
        Caustic: 0.8
  - type: ClothingSpeedModifier
-    walkModifier: 0.9
+    walkModifier: 0.8
    sprintModifier: 0.8
  - type: HeldSpeedModifier
  - type: ToggleableClothing
@@ -352,7 +352,7 @@
        Radiation: 0.0
        Caustic: 0.7
  - type: ClothingSpeedModifier
-    walkModifier: 0.75
+    walkModifier: 0.8
    sprintModifier: 0.8
  - type: HeldSpeedModifier
  - type: ToggleableClothing
@@ -379,7 +379,7 @@
  - type: ZombificationResistance
    zombificationResistanceCoefficient: 0.4
  - type: ClothingSpeedModifier
-    walkModifier: 0.9
+    walkModifier: 0.95
    sprintModifier: 0.95
  - type: HeldSpeedModifier
  - type: ToggleableClothing
@@ -488,7 +488,7 @@
        Radiation: 0.5
        Caustic: 0.8
  - type: ClothingSpeedModifier
-    walkModifier: 0.85
+    walkModifier: 0.9
    sprintModifier: 0.9
  - type: HeldSpeedModifier
  - type: ToggleableClothing
@@ -513,8 +513,8 @@
    lowPressureMultiplier: 1000
  - type: ExplosionResistance
    damageCoefficient: 0.5
-  #- type: StaminaResistance
-  #  damageCoefficient: 0.75
+  - type: StaminaResistance
+    damageCoefficient: 0.75
  - type: Armor
    modifiers:
      coefficients:
@@ -535,6 +535,8 @@
    - MonkeyWearable
    - Hardsuit
    - WhitelistChameleon
+  - type: StaticPrice
+    price: 5000

 # Syndicate Medic Hardsuit
 - type: entity
@@ -575,8 +577,8 @@
    damageCoefficient: 0.2
  - type: FireProtection
    reduction: 0.8
-  #- type: StaminaResistance
-  #  damageCoefficient: 0.6
+  - type: StaminaResistance
+    damageCoefficient: 0.6
  - type: Armor
    modifiers:
      coefficients:
@@ -589,7 +591,7 @@
  - type: Item
    size: Huge
  - type: ClothingSpeedModifier
-    walkModifier: 1.0
+    walkModifier: 0.9
    sprintModifier: 0.9
  - type: HeldSpeedModifier
  - type: ToggleableClothing
@@ -611,8 +613,8 @@
    lowPressureMultiplier: 1000
  - type: ExplosionResistance
    damageCoefficient: 0.5
-  #- type: StaminaResistance
-  #  damageCoefficient: 0.6
+  - type: StaminaResistance
+    damageCoefficient: 0.6
  - type: Armor
    modifiers:
      coefficients:
@@ -645,8 +647,8 @@
    lowPressureMultiplier: 1000
  - type: ExplosionResistance
    damageCoefficient: 0.3
-  #- type: StaminaResistance # Should not have stamina resistance, this is purely so people know it was not forgotten.
-  #  damageCoefficient: 0.99
+  - type: StaminaResistance # Should not have stamina resistance, this is purely so people know it was not forgotten.
+    damageCoefficient: 0.99
  - type: Armor
    modifiers:
      coefficients:
@@ -657,7 +659,7 @@
        Radiation: 0.2
        Caustic: 0.2
  - type: ClothingSpeedModifier
-    walkModifier: 0.9
+    walkModifier: 0.65
    sprintModifier: 0.65
  - type: HeldSpeedModifier
  - type: ToggleableClothing
@@ -665,6 +667,7 @@
  - type: Tag
    tags:
    - MonkeyWearable
+    - WhitelistChameleon

 #Wizard Hardsuit
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -8,6 +8,10 @@
    sprite: Clothing/OuterClothing/Misc/apron.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Misc/apron.rsi
+  - type: Tag
+    tags:
+    - Apron
+    - WhitelistChameleon

 - type: entity
  parent: ClothingOuterStorageBase
@@ -20,6 +24,10 @@
    sprite: Clothing/OuterClothing/Misc/apronbar.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Misc/apronbar.rsi
+  - type: Tag
+    tags:
+    - Apron
+    - WhitelistChameleon

 - type: entity
  parent: ClothingOuterStorageBase
@@ -32,6 +40,10 @@
    sprite: Clothing/OuterClothing/Misc/apronbotanist.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Misc/apronbotanist.rsi
+  - type: Tag
+    tags:
+    - Apron
+    - WhitelistChameleon

 - type: entity
  parent: ClothingOuterStorageBase
@@ -44,6 +56,10 @@
    sprite: Clothing/OuterClothing/Misc/apronchef.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Misc/apronchef.rsi
+  - type: Tag
+    tags:
+    - Apron
+    - WhitelistChameleon

 - type: entity
  parent: ClothingOuterStorageBase
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml
@@ -0,0 +1,85 @@
+# Separate yml file for scrap armor since it has so many construction steps.
+# Listed from first step of crafting to the final armor
+
+- type: entity
+  name: wired apron
+  parent: BaseItem
+  id: WiredApronBase
+  description: An apron threaded with cabling. It looks incomplete.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi
+    state: construction-1
+  - type: Item
+    size: Ginormous
+    sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi
+  - type: Construction
+    graph: scraparmor
+    node: wiredapron
+
+- type: entity
+  name: steel-covered apron
+  parent: BaseItem
+  id: SteelApronBase
+  description: An apron with steel plating haphazardly affixed by spare cabling. In it's current state, it would fall apart immediately if worn.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi
+    state: construction-2
+  - type: Item
+    size: Ginormous
+    sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi
+  - type: Construction
+    graph: scraparmor
+    node: steelapron
+
+- type: entity
+  name: welded steel apron
+  parent: BaseItem
+  id: WeldedSteelApronBase
+  description: An apron affixed with welded steel plating attached to spare cabling. The armor is no longer in danger of falling apart, but requires additional work to be worn securely.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi
+    state: construction-3
+  - type: Item
+    size: Ginormous
+    sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi
+  - type: Construction
+    graph: scraparmor
+    node: weldedsteelapron
+
+# The armor itself
+- type: entity
+  parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseMajorContraband]
+  id: ClothingOuterArmorScrap
+  name: scrap armor
+  description: A tider's gleaming plate mail. Bail up, or you're a dead man.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi
+  - type: Item
+    size: Ginormous
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/scrap_armor.rsi
+    equipSound: /Audio/Effects/metal_scrape2.ogg
+    unequipSound: /Audio/Effects/metal_scrape1.ogg
+    equipDelay: 5
+    unequipDelay: 5 #Its insane more armor/hardsuits don't have equip times tbh?
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.5
+        Slash: 0.5
+        Piercing: 0.5 #Some nukie tier physical protection...
+        Heat: 0.8
+        Radiation: 0.8 #Hey, it's a bunch of solid steel.
+  - type: ExplosionResistance
+    damageCoefficient: 0.80
+  - type: ClothingSpeedModifier #But that protection comes at a price.
+    walkModifier: 0.6
+    sprintModifier: 0.6
+  - type: GroupExamine
+  - type: Construction
+    graph: scraparmor
+    node: scraparmorfinished
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -31,6 +31,8 @@
    - SuitEVA
    - MonkeyWearable
    - WhitelistChameleon
+  - type: StaticPrice
+    price: 1000 # Helmet is 500

 #Emergency EVA
 - type: entity
@@ -56,6 +58,10 @@
  - type: ContainerContainer
    containers:
      toggleable-clothing: !type:ContainerSlot {}
+  - type: Tag
+    tags:
+    - MonkeyWearable
+    - WhitelistChameleon

 #Prisoner EVA
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -32,7 +32,7 @@
  parent: ClothingOuterSuitBomb
  id: ClothingOuterSuitJanitorBomb
  name: janitorial bomb suit
-  description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
+  description: Heavy body armor designed to withstand explosions formed from reactions between chemicals.
  categories: [ DoNotMap ]
  components:
  - type: Sprite
@@ -64,7 +64,7 @@
        Heat: 0.8
        Cold: 0.8
  - type: ClothingSpeedModifier
-    walkModifier: 0.8
+    walkModifier: 0.7
    sprintModifier: 0.7
  - type: HeldSpeedModifier
  - type: GroupExamine
@@ -299,3 +299,6 @@
    coolingCoefficient: 0.01
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHelmetHardsuitCarp
+  - type: StaticPrice
+    price: 1500
+
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -13,6 +13,11 @@
    - state: icon
    - state: icon-unshaded
      shader: unshaded
+    - state: icon-unshaded
+      shader: shaded
+      #This is a neat trick I found to sort of "hack" an emissive map into ss14. Basically, the icon-unshaded texture has an alpha channel.
+      #Alpha doesn't work for unshaded, but for *shaded* it does, and by putting a shaded texture infront of the unshaded, we can dim the unshaded texture, effectively allowing brightness control.
+      #I go further indepth on this in my PR, https://github.com/space-wizards/space-station-14/pull/37869
  - type: Clothing
    sprite: Clothing/OuterClothing/Vests/hazard.rsi
    clothingVisuals:
@@ -20,9 +25,18 @@
      - state: equipped-OUTERCLOTHING
      - state: equipped-OUTERCLOTHING-unshaded
        shader: unshaded
+      - state: equipped-OUTERCLOTHING-unshaded
+        shader: shaded
+        #same trick here
+  - type: Reflect
+    reflectProb: 0.02
+    reflects:
+    - Energy
+    reflectingInHands: false
  - type: Tag
    tags:
    - HiViz
+    - WhitelistChameleon

 #(Bartender) vest
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -9,7 +9,7 @@
    sprite: Clothing/Shoes/Boots/magboots.rsi
    layers:
    - state: icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
  - type: Clothing
    sprite: Clothing/Shoes/Boots/magboots.rsi
  - type: ToggleClothing
@@ -24,13 +24,13 @@
    prefixOn: on
  - type: Magboots
  - type: ClothingSpeedModifier
-    walkModifier: 0.85
+    walkModifier: 0.8
    sprintModifier: 0.8
  - type: Appearance
  - type: GenericVisualizer
    visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
          True: {state: icon-on}
          False: {state: icon}
  - type: StaticPrice
@@ -82,8 +82,8 @@
  description: These would look fetching on a fetcher like you.
  components:
  - type: ClothingSpeedModifier
-    walkModifier: 1.10 #PVS isn't too much of an issue when you are blind...
-    sprintModifier: 1.10
+    walkModifier: 1.1 #PVS isn't too much of an issue when you are blind...
+    sprintModifier: 1.1
  - type: StaticPrice
    price: 3000

@@ -99,7 +99,7 @@
  - type: Clothing
    sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi
  - type: ClothingSpeedModifier
-    walkModifier: 0.95
+    walkModifier: 0.9
    sprintModifier: 0.9
  - type: GasTank
    outputPressure: 42.6
@@ -113,12 +113,16 @@
  - type: Item
    sprite: null
    size: Normal
+  - type: StaticPrice
+    price: 1500

 - type: entity
+  parent: BaseAction
  id: ActionToggleMagboots
  name: Toggle Magboots
  description: Toggles the magboots on and off.
  components:
-  - type: InstantAction
+  - type: Action
    itemIconStyle: BigItem
+  - type: InstantAction
    event: !type:ToggleActionEvent
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -127,7 +127,7 @@
    sprite: Clothing/Shoes/Boots/speedboots.rsi
    layers:
    - state: icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
  - type: Clothing
    sprite: Clothing/Shoes/Boots/speedboots.rsi
  - type: ToggleClothing
@@ -138,8 +138,8 @@
  - type: Appearance
  - type: GenericVisualizer
    visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
          True: {state: icon-on}
          False: {state: icon}
  - type: StaticPrice
@@ -155,12 +155,14 @@
    tags: []

 - type: entity
+  parent: BaseAction
  id: ActionToggleSpeedBoots
  name: Toggle Speed Boots
  description: Toggles the speed boots on and off.
  components:
-  - type: InstantAction
+  - type: Action
    itemIconStyle: BigItem
+  - type: InstantAction
    event: !type:ToggleActionEvent

 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -135,7 +135,7 @@
  - type: Magboots # always have gravity because le suction cups
  - type: ClothingSpeedModifier
    # ninja are masters of sneaking around relatively quickly, won't break cloak
-    walkModifier: 1.1
+    walkModifier: 1.3
    sprintModifier: 1.3
  - type: FootstepModifier
    footstepSoundCollection: null
@@ -259,7 +259,7 @@
    size: Small
    sprite: Clothing/Shoes/Specific/large_clown.rsi
  - type: ClothingSpeedModifier
-    walkModifier: 0.85
+    walkModifier: 0.8
    sprintModifier: 0.8

 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -521,6 +521,8 @@
    sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi
+  - type: StaticPrice
+    price: 500

 - type: entity
  parent: ClothingUniformSkirtBase
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -855,6 +855,8 @@
    sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
+  - type: StaticPrice
+    price: 500

 - type: entity
  parent: ClothingUniformBase
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -9,7 +9,6 @@
  - type: SmokeVisuals
  - type: Transform
    anchored: true
-  - type: Clickable
  - type: Physics
  - type: Fixtures
    fixtures:
@@ -48,6 +47,29 @@
    tags:
    - HideContextMenu

+- type: entity
+  parent: BaseFoam
+  id: TearGasSmoke
+  name: tear gas
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Effects/chemsmoke.rsi
+    state: chemsmoke
+  - type: TimedDespawn
+    lifetime: 10
+  - type: Tag
+    tags:
+    - HideContextMenu
+
+- type: entity
+  parent: TearGasSmoke
+  id: TearGasSmokeWhite
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    state: chemsmoke_white
+
 - type: entity
  parent: Smoke
  id: WizardSmoke
--- a/Resources/Prototypes/Entities/Effects/mobspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml
@@ -87,6 +87,18 @@
  - type: SpawnOnDespawn
    prototype: MobUraniumCrab

+- type: entity
+  id: MobSpawnCrabBananium
+  parent: MobSpawnCrabQuartz
+  name: mobspawner bananiumcrab
+  categories: [ HideSpawnMenu, Spawner ]
+  components:
+  - type: Sprite
+    sprite: /Textures/Effects/mobspawn.rsi
+    state: crab_bananium
+  - type: SpawnOnDespawn
+    prototype: MobBananiumCrab
+
 - type: entity
  id: EffectAnomalyFloraBulb
  categories: [ HideSpawnMenu ]
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -56,6 +56,58 @@
        - ReagentId: Water
          Quantity: 5

+- type: entity
+  parent: PuddleTemporary
+  id: PuddleBloodSmall
+  suffix: Blood (5u)
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Blood
+          Quantity: 5
+
+- type: entity
+  parent: PuddleTemporary
+  id: PuddleBlood
+  suffix: Blood (30u)
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Blood
+          Quantity: 30
+
+- type: entity
+  parent: PuddleTemporary
+  id: PuddleFluorosulfuricAcidSmall
+  suffix: FluorosulfuricAcid (5u)
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: FluorosulfuricAcid
+          Quantity: 5
+
+- type: entity
+  parent: PuddleTemporary
+  id: PuddleFluorosulfuricAcid
+  suffix: FluorosulfuricAcid (15u)
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: FluorosulfuricAcid
+          Quantity: 15
+
 - type: entity
  id: PuddleWatermelon
  parent: PuddleTemporary
--- a/Resources/Prototypes/Entities/Effects/wallspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml
@@ -34,6 +34,22 @@
  - type: SpawnOnDespawn
    prototype: AsteroidRockUraniumCrab

+- type: entity
+  id: WallSpawnAsteroidBananium
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockBananium
+
+- type: entity
+  id: WallSpawnAsteroidBananiumCrab
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockBananiumCrab
+
 - type: entity
  id: WallSpawnAsteroidUranium
  parent: WallSpawnAsteroid
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/nukies.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/nukies.yml
@@ -7,5 +7,5 @@
  - type: Sprite
    layers:
    - state: green
-    - sprite: Objects/Fun/toys.rsi
-      state: synb
+    - sprite: Objects/Fun/Balloons/syndicate.rsi
+      state: icon
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml
@@ -144,6 +144,9 @@
    - MobSpawnCrabIron
    - MobSpawnCrabQuartz
    - MobSpawnCrabSilver
+    - MobSpawnCrabCoal
+    - MobSpawnCrabGold
+    - MobSpawnCrabBananium

 - type: entity
  parent: MarkerBase
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/misc.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/misc.yml
@@ -12,17 +12,3 @@
  - type: ConditionalSpawner
    prototypes:
    - MobGingerbreadAI
-
- type: entity
-  parent: MarkerBase
-  id: SpawnHonkBot
-  name: honk bot spawner
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - state: honkbot
-      sprite: Mobs/Silicon/Bots/honkbot.rsi
-  - type: ConditionalSpawner
-    prototypes:
-    - MobHonkBot
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/base.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/base.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: MarkerBase
+  id: DecalSpawnerBase
+  name: Decal Spawner
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: decal
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/dirt.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/dirt.yml
@@ -0,0 +1,157 @@
+- type: entity
+  parent: DecalSpawnerBase
+  id: DecalSpawnerDirtBase
+  abstract: true
+  components:
+  - type: RandomDecalSpawner
+    decals:
+    - DirtLight
+    - DirtMedium
+    - DirtHeavy
+    maxDecalsPerTile: 1
+    snapPosition: true
+    zIndex: 1
+    prob: 0.8
+    color: '#FFFFFF7F'
+    cleanable: true
+    tileBlacklist: # Everything here just looks bad if it gets regular dirt on it
+    - FloorSteelMono
+    - FloorSteelDiagonal
+    - FloorSteelOffset
+    - FloorSteelDiagonalMini
+    - FloorWood
+    - FloorWoodLarge
+    - FloorWhiteMono
+    - FloorWhiteDiagonal
+    - FloorWhiteOffset
+    - FloorWhiteDiagonalMini
+    - FloorDarkMono
+    - FloorDarkDiagonal
+    - FloorDarkOffset
+    - FloorDarkDiagonalMini
+    - FloorArcadeBlue
+    - FloorArcadeBlue2
+    - FloorArcadeRed
+    - FloorEighties
+    - FloorCarpetClown
+    - FloorCarpetOffice
+    - FloorBoxing
+    - FloorGym
+    - FloorGlass
+    - FloorRGlass
+    - FloorAstroGrass
+    - FloorMowedAstroGrass
+    - FloorJungleAstroGrass
+    - FloorAstroIce
+    - FloorAstroSnow
+    - FloorAstroAsteroidSand
+    - FloorFlesh
+    - FloorAsteroidSandUnvariantized
+    - FloorAsteroidIronsandUnvariantized
+    - FloorCave
+    - FloorAsteroidIronsand
+    - FloorAsteroidTile
+    - FloorAsteroidSandDug
+    - FloorAsteroidSand
+    - FloorDirt
+    - FloorGrassLight
+    - FloorGrassDark
+    - FloorGrassJungle
+    - FloorGrass
+    - FloorAsphalt
+    - FloorReinforced
+    - FloorLino
+    deleteSpawnerAfterSpawn: true
+
+- type: entity
+  parent: DecalSpawnerDirtBase
+  id: DecalSpawnerDirtSingle
+  suffix: Dirt, 0 Radius
+  components:
+  - type: RandomDecalSpawner
+    radius: 0
+    prob: 1.0
+    maxDecals: 1
+
+- type: entity
+  parent: DecalSpawnerDirtBase
+  id: DecalSpawnerDirtNear
+  suffix: Dirt, 1.5 Radius
+  components:
+  - type: RandomDecalSpawner
+    radius: 1.5
+    maxDecals: 5
+
+- type: entity
+  parent: DecalSpawnerDirtBase
+  id: DecalSpawnerDirtWide
+  suffix: Dirt, 3 Radius
+  components:
+  - type: RandomDecalSpawner
+    radius: 3
+    maxDecals: 20
+    maxDecalsPerTile: 2
+
+- type: entity
+  parent: DecalSpawnerDirtBase
+  id: DecalSpawnerDirtMonospace
+  suffix: Dirt, Monospace, 1 Radius
+  components:
+  - type: RandomDecalSpawner
+    radius: 1
+    maxDecals: 5
+    decals:
+    - Dirt
+    - DirtHeavyMonotile
+    tileBlacklist:
+    - FloorSteelDiagonal
+    - FloorSteelOffset
+    - FloorSteelDiagonalMini
+    - FloorWhiteDiagonal
+    - FloorWhiteOffset
+    - FloorWhiteDiagonalMini
+    - FloorDarkDiagonal
+    - FloorDarkOffset
+    - FloorDarkDiagonalMini
+    - FloorArcadeBlue
+    - FloorArcadeBlue2
+    - FloorArcadeRed
+    - FloorEighties
+    - FloorCarpetClown
+    - FloorCarpetOffice
+    - FloorBoxing
+    - FloorGym
+    - FloorAstroGrass
+    - FloorMowedAstroGrass
+    - FloorJungleAstroGrass
+    - FloorAstroIce
+    - FloorAstroSnow
+    - FloorAstroAsteroidSand
+    - FloorFlesh
+    - FloorAsteroidSandUnvariantized
+    - FloorAsteroidIronsandUnvariantized
+    - FloorCave
+    - FloorAsteroidIronsand
+    - FloorAsteroidTile
+    - FloorAsteroidSandDug
+    - FloorAsteroidSand
+    - FloorDirt
+    - FloorGrassLight
+    - FloorGrassDark
+    - FloorGrassJungle
+    - FloorGrass
+    - FloorAsphalt
+    - FloorReinforced
+
+- type: entity
+  parent: DecalSpawnerDirtMonospace
+  id: DecalSpawnerBurns
+  suffix: Burns, 1 Radius
+  components:
+  - type: RandomDecalSpawner
+    decals:
+    - burnt1
+    - burnt2
+    - burnt3
+    - burnt4
+    radius: 1
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/flora.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/flora.yml
@@ -0,0 +1,183 @@
+- type: entity
+  parent: DecalSpawnerBase
+  id: DecalSpawnerFloraBase
+  abstract: true
+  components:
+  - type: RandomDecalSpawner
+    radius: 0.3
+    zIndex: 1
+    deleteSpawnerAfterSpawn: true
+    tileWhitelist:
+    - FloorAstroGrass
+    - FloorMowedAstroGrass
+    - FloorJungleAstroGrass
+    - FloorAstroIce
+    - FloorAstroSnow
+    - FloorAstroAsteroidSand
+    - FloorAsteroidSandUnvariantized
+    - FloorAsteroidIronsandUnvariantized
+    - FloorCave
+    - FloorAsteroidIronsand
+    - FloorAsteroidTile
+    - FloorAsteroidSandDug
+    - FloorAsteroidSand
+    - FloorDirt
+    - FloorGrassLight
+    - FloorGrassDark
+    - FloorGrassJungle
+    - FloorGrass
+
+- type: entity
+  parent: DecalSpawnerFloraBase
+  id: DecalSpawnerGrassyRock
+  suffix: Grassy Rock
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: decal
+    - sprite: Decals/Flora/flora_rocks.rsi
+      state: rock01
+  - type: RandomDecalSpawner
+    decals:
+    - Rock01
+    - Rock02
+    - Rock03
+    - Rock04
+    - Rock05
+    - Rock06
+    - Rock07
+
+- type: entity
+  parent: DecalSpawnerFloraBase
+  id: DecalSpawnerBasaltRock
+  suffix: Basalt Rock
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: decal
+    - sprite: Decals/basalt.rsi
+      state: basalt1
+  - type: RandomDecalSpawner
+    decals:
+    - Basalt1
+    - Basalt2
+    - Basalt3
+    - Basalt4
+    - Basalt5
+    - Basalt6
+    - Basalt7
+    - Basalt8
+    - Basalt9
+
+- type: entity
+  parent: DecalSpawnerFloraBase
+  id: DecalSpawnerBushesAC
+  suffix: Bushes (a-c)
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: decal
+    - sprite: Decals/Flora/flora_bushes.rsi
+      state: busha1
+  - type: RandomDecalSpawner
+    decals:
+    - Busha1
+    - Busha2
+    - Busha3
+    - Bushb1
+    - Bushb2
+    - Bushb3
+    - Bushc1
+    - Bushc2
+    - Bushc3
+
+# I really don't want to add all the rest of the bushes right now, leaving this as an exercise for someone else.
+
+- type: entity
+  parent: DecalSpawnerFloraBase
+  id: DecalSpawnerFlowers
+  suffix: Flowers
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: decal
+    - sprite: Decals/Flora/flora_flowers.rsi
+      state: flowersbr1
+  - type: RandomDecalSpawner
+    decals:
+    - Flowersbr1
+    - Flowersbr2
+    - Flowersbr3
+    - Flowerspv1
+    - Flowerspv2
+    - Flowerspv3
+    - Flowersy1
+    - Flowersy2
+    - Flowersy3
+    - Flowersy4
+
+- type: entity
+  parent: DecalSpawnerFloraBase
+  id: DecalSpawnerGrassAB
+  suffix: Grass (a-b)
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: decal
+    - sprite: Decals/Flora/flora_grass.rsi
+      state: grassa1
+  - type: RandomDecalSpawner
+    decals:
+    - Grassa1
+    - Grassa2
+    - Grassa3
+    - Grassa4
+    - Grassa5
+    - Grassb1
+    - Grassb2
+    - Grassb3
+    - Grassb4
+    - Grassb5
+
+- type: entity
+  parent: DecalSpawnerFloraBase
+  id: DecalSpawnerGrassC
+  suffix: Grass (c)
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: decal
+    - sprite: Decals/Flora/flora_grass.rsi
+      state: grassc1
+  - type: RandomDecalSpawner
+    decals:
+    - Grassc1
+    - Grassc2
+    - Grassc3
+    - Grassc4
+
+- type: entity
+  parent: DecalSpawnerFloraBase
+  id: DecalSpawnerGrassDE
+  suffix: Grass (d-e)
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: decal
+    - sprite: Decals/Flora/flora_grass.rsi
+      state: grassd1
+  - type: RandomDecalSpawner
+    decals:
+    - Grassd1
+    - Grassd2
+    - Grassd3
+    - Grasse1
+    - Grasse2
+    - Grasse3
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/splatters.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/splatters.yml
@@ -0,0 +1,102 @@
+- type: entity
+  parent: DecalSpawnerBase
+  id: DecalSpawnerBloodSplatters
+  suffix: Blood Splatters, Footprints
+  components:
+  - type: RandomDecalSpawner
+    decals:
+    - footprint
+    - splatter
+    radius: 1
+    randomRotation: true
+    maxDecals: 3
+    prob: 0.5
+    zIndex: 1
+    color: '#9900007F'
+    cleanable: true
+    deleteSpawnerAfterSpawn: true
+
+- type: entity
+  parent: DecalSpawnerBase
+  id: DecalSpawnerGraffiti
+  suffix: Graffiti
+  components:
+  - type: RandomDecalSpawner
+    decals:
+    - Blasto
+    - Clandestine
+    - Cyber
+    - Diablo
+    - Donk
+    - Gene
+    - Gib
+    - Max
+    - Newton
+    - North
+    - Omni
+    - Osiron
+    - Prima
+    - Psyke
+    - Sirius
+    - Tunnel
+    - Waffle
+    - amyjon
+    - beepsky
+    - biohazard
+    - blueprint
+    - bottle
+    - carp
+    - cat
+    - clown
+    - corgi
+    - credit
+    - cyka
+    - danger
+    - disk
+    - dwarf
+    - end
+    - engie
+    - face
+    - fireaxe
+    - firedanger
+    - ghost
+    - guy
+    - heart
+    - like
+    - matt
+    - peace
+    - prolizard
+    - radiation
+    - revolution
+    - safe
+    - scroll
+    - shotgun
+    - skull
+    - snake
+    - star
+    - stickman
+    - taser
+    - toilet
+    - toolbox
+    - uboa
+    radius: 0.5
+    randomRotation: true
+    maxDecals: 1
+    zIndex: 2
+    randomColorList:
+    - aqua
+    - betterviolet
+    - blue
+    - chartreuse
+    - cyan
+    - deeppink
+    - fuchsia
+    - green
+    - indigo
+    - lime
+    - pink
+    - red
+    - silver
+    - yellow
+    cleanable: true
+    deleteSpawnerAfterSpawn: true
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
@@ -26,8 +26,6 @@
    - PowerCellSmall
    - PowerCellMedium
    - FlashlightLantern
-    - MatterBinStockPart
-    - CapacitorStockPart
    - MicroManipulatorStockPart
    - Beaker
    chance: 0.8
@@ -63,8 +61,6 @@
      - id: SheetGlass10
      - id: ToolboxElectricalFilled
      - id: ToolboxMechanicalFilled
-      - id: MatterBinStockPart
-      - id: CapacitorStockPart
      - id: MicroManipulatorStockPart
    # Rare Group
    - !type:GroupSelector
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_breakfast.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_breakfast.yml
@@ -0,0 +1,18 @@
+- type: entity
+  id: RandomFoodBreakfast
+  name: random food spawner
+  suffix: Meal
+  parent: MarkerBase
+  placement:
+    mode: AlignTileAny
+  components:
+  - type: Sprite
+    layers:
+      - sprite: Objects/Consumable/Food/breakfast.rsi
+        state: fullamerican
+  - type: RandomSpawner
+    prototypes:
+      - FoodBreakfastAmerican
+      - FoodBreakfastEnglish
+    chance: 0.8
+    offset: 0.0
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
@@ -51,3 +51,4 @@
    - id: FoodSnackSemki
    - id: FoodSnackSus
    - id: FoodSnackSyndi
+    - id: FoodSnackSwirlLollipop
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
@@ -46,6 +46,7 @@
    - AnomalyRockGold
    - AnomalyRockQuartz
    - AnomalyRockUranium
+    - AnomalyRockBananium
    chance: 1
    offset: 0.15

--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
@@ -45,9 +45,7 @@
          state: icon
    - type: RandomSpawner
      rarePrototypes:
-        - CapacitorStockPart
        - MicroManipulatorStockPart
-        - MatterBinStockPart
        - CableHVStack10
        - WelderIndustrial
        - PowerCellHigh
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -6,8 +6,8 @@
    - type: Sprite
      layers:
        - state: red
-        - sprite: Objects/Fun/toys.rsi
-          state: plushie_h
+        - sprite: Objects/Fun/Plushies/bee.rsi
+          state: icon
    - type: RandomSpawner
      rarePrototypes:
        - FoamBlade
@@ -101,7 +101,7 @@
      - ToyFigurineLawyer
      - ToyFigurineCargoTech
      - ToyFigurineSalvage
-      - ToyFigurineQuartermaster   
+      - ToyFigurineQuartermaster
      - ToyFigurineChiefEngineer
      - ToyFigurineAtmosTech
      - ToyFigurineEngineer
--- a/Resources/Prototypes/Entities/Markers/Spawners/bots.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/bots.yml
@@ -1,28 +1,69 @@
 - type: entity
-  name: medibot spawner
+  parent: MarkerBase
  id: SpawnMobMedibot
-  parent: MarkerBase
+  name: medibot spawner
  components:
  - type: Sprite
    layers:
-      - state: green
-      - sprite: Mobs/Silicon/Bots/medibot.rsi
-        state: medibot
+    - state: green
+    - sprite: Mobs/Silicon/Bots/medibot.rsi
+      state: medibot
  - type: ConditionalSpawner
    prototypes:
-      - MobMedibot
+    - MobMedibot

 - type: entity
-  name: cleanbot spawner
-  id: SpawnMobCleanBot
  parent: MarkerBase
+  id: SpawnMobCleanBot
+  name: cleanbot spawner
  components:
  - type: Sprite
    layers:
-      - state: green
-      - sprite: Mobs/Silicon/Bots/cleanbot.rsi
-        state: cleanbot
+    - state: green
+    - sprite: Mobs/Silicon/Bots/cleanbot.rsi
+      state: cleanbot
  - type: ConditionalSpawner
    prototypes:
-      - MobCleanBot
+    - MobCleanBot

+- type: entity
+  parent: MarkerBase
+  id: SpawnMobFireBot
+  name: firebot spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Silicon/Bots/firebot.rsi
+      state: firebot
+  - type: ConditionalSpawner
+    prototypes:
+    - MobFireBot
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobSupplyBot
+  name: supplybot spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Silicon/Bots/supplybot.rsi
+      state: supplybot
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSupplyBot
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobHonkBot
+  name: honkbot spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Silicon/Bots/honkbot.rsi
+      state: honkbot
+  - type: ConditionalSpawner
+    prototypes:
+    - MobHonkBot
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -18,9 +18,9 @@
  - type: GhostRole
    name: ghost-role-information-rat-king-name
    description: ghost-role-information-rat-king-description
-    rules: ghost-role-information-freeagent-rules
+    rules: ghost-role-information-antagonist-rules
    mindRoles:
-    - MindRoleGhostRoleFreeAgent
+    - MindRoleGhostRoleSoloAntagonist
    raffle:
      settings: default
  - type: GhostRoleMobSpawner
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -369,6 +369,15 @@
    - sprite: Mobs/Customization/reptilian_parts.rsi
      state: tail_smooth_wagging_secondary

+- type: marking
+  id: LizardTailLargeAnimated
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: []
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: tail_large_wagging
+
 - type: marking
  id: LizardTailSpikesAnimated
  bodyPart: Tail
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
@@ -2,7 +2,7 @@
  id: ScarEyeRight
  bodyPart: Head
  markingCategory: Head
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, SlimePerson]
  followSkinColor: true
  sprites:
  - sprite: Mobs/Customization/scars.rsi
@@ -12,7 +12,7 @@
  id: ScarEyeLeft
  bodyPart: Head
  markingCategory: Head
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, SlimePerson]
  followSkinColor: true
  sprites:
  - sprite: Mobs/Customization/scars.rsi
@@ -22,7 +22,7 @@
  id: ScarTopSurgeryShort
  bodyPart: Chest
  markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
  sexRestriction: [Male]
  followSkinColor: true
  sprites:
@@ -33,7 +33,7 @@
  id: ScarTopSurgeryLong
  bodyPart: Chest
  markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
  sexRestriction: [Male]
  followSkinColor: true
  sprites:
@@ -44,7 +44,7 @@
  id: ScarChest
  bodyPart: Chest
  markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid, Diona]
  followSkinColor: true
  sprites:
  - sprite: Mobs/Customization/scars.rsi
@@ -54,7 +54,7 @@
  id: ScarNeck
  bodyPart: Head
  markingCategory: Head
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
  followSkinColor: true
  sprites:
  - sprite: Mobs/Customization/scars.rsi
@@ -64,7 +64,7 @@
  id: ScarChestBullets
  bodyPart: Chest
  markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid]
  followSkinColor: true
  sprites:
  - sprite: Mobs/Customization/scars.rsi
@@ -74,7 +74,7 @@
  id: ScarStomachBullets
  bodyPart: Chest
  markingCategory: Chest
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth, Arachnid]
  followSkinColor: true
  sprites:
  - sprite: Mobs/Customization/scars.rsi
@@ -84,7 +84,7 @@
  id: ScarFace1
  bodyPart: Head
  markingCategory: Head
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth]
  followSkinColor: true
  sprites:
  - sprite: Mobs/Customization/scars.rsi
@@ -94,8 +94,28 @@
  id: ScarFace2
  bodyPart: Head
  markingCategory: Head
-  speciesRestriction: [Human, Dwarf]
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson, Moth]
  followSkinColor: true
  sprites:
  - sprite: Mobs/Customization/scars.rsi
-    state: scar_face_2
+    state: scar_face_2
+
+- type: marking
+  id: ScarEyeRightSmall
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_eye_right_small
+
+- type: marking
+  id: ScarEyeLeftSmall
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf, Reptilian, SlimePerson]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_eye_left_small
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -155,7 +155,7 @@
  - type: Vocal
    sounds:
      Unsexed: UnisexSilicon
-    screamAction: null
+    wilhelmProbability: 0
  - type: DamagedSiliconAccent
  - type: UnblockableSpeech
  - type: FootstepModifier
@@ -220,7 +220,8 @@
      minValue: 0.1
      maxValue: 2.0
      isLooped: true
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
+    spriteLayer: light
  - type: PointLight
    enabled: false
    mask: /Textures/Effects/LightMasks/cone.png
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1199,6 +1199,28 @@
  - type: HTN
    rootTask:
      task: SimpleHostileCompound
+    blackboard:
+      NavClimb: !type:Bool
+        true
+      NavInteract: !type:Bool
+        true
+      NavPry: !type:Bool
+        true
+      NavSmash: !type:Bool
+        true
+  - type: Prying
+    pryPowered: true
+    force: true
+    speedModifier: 1.5
+    useSound:
+      path: /Audio/Items/crowbar.ogg
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      200: Critical
+      250: Dead
+  - type: StaminaResistance
+    damageCoefficient: 0.40

 - type: entity
  name: kangaroo
@@ -2311,6 +2333,7 @@
        Brute: 5
  - type: Item
    size: Normal
+    sprite: Mobs/Animals/grenadepenguin.rsi
  - type: OnUseTimerTrigger
    delay: 10
    beepSound:
@@ -3084,6 +3107,10 @@
  - type: NpcFactionMember
    factions:
    - Syndicate
+  - type: Access
+    tags: 
+    - NuclearOperative
+    - SyndicateAgent
  - type: MeleeWeapon
    altDisarm: false
    angle: 0
--- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -99,11 +99,12 @@
      amount: 3

 - type: entity
+  parent: BaseAction
  id: ActionGoliathTentacle
  name: "[color=red]Tentacle Slam[/color]"
  description: Use your tentacles to grab and stun a target player!
  components:
-  - type: EntityWorldTargetAction
+  - type: Action
    raiseOnUser: true
    icon:
      sprite: Mobs/Aliens/Asteroid/goliath.rsi
@@ -113,9 +114,11 @@
      state: goliath_tentacle_wiggle
    sound:
      path: "/Audio/Weapons/slash.ogg"
-    event: !type:GoliathSummonTentacleAction
    useDelay: 8
+  - type: TargetAction
    range: 10
+  - type: WorldTargetAction
+    event: !type:GoliathSummonTentacleAction

 - type: entity
  id: GoliathTentacle
@@ -371,12 +374,12 @@
      Dead:
        Base: basilisk_dead
  - type: MovementSpeedModifier
-    baseWalkSpeed : 3
-    baseSprintSpeed : 3.5
+    baseWalkSpeed : 2
+    baseSprintSpeed : 3
  - type: MobThresholds
    thresholds:
      0: Alive
-      80: Dead
+      75: Dead
  - type: MeleeWeapon
    angle: 0
    animation: WeaponArcBite
@@ -388,6 +391,7 @@
        Piercing: 5
  - type: Gun
    fireRate: 0.75
+    projectileSpeed: 10.0 # When we get predicted guns and projectiles this should be raised to like 15, 15 mis-predicts too much right now unfortunately.
    selectedMode: SemiAuto
    showExamineText: false
    availableModes: [ SemiAuto ]
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -172,8 +172,6 @@
      rules: ghost-role-information-space-dragon-summoned-carp-rules
      mindRoles:
      - MindRoleGhostRoleTeamAntagonistFlock
-      raffle:
-        settings: short
    - type: GhostTakeoverAvailable
    - type: HTN
      rootTask:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -227,6 +227,62 @@
    energy: 3
    color: "#06DF24"

+- type: entity
+  parent: MobOreCrab
+  id: MobBananiumCrab
+  description: An ore crab made from bananium.
+  suffix: Bananium
+  components:
+  - type: Sprite
+    state: bananium_crab
+  - type: FactionException
+  - type: NPCRetaliation
+    attackMemoryLength: 10
+  - type: NpcFactionMember
+    factions:
+      - SimpleNeutral
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 30
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          BananiumOre1:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Slippery
+    slipData:
+      launchForwardsMultiplier: 2
+  - type: StepTrigger
+    intersectRatio: 0.2
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        hard: false
+        layer:
+          - SlipLayer
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 20
+        mask:
+        - MobMask
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
  parent: MobOreCrab
  id: MobSilverCrab
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -29,6 +29,8 @@
    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
      state: eyes
      shader: unshaded
+  - type: TypingIndicator
+    proto: regal
  - type: Physics
    bodyType: KinematicController
  - type: Fixtures
@@ -90,9 +92,9 @@
    makeSentient: true
    name: ghost-role-information-rat-king-name
    description: ghost-role-information-rat-king-description
-    rules: ghost-role-information-freeagent-rules
+    rules: ghost-role-information-antagonist-rules
    mindRoles:
-    - MindRoleGhostRoleFreeAgent
+    - MindRoleGhostRoleSoloAntagonist
    raffle:
      settings: default
  - type: GhostTakeoverAvailable
@@ -313,35 +315,40 @@
    IngotGold1: 5 #loot

 - type: entity
+  parent: BaseAction
  id: ActionRatKingRaiseArmy
  name: Raise Army
  description: Spend some hunger to summon an allied rat to help defend you.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 4
    icon:
      sprite: Interface/Actions/actions_rat_king.rsi
      state: ratKingArmy
+  - type: InstantAction
    event: !type:RatKingRaiseArmyActionEvent

 - type: entity
+  parent: BaseAction
  id: ActionRatKingDomain
  name: Rat King's Domain
  description: Spend some hunger to release a cloud of ammonia into the air.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 6
    icon:
      sprite: Interface/Actions/actions_rat_king.rsi
      state: ratKingDomain
+  - type: InstantAction
    event: !type:RatKingDomainActionEvent

 - type: entity
+  parent: BaseAction
  id: ActionRatKingOrderStay
  name: Stay
  description: Command your army to stand in place.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 1
    icon:
      sprite: Interface/Actions/actions_rat_king.rsi
@@ -349,17 +356,18 @@
    iconOn:
      sprite: Interface/Actions/actions_rat_king.rsi
      state: stay
-    event:
-      !type:RatKingOrderActionEvent
-        type: Stay
    priority: 5
+  - type: InstantAction
+    event: !type:RatKingOrderActionEvent
+      type: Stay

 - type: entity
+  parent: BaseAction
  id: ActionRatKingOrderFollow
  name: Follow
  description: Command your army to follow you around.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 1
    icon:
      sprite: Interface/Actions/actions_rat_king.rsi
@@ -367,17 +375,18 @@
    iconOn:
      sprite: Interface/Actions/actions_rat_king.rsi
      state: follow
-    event:
-      !type:RatKingOrderActionEvent
-      type: Follow
    priority: 6
+  - type: InstantAction
+    event: !type:RatKingOrderActionEvent
+      type: Follow

 - type: entity
+  parent: BaseAction
  id: ActionRatKingOrderCheeseEm
  name: Cheese 'Em
  description: Command your army to attack whoever you point at.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 1
    icon:
      sprite: Interface/Actions/actions_rat_king.rsi
@@ -385,17 +394,18 @@
    iconOn:
      sprite: Interface/Actions/actions_rat_king.rsi
      state: attack
-    event:
-      !type:RatKingOrderActionEvent
-      type: CheeseEm
    priority: 7
+  - type: InstantAction
+    event: !type:RatKingOrderActionEvent
+      type: CheeseEm

 - type: entity
+  parent: BaseAction
  id: ActionRatKingOrderLoose
  name: Loose
  description: Command your army to act at their own will.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 1
    icon:
      sprite: Interface/Actions/actions_rat_king.rsi
@@ -403,7 +413,8 @@
    iconOn:
      sprite: Interface/Actions/actions_rat_king.rsi
      state: loose
+    priority: 8
+  - type: InstantAction
    event:
      !type:RatKingOrderActionEvent
      type: Loose
-    priority: 8
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -454,3 +454,121 @@
      amount: 2
  - type: SolutionTransfer
    maxTransferAmount: 1
+
+# Mob mapped to Xeno Station that can not be ghostrole / pry
+
+- type: entity
+  name: lone praetorian
+  description: The last of its kind.
+  parent: SimpleSpaceMobBase
+  id: MobXenoLonePraetorianNoGhost
+  components:
+  - type: Insulated
+  - type: CombatMode
+  - type: InputMover
+  - type: MobMover
+  - type: HTN
+    rootTask:
+      task: XenoCompound
+    blackboard:
+      NavClimb: !type:Bool
+        true
+      NavInteract: !type:Bool
+        true
+      NavPry: !type:Bool
+        true
+      NavSmash: !type:Bool
+        true
+  - type: Reactive
+    groups:
+      Flammable: [Touch]
+      Extinguish: [Touch]
+  - type: NpcFactionMember
+    factions:
+    - Xeno
+  - type: Hands
+  - type: ComplexInteraction
+  - type: MobState
+  - type: Stamina
+    critThreshold: 200
+  - type: Bloodstream
+    bloodReagent: FluorosulfuricAcid
+    bloodMaxVolume: 300
+  - type: MeleeWeapon
+    altDisarm: false
+    angle: 0
+    soundHit:
+     collection: AlienClaw
+    animation: WeaponArcBite
+    damage:
+     groups:
+       Brute: 5
+  - type: DamageStateVisuals
+    rotate: true
+    states:
+      Alive:
+        Base: running
+      Critical:
+        Base: crit
+      Dead:
+        Base: dead
+  - type: Puller
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatXeno
+      amount: 5
+  - type: TypingIndicator
+    proto: alien
+  - type: Temperature
+    heatDamageThreshold: 360
+    coldDamageThreshold: -150
+    currentTemperature: 310.15
+  - type: NoSlip
+  - type: Perishable #Ummmm the acid kills a lot of the bacteria or something
+    molsPerSecondPerUnitMass: 0.0005
+  - type: Speech
+    speechVerb: LargeMob
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Aliens/Xenos/praetorian.rsi
+    offset: 0,0.4
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: running
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      -1: Critical
+      250: Dead
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      120: 0.7
+  - type: MovementSpeedModifier
+    baseSprintSpeed: 3.7
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        density: 15500
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Tag
+    tags:
+    - CannotSuicide
+  - type: SolutionContainerManager # Being hit speeds you up so you can escape
+    solutions:
+      bite:
+        reagents:
+        - ReagentId: Stimulants
+          Quantity: 50
+        - ReagentId: TranexamicAcid
+          Quantity: 50
+  - type: MeleeChemicalInjector
+    transferAmount: 1
+    solution: bite
+    pierceArmor: true
--- a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/roles.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/roles.yml
@@ -13,9 +13,6 @@
      state: captain
    - type: RandomHumanoidSpawner
      settings: VisitorCaptain
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidVisitorCE
@@ -26,9 +23,6 @@
      state: ce
    - type: RandomHumanoidSpawner
      settings: VisitorCE
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidVisitorCMO
@@ -39,9 +33,6 @@
      state: cmo
    - type: RandomHumanoidSpawner
      settings: VisitorCMO
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidVisitorHOP
@@ -52,9 +43,6 @@
      state: hop
    - type: RandomHumanoidSpawner
      settings: VisitorHOP
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidVisitorHOS
@@ -65,9 +53,6 @@
      state: hos
    - type: RandomHumanoidSpawner
      settings: VisitorHOS
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidVisitorRD
@@ -78,9 +63,6 @@
      state: rd
    - type: RandomHumanoidSpawner
      settings: VisitorResearchDirector
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidVisitorQM
@@ -91,9 +73,6 @@
      state: qm
    - type: RandomHumanoidSpawner
      settings: VisitorQM
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 # Security

@@ -106,9 +85,6 @@
      state: security_cadet
    - type: RandomHumanoidSpawner
      settings: VisitorSecurityCadet
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidVisitorSecurityOfficer
@@ -119,9 +95,6 @@
      state: security_officer
    - type: RandomHumanoidSpawner
      settings: VisitorSecurityOfficer
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidVisitorDetective
@@ -132,9 +105,6 @@
      state: detective
    - type: RandomHumanoidSpawner
      settings: VisitorDetective
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidVisitorWarden
@@ -145,9 +115,6 @@
      state: warden
    - type: RandomHumanoidSpawner
      settings: VisitorWarden
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 # Cargo

@@ -504,9 +471,6 @@
      state: skull_icon
    - type: RandomHumanoidSpawner
      settings: ChallengeVictimCaptain
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidChallengeVictimCE
@@ -517,9 +481,6 @@
  components:
    - type: RandomHumanoidSpawner
      settings: ChallengeVictimChiefEngineer
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidChallengeVictimCMO
@@ -530,9 +491,6 @@
  components:
    - type: RandomHumanoidSpawner
      settings: ChallengeVictimCMO
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidChallengeVictimHOP
@@ -543,9 +501,6 @@
  components:
    - type: RandomHumanoidSpawner
      settings: ChallengeVictimHeadOfPersonnel
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidChallengeVictimHOS
@@ -556,9 +511,6 @@
  components:
    - type: RandomHumanoidSpawner
      settings: ChallengeVictimHeadOfSecurity
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidChallengeVictimRD
@@ -569,9 +521,6 @@
  components:
    - type: RandomHumanoidSpawner
      settings: ChallengeVictimResearchDirector
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 - type: entity
  id: RandomHumanoidChallengeVictimQM
@@ -582,9 +531,6 @@
  components:
    - type: RandomHumanoidSpawner
      settings: ChallengeVictimQuartermaster
-    - type: AutoImplant
-      implants:
-      - MindShieldImplant

 # Security

--- a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
@@ -581,6 +581,7 @@

 - type: randomHumanoidSettings
  id: ChallengeVictimChiefEngineer
+  parent: EventHumanoidMindShielded
  randomizeName: false
  components:
    - type: GhostRole
@@ -601,6 +602,7 @@

 - type: randomHumanoidSettings
  id: ChallengeVictimCMO
+  parent: EventHumanoidMindShielded
  randomizeName: false
  components:
    - type: GhostRole
@@ -621,6 +623,7 @@

 - type: randomHumanoidSettings
  id: ChallengeVictimHeadOfPersonnel
+  parent: EventHumanoidMindShielded
  randomizeName: false
  components:
    - type: GhostRole
@@ -641,6 +644,7 @@

 - type: randomHumanoidSettings
  id: ChallengeVictimHeadOfSecurity
+  parent: EventHumanoidMindShielded
  randomizeName: false
  components:
    - type: GhostRole
@@ -661,6 +665,7 @@

 - type: randomHumanoidSettings
  id: ChallengeVictimResearchDirector
+  parent: EventHumanoidMindShielded
  randomizeName: false
  components:
    - type: GhostRole
@@ -681,6 +686,7 @@

 - type: randomHumanoidSettings
  id: ChallengeVictimQuartermaster
+  parent: EventHumanoidMindShielded
  randomizeName: false
  components:
    - type: GhostRole
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -103,73 +103,86 @@
  - type: BypassInteractionChecks

 - type: entity
+  abstract: true
+  parent: BaseAction
+  id: BaseAGhostAction
+  components:
+  - type: Action
+    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
+    iconOn: Structures/Machines/parts.rsi/box_2.png
+    keywords: [ "AI", "console", "interface" ]
+    priority: -10
+
+- type: entity
+  parent: BaseAGhostAction
  id: ActionAGhostShowSolar
  name: Solar Control Interface
  description: View a Solar Control Interface.
  components:
  - type: InstantAction
-    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
-    iconOn: Structures/Machines/parts.rsi/box_2.png
-    keywords: [ "AI", "console", "interface" ]
-    priority: -10
    event: !type:ToggleIntrinsicUIEvent { key: enum.SolarControlConsoleUiKey.Key }

 - type: entity
+  parent: BaseAGhostAction
  id: ActionAGhostShowCommunications
  name: Communications Interface
  description: View a Communications Interface.
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
    iconOn: Interface/Actions/actions_ai.rsi/comms_console.png
    keywords: [ "AI", "console", "interface" ]
    priority: -4
+  - type: InstantAction
    event: !type:ToggleIntrinsicUIEvent { key: enum.CommunicationsConsoleUiKey.Key }

 - type: entity
+  parent: BaseAGhostAction
  id: ActionAGhostShowRadar
  name: Mass Scanner Interface
  description: View a Mass Scanner Interface.
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
    iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png
    keywords: [ "AI", "console", "interface" ]
    priority: -6
+  - type: InstantAction
    event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key }

 - type: entity
+  parent: BaseAGhostAction
  id: ActionAGhostShowCargo
  name: Cargo Ordering Interface
  description: View a Cargo Ordering Interface.
  components:
  - type: InstantAction
-    icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
-    iconOn: Structures/Machines/parts.rsi/box_2.png
-    keywords: [ "AI", "console", "interface" ]
-    priority: -10
    event: !type:ToggleIntrinsicUIEvent { key: enum.CargoConsoleUiKey.Orders }

 - type: entity
+  parent: BaseAGhostAction
  id: ActionAGhostShowCrewMonitoring
  name: Crew Monitoring Interface
  description: View a Crew Monitoring Interface.
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
    iconOn: Interface/Actions/actions_ai.rsi/crew_monitor.png
    keywords: [ "AI", "console", "interface" ]
    priority: -8
+  - type: InstantAction
    event: !type:ToggleIntrinsicUIEvent { key: enum.CrewMonitoringUIKey.Key }

 - type: entity
+  parent: BaseAGhostAction
  id: ActionAGhostShowStationRecords
  name: Station Records Interface
  description: View a Station Records Interface.
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
    iconOn: Interface/Actions/actions_ai.rsi/station_records.png
    keywords: [ "AI", "console", "interface" ]
    priority: -7
+  - type: InstantAction
    event: !type:ToggleIntrinsicUIEvent { key: enum.GeneralStationRecordConsoleKey.Key }
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -17,6 +17,7 @@
  # traits
  # - LegsParalyzed (you get healed)
  - LightweightDrunk
+  - Monochromacy
  - Muted
  - Narcolepsy
  - Pacified
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -230,39 +230,55 @@
        Brute: 12

 - type: entity
+  parent: BaseAction
  id: ActionSpawnRift
  name: Summon Carp Rift
  description: Summons a carp rift that will periodically spawns carps.
  components:
-  - type: InstantAction
+  - type: Action
    icon:
      sprite: Interface/Actions/carp_rift.rsi
      state: icon
-    event: !type:DragonSpawnRiftActionEvent
    useDelay: 1
    priority: 3
+  - type: InstantAction
+    event: !type:DragonSpawnRiftActionEvent

 - type: entity
+  parent: BaseAction
  id: ActionDevour
  name: "[color=red]Devour[/color]"
  description: Attempt to break a structure with your jaws or swallow a creature.
  components:
-  - type: EntityTargetAction
+  - type: Action
    icon: { sprite : Interface/Actions/devour.rsi, state: icon }
    iconOn: { sprite : Interface/Actions/devour.rsi, state: icon-on }
-    event: !type:DevourActionEvent
+    itemIconStyle: BigAction
    priority: 1
+  - type: TargetAction
+  - type: EntityTargetAction
+    canTargetSelf: false
+    whitelist:
+      components:
+      - MobState
+      - Door
+      tags:
+      - Wall
+    event: !type:DevourActionEvent

 - type: entity
+  parent: BaseAction
  id: ActionDragonsBreath
  name: "[color=orange]Dragon's Breath[/color]"
  description: Spew out flames at anyone foolish enough to attack you!
  components:
-  - type: WorldTargetAction
-    # TODO: actual sprite
+  - type: Action
+    # TODO: actual sprite and iconOn
    icon: { sprite : Objects/Weapons/Guns/Projectiles/magic.rsi, state: fireball }
-    event: !type:ActionGunShootEvent
+    itemIconStyle: BigAction
    priority: 2
+  - type: TargetAction
    checkCanAccess: false
    range: 0
-    itemIconStyle: BigAction
+  - type: WorldTargetAction
+    event: !type:ActionGunShootEvent
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -261,13 +261,13 @@
        task: SimpleHumanoidHostileCompound

 - type: entity
+  parent: BaseMentalAction
  id: ActionToggleGuardian
  name: Toggle Guardian
  description: Either manifests the guardian or recalls it back into your body
  components:
-  - type: InstantAction
+  - type: Action
    icon: Interface/Actions/manifest.png
-    event: !type:GuardianToggleActionEvent
    useDelay: 2
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: InstantAction
+    event: !type:GuardianToggleActionEvent
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -12,7 +12,9 @@
  id: EventHumanoidMindShielded
  parent: EventHumanoid
  components:
-    - type: MindShield
+    - type: AutoImplant
+      implants:
+      - MindShieldImplant
    - type: AntagImmune

 - type: randomHumanoidSettings
@@ -22,6 +24,7 @@
  components:
  - type: AutoImplant
    implants:
+    - MindShieldImplant
    - DeathRattleImplantCentcomm

 ## Death Squad
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -80,59 +80,65 @@
    - AllowGhostShownByEvent

 - type: entity
+  parent: BaseMentalAction
  id: ActionGhostBoo
  name: Boo!
  description: Scare your crew members because of boredom!
  components:
-  - type: InstantAction
+  - type: Action
    icon: Interface/Actions/scream.png
    checkCanInteract: false
-    event: !type:BooActionEvent
    startDelay: true
    useDelay: 120
+  - type: InstantAction
+    event: !type:BooActionEvent

 - type: entity
+  parent: BaseMentalAction
  id: ActionToggleLighting
  name: Toggle Lighting
  description: Toggle light rendering to better observe dark areas.
  components:
-  - type: InstantAction
+  - type: Action
    icon: Interface/VerbIcons/light.svg.192dpi.png
    clientExclusive: true
-    checkCanInteract: false
+  - type: InstantAction
    event: !type:ToggleLightingActionEvent

 - type: entity
+  parent: BaseMentalAction
  id: ActionToggleFov
  name: Toggle FoV
  description: Toggles field-of-view in order to see what players see.
  components:
-  - type: InstantAction
+  - type: Action
    icon: Interface/VerbIcons/vv.svg.192dpi.png
    clientExclusive: true
-    checkCanInteract: false
+  - type: InstantAction
    event: !type:ToggleFoVActionEvent

 - type: entity
+  parent: BaseMentalAction
  id: ActionToggleGhosts
  name: Toggle Ghosts
  description: Toggle the visibility of other ghosts.
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Mobs/Ghosts/ghost_human.rsi, state: icon }
    clientExclusive: true
-    checkCanInteract: false
+  - type: InstantAction
    event: !type:ToggleGhostsActionEvent

 - type: entity
+  parent: BaseMentalAction
  id: ActionToggleGhostHearing
  name: Toggle Ghost Hearing
  description: Toggle between hearing all messages and hearing only radio & nearby messages.
  components:
-  - type: InstantAction
-    checkCanInteract: false
+  - type: Action
    icon:
      sprite: Clothing/Ears/Headsets/base.rsi
      state: icon
    iconOn: Interface/Actions/ghostHearingToggled.png
+  - type: InstantAction
    event: !type:ToggleGhostHearingActionEvent
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -90,8 +90,6 @@
      - map: ["enum.HumanoidVisualLayers.RHand"]
      - map: [ "gloves" ]
      - map: [ "shoes" ]
-      - map: [ "ears" ]
-      - map: [ "eyes" ]
      - map: [ "belt" ]
      - map: [ "id" ]
      - map: [ "outerClothing" ]
@@ -101,6 +99,8 @@
      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
      - map: [ "enum.HumanoidVisualLayers.Hair" ] # Do these need to be here? (arachnid hair arachnid hair)
      - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+      - map: [ "ears" ]
+      - map: [ "eyes" ]
      - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
      - map: [ "mask" ]
      - map: [ "head" ]
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -112,6 +112,7 @@
          32:
            sprite: Mobs/Species/Human/displacement.rsi
            state: jumpsuit-female
+  - type: Rootable

 - type: entity
  parent: BaseSpeciesDummy
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -15,7 +15,6 @@
  # they like eat it idk lol
  - type: Storage
    clickInsert: false
-    openOnActivate: false
    grid:
    - 0,0,1,2
    maxItemSize: Large
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -107,6 +107,8 @@
    - Shock
    - Cold
    - Caustic
+    - Asphyxiation
+    - Radiation
  - type: DamageOnHighSpeedImpact
    damage:
      types:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -138,6 +138,8 @@
    - type: SolutionContainerVisuals
      maxFillLevels: 5
      fillBaseName: fill
+      inHandsMaxFillLevels: 1
+      inHandsFillBaseName: -fill-

 - type: entity
  parent: DrinkGlass
@@ -147,10 +149,10 @@
  - type: SolutionContainerManager
    solutions:
      drink:
-        maxVol: 30
+        maxVol: 20
        reagents:
        - ReagentId: Absinthe
-          Quantity: 30
+          Quantity: 20
  - type: Icon
    sprite: Objects/Consumable/Drinks/absintheglass.rsi
    state: icon
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -331,9 +331,6 @@
          Quantity: 100
  - type: Label
    currentLabel: reagent-name-grenadine
-  # intended use is to spike drinks so starts open
-  - type: Openable
-    opened: true
  - type: Sprite
    sprite: Objects/Consumable/Drinks/grenadinebottle.rsi
  - type: SolutionContainerVisuals
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -116,14 +116,13 @@
    sprite: Objects/Consumable/Drinks/mug_green.rsi

 - type: entity
-  parent: DrinkBaseCup #this one doesn't have the proper layers in the rsi
+  parent: DrinkBaseMug
  id: DrinkMugDog
  name: funny dog mug
  description: It looks like a cartoon beagle.
  components:
  - type: Sprite
    sprite: Objects/Consumable/Drinks/mug_dog.rsi
-    state: icon-3

 - type: entity
  parent: DrinkBaseMug
@@ -330,7 +329,7 @@
    solutions:
      drink:
        reagents:
-        - ReagentId: Water
+        - ReagentId: JuiceGrape
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/lean.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -113,6 +113,7 @@
    sprite: Objects/Consumable/Drinks/pitcher.rsi
    layers:
      - state: icon
+        map: ["enum.SolutionContainerLayers.Base"]
      - state: fill-6
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
@@ -120,3 +121,5 @@
  - type: SolutionContainerVisuals
    maxFillLevels: 6
    fillBaseName: fill-
+    inHandsMaxFillLevels: 2
+    inHandsFillBaseName: -fill-
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -70,6 +70,8 @@
  - type: SolutionContainerVisuals
    maxFillLevels: 2
    fillBaseName: fill
+    inHandsMaxFillLevels: 1
+    inHandsFillBaseName: -fill-

 - type: entity
  parent: DrinkGlassBase
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -15,12 +15,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 30
+        maxVol: 55 # flavored cakes have less room for spiking
        reagents:
        - ReagentId: Nutriment
-          Quantity: 20
+          Quantity: 40
        - ReagentId: Vitamin
-          Quantity: 5
+          Quantity: 10
  - type: Item
    size: Normal
  - type: Tag
@@ -53,12 +53,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 10
+        maxVol: 12
        reagents:
        - ReagentId: Nutriment
-          Quantity: 4
+          Quantity: 8
        - ReagentId: Vitamin
-          Quantity: 1
+          Quantity: 2
  - type: Item
    size: Tiny
  - type: Tag
@@ -85,6 +85,16 @@
    tags:
    - Cake
    - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: blue
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: blue

 - type: entity
  name: blueberry slice
@@ -102,6 +112,16 @@
    - Cake
    - Fruit
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: blue
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: blue

 # Cake

@@ -115,6 +135,17 @@
    state: plain
  - type: SliceableFood
    slice: FoodCakePlainSlice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 55
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 20
+        - ReagentId: Vitamin
+          Quantity: 5
+  - type: Item
+    heldPrefix: plain

 # Added in type lines above

@@ -125,6 +156,17 @@
  components:
  - type: Sprite
    state: plain-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 4
+        - ReagentId: Vitamin
+          Quantity: 1
+  - type: Item
+    heldPrefix: plain-slice
 # Tastes like sweetness, cake.

 - type: entity
@@ -152,6 +194,18 @@
    tags:
    - Cake
    - Vegetable
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+        color: "#f8e0af"
+      - state: alpha-filling-inhand-left
+        color: "#ffbd2f"
+      right:
+      - state: plain-inhand-right
+        color: "#f8e0af"
+      - state: alpha-filling-inhand-right
+        color: "#ffbd2f"

 - type: entity
  name: slice of carrot cake
@@ -177,6 +231,18 @@
    - Cake
    - Vegetable
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+        color: "#f8e0af"
+      - state: alpha-slice-filling-inhand-left
+        color: "#ffbd2f"
+      right:
+      - state: plain-slice-inhand-right
+        color: "#f8e0af"
+      - state: alpha-slice-filling-inhand-right
+        color: "#ffbd2f"

 # Tastes like sweetness, cake, carrot.

@@ -194,6 +260,18 @@
    tags:
    - Cake
    - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-inhand-left
+        color: "#ff5b7a"
+      - state: alpha-filling-inhand-left
+        color: "#ff5b7a"
+      right:
+      - state: alpha-inhand-right
+        color: "#ff5b7a"
+      - state: alpha-filling-inhand-right
+        color: "#ff5b7a"

 - type: entity
  name: slice of brain cake
@@ -208,6 +286,18 @@
    - Cake
    - Meat
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: "#ff5b7a"
+      - state: alpha-slice-filling-inhand-left
+        color: "#ff5b7a"
+      right:
+      - state: alpha-slice-inhand-right
+        color: "#ff5b7a"
+      - state: alpha-slice-filling-inhand-right
+        color: "#ff5b7a"
 # Tastes like sweetness, cake, brains.

 - type: entity
@@ -220,6 +310,16 @@
    state: cheese
  - type: SliceableFood
    slice: FoodCakeCheeseSlice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ffffff"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#ffffff"

 - type: entity
  name: slice of cheese cake
@@ -229,6 +329,16 @@
  components:
  - type: Sprite
    state: cheese-slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ffffff"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#ffffff"
 # Tastes like sweetness, cream cheese.

 - type: entity
@@ -238,13 +348,26 @@
  description: A cake with added orange.
  components:
  - type: Sprite
-    state: orange
+    layers:
+    - state: plain
+    - state: alpha-filling
+      color: "#ff9900"
  - type: SliceableFood
    slice: FoodCakeOrangeSlice
  - type: Tag
    tags:
    - Cake
    - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ff9900"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#ff9900"

 - type: entity
  name: slice of orange cake
@@ -252,12 +375,25 @@
  id: FoodCakeOrangeSlice
  components:
  - type: Sprite
-    state: orange-slice
+    layers:
+    - state: plain-slice
+    - state: alpha-slice-filling
+      color: "#ff9900"
  - type: Tag
    tags:
    - Cake
    - Fruit
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: "#ff9900"
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#ff9900"
 # Tastes like sweetness, cake, oranges.

 - type: entity
@@ -267,13 +403,26 @@
  description: A cake with added lime.
  components:
  - type: Sprite
-    state: lime
+    layers:
+    - state: plain
+    - state: alpha-filling
+      color: "#00ff00"
  - type: SliceableFood
    slice: FoodCakeLimeSlice
  - type: Tag
    tags:
    - Cake
    - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#00ff00"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#00ff00"

 - type: entity
  name: slice of lime cake
@@ -281,12 +430,25 @@
  id: FoodCakeLimeSlice
  components:
  - type: Sprite
-    state: lime-slice
+    layers:
+    - state: plain-slice
+    - state: alpha-slice-filling
+      color: "#00ff00"
  - type: Tag
    tags:
    - Cake
    - Fruit
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: "#00ff00"
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#00ff00"
 # Tastes like sweetness, cake, limes.

 - type: entity
@@ -296,13 +458,26 @@
  description: A cake with added lemon.
  components:
  - type: Sprite
-    state: lemon
+    layers:
+    - state: plain
+    - state: alpha-filling
+      color: "#ffff00"
  - type: SliceableFood
    slice: FoodCakeLemonSlice
  - type: Tag
    tags:
    - Cake
    - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ffff00"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#ffff00"

 - type: entity
  name: slice of lemon cake
@@ -310,12 +485,25 @@
  id: FoodCakeLemonSlice
  components:
  - type: Sprite
-    state: lemon-slice
+    layers:
+    - state: plain-slice
+    - state: alpha-slice-filling
+      color: "#ffff00"
  - type: Tag
    tags:
    - Cake
    - Fruit
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: "#ffff00"
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#ffff00"
 # Tastes like sweetness, cake, lemons.

 - type: entity
@@ -335,18 +523,20 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 30
+        maxVol: 70
        reagents:
        - ReagentId: Nutriment
-          Quantity: 15
+          Quantity: 40
        - ReagentId: Vitamin
-          Quantity: 5
+          Quantity: 20
        - ReagentId: Milk
-          Quantity: 5
+          Quantity: 10
  - type: Tag
    tags:
    - Cake
    - Fruit
+  - type: Item
+    heldPrefix: lemoon

 - type: entity
  name: shard of lemoon cake
@@ -366,16 +556,28 @@
        maxVol: 15
        reagents:
        - ReagentId: Nutriment
-          Quantity: 3
+          Quantity: 8
        - ReagentId: Vitamin
-          Quantity: 1
+          Quantity: 4
        - ReagentId: Milk
-          Quantity: 1
+          Quantity: 2
  - type: Tag
    tags:
    - Cake
    - Fruit
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: "#fffead"
+      - state: alpha-slice-filling-inhand-left
+        color: "#fffead"
+      right:
+      - state: alpha-slice-inhand-right
+        color: "#fffead"
+      - state: alpha-slice-filling-inhand-right
+        color: "#fffead"

 - type: entity
  name: chocolate cake
@@ -384,20 +586,30 @@
  description: A cake with added chocolate.
  components:
  - type: Sprite
-    state: chocolate
+    layers:
+    - state: alpha
+      color: "#ba672e"
  - type: SliceableFood
    slice: FoodCakeChocolateSlice
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 35
+        maxVol: 55
        reagents:
        - ReagentId: Nutriment
-          Quantity: 20
+          Quantity: 40
        - ReagentId: Theobromine
          Quantity: 5
        - ReagentId: Vitamin
          Quantity: 5
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-inhand-left
+        color: "#ba672e"
+      right:
+      - state: alpha-inhand-right
+        color: "#ba672e"

 - type: entity
  name: slice of chocolate cake
@@ -405,18 +617,28 @@
  id: FoodCakeChocolateSlice
  components:
  - type: Sprite
-    state: chocolate-slice
+    layers:
+    - state: alpha-slice
+      color: "#ba672e"
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 8
+        maxVol: 15
        reagents:
        - ReagentId: Nutriment
-          Quantity: 4
+          Quantity: 8
        - ReagentId: Theobromine
          Quantity: 1
        - ReagentId: Vitamin
-          Quantity: 1
+          Quantity: 2
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: "#ba672e"
+      right:
+      - state: alpha-slice-inhand-right
+        color: "#ba672e"
 # Tastes like sweetness, cake, chocolate.

 - type: entity
@@ -426,13 +648,26 @@
  description: A cake centred with apple.
  components:
  - type: Sprite
-    state: apple
+    layers:
+    - state: plain
+    - state: alpha-filling
+      color: "#ff4300"
  - type: SliceableFood
    slice: FoodCakeAppleSlice
  - type: Tag
    tags:
    - Cake
    - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ff4300"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#ff4300"

 - type: entity
  name: slice of apple cake
@@ -441,12 +676,26 @@
  description: A slice of heavenly cake.
  components:
  - type: Sprite
-    state: apple-slice
+    layers:
+    - state: plain-slice
+    - state: alpha-slice-filling
+      color: "#ff4300"
  - type: Tag
    tags:
    - Cake
    - Fruit
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: "#ff4300"
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#ff4300"
+
 # Tastes like sweetness, cake, slime.

 - type: entity
@@ -463,6 +712,18 @@
    tags:
    - Cake
    - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-inhand-left
+        color: "#00ffff"
+      - state: alpha-filling-inhand-left
+        color: "#00ffff"
+      right:
+      - state: alpha-inhand-right
+        color: "#00ffff"
+      - state: alpha-filling-inhand-right
+        color: "#00ffff"

 - type: entity
  name: slice of slime cake
@@ -477,6 +738,18 @@
    - Cake
    - Meat
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: "#00ffff"
+      - state: alpha-slice-filling-inhand-left
+        color: "#00ffff"
+      right:
+      - state: alpha-slice-inhand-right
+        color: "#00ffff"
+      - state: alpha-slice-filling-inhand-right
+        color: "#00ffff"
 # Tastes like sweetness, cake, slime.

 - type: entity
@@ -492,16 +765,26 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 50
+        maxVol: 60
        reagents:
        - ReagentId: Nutriment
-          Quantity: 32
+          Quantity: 35
        - ReagentId: Vitamin
-          Quantity: 11
+          Quantity: 15
  - type: Tag
    tags:
    - Cake
    - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: "#ffffff"
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: "#ffffff"

 - type: entity
  name: slice of pumpkin-spice cake
@@ -517,14 +800,24 @@
        maxVol: 15
        reagents:
        - ReagentId: Nutriment
-          Quantity: 6.4
+          Quantity: 7
        - ReagentId: Vitamin
-          Quantity: 2.2
+          Quantity: 3
  - type: Tag
    tags:
    - Cake
    - Fruit
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+        color: "#ffffff"
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
+        color: "#ffffff"
 # Tastes like sweetness, cake, pumpkin.

 - type: entity
@@ -541,6 +834,14 @@
    tags:
    - Cake
    - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-inhand-left
+        color: "#ab5012"
+      right:
+      - state: alpha-inhand-right
+        color: "#ab5012"

 - type: entity
  name: slice of christmas cake
@@ -554,6 +855,14 @@
    - Cake
    - Fruit
    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: "#ab5012"
+      right:
+      - state: alpha-slice-inhand-right
+        color: "#ab5012"
 # Tastes like sweetness, cake, christmas.

 - type: entity
@@ -566,6 +875,8 @@
    state: birthday
  - type: SliceableFood
    slice: FoodCakeBirthdaySlice
+  - type: Item
+    heldPrefix: birthday

 - type: entity
  name: slice of birthday cake
@@ -575,6 +886,8 @@
  components:
  - type: Sprite
    state: birthday-slice
+  - type: Item
+    heldPrefix: birthday-slice
 # Tastes like sweetness, cake, christmas.

 - type: entity
@@ -590,14 +903,16 @@
  - type: SolutionContainerManager #TODO Sprinkles
    solutions:
      food:
-        maxVol: 45
+        maxVol: 55
        reagents:
        - ReagentId: Nutriment
-          Quantity: 20
+          Quantity: 25
        - ReagentId: Vitamin
          Quantity: 5
        - ReagentId: Sugar
          Quantity: 15
+  - type: Item
+    heldPrefix: vanilla

 - type: entity
  name: slice of vanilla cake
@@ -610,14 +925,22 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 45
+        maxVol: 15
        reagents:
        - ReagentId: Nutriment
-          Quantity: 4
+          Quantity: 6
        - ReagentId: Vitamin
-          Quantity: 1
+          Quantity: 2
        - ReagentId: Sugar
-          Quantity: 3
+          Quantity: 5
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-slice-inhand-left
+      - state: alpha-slice-filling-inhand-left
+      right:
+      - state: plain-slice-inhand-right
+      - state: alpha-slice-filling-inhand-right
 # Tastes like sweetness, cake, vanilla.

 - type: entity
@@ -633,14 +956,16 @@
  - type: SolutionContainerManager #TODO Sprinkles
    solutions:
      food:
-        maxVol: 45
+        maxVol: 55
        reagents:
        - ReagentId: Nutriment
-          Quantity: 20
+          Quantity: 30
        - ReagentId: Vitamin
          Quantity: 5
        - ReagentId: Sugar
          Quantity: 15
+  - type: Item
+    heldPrefix: clown

 - type: entity
  name: slice of clown cake
@@ -653,14 +978,16 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 45
+        maxVol: 15
        reagents:
        - ReagentId: Nutriment
-          Quantity: 4
+          Quantity: 8
        - ReagentId: Vitamin
          Quantity: 1
        - ReagentId: Sugar
-          Quantity: 3
+          Quantity: 5
+  - type: Item
+    heldPrefix: clown-slice
 # Tastes like sweetness, cake, clown.

 - type: entity
@@ -676,14 +1003,16 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 45
+        maxVol: 55
        reagents:
        - ReagentId: Nutriment
-          Quantity: 20
+          Quantity: 30
        - ReagentId: Vitamin
          Quantity: 5
        - ReagentId: PolypyryliumOligomers
          Quantity: 15
+  - type: Item
+    heldPrefix: trumpet

 - type: entity
  name: slice of spaceman's cake
@@ -696,14 +1025,16 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 10
+        maxVol: 15
        reagents:
        - ReagentId: Nutriment
-          Quantity: 4
+          Quantity: 8
        - ReagentId: Vitamin
          Quantity: 1
        - ReagentId: PolypyryliumOligomers
          Quantity: 3
+  - type: Item
+    heldPrefix: trumpet-slice
 # Tastes like sweetness, cake, jam.

 - type: entity
@@ -811,14 +1142,17 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 48
+        maxVol: 125 # SUPER dense cake
        reagents:
        - ReagentId: Nutriment
-          Quantity: 48
+          Quantity: 80
+        - ReagentId: Sugar
+          Quantity: 30
  - type: Food
    transferAmount: 12
  - type: Item
    size: Normal
+    heldPrefix: suppermatter
  - type: PointLight
    color: "#FFFF00"
    radius: 2
@@ -835,10 +1169,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 12
+        maxVol: 25
        reagents:
        - ReagentId: Nutriment
-          Quantity: 12
+          Quantity: 10
+        - ReagentId: Sugar
+          Quantity: 5
  - type: Food
    transferAmount: 3
  - type: PointLight
@@ -852,3 +1188,5 @@
    entries:
      Taco: Suppermatter
      Burger: SuppermatterBurger
+  - type: Item
+    heldPrefix: suppermatter-shard
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -16,11 +16,13 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 50
        reagents: #Most of these are this with slight variations, not worth changing until we have the rest of the reagents
        - ReagentId: Nutriment
-          Quantity: 11
+          Quantity: 30
        - ReagentId: Vitamin
+          Quantity: 14
+        - ReagentId: Sugar
          Quantity: 5
  - type: Food #All pies here made with a pie tin; unless you're some kind of savage, you're probably not destroying this when you eat or slice the pie!
    trash:
@@ -47,12 +49,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 6
+        maxVol: 7
        reagents:
        - ReagentId: Nutriment
-          Quantity: 1.2
+          Quantity: 7.5
        - ReagentId: Vitamin
-          Quantity: 1
+          Quantity: 3.5
+        - ReagentId: Sugar
+          Quantity: 1.25
  - type: Tag
    tags:
    - Pie
@@ -509,6 +513,17 @@
      - sweet
  - type: Sprite
    state: grape
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 15
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Sugar
+          Quantity: 5
  - type: Tag
    tags:
    - Fruit
@@ -546,10 +561,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 26
+        maxVol: 35
        reagents:
        - ReagentId: Nutriment
-          Quantity: 15
+          Quantity: 25
        - ReagentId: Theobromine
          Quantity: 2
 # Tastes like tart, dark chocolate.
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -96,6 +96,8 @@
  - type: Sprite
    layers:
    - state: margherita-slice
+  - type: Item
+    heldPrefix: margherita-slice

 - type: entity
  name: meat pizza
@@ -134,6 +136,8 @@
  - type: Sprite
    layers:
    - state: meat-slice
+  - type: Item
+    heldPrefix: meat-slice
  - type: Tag
    tags:
    - Meat
@@ -172,6 +176,8 @@
  - type: Sprite
    layers:
    - state: mushroom-slice
+  - type: Item
+    heldPrefix: mushroom-slice
 # Tastes like crust, tomato, cheese, mushroom.

 - type: entity
@@ -223,6 +229,8 @@
  - type: Sprite
    layers:
    - state: vegetable-slice
+  - type: Item
+    heldPrefix: vegetable-slice
  - type: SolutionContainerManager
    solutions:
      food:
@@ -280,6 +288,8 @@
  - type: Sprite
    layers:
    - state: donkpocket-slice
+  - type: Item
+    heldPrefix: donkpocket-slice
  - type: SolutionContainerManager
    solutions:
      food:
@@ -340,6 +350,8 @@
  - type: Sprite
    layers:
    - state: dank-slice
+  - type: Item
+    heldPrefix: dank-slice
  - type: SolutionContainerManager
    solutions:
      food:
@@ -388,6 +400,8 @@
  - type: Sprite
    layers:
    - state: sassysage-slice
+  - type: Item
+    heldPrefix: sassysage-slice
  - type: Tag
    tags:
    - Meat
@@ -434,6 +448,8 @@
  - type: Sprite
    layers:
    - state: pineapple-slice
+  - type: Item
+    heldPrefix: pineapple-slice
  - type: Tag
    tags:
    - Meat
@@ -494,6 +510,8 @@
  - type: Sprite
    layers:
    - state: arnold-slice
+  - type: Item
+    heldPrefix: arnold-slice
  - type: SolutionContainerManager
    solutions:
      food:
@@ -529,6 +547,8 @@
  - type: Sprite
    layers:
    - state: moldy-slice
+  - type: Item
+    heldPrefix: moldy-slice
  - type: Tag
    tags:
    - Trash
@@ -597,6 +617,8 @@
  - type: Sprite
    layers:
    - state: uranium-slice
+  - type: Item
+    heldPrefix: uranium-slice
  - type: Tag
    tags:
    - Meat
@@ -665,6 +687,8 @@
  - type: Sprite
    layers:
    - state: cotton-slice
+  - type: Item
+    heldPrefix: cotton-slice
  - type: Tag
    tags:
    - ClothMade
@@ -722,6 +746,8 @@
  - type: Sprite
    layers:
    - state: worldpeas-slice
+  - type: Item
+    heldPrefix: worldpeas-slice
  - type: SolutionContainerManager
    solutions:
      food:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -19,6 +19,11 @@
    shape:
    - 0,0,1,0
    storedOffset: 0,-6
+    inhandVisuals:
+      left:
+      - state: plate-inhand-left
+      right:
+      - state: plate-inhand-right
  - type: DamageOnLand
    damage:
      types:
@@ -86,6 +91,11 @@
    state: plate-small
  - type: Item
    storedOffset: 0,-3
+    inhandVisuals:
+      left:
+      - state: plate-inhand-left
+      right:
+      - state: plate-inhand-right
 # Needs the full thing because inherting is dumb sometimes.
  - type: Destructible
    thresholds:
@@ -134,6 +144,11 @@
    shape:
    - 0,0,1,0
    storedOffset: 0,-6
+    inhandVisuals:
+      left:
+      - state: plate-plastic-inhand-left
+      right:
+      - state: plate-plastic-inhand-right
  - type: Tag
    tags:
    - Trash
@@ -151,6 +166,11 @@
    shape:
    - 0,0,1,0
    storedOffset: 0,-3
+    inhandVisuals:
+      left:
+      - state: plate-plastic-inhand-left
+      right:
+      - state: plate-plastic-inhand-right
  - type: Tag
    tags:
    - Trash
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
@@ -0,0 +1,50 @@
+# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_breakfast.yml
+
+# Base
+
+- type: entity
+  parent: FoodInjectableBase
+  id: FoodBreakfastBase
+  abstract: true
+  description: A full breakfast, rise and shine!
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Food
+  - type: Sprite
+    sprite: Objects/Consumable/Food/breakfast.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 60
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 40
+        - ReagentId: Vitamin
+          Quantity: 10
+
+# Breakfasts
+
+- type: entity
+  name: full american breakfast
+  parent: FoodBreakfastBase
+  id: FoodBreakfastAmerican
+  description: A huge plate of protein and carbs, more likely to put you back in bed than get you out of it. Oh, what fresh hell is this?
+  components:
+  - type: FlavorProfile
+    flavors:
+      - food
+  - type: Sprite
+    state: fullamerican
+
+- type: entity
+  name: full english breakfast
+  parent: FoodBreakfastBase
+  id: FoodBreakfastEnglish
+  description: A huge plate of protein and carbs, more likely to put you back in bed than get you out of it. Don't mention the war!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - food
+  - type: Sprite
+    state: fullenglish
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -254,12 +254,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 33
+        maxVol: 45
        reagents:
        - ReagentId: Nutriment
-          Quantity: 17
+          Quantity: 18
+        - ReagentId: Protein
+          Quantity: 18
        - ReagentId: Vitamin
-          Quantity: 9
+          Quantity: 6
  - type: Sprite
    state: bigbite
  - type: Tag
@@ -339,14 +341,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 26
        reagents:
        - ReagentId: Nutriment
-          Quantity: 3
+          Quantity: 7
        - ReagentId: Vitamin
          Quantity: 7
        - ReagentId: Protein
-          Quantity: 1
+          Quantity: 10
  - type: Tag
    tags:
    - Meat
@@ -375,10 +377,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 20
        reagents:
        - ReagentId: Nutriment
-          Quantity: 3
+          Quantity: 5
        - ReagentId: Protein
          Quantity: 7
        - ReagentId: Vitamin
@@ -486,16 +488,18 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 25
+        maxVol: 65
        reagents:
        - ReagentId: Nutriment
-          Quantity: 4
+          Quantity: 31
        - ReagentId: Protein
-          Quantity: 6
+          Quantity: 15
        - ReagentId: CapsaicinOil
          Quantity: 3
        - ReagentId: Vitamin
-          Quantity: 6
+          Quantity: 8
+        - ReagentId: Sulfur # What you get for eating something with a flare in it
+          Quantity: 5 
  - type: Tag
    tags:
    - Meat
@@ -515,14 +519,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 20
        reagents:
        - ReagentId: Nutriment
-          Quantity: 3
+          Quantity: 15
        - ReagentId: Protein
-          Quantity: 7
-        - ReagentId: Vitamin
-          Quantity: 1
+          Quantity: 5
  - type: Tag
    tags:
    - Meat
@@ -583,16 +585,18 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 55
        reagents:
        - ReagentId: Nutriment
-          Quantity: 6
+          Quantity: 25
+        - ReagentId: Protein
+          Quantity: 5
        - ReagentId: CapsaicinOil
          Quantity: 5
        - ReagentId: Blackpepper
          Quantity: 5
        - ReagentId: Vitamin
-          Quantity: 1
+          Quantity: 12
  - type: Tag
    tags:
    - Meat
@@ -641,10 +645,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 20
        reagents:
        - ReagentId: Nutriment
-          Quantity: 2
+          Quantity: 5
        - ReagentId: Protein
          Quantity: 6
        - ReagentId: Vitamin
@@ -668,14 +672,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 20
        reagents:
        - ReagentId: Nutriment
-          Quantity: 2
+          Quantity: 5
        - ReagentId: Protein
-          Quantity: 7
+          Quantity: 8
        - ReagentId: Vitamin
-          Quantity: 1
+          Quantity: 3
  - type: Tag
    tags:
    - Meat
@@ -698,16 +702,16 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 30 
        reagents:
        - ReagentId: Nutriment
-          Quantity: 2
+          Quantity: 11
        - ReagentId: Protein
-          Quantity: 7
+          Quantity: 10
        - ReagentId: Vitamin
          Quantity: 4
        - ReagentId: BbqSauce
-          Quantity: 1
+          Quantity: 5
  - type: Tag
    tags:
    - Meat
@@ -782,10 +786,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 20
        reagents:
        - ReagentId: Nutriment
-          Quantity: 3
+          Quantity: 6
        - ReagentId: Protein
          Quantity: 6
        - ReagentId: Vitamin
@@ -837,14 +841,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 20
        reagents:
        - ReagentId: Nutriment
-          Quantity: 4
-        - ReagentId: Protein
-          Quantity: 6
+          Quantity: 13
        - ReagentId: Vitamin
-          Quantity: 4
+          Quantity: 5
 # Tastes like bun, redditors.

 - type: entity
@@ -921,10 +923,8 @@
        maxVol: 15
        reagents:
        - ReagentId: Nutriment
-          Quantity: 3
+          Quantity: 8
        - ReagentId: Protein
-          Quantity: 6
-        - ReagentId: Vitamin
          Quantity: 3
 # Tastes like bun, tofu.

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -720,6 +720,12 @@
    entries:
      Taco: CheeseTaco
      Burger: CheeseBurger
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: cheesewedge-inhand-left
+      right:
+      - state: cheesewedge-inhand-right

 - type: entity
  name: chèvre log
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -109,14 +109,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 11
+        maxVol: 20
        reagents:
        - ReagentId: Nutriment
-          Quantity: 4
-        - ReagentId: Vitamin
-          Quantity: 1
+          Quantity: 15
        - ReagentId: TableSalt
-          Quantity: 1
+          Quantity: 2
 # Tastes like nachos.

 - type: entity
@@ -137,14 +135,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 25
        reagents:
        - ReagentId: Nutriment
-          Quantity: 6
-        - ReagentId: Vitamin
-          Quantity: 3
+          Quantity: 20
        - ReagentId: TableSalt
-          Quantity: 1
+          Quantity: 2
 # Tastes like nachos, cheese.

 - type: entity
@@ -166,10 +162,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 25
+        maxVol: 40
        reagents:
        - ReagentId: Nutriment
-          Quantity: 8
+          Quantity: 25
        - ReagentId: CapsaicinOil
          Quantity: 7
        - ReagentId: Vitamin
@@ -253,12 +249,16 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 55
        reagents:
        - ReagentId: Nutriment
-          Quantity: 6
+          Quantity: 40
        - ReagentId: CarpoToxin
          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: CapsaicinOil
+          Quantity: 4
  - type: Tag
    tags:
    - CubanCarp
@@ -361,12 +361,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 25
+        maxVol: 35
        reagents:
        - ReagentId: Nutriment
          Quantity: 3
        - ReagentId: Protein
-          Quantity: 10
+          Quantity: 20
        - ReagentId: BbqSauce
          Quantity: 10
  - type: Tag
@@ -563,12 +563,16 @@
    - type: SolutionContainerManager
      solutions:
        food:
-          maxVol: 15
+          maxVol: 35
          reagents:
          - ReagentId: Nutriment
-            Quantity: 8
+            Quantity: 20
+          - ReagentId: Protein
+            Quantity: 5
          - ReagentId: CapsaicinOil
            Quantity: 6
+          - ReagentId: Vitamin
+            Quantity: 6
    - type: Tag
      tags:
      - Meat
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -109,6 +109,12 @@
  - type: Tag
    tags:
    - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      right:
+      - state: plain-inhand-right

 - type: entity
  name: raw human meat
@@ -127,6 +133,12 @@
  - type: SliceableFood
    count: 3
    slice: FoodMeatCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      right:
+      - state: plain-inhand-right

 - type: entity
  name: raw carp fillet
@@ -155,6 +167,12 @@
      reagents:
      - ReagentId: CarpoToxin
        Quantity: 5
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+      right:
+      - state: generic-pink-inhand-right

 - type: entity
  name: raw bacon
@@ -185,6 +203,12 @@
    graph: Bacon
    node: start
    defaultTarget: bacon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+      right:
+      - state: generic-pink-inhand-right

 - type: entity
  name: raw bear meat
@@ -209,6 +233,14 @@
    graph: BearSteak
    node: start
    defaultTarget: filet migrawr
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#934C64"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#934C64"

 - type: entity
  name: raw penguin meat
@@ -233,6 +265,12 @@
    graph: PenguinSteak
    node: start
    defaultTarget: cooked penguin
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+      right:
+      - state: generic-pink-inhand-right

 - type: entity
  name: raw chicken meat
@@ -259,6 +297,12 @@
    graph: ChickenSteak
    node: start
    defaultTarget: cooked chicken
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+      right:
+      - state: generic-pink-inhand-right

 - type: entity
  name: raw duck meat
@@ -283,6 +327,12 @@
    graph: DuckSteak
    node: start
    defaultTarget: cooked duck
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+      right:
+      - state: generic-pink-inhand-right

 - type: entity
  name: prime-cut corgi meat
@@ -308,6 +358,12 @@
    price: 750
  - type: StealTarget
    stealGroup: FoodMeatCorgi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: corgi-inhand-left
+      right:
+      - state: corgi-inhand-right

 - type: entity
  name: raw crab meat
@@ -355,6 +411,12 @@
    graph: GoliathSteak
    node: start
    defaultTarget: goliath steak
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      right:
+      - state: plain-inhand-right

 - type: entity
  name: dragon flesh
@@ -389,6 +451,12 @@
    graph: DragonSteak
    node: start
    defaultTarget: dragon steak
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: dragon-inhand-left
+      right:
+      - state: dragon-inhand-right

 - type: entity
  name: raw rat meat
@@ -409,6 +477,12 @@
  - type: SliceableFood
    count: 3
    slice: FoodMeatCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      right:
+      - state: plain-inhand-right

 - type: entity
  name: raw lizard meat
@@ -433,6 +507,14 @@
    graph: LizardSteak
    node: start
    defaultTarget: lizard steak
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+        color: "#6EFF41"
+      right:
+      - state: plain-inhand-right
+        color: "#6EFF41"

 - type: entity
  name: raw plant meat
@@ -467,6 +549,12 @@
          Quantity: 4
        - ReagentId: Fat
          Quantity: 4
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: rotten-inhand-left
+      right:
+      - state: rotten-inhand-right

 - type: entity
  name: raw spider meat
@@ -487,6 +575,8 @@
  - type: SliceableFood
    count: 3
    slice: FoodMeatSpiderCutlet
+  - type: Item
+    heldPrefix: spider

 - type: entity
  name: raw spider leg
@@ -504,6 +594,14 @@
          Quantity: 10
        - ReagentId: Fat
          Quantity: 3
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: snake-inhand-left
+        color: "#333333"
+      right:
+      - state: snake-inhand-right
+        color: "#333333"

 - type: entity
  name: meatwheat clump
@@ -522,6 +620,14 @@
        reagents:
        - ReagentId: UncookedAnimalProteins
          Quantity: 1
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#934C64"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#934C64"

 - type: entity
  name: raw snake meat
@@ -543,6 +649,12 @@
          Quantity: 10
        - ReagentId: Toxin
          Quantity: 2
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: snake-inhand-left
+      right:
+      - state: snake-inhand-right

 - type: entity
  name: raw xeno meat
@@ -570,6 +682,14 @@
  - type: SliceableFood
    count: 3
    slice: FoodMeatXenoCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+        color: "#6EFF41"
+      right:
+      - state: plain-inhand-right
+        color: "#6EFF41"

 - type: entity
  name: raw rouny meat
@@ -599,6 +719,12 @@
    graph: RounySteak
    node: start
    defaultTarget: rouny steak
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      right:
+      - state: plain-inhand-right

 - type: entity
  name: killer tomato meat
@@ -613,6 +739,12 @@
    slice: FoodMeatTomatoCutlet
  - type: StaticPrice
    price: 100
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: tomato-inhand-left
+      right:
+      - state: tomato-inhand-right

 - type: entity
  name: salami
@@ -695,6 +827,8 @@
    graph: CookedPatty
    node: start
    defaultTarget: cooked meat patty
+  - type: Item
+    heldPrefix: generic-pink

 - type: entity
  name: slimeball
@@ -716,6 +850,12 @@
        Quantity: 10
  - type: Sprite
    state: slime
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: slime-inhand-left
+      right:
+      - state: slime-inhand-right

 - type: entity
  name: raw snail meat
@@ -736,6 +876,14 @@
          Quantity: 3
        - ReagentId: Water
          Quantity: 4 #It makes saline if you add salt!
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#E2AE7C"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#E2AE7C"

 - type: entity
  name: anomalous meat mass
@@ -766,6 +914,12 @@
  - type: Tag
    tags:
    - Meat
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      right:
+      - state: plain-inhand-right

 # Cooked

@@ -833,6 +987,12 @@
    entries:
      Burger: MeatSteak
      Taco: MeatSteak
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-cooked-inhand-left
+      right:
+      - state: plain-cooked-inhand-right

 - type: entity
  name: bacon
@@ -868,6 +1028,14 @@
    entries:
      Burger: MeatBacon
      Taco: MeatBacon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#5B3E2A"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#5B3E2A"

 - type: entity
  name: cooked bear
@@ -901,6 +1069,8 @@
    entries:
      Burger: MeatBearBurger
      Taco: MeatBear
+  - type: Item
+    heldPrefix: meatball

 - type: entity
  name: penguin filet
@@ -933,6 +1103,14 @@
    entries:
      Burger: MeatPenguinBurger
      Taco: MeatPenguin
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-cooked-inhand-left
+        color: "#F7E3A3"
+      right:
+      - state: plain-cooked-inhand-right
+        color: "#F7E3A3"

 - type: entity
  name: cooked chicken
@@ -965,6 +1143,14 @@
    entries:
      Burger: MeatChicken
      Taco: MeatChicken
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-cooked-inhand-left
+        color: "#F7E3A3"
+      right:
+      - state: plain-cooked-inhand-right
+        color: "#F7E3A3"

 - type: entity
  name: fried chicken
@@ -997,6 +1183,14 @@
    entries:
      Burger: MeatChicken
      Taco: MeatChicken
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-cooked-inhand-left
+        color: "#F7E3A3"
+      right:
+      - state: plain-cooked-inhand-right
+        color: "#F7E3A3"

 - type: entity
  name: cooked duck
@@ -1029,6 +1223,14 @@
    entries:
      Burger: MeatDuck
      Taco: MeatDuck
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-cooked-inhand-left
+        color: "#F7E3A3"
+      right:
+      - state: plain-cooked-inhand-right
+        color: "#F7E3A3"

 - type: entity
  name: cooked crab
@@ -1061,6 +1263,12 @@
    entries:
      Burger: MeatCrabBurger
      Taco: MeatCrab
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-cooked-inhand-left
+      right:
+      - state: plain-cooked-inhand-right

 - type: entity
  name: goliath steak
@@ -1091,6 +1299,12 @@
    entries:
      Burger: MeatGoliathBurger
      Taco: MeatGoliath
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-cooked-inhand-left
+      right:
+      - state: plain-cooked-inhand-right

 - type: entity
  name: rouny steak
@@ -1125,6 +1339,12 @@
    entries:
      Burger: MeatXeno
      Taco: MeatXeno
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-cooked-inhand-left
+      right:
+      - state: plain-cooked-inhand-right

 - type: entity
  name: lizard steak
@@ -1158,6 +1378,12 @@
    entries:
      Burger: MeatLizardBurger
      Taco: MeatLizard
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-cooked-inhand-left
+      right:
+      - state: plain-cooked-inhand-right

 - type: entity
  name: boiled spider leg
@@ -1184,6 +1410,14 @@
    entries:
      Burger: MeatSpiderBurger
      Taco: MeatSpider
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: snake-inhand-left
+        color: "#44201A"
+      right:
+      - state: snake-inhand-right
+        color: "#44201A"

 - type: entity
  name: meatball
@@ -1212,6 +1446,8 @@
  - type: Construction
    graph: MeatMeatballCooked
    node: meatball cooked
+  - type: Item
+    heldPrefix: meatball

 - type: entity
  name: cooked meat patty
@@ -1241,6 +1477,8 @@
    entries:
      Burger: MeatPatty
      Taco: MeatPatty
+  - type: Item
+    heldPrefix: meatball

 - type: entity
  name: boiled snail
@@ -1270,6 +1508,14 @@
    entries:
      Burger: MeatSnail
      Taco: MeatSnail
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#5B3E2A"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#5B3E2A"

 - type: entity
  name: anomalous steak
@@ -1299,6 +1545,12 @@
  - type: Construction
    graph: AnomalyMeatSteak
    node: anomaly steak
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-cooked-inhand-left
+      right:
+      - state: plain-cooked-inhand-right

 - type: entity
  name: dragon steak
@@ -1334,6 +1586,12 @@
    entries:
      Burger: DragonSteak
      Taco: DragonSteak
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: dragon-cooked-inhand-left
+      right:
+      - state: dragon-cooked-inhand-right

 # Cutlets

@@ -1364,6 +1622,12 @@
    graph: Cutlet
    node: start
    defaultTarget: cutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+      right:
+      - state: generic-pink-inhand-right

 - type: entity
  name: raw bear cutlet
@@ -1393,6 +1657,14 @@
    graph: BearCutlet
    node: start
    defaultTarget: bear cutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: brown
+      right:
+      - state: generic-pink-inhand-right
+        color: brown

 - type: entity
  name: raw penguin cutlet
@@ -1420,6 +1692,14 @@
    graph: PenguinCutlet
    node: start
    defaultTarget: penguin cutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: white
+      right:
+      - state: generic-pink-inhand-right
+        color: white

 - type: entity
  name: raw chicken cutlet
@@ -1447,6 +1727,12 @@
    graph: ChickenCutlet
    node: start
    defaultTarget: chicken cutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+      right:
+      - state: generic-pink-inhand-right

 - type: entity
  name: raw duck cutlet
@@ -1474,6 +1760,12 @@
    graph: DuckCutlet
    node: start
    defaultTarget: duck cutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+      right:
+      - state: generic-pink-inhand-right

 - type: entity
  name: raw lizard cutlet
@@ -1504,6 +1796,14 @@
    graph: LizardCutlet
    node: start
    defaultTarget: lizard cutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: green
+      right:
+      - state: generic-pink-inhand-right
+        color: green

 - type: entity
  name: raw spider cutlet
@@ -1530,6 +1830,14 @@
    graph: SpiderCutlet
    node: start
    defaultTarget: spider cutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: green
+      right:
+      - state: generic-pink-inhand-right
+        color: green

 - type: entity
  name: raw xeno cutlet
@@ -1558,6 +1866,14 @@
    graph: XenoCutlet
    node: start
    defaultTarget: xeno cutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: green
+      right:
+      - state: generic-pink-inhand-right
+        color: green

 - type: entity
  name: raw killer tomato cutlet
@@ -1623,6 +1939,14 @@
    graph: DragonCutlet
    node: start
    defaultTarget: dragon cutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#D127A7"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#D127A7"

 # Cooked

@@ -1654,6 +1978,14 @@
    entries:
      Burger: MeatCutlet
      Taco: MeatCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#5B3614"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#5B3614"

 - type: entity
  name: bear cutlet
@@ -1686,6 +2018,14 @@
    entries:
      Burger: BearCutletBurger
      Taco: BearCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#5B3614"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#5B3614"

 - type: entity
  name: penguin cutlet
@@ -1716,6 +2056,14 @@
    entries:
      Burger: PenguinCutletBurger
      Taco: PenguinCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#5B3614"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#5B3614"

 - type: entity
  name: chicken cutlet
@@ -1746,6 +2094,14 @@
    entries:
      Burger: ChickenCutlet
      Taco: ChickenCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#5B3614"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#5B3614"

 - type: entity
  name: duck cutlet
@@ -1776,6 +2132,14 @@
    entries:
      Burger: DuckCutlet
      Taco: DuckCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#5B3614"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#5B3614"

 - type: entity
  name: lizard cutlet
@@ -1807,6 +2171,14 @@
    entries:
      Burger: LizardCutletBurger
      Taco: LizardCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#153F06"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#153F06"

 - type: entity
  name: spider cutlet
@@ -1836,6 +2208,14 @@
    entries:
      Burger: SpiderCutletBurger
      Taco: SpiderCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#153F06"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#153F06"

 - type: entity
  name: xeno cutlet
@@ -1865,6 +2245,14 @@
    entries:
      Burger: XenoCutlet
      Taco: XenoCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#153F06"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#153F06"

 - type: entity
  name: dragon cutlet
@@ -1896,3 +2284,11 @@
    entries:
      Burger: DragonCutlet
      Taco: DragonCutlet
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: generic-pink-inhand-left
+        color: "#7A1763"
+      right:
+      - state: generic-pink-inhand-right
+        color: "#7A1763"
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
@@ -46,6 +46,13 @@
      - tomato
  - type: Sprite
    state: tomato
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 40
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 35
  - type: Tag
    tags:
    - Fruit
@@ -69,12 +76,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 25
+        maxVol: 80
        reagents:
        - ReagentId: Nutriment
-          Quantity: 12
-        - ReagentId: Vitamin
-          Quantity: 8
+          Quantity: 70
 # Tastes like pasta, bad humor.

 - type: entity
@@ -92,12 +97,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 25
        reagents:
        - ReagentId: Nutriment
-          Quantity: 8
-        - ReagentId: Vitamin
-          Quantity: 4
+          Quantity: 15
+        - ReagentId: Protein
+          Quantity: 6
  - type: Tag
    tags:
    - Meat
@@ -143,12 +148,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 50
        reagents:
        - ReagentId: Nutriment
-          Quantity: 7
-        - ReagentId: Vitamin
+          Quantity: 20
+        - ReagentId: Protein
          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 20
 # Tastes like pasta, tomato.

 - type: entity
@@ -166,10 +173,8 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 25
        reagents:
        - ReagentId: Nutriment
-          Quantity: 8
-        - ReagentId: Vitamin
-          Quantity: 1
+          Quantity: 23
 # Tastes like pasta, butter.
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -280,7 +280,7 @@
  - type: Extractable
    grindableSolutionName: food
  - type: DamageOnInteract
-    damage: 
+    damage:
      types:
        Heat: 4
        Caustic: 4
@@ -307,7 +307,7 @@
            volume: -5
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
-  - type: DamageOnHit 
+  - type: DamageOnHit
    damage:
      types:
        Blunt: 5 # The nettle will "wilt" after 5 hits.
@@ -1312,6 +1312,7 @@
  - type: Tag
    tags:
    - Vegetable
+    - Mushroom

 # Slices

@@ -1623,6 +1624,9 @@
    entries:
      Taco: Lingzhi
      Burger: Lingzhi
+  - type: Tag
+    tags:
+    - Mushroom

 - type: entity
  name: ambrosia vulgaris
@@ -1844,6 +1848,9 @@
    entries:
      Taco: FlyAmanita
      Burger: FlyAmanita
+  - type: Tag
+    tags:
+    - Mushroom

 - type: entity
  name: gatfruit
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -40,6 +40,7 @@
  - type: Sprite
    state: boritos
  - type: Item
+    heldPrefix: boritos
  - type: Food
    trash:
    - FoodPacketBoritosTrash
@@ -56,6 +57,7 @@
  - type: Sprite
    state: cnds
  - type: Item
+    heldPrefix: cnds
  - type: Food
    trash:
    - FoodPacketCnDsTrash
@@ -73,6 +75,7 @@
  - type: Sprite
    state: cheesiehonkers
  - type: Item
+    heldPrefix: cheesiehonkers
  - type: Food
    trash:
    - FoodPacketCheesieTrash
@@ -91,6 +94,7 @@
  - type: Sprite
    state: chips
  - type: Item
+    heldPrefix: chips
  - type: Food
    trash:
    - FoodPacketChipsTrash
@@ -129,6 +133,7 @@
  - type: Sprite
    state: chocolatebar-open
  - type: Item
+    heldPrefix: chocolatebar-open
  - type: Tag
    tags:
      - FoodSnack
@@ -154,6 +159,7 @@
  - type: Sprite
    state: energybar
  - type: Item
+    heldPrefix: energybar
  - type: SpawnItemsOnUse
    items:
      - id: FoodPacketEnergyTrash
@@ -176,6 +182,7 @@
  - type: Sprite
    state: energybar-open
  - type: Item
+    heldPrefix: energybar-open

 - type: entity
  name: Sweetie's pistachios
@@ -190,6 +197,7 @@
  - type: Sprite
    state: pistachio
  - type: Item
+    heldPrefix: pistachio
  - type: Food
    trash:
    - FoodPacketPistachioTrash
@@ -229,6 +237,7 @@
  - type: Sprite
    state: raisins
  - type: Item
+    heldPrefix: raisins
  - type: Food
    trash:
    - FoodPacketRaisinsTrash
@@ -248,6 +257,7 @@
  - type: Sprite
    state: semki
  - type: Item
+    heldPrefix: semki
  - type: Food
    trash:
    - FoodPacketSemkiTrash
@@ -264,6 +274,7 @@
  - type: Sprite
    state: susjerky
  - type: Item
+    heldPrefix: susjerky
  - type: Food
    trash:
    - FoodPacketSusTrash
@@ -283,6 +294,7 @@
  - type: Sprite
    state: syndicakes
  - type: Item
+    heldPrefix: syndicakes
  - type: Food
    trash:
    - FoodPacketSyndiTrash
@@ -311,6 +323,8 @@
  - type: Food
    trash:
    - FoodPacketCupRamenTrash
+  - type: Item
+    heldPrefix: ramen

 - type: entity
  parent: DrinkRamen
@@ -342,6 +356,7 @@
  - type: Sprite
    state: chinese1
  - type: Item
+    heldPrefix: chinese1
  - type: SolutionContainerManager
    solutions:
      food:
@@ -369,6 +384,7 @@
  - type: Sprite
    state: chinese2
  - type: Item
+    heldPrefix: chinese2
  - type: SolutionContainerManager
    solutions:
      food:
@@ -404,7 +420,7 @@
          Quantity: 1
  - type: Item
    sprite: Objects/Consumable/Food/snacks.rsi
-    heldPrefix: packet
+    heldPrefix: cookie_fortune
    size: Tiny
  - type: Food
    trash:
@@ -418,6 +434,7 @@
  components:
  - type: Item
    size: Small
+    heldPrefix: nutribrick
  - type: Tag
    tags:
      - FoodSnack
@@ -442,6 +459,7 @@
      - nutribrick
  - type: Item
    size: Small
+    heldPrefix: nutribrick-open
  - type: Tag
    tags:
      - ReptilianFood
@@ -465,6 +483,8 @@
  - type: Sprite
    sprite: Objects/Consumable/Food/snacks.rsi
    state: mre-brownie
+  - type: Item
+    heldPrefix: mre-brownie
  - type: Tag
    tags:
      - FoodSnack
@@ -487,6 +507,8 @@
      - mrebrownie
  - type: Sprite
    state: mre-brownie-open
+  - type: Item
+    heldPrefix: mre-brownie-open
  - type: Food
  - type: SolutionContainerManager
    solutions:
@@ -498,6 +520,41 @@
        - ReagentId: Theobromine
          Quantity: 3

+- type: entity
+  name: swirl lollipop
+  parent: FoodSnackBase
+  id: FoodSnackSwirlLollipop
+  description: A swirly circle of pure concentrated sugar. Who's the biggest kid on the playground now?
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/candy.rsi
+    state: swirl_lollipop
+  - type: Item
+    sprite: Objects/Consumable/Food/candy.rsi
+    heldPrefix: swirl_lollipop
+    size: Small
+  - type: Tag
+    tags:
+    - FoodSnack
+    - ReptilianFood
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20 # Room for extra condiments
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 15
+  - type: FlavorProfile
+    flavors:
+    - sweet
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 2
+    soundHit:
+      collection: WeakHit
+
 # Trash

 - type: entity
@@ -511,7 +568,6 @@
    sprite: Objects/Consumable/Food/snacks.rsi
  - type: Item
    sprite: Objects/Consumable/Food/snacks.rsi
-    heldPrefix: packet
    size: Tiny
  - type: Tag
    tags:
@@ -540,6 +596,14 @@
  components:
  - type: Sprite
    state: boritos-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#4F54BE"
+      right:
+      - state: trash-inhand-right
+        color: "#4F54BE"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -549,6 +613,14 @@
  components:
  - type: Sprite
    state: cnds-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#915145"
+      right:
+      - state: trash-inhand-right
+        color: "#915145"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -558,6 +630,14 @@
  components:
  - type: Sprite
    state: cheesiehonkers-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#FFCC33"
+      right:
+      - state: trash-inhand-right
+        color: "#FFCC33"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -567,6 +647,14 @@
  components:
  - type: Sprite
    state: chips-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#008000"
+      right:
+      - state: trash-inhand-right
+        color: "#008000"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -576,6 +664,14 @@
  components:
  - type: Sprite
    state: chocolatebar-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#A20000"
+      right:
+      - state: trash-inhand-right
+        color: "#A20000"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -585,6 +681,14 @@
  components:
  - type: Sprite
    state: energybar-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#9AFF1F"
+      right:
+      - state: trash-inhand-right
+        color: "#9AFF1F"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -594,6 +698,14 @@
  components:
  - type: Sprite
    state: pistachio-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#99B334"
+      right:
+      - state: trash-inhand-right
+        color: "#99B334"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -603,6 +715,14 @@
  components:
  - type: Sprite
    state: popcorn-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#5193FF"
+      right:
+      - state: trash-inhand-right
+        color: "#5193FF"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -612,6 +732,14 @@
  components:
  - type: Sprite
    state: raisins-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#FF0033"
+      right:
+      - state: trash-inhand-right
+        color: "#FF0033"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -621,6 +749,14 @@
  components:
  - type: Sprite
    state: semki-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#C2821E"
+      right:
+      - state: trash-inhand-right
+        color: "#C2821E"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -630,6 +766,14 @@
  components:
  - type: Sprite
    state: susjerky-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#990033"
+      right:
+      - state: trash-inhand-right
+        color: "#990033"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -639,6 +783,14 @@
  components:
  - type: Sprite
    state: syndicakes-trash
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#FFFFFF"
+      right:
+      - state: trash-inhand-right
+        color: "#FFFFFF"

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -648,6 +800,8 @@
  components:
  - type: Sprite
    state: ramen
+  - type: Item
+    heldPrefix: ramen

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -657,6 +811,8 @@
  components:
  - type: Sprite
    state: chinese1
+  - type: Item
+    heldPrefix: chinese1

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -666,6 +822,8 @@
  components:
  - type: Sprite
    state: chinese2
+  - type: Item
+    heldPrefix: chinese2

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -702,3 +860,11 @@
    - Trash
  - type: Sprite
    state: mre-wrapper
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: trash-inhand-left
+        color: "#8B7356"
+      right:
+      - state: trash-inhand-right
+        color: "#8B7356"
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -138,12 +138,16 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 70
        reagents:
        - ReagentId: Nutriment
-          Quantity: 8
+          Quantity: 20
+        - ReagentId: Kelotane
+          Quantity: 12
+        - ReagentId: Bicaridine
+          Quantity: 12
        - ReagentId: Vitamin
-          Quantity: 2
+          Quantity: 20
  - type: Tag
    tags:
    - Fruit
@@ -168,14 +172,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 50
        reagents:
        - ReagentId: Nutriment
-          Quantity: 8
+          Quantity: 10
        - ReagentId: Vitamin
-          Quantity: 2
+          Quantity: 25
        - ReagentId: DoctorsDelight
-          Quantity: 5
+          Quantity: 10
  - type: Tag
    tags:
    - Meat
@@ -200,14 +204,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 45
        reagents:
        - ReagentId: Nutriment
-          Quantity: 8
+          Quantity: 20
        - ReagentId: Vitamin
-          Quantity: 2
+          Quantity: 10
        - ReagentId: Allicin
-          Quantity: 3
+          Quantity: 8

 - type: entity
  name: caesar salad
@@ -228,12 +232,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 50
        reagents:
        - ReagentId: Nutriment
-          Quantity: 8
+          Quantity: 15
        - ReagentId: Vitamin
-          Quantity: 6
+          Quantity: 30

 - type: entity
  name: kimchi salad
@@ -253,12 +257,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 30
        reagents:
        - ReagentId: Nutriment
          Quantity: 8
        - ReagentId: Vitamin
-          Quantity: 2
+          Quantity: 15
        - ReagentId: Allicin
          Quantity: 2

@@ -278,12 +282,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 10
+        maxVol: 35
        reagents:
-        - ReagentId: Nutriment
-          Quantity: 2
+        - ReagentId: Sugar
+          Quantity: 10
        - ReagentId: Vitamin
-          Quantity: 4
+          Quantity: 15
  - type: Tag
    tags:
    - Fruit
@@ -306,12 +310,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 35
        reagents:
-        - ReagentId: Nutriment
-          Quantity: 7
+        - ReagentId: Sugar
+          Quantity: 8
        - ReagentId: Vitamin
-          Quantity: 4
+          Quantity: 17 
  - type: Tag
    tags:
    - Fruit
@@ -404,12 +408,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 12
+        maxVol: 35
        reagents:
        - ReagentId: Nutriment
-          Quantity: 4
+          Quantity: 25
        - ReagentId: Vitamin
          Quantity: 4
+        - ReagentId: Protein
+          Quantity: 4
  - type: Tag
    tags:
    - Meat
@@ -494,12 +500,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 12
+        maxVol: 30
        reagents:
        - ReagentId: Nutriment
-          Quantity: 5
+          Quantity: 10
        - ReagentId: Vitamin
-          Quantity: 3
+          Quantity: 15
        - ReagentId: CapsaicinOil
          Quantity: 2
  - type: Tag
@@ -591,14 +597,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 30
+        maxVol: 40
        reagents:
        - ReagentId: Nutriment
-          Quantity: 7
-        - ReagentId: Vitamin
          Quantity: 8
+        - ReagentId: Vitamin
+          Quantity: 17
        - ReagentId: Water
-          Quantity: 10
+          Quantity: 5
  - type: Tag
    tags:
    - Meat
@@ -620,7 +626,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 40
        reagents:
        - ReagentId: Nutriment
          Quantity: 1
@@ -646,10 +652,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 40
        reagents:
        - ReagentId: Nutriment
-          Quantity: 3
+          Quantity: 10
        - ReagentId: Iron
          Quantity: 10
        - ReagentId: Blood
@@ -676,14 +682,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 30
+        maxVol: 40
        reagents:
        - ReagentId: Protein
-          Quantity: 9
+          Quantity: 15
        - ReagentId: Soysauce
          Quantity: 10
        - ReagentId: Vitamin
-          Quantity: 7
+          Quantity: 10

 - type: entity
  name: clown's tears
@@ -701,7 +707,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 25
+        maxVol: 55
        reagents:
        - ReagentId: Nutriment
          Quantity: 2
@@ -709,6 +715,8 @@
          Quantity: 9
        - ReagentId: Water
          Quantity: 10
+        - ReagentId: Razorium
+          Quantity: 1 # silly

 - type: entity
  name: vegetable soup
@@ -727,16 +735,16 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 25
+        maxVol: 40
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
        - ReagentId: Vitamin
-          Quantity: 7
+          Quantity: 15
        - ReagentId: Water
          Quantity: 10
        - ReagentId: Oculine
-          Quantity: 1
+          Quantity: 4

 - type: entity
  name: nettle soup
@@ -754,18 +762,18 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 30.5
+        maxVol: 40
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
        - ReagentId: Vitamin
-          Quantity: 8
+          Quantity: 15
        - ReagentId: Water
          Quantity: 10
        - ReagentId: Omnizine
          Quantity: 5
        - ReagentId: Histamine
-          Quantity: 0.5
+          Quantity: 4

 - type: entity
  name: mystery soup
@@ -797,14 +805,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 25
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
            Quantity: 8
          - ReagentId: CapsaicinOil
            Quantity: 5
          - ReagentId: Vitamin
-            Quantity: 4
+            Quantity: 20
          - ReagentId: Allicin
            Quantity: 3
  - type: Tag
@@ -829,12 +837,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
            Quantity: 8
          - ReagentId: Vitamin
-            Quantity: 4
+            Quantity: 25
  - type: Tag
    tags:
    - ChiliBowl
@@ -858,14 +866,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 6
+            Quantity: 12
          - ReagentId: CapsaicinOil
            Quantity: 5
          - ReagentId: Vitamin
-            Quantity: 4
+            Quantity: 20
          - ReagentId: Allicin
            Quantity: 3
  - type: Tag
@@ -889,10 +897,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 10
+            Quantity: 15
          - ReagentId: Vitamin
            Quantity: 5
          - ReagentId: TableSalt
@@ -920,12 +928,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 22
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
            Quantity: 3
          - ReagentId: Vitamin
-            Quantity: 5
+            Quantity: 20
          - ReagentId: Water
            Quantity: 10
  - type: Tag
@@ -950,12 +958,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 12
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 5
+            Quantity: 10 # Eyes are yummy
          - ReagentId: Vitamin
-            Quantity: 3
+            Quantity: 15
  - type: Tag
    tags:
    - Meat
@@ -981,7 +989,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 30
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
            Quantity: 9
@@ -1010,12 +1018,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 25
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 2
+            Quantity: 5
          - ReagentId: Vitamin
-            Quantity: 6
+            Quantity: 20
          - ReagentId: Water
            Quantity: 5
          - ReagentId: Milk
@@ -1034,10 +1042,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 25
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 3
+            Quantity: 15
          - ReagentId: Vitamin
            Quantity: 7
          - ReagentId: Water
@@ -1057,12 +1065,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 4
+            Quantity: 15
          - ReagentId: Vitamin
-            Quantity: 6
+            Quantity: 15
 # Tastes like beet.

 - type: entity
@@ -1083,14 +1091,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 25
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 15
-          - ReagentId: Protein
            Quantity: 5
+          - ReagentId: Protein
+            Quantity: 20
          - ReagentId: Vitamin
-            Quantity: 2
+            Quantity: 15
  - type: Tag
    tags:
    - Meat
@@ -1113,12 +1121,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 12
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 4
+            Quantity: 15
          - ReagentId: Vitamin
-            Quantity: 5
+            Quantity: 15
 # Tastes like sweet potato.

 - type: entity
@@ -1137,12 +1145,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 1
-          - ReagentId: Vitamin
            Quantity: 5
+          - ReagentId: Vitamin
+            Quantity: 25
          - ReagentId: Allicin
            Quantity: 5

@@ -1162,14 +1170,14 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 30
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 6
+            Quantity: 5
          - ReagentId: Vitamin
-            Quantity: 6
+            Quantity: 15
          - ReagentId: Protein
-            Quantity: 6
+            Quantity: 5
          - ReagentId: Water
            Quantity: 5
 # Tastes like crab.
@@ -1191,10 +1199,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 10
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 3
+            Quantity: 15
          - ReagentId: Licoxide
            Quantity: 6

@@ -1214,12 +1222,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 6
+            Quantity: 10
          - ReagentId: Vitamin
-            Quantity: 5
+            Quantity: 15
          - ReagentId: CapsaicinOil
            Quantity: 5
  - type: Tag
@@ -1245,12 +1253,12 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 40
        reagents:
          - ReagentId: Nutriment
-            Quantity: 6
+            Quantity: 15
          - ReagentId: Vitamin
-            Quantity: 6
+            Quantity: 15
          - ReagentId: Allicin
            Quantity: 3
  - type: Tag
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
@@ -140,10 +140,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 26
+        maxVol: 30
        reagents:
        - ReagentId: Nutriment
-          Quantity: 14
+          Quantity: 22
        - ReagentId: Vitamin
          Quantity: 6

@@ -159,10 +159,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 26
+        maxVol: 30
        reagents:
        - ReagentId: Nutriment
-          Quantity: 14
+          Quantity: 22
        - ReagentId: Vitamin
          Quantity: 6

@@ -207,6 +207,15 @@
      - onion
  - type: Sprite
    state: softtaco
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 18
  - type: Tag
    tags:
      - Meat
--- a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml
@@ -28,6 +28,12 @@
          variation: 0.05
  - type: Destructible
    thresholds:
+    - trigger: # Excess damage, don't spawn entities
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
    - trigger:
        !type:DamageTrigger
        damage: 10
@@ -89,6 +95,12 @@
          variation: 0.05
  - type: Destructible
    thresholds:
+    - trigger: # Excess damage, don't spawn entities
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
    - trigger:
        !type:DamageTrigger
        damage: 50
@@ -158,6 +170,12 @@
        density: 1000
  - type: Destructible
    thresholds:
+    - trigger: # Excess damage, don't spawn entities
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
    - trigger:
        !type:DamageTrigger
        damage: 75
@@ -179,6 +197,12 @@
    state: support_wall_broken
  - type: Destructible
    thresholds:
+    - trigger: # Excess damage, don't spawn entities
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
    - trigger:
        !type:DamageTrigger
        damage: 50
--- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml
+++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml
@@ -216,7 +216,7 @@
      path: /Audio/Effects/lightburn.ogg
  - type: Explosive
    explosionType: MicroBomb
-    totalIntensity: 120
-    intensitySlope: 4
-    maxIntensity: 30
+    totalIntensity: 150
+    intensitySlope: 5
+    maxIntensity: 15
    canCreateVacuum: false
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
@@ -13,8 +13,7 @@
  - type: MachineBoard
    prototype: ShuttleGunSvalinnMachineGun
    stackRequirements:
-      MatterBin: 2
-      Manipulator: 4
+      Manipulator: 6
      Steel: 5
      CableHV: 5

@@ -31,8 +30,7 @@
  - type: MachineBoard
    prototype: ShuttleGunPerforator
    stackRequirements:
-      MatterBin: 4
-      Manipulator: 6
+      Manipulator: 10
      Steel: 10
      CableHV: 5

@@ -49,8 +47,7 @@
  - type: MachineBoard
    prototype: ShuttleGunFriendship
    stackRequirements:
-      MatterBin: 3
-      Manipulator: 2
+      Manipulator: 5
      Steel: 7
      CableHV: 5

@@ -67,8 +64,7 @@
  - type: MachineBoard
    prototype: ShuttleGunDuster
    stackRequirements:
-      MatterBin: 6
-      Manipulator: 4
+      Manipulator: 10
      Steel: 10
      CableHV: 5
      Uranium: 2
@@ -86,7 +82,6 @@
  - type: MachineBoard
    prototype: ShuttleGunKinetic
    stackRequirements:
-      MatterBin: 2
-      Manipulator: 3
+      Manipulator: 5
      Steel: 5
      CableHV: 2
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/holopad.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/holopad.yml
@@ -7,6 +7,6 @@
    - type: MachineBoard
      prototype: Holopad
      stackRequirements:
-        Capacitor: 4
+        Manipulator: 4
        Cable: 4
-        Glass: 2
+        Glass: 2
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -7,8 +7,7 @@
    - type: MachineBoard
      prototype: Autolathe
      stackRequirements:
-        MatterBin: 3
-        Manipulator: 1
+        Manipulator: 4
        Glass: 1

 - type: entity
@@ -20,7 +19,7 @@
  - type: MachineBoard
    prototype: AutolatheHyperConvection
    stackRequirements:
-      MatterBin: 3
+      Manipulator: 3
      Glass: 1
    tagRequirements:
      Igniter:
@@ -38,8 +37,7 @@
  - type: MachineBoard
    prototype: Protolathe
    stackRequirements:
-      MatterBin: 2
-      Manipulator: 2
+      Manipulator: 4
    tagRequirements:
      GlassBeaker:
        amount: 2
@@ -56,7 +54,7 @@
  - type: MachineBoard
    prototype: ProtolatheHyperConvection
    stackRequirements:
-      MatterBin: 2
+      Manipulator: 4
    tagRequirements:
      GlassBeaker:
        amount: 2
@@ -76,7 +74,7 @@
  - type: MachineBoard
    prototype: Biofabricator
    stackRequirements:
-      MatterBin: 4
+      Manipulator: 4
      Glass: 1

 - type: entity
@@ -90,8 +88,7 @@
    - type: MachineBoard
      prototype: SecurityTechFab
      stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
      tagRequirements:
        GlassBeaker:
          amount: 2
@@ -108,8 +105,7 @@
    - type: MachineBoard
      prototype: AmmoTechFab
      stackRequirements:
-        MatterBin: 1
-        Manipulator: 1
+        Manipulator: 2

 - type: entity
  id: MedicalTechFabCircuitboard
@@ -122,8 +118,7 @@
    - type: MachineBoard
      prototype: MedicalTechFab
      stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
      tagRequirements:
        GlassBeaker:
          amount: 2
@@ -141,8 +136,7 @@
  - type: MachineBoard
    prototype: CircuitImprinter
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 1
+      Manipulator: 2
    tagRequirements:
      GlassBeaker:
        amount: 2
@@ -159,7 +153,7 @@
  - type: MachineBoard
    prototype: CircuitImprinterHyperConvection
    stackRequirements:
-      MatterBin: 2
+      Manipulator: 2
    tagRequirements:
      GlassBeaker:
        amount: 2
@@ -178,8 +172,7 @@
  - type: MachineBoard
    prototype: ExosuitFabricator
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 3
+      Manipulator: 4
      Glass: 5
  - type: GuideHelp
    guides:
@@ -210,7 +203,7 @@
  - type: MachineBoard
    prototype: Biogenerator
    stackRequirements:
-      MatterBin: 2
+      Manipulator: 2
    tagRequirements:
      GlassBeaker:
        amount: 1
@@ -224,8 +217,7 @@
  - type: MachineBoard
    prototype: UniformPrinter
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 2
+      Manipulator: 3

 - type: entity
  id: VaccinatorMachineCircuitboard
@@ -237,8 +229,7 @@
  - type: MachineBoard
    prototype: Vaccinator
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 1
+      Manipulator: 2
      Cable: 5
    tagRequirements:
        GlassBeaker:
@@ -276,8 +267,7 @@
    - type: MachineBoard
      prototype: MachineArtifactAnalyzer
      stackRequirements:
-        Manipulator: 3
-        Capacitor: 1
+        Manipulator: 1
        Glass: 5

 - type: entity
@@ -306,7 +296,7 @@
    - type: MachineBoard
      prototype: MachineAnomalyVessel
      stackRequirements:
-        Capacitor: 3
+        Manipulator: 3
        Cable: 1
        PlasmaGlass: 10

@@ -321,7 +311,7 @@
  - type: MachineBoard
    prototype: MachineAnomalyVesselExperimental
    stackRequirements:
-      Capacitor: 3
+      Manipulator: 3
      Cable: 5
      PlasmaGlass: 15
      MetalRod: 4
@@ -337,8 +327,7 @@
    - type: MachineBoard
      prototype: MachineAnomalySynchronizer
      stackRequirements:
-        Manipulator: 2
-        Capacitor: 5
+        Manipulator: 7
        PlasmaGlass: 5
        Cable: 5

@@ -353,7 +342,7 @@
    - type: MachineBoard
      prototype: MachineAPE
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        Cable: 1
        Glass: 1

@@ -368,8 +357,7 @@
  - type: MachineBoard
    prototype: GasThermoMachineFreezer
    stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
      Cable: 5
  - type: Construction
    deconstructionTarget: null
@@ -387,8 +375,7 @@
  - type: MachineBoard
    prototype: GasThermoMachineHeater
    stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
      Cable: 5
  - type: Construction
    graph: ThermomachineBoard
@@ -406,8 +393,7 @@
  - type: MachineBoard
    prototype: GasThermoMachineHellfireFreezer
    stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
      Plasma: 1
  - type: Construction
    deconstructionTarget: null
@@ -425,8 +411,7 @@
  - type: MachineBoard
    prototype: GasThermoMachineHellfireHeater
    stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
      Plasma: 1
  - type: Construction
    graph: ThermomachineBoard
@@ -444,7 +429,7 @@
  - type: MachineBoard
    prototype: BaseGasCondenser
    stackRequirements:
-      MatterBin: 1
+      Manipulator: 1
      Glass: 1

 - type: entity
@@ -458,8 +443,7 @@
  - type: MachineBoard
    prototype: PortableScrubber
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 2
+      Manipulator: 3
      Cable: 5
      Glass: 2

@@ -474,8 +458,7 @@
  - type: MachineBoard
    prototype: SpaceHeater
    stackRequirements:
-      MatterBin: 1
-      Capacitor: 2
+      Manipulator: 3
      Cable: 5

 - type: entity
@@ -489,8 +472,7 @@
    - type: MachineBoard
      prototype: CloningPod
      stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
        Glass: 1
        Cable: 1

@@ -505,7 +487,7 @@
    - type: MachineBoard
      prototype: MedicalScanner
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Glass: 5
        Cable: 1

@@ -546,7 +528,7 @@
    - type: MachineBoard
      prototype: ChemMaster
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Glass: 1
        Cable: 1
      tagRequirements:
@@ -565,7 +547,7 @@
    - type: MachineBoard
      prototype: ChemDispenserEmpty
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Glass: 1
        Steel: 3
      tagRequirements:
@@ -584,8 +566,7 @@
  - type: MachineBoard
    prototype: BiomassReclaimer
    stackRequirements:
-      MatterBin: 2
-      Manipulator: 1
+      Manipulator: 3
      Steel: 5
    tagRequirements:
      Knife:
@@ -623,8 +604,7 @@
    - type: MachineBoard
      prototype: SeedExtractor
      stackRequirements:
-        Manipulator: 2
-        Capacitor: 1
+        Manipulator: 3
        # replacing the console screen
        Glass: 1
        Cable: 2
@@ -641,7 +621,7 @@
    - type: MachineBoard
      prototype: SMESBasicEmpty
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        CableHV: 10
      componentRequirements:
        PowerCell:
@@ -660,7 +640,7 @@
  - type: MachineBoard
    prototype: SMESAdvancedEmpty
    stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
      CableHV: 20
    componentRequirements:
      PowerCell:
@@ -679,7 +659,7 @@
    - type: MachineBoard
      prototype: PowerCellRecharger
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        Cable: 5
    - type: PhysicalComposition
      materialComposition:
@@ -700,7 +680,7 @@
    - type: MachineBoard
      prototype: PowerCageRecharger
      stackRequirements:
-        Capacitor: 4
+        Manipulator: 4
        Steel: 5
        Cable: 10
    - type: PhysicalComposition
@@ -722,7 +702,7 @@
    - type: MachineBoard
      prototype: BorgCharger
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        Cable: 5
    - type: PhysicalComposition
      materialComposition:
@@ -743,7 +723,7 @@
    - type: MachineBoard
      prototype: WeaponCapacitorRecharger
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        CableMV: 5
    - type: PhysicalComposition
      materialComposition:
@@ -764,7 +744,7 @@
  - type: MachineBoard
    prototype: TurboItemRecharger
    stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
      CableMV: 5
  - type: PhysicalComposition
    materialComposition:
@@ -780,7 +760,7 @@
    - type: MachineBoard
      prototype: SubstationBasicEmpty
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        CableMV: 5
        CableHV: 5
      componentRequirements:
@@ -840,7 +820,7 @@
    - type: MachineBoard
      prototype: PortableGeneratorPacman
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        CableHV: 5
    - type: PhysicalComposition
      materialComposition:
@@ -860,7 +840,7 @@
  - type: MachineBoard
    prototype: Thruster
    stackRequirements:
-      Capacitor: 4
+      Manipulator: 4
      Steel: 5

 - type: entity
@@ -873,8 +853,7 @@
  - type: MachineBoard
    prototype: Gyroscope
    stackRequirements:
-      Manipulator: 2
-      Capacitor: 1
+      Manipulator: 3
      Glass: 2

 - type: entity
@@ -887,7 +866,7 @@
    - type: MachineBoard
      prototype: PortableGeneratorSuperPacman
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        CableHV: 10
    - type: PhysicalComposition
      materialComposition:
@@ -907,7 +886,7 @@
    - type: MachineBoard
      prototype: PortableGeneratorJrPacman
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Cable: 10
    - type: PhysicalComposition
      materialComposition:
@@ -926,8 +905,7 @@
    - type: MachineBoard
      prototype: KitchenReagentGrinder
      stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
      tagRequirements:
        GlassBeaker:
          amount: 1
@@ -944,7 +922,7 @@
  - type: MachineBoard
    prototype: ChemistryHotplate
    stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
      Glass: 1

 - type: entity
@@ -958,7 +936,7 @@
  - type: MachineBoard
    prototype: KitchenElectricGrill
    stackRequirements:
-      Capacitor: 4
+      Manipulator: 4
      Glass: 2
      Cable: 5

@@ -972,8 +950,7 @@
    - type: MachineBoard
      prototype: StasisBed
      stackRequirements:
-        Capacitor: 1
-        Manipulator: 1
+        Manipulator: 2
        Cable: 3
        Steel: 2

@@ -988,7 +965,7 @@
  - type: MachineBoard
    prototype: MachineElectrolysisUnit
    stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
      Cable: 1

 - type: entity
@@ -1015,7 +992,7 @@
  - type: MachineBoard
    prototype: MachineMaterialSilo
    stackRequirements:
-      MatterBin: 4
+      Manipulator: 4
      Cable: 1

 - type: entity
@@ -1028,8 +1005,7 @@
    - type: MachineBoard
      prototype: OreProcessor
      stackRequirements:
-        MatterBin: 1
-        Manipulator: 3
+        Manipulator: 4
        Glass: 1

 - type: entity
@@ -1042,8 +1018,7 @@
  - type: MachineBoard
    prototype: OreProcessorIndustrial
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 3
+      Manipulator: 4
      Glass: 1

 - type: entity
@@ -1054,8 +1029,7 @@
  - type: MachineBoard
    prototype: Sheetifier
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 1
+      Manipulator: 2

 - type: entity
  id: MicrowaveMachineCircuitboard
@@ -1067,7 +1041,7 @@
    - type: MachineBoard
      prototype: KitchenMicrowave
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Glass: 2
        Cable: 2
    - type: Tag
@@ -1084,7 +1058,7 @@
    - type: MachineBoard
      prototype: SyndicateMicrowave
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Glass: 2
        Cable: 2

@@ -1113,8 +1087,7 @@
  - type: MachineBoard
    prototype: MachineFlatpacker
    stackRequirements:
-      Manipulator: 2
-      MatterBin: 1
+      Manipulator: 3
      Steel: 1

 - type: entity
@@ -1127,7 +1100,7 @@
    - type: MachineBoard
      prototype: Emitter
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        CableHV: 5
        Glass: 2

@@ -1197,8 +1170,7 @@
  - type: MachineBoard
    prototype: GasRecycler
    stackRequirements:
-      Capacitor: 1
-      Manipulator: 1
+      Manipulator: 2
      Steel: 10
      Plasma: 5

@@ -1230,7 +1202,7 @@
    - type: MachineBoard
      prototype: CargoTelepad
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        Steel: 5

 - type: entity
@@ -1244,7 +1216,7 @@
  - type: MachineBoard
    prototype: CargoMailTeleporter
    stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
      Steel: 5

 - type: entity
@@ -1289,7 +1261,7 @@
  - type: MachineBoard
    prototype: SalvageMagnet
    stackRequirements:
-      Capacitor: 4
+      Manipulator: 4
      Steel: 5
      CableHV: 5
      Cable: 2
@@ -1305,8 +1277,7 @@
  - type: MachineBoard
    prototype: GravityGeneratorMini
    stackRequirements:
-      Capacitor: 4
-      MatterBin: 3
+      Manipulator: 7
      Steel: 5
      CableHV: 5
      Uranium: 2
@@ -1320,8 +1291,7 @@
  - type: MachineBoard
    prototype: StationAnchor
    stackRequirements:
-      Capacitor: 4
-      MatterBin: 3
+      Manipulator: 7
      Steel: 10
      Glass: 5
      CableHV: 8
@@ -1335,8 +1305,7 @@
  - type: MachineBoard
    prototype: ReagentGrinderIndustrial
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 3
+      Manipulator: 4
      Glass: 1

 - type: entity
@@ -1364,6 +1333,5 @@
    prototype: CutterMachine
    stackRequirements:
      Steel: 2
-      Capacitor: 1
-      Manipulator: 1
+      Manipulator: 2
      Cable: 1
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/turrets.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/turrets.yml
@@ -1,6 +1,7 @@
 - type: entity
-  id: WeaponEnergyTurretStationMachineCircuitboard
+  abstract: true
  parent: BaseMachineCircuitboard
+  id: WeaponEnergyTurretStationMachineCircuitboardBase
  name: sentry turret machine board
  description: A machine printed circuit board for a sentry turret.
  components:
@@ -13,7 +14,7 @@
      TurretCompatibleWeapon:
        amount: 1
        defaultPrototype: WeaponLaserCannon
-        examineName: construction-insert-info-examine-name-laser-cannon 
+        examineName: construction-insert-info-examine-name-laser-cannon
      ProximitySensor:
        amount: 1
        defaultPrototype: ProximitySensor
@@ -21,16 +22,27 @@
      PowerCell:
        amount: 1
        defaultPrototype: PowerCellMedium
-        examineName: construction-insert-info-examine-name-power-cell 
-        
+        examineName: construction-insert-info-examine-name-power-cell
+
 - type: entity
+  parent: WeaponEnergyTurretStationMachineCircuitboardBase
  id: WeaponEnergyTurretAIMachineCircuitboard
-  parent: WeaponEnergyTurretStationMachineCircuitboard
-  name: AI sentry turret machine board
-  description: A machine printed circuit board for an AI sentry turret.
+  suffix: AI, Silicon
  components:
  - type: Sprite
    sprite: Objects/Misc/module.rsi
    state: command
  - type: MachineBoard
-    prototype: WeaponEnergyTurretAI
+    prototype: WeaponEnergyTurretAI
+
+- type: entity
+  parent: WeaponEnergyTurretStationMachineCircuitboardBase
+  id: WeaponEnergyTurretSecurityMachineCircuitboard
+  suffix: Security
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/module.rsi
+    state: security
+  - type: MachineBoard
+    prototype: WeaponEnergyTurretSecurity
+
--- a/Show More
+++ b/Show More