Merge pull request #1416 from crystallpunk-14/ed-10-06-2025-upstream-sync

Stable upstream sync

Resources/Prototypes/Access/misc.yml

@@ -34,3 +34,8 @@
   - Atmospherics
   - GenpopEnter
   - GenpopLeave
+
+- type: accessGroup
+  id: General
+  tags:
+  - Maintenance

Resources/Prototypes/Actions/anomaly.yml

@@ -1,9 +1,11 @@
 - type: entity
+  parent: BaseAction
   id: ActionAnomalyPulse
   name: Anomaly pulse
   description: Release a pulse of energy of your abnormal nature
   components:
-  - type: InstantAction
+  - type: Action
+    useDelay: 30
     icon: Structures/Specific/anomaly.rsi/anom1.png
+  - type: InstantAction
     event: !type:ActionAnomalyPulseEvent
-    useDelay: 30

Resources/Prototypes/Actions/borgs.yml

@@ -1,26 +1,28 @@
-- type: entity
+- type: entity
+  parent: BaseMentalAction # allow reading laws when crit
   id: ActionViewLaws
   name: View Laws
   description: View the laws that you must follow.
   components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     itemIconStyle: NoItem
     icon:
       sprite: Interface/Actions/actions_borg.rsi
       state: state-laws
-    event: !type:ToggleLawsScreenEvent
     useDelay: 0.5
+  - type: InstantAction
+    event: !type:ToggleLawsScreenEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionSelectBorgType
   name: Select Cyborg Type
   components:
-  - type: InstantAction
+  - type: Action
     itemIconStyle: NoItem
     icon:
       sprite: Interface/Actions/actions_borg.rsi
       state: select-type
-    event: !type:BorgToggleSelectTypeEvent
     useDelay: 0.5
+  - type: InstantAction
+    event: !type:BorgToggleSelectTypeEvent

Resources/Prototypes/Actions/crit.yml

@@ -1,47 +1,50 @@
 # Actions added to mobs in crit.
 - type: entity
+  abstract: true
+  parent: BaseMentalAction
+  id: BaseCritAction
+  components:
+  - type: Action
+    itemIconStyle: NoItem
+
+- type: entity
+  parent: BaseCritAction
   id: ActionCritSuccumb
   name: Succumb
   description: Accept your fate.
   components:
-  - type: InstantAction
-    itemIconStyle: NoItem
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
+    startDelay: true
+    useDelay: 10
     icon:
       sprite: Mobs/Ghosts/ghost_human.rsi
       state: icon
+  - type: InstantAction
     event: !type:CritSuccumbEvent
-    startDelay: true
-    useDelay: 10
 
 - type: entity
+  parent: BaseCritAction
   id: ActionCritFakeDeath
   name: Fake Death
   description: Pretend to take your final breath while staying alive.
   components:
-  - type: InstantAction
-    itemIconStyle: NoItem
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
+    useDelay: 30
     icon:
       sprite: Interface/Actions/actions_crit.rsi
       state: fakedeath
+  - type: InstantAction
     event: !type:CritFakeDeathEvent
-    useDelay: 30
 
 - type: entity
+  parent: ActionCritSuccumb # for use delay
   id: ActionCritLastWords
   name: Say Last Words
   description: Whisper your last words to anyone nearby, and then succumb to your fate. You only have 30 characters to work with.
   components:
-  - type: InstantAction
-    itemIconStyle: NoItem
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     icon:
       sprite: Interface/Actions/actions_crit.rsi
       state: lastwords
+  - type: InstantAction
     event: !type:CritLastWordsEvent
-    startDelay: true
-    useDelay: 10

Resources/Prototypes/Actions/diona.yml

@@ -1,24 +1,26 @@
 - type: entity
+  parent: BaseSuicideAction
   id: DionaGibAction
   name: Gib Yourself!
   description: Split apart into 3 nymphs.
   components:
-  - type: InstantAction
+  - type: Action
     icon:
       sprite: Mobs/Species/Diona/organs.rsi
       state: brain
+  - type: InstantAction
     event: !type:GibActionEvent {}
-    checkCanInteract: false
-    checkConsciousness: false
 
 - type: entity
+  parent: BaseAction
   id: DionaReformAction
   name: Reform
   description: Reform back into a whole Diona.
   components:
-  - type: InstantAction
+  - type: Action
+    useDelay: 600 # Once every 10 minutes. Keep them dead for a fair bit before reforming
     icon:
       sprite: Mobs/Species/Diona/parts.rsi
       state: full
+  - type: InstantAction
     event: !type:ReformEvent {}
-    useDelay: 600 # Once every 10 minutes. Keep them dead for a fair bit before reforming

Resources/Prototypes/Actions/internals.yml

@@ -1,14 +1,16 @@
-- type: entity
+- type: entity
+  parent: BaseAction
   id: ActionToggleInternals
   name: Toggle Internals
   description: Breathe from the equipped gas tank. Also requires equipped breath mask.
   components:
-  - type: InstantAction
+  - type: Action
+    useDelay: 1
     icon:
       sprite: Interface/Alerts/internals.rsi
       state: internal2
     iconOn:
       sprite: Interface/Alerts/internals.rsi
       state: internal1
+  - type: InstantAction
     event: !type:ToggleActionEvent
-    useDelay: 1

Resources/Prototypes/Actions/mapping.yml

@@ -0,0 +1,48 @@
+- type: entity
+  abstract: true
+  parent: BaseMentalAction
+  id: BaseMappingAction
+  components:
+  - type: Action
+    clientExclusive: true
+
+- type: entity
+  parent: BaseMappingAction
+  id: BaseMappingDecalAction # not abstract but the event has to be set in code
+  components:
+  - type: TargetAction
+    repeat: true
+    range: -1
+  - type: WorldTargetAction
+    event: null # has to be set with SetEvent in DecalPlacementSystem
+
+- type: entity
+  parent: BaseMappingAction
+  id: BaseMappingSpawnAction # not abstract but the event has to be set in code
+  components:
+  - type: Action
+    icon: Tiles/cropped_parallax.png
+  - type: InstantAction
+    event: null # has to be set with SetEvent in MappingSystem
+
+- type: entity
+  parent: BaseMappingAction
+  id: ActionMappingEraser
+  name: action-name-mapping-erase
+  components:
+  - type: Action
+    icon: Interface/VerbIcons/delete.svg.192dpi.png
+  - type: InstantAction
+    event: !type:StartPlacementActionEvent
+      eraser: true
+
+# these are used for mapping actions yml files
+- type: entity
+  parent: BaseMappingSpawnAction
+  id: BaseMappingEntityAction # not abstract but the event has to be set in code
+  components:
+  - type: Action
+    autoPopulate: False
+    temporary: True
+  - type: InstantAction
+    event: null # has to be set with SetEvent in ActionsSystem

Resources/Prototypes/Actions/mech.yml

@@ -1,37 +1,48 @@
 - type: entity
+  abstract: true
+  parent: BaseAction
+  id: BaseMechAction
+  components:
+  - type: Action
+    itemIconStyle: NoItem
+
+- type: entity
+  parent: BaseMechAction
   id: ActionMechCycleEquipment
   name: Cycle
   description: Cycles currently selected equipment
   components:
-  - type: InstantAction
-    itemIconStyle: NoItem
+  - type: Action
+    useDelay: 0.5
     icon:
       sprite: Interface/Actions/actions_mecha.rsi
       state: mech_cycle_equip_on
+  - type: InstantAction
     event: !type:MechToggleEquipmentEvent
-    useDelay: 0.5
 
 - type: entity
+  parent: BaseMechAction
   id: ActionMechOpenUI
   name: Control Panel
   description: Opens the control panel for the mech
   components:
-  - type: InstantAction
-    itemIconStyle: NoItem
+  - type: Action
+    useDelay: 1
     icon:
       sprite: Interface/Actions/actions_mecha.rsi
       state: mech_view_stats
+  - type: InstantAction
     event: !type:MechOpenUiEvent
-    useDelay: 1
 
 - type: entity
+  parent: BaseMechAction
   id: ActionMechEject
   name: Eject
   description: Ejects the pilot from the mech
   components:
-  - type: InstantAction
-    itemIconStyle: NoItem
+  - type: Action
     icon:
       sprite: Interface/Actions/actions_mecha.rsi
       state: mech_eject
+  - type: InstantAction
     event: !type:MechEjectPilotEvent

Resources/Prototypes/Actions/ninja.yml

@@ -1,73 +1,82 @@
 # gloves
 - type: entity
+  parent: BaseToggleAction
   id: ActionToggleNinjaGloves
   name: Toggle ninja gloves
   description: Toggles all glove actions on left click. Includes your doorjack, draining power, stunning enemies and hacking certain computers.
   components:
-  - type: InstantAction
+  - type: Action
     priority: -13
-    event: !type:ToggleActionEvent {}
 
 # suit
 - type: entity
+  parent: BaseAction
   id: ActionCreateThrowingStar
   name: Create throwing star
   description: Channels suit power into creating a throwing star that deals extra stamina damage.
   components:
-  - type: InstantAction
+  - type: Action
     useDelay: 0.5
     icon:
       sprite: Objects/Weapons/Throwable/throwing_star.rsi
       state: icon
     itemIconStyle: NoItem
     priority: -10
+  - type: InstantAction
     event: !type:CreateItemEvent {}
 
 - type: entity
+  parent: BaseAction
   id: ActionRecallKatana
   name: Recall katana
   description: Teleports the Energy Katana linked to this suit to its wearer, cost based on distance.
   components:
-  - type: InstantAction
+  - type: Action
     useDelay: 1
     icon:
       sprite: Objects/Weapons/Melee/energykatana.rsi
       state: icon
     itemIconStyle: NoItem
     priority: -11
+  - type: InstantAction
     event: !type:RecallKatanaEvent {}
 
 - type: entity
+  parent: BaseAction
   id: ActionNinjaEmp
   name: EM Burst
   description: Disable any nearby technology with an electro-magnetic pulse.
   components:
-  - type: InstantAction
+  - type: Action
     icon:
       sprite: Objects/Weapons/Grenades/empgrenade.rsi
       state: icon
     itemIconStyle: BigAction
     priority: -13
+  - type: InstantAction
     event: !type:NinjaEmpEvent {}
 
 - type: entity
+  parent: BaseAction
   id: ActionTogglePhaseCloak
   name: Phase cloak
   description: Toggles your suit's phase cloak. Beware that if you are hit, all abilities are disabled for 5 seconds, including your cloak!
   components:
-  - type: InstantAction
+  - type: Action
     # have to plan (un)cloaking ahead of time
     useDelay: 5
     priority: -9
+  - type: InstantAction
     event: !type:ToggleActionEvent
 
 # katana
 - type: entity
+  parent: BaseAction
   id: ActionEnergyKatanaDash
   name: Katana dash
   description: Teleport to anywhere you can see, if your Energy Katana is in your hand.
   components:
-  - type: WorldTargetAction
+  - type: Action
     icon:
       sprite: Objects/Magic/magicactions.rsi
       state: blink
@@ -77,6 +86,8 @@
       params:
         volume: 5
     priority: -12
-    event: !type:DashEvent
+  - type: TargetAction
     checkCanAccess: false
     range: 0
+  - type: WorldTargetAction
+    event: !type:DashEvent

Resources/Prototypes/Actions/polymorph.yml

@@ -1,4 +1,5 @@
-- type: entity
+- type: entity
+  parent: BaseAction
   id: ActionRevertPolymorph
   name: Revert
   description: Revert back into your original form.
@@ -7,54 +8,59 @@
     event: !type:RevertPolymorphActionEvent
 
 - type: entity
-  id: ActionPolymorph
+  abstract: true
+  parent: BaseAction
+  id: BaseActionPolymorph
   components:
+  - type: Action
+    itemIconStyle: NoItem
+    useDelay: 60
   - type: InstantAction
     event: !type:PolymorphActionEvent
-    itemIconStyle: NoItem
 
 - type: entity
+  parent: BaseActionPolymorph
   id: ActionPolymorphWizardSpider
   name: Spider Polymorph
   description: Polymorphs you into a Spider.
   components:
-  - type: InstantAction
-    useDelay: 60
-    event: !type:PolymorphActionEvent
-      protoId: WizardSpider
-    itemIconStyle: NoItem
+  - type: Action
     icon:
       sprite: Mobs/Animals/spider.rsi
       state: tarantula
+  - type: InstantAction
+    event: !type:PolymorphActionEvent
+      protoId: WizardSpider
 
 - type: entity
+  parent: BaseActionPolymorph
   id: ActionPolymorphWizardRod
   name: Rod Form
   description: CLANG!
   components:
-  - type: InstantAction
-    useDelay: 60
-    event: !type:PolymorphActionEvent
-      protoId: WizardRod
-    itemIconStyle: NoItem
+  - type: Action
     icon:
       sprite: Objects/Fun/immovable_rod.rsi
       state: icon
+  - type: InstantAction
+    event: !type:PolymorphActionEvent
+      protoId: WizardRod
 
 - type: entity
+  parent: BaseActionPolymorph
   id: ActionPolymorphJaunt
   name: Ethereal Jaunt
   description: Melt into the Ethereal Plane for a quick getaway!
   components:
   - type: Magic
-  - type: InstantAction
+  - type: Action
     useDelay: 30
-    event: !type:PolymorphActionEvent
-      protoId: Jaunt
-    itemIconStyle: NoItem
     icon:
       sprite: Objects/Magic/magicactions.rsi
       state: jaunt
+  - type: InstantAction
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
     # TODO: Effect ECS (from cardboard box)
   - type: ActionUpgrade
     effectedLevels:
@@ -62,31 +68,19 @@
       3: ActionPolymorphJauntIII
 
 - type: entity
-  id: ActionPolymorphJauntII
   parent: ActionPolymorphJaunt
+  id: ActionPolymorphJauntII
   name: Ethereal Jaunt II
   description: Melt into the Ethereal Plane for an even quicker getaway!
   components:
-  - type: InstantAction
+  - type: Action
     useDelay: 25
-    event: !type:PolymorphActionEvent
-      protoId: Jaunt
-    itemIconStyle: NoItem
-    icon:
-      sprite: Objects/Magic/magicactions.rsi
-      state: jaunt
 
 - type: entity
-  id: ActionPolymorphJauntIII
   parent: ActionPolymorphJaunt
+  id: ActionPolymorphJauntIII
   name: Ethereal Jaunt III
   description: Are you even tangible anymore?
   components:
-  - type: InstantAction
+  - type: Action
     useDelay: 20
-    event: !type:PolymorphActionEvent
-      protoId: Jaunt
-    itemIconStyle: NoItem
-    icon:
-      sprite: Objects/Magic/magicactions.rsi
-      state: jaunt

Resources/Prototypes/Actions/revenant.yml

@@ -1,48 +1,58 @@
 - type: entity
+  parent: BaseAction
   id: ActionRevenantShop
   name: Shop
   description: Opens the ability shop.
   components:
-  - type: InstantAction
+  - type: Action
     icon: Interface/Actions/shop.png
+  - type: InstantAction
     event: !type:RevenantShopActionEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionRevenantDefile
   name: Defile
   description: Costs 30 Essence.
   components:
-  - type: InstantAction
-    icon: Interface/Actions/defile.png
-    event: !type:RevenantDefileActionEvent
+  - type: Action
     useDelay: 15
+    icon: Interface/Actions/defile.png
+  - type: InstantAction
+    event: !type:RevenantDefileActionEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionRevenantOverloadLights
   name: Overload Lights
   description: Costs 40 Essence.
   components:
-  - type: InstantAction
+  - type: Action
     icon: Interface/Actions/overloadlight.png
-    event: !type:RevenantOverloadLightsActionEvent
     useDelay: 20
+  - type: InstantAction
+    event: !type:RevenantOverloadLightsActionEvent
 
 #- type: entity
+#  parent: BaseAction
 #  id: ActionRevenantBlight
 #  name: Blight
 #  description: Costs 50 Essence.
 #  components:
-#  - type: InstantAction
+#  - type: Action
 #    icon: Interface/Actions/blight.png
-#    event: !type:RevenantBlightActionEvent
 #    useDelay: 20
+#  - type: InstantAction
+#    event: !type:RevenantBlightActionEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionRevenantMalfunction
   name: Malfunction
   description: Costs 60 Essence.
   components:
-  - type: InstantAction
+  - type: Action
     icon: Interface/Actions/malfunction.png
-    event: !type:RevenantMalfunctionActionEvent
     useDelay: 20
+  - type: InstantAction
+    event: !type:RevenantMalfunctionActionEvent

Resources/Prototypes/Actions/security.yml

@@ -1,5 +1,6 @@
 # gloves
 - type: entity
+  parent: BaseAction
   id: ActionToggleKnuckleDustersStun
   name: Toggle stun knuckle dusters
   description: Toggles the duster's built in stun baton.

Resources/Prototypes/Actions/speech.yml

@@ -1,10 +1,12 @@
-- type: entity
+- type: entity
+  parent: BaseAction
   id: ActionConfigureMeleeSpeech
   name: Set Battlecry
   description: Set a custom battlecry for when you attack!
   components:
-  - type: InstantAction
+  - type: Action
     itemIconStyle: BigItem
     priority: -20
     useDelay: 1
+  - type: InstantAction
     event: !type:MeleeSpeechConfigureActionEvent

Resources/Prototypes/Actions/spider.yml

@@ -1,19 +1,23 @@
 - type: entity
+  parent: BaseAction
   id: ActionSpiderWeb
   name: Spider Web
   description: Spawns a web that slows your prey down.
   components:
-  - type: InstantAction
+  - type: Action
     icon: Interface/Actions/web.png
-    event: !type:SpiderWebActionEvent
     useDelay: 25
+  - type: InstantAction
+    event: !type:SpiderWebActionEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionSericulture
   name: Weave silk
   description: Weave a bit of silk for use in arts and crafts.
   components:
-  - type: InstantAction
+  - type: Action
     icon: Interface/Actions/web.png
-    event: !type:SericultureActionEvent
     useDelay: 1
+  - type: InstantAction
+    event: !type:SericultureActionEvent

Resources/Prototypes/Actions/station_ai.yml

@@ -1,28 +1,32 @@
-# Actions
+# Actions
 - type: entity
+  parent: BaseAction
   id: ActionJumpToCore
   name: Jump to core
   description: Sends your eye back to the core.
   components:
-  - type: InstantAction
+  - type: Action
     priority: -9
     itemIconStyle: BigAction
     icon:
       sprite: Interface/Actions/actions_ai.rsi
       state: ai_core
+  - type: InstantAction
     event: !type:JumpToCoreEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionSurvCameraLights
   name: Toggle camera lights
   description: Enable surveillance camera lights near wherever you're viewing.
   components:
-  - type: InstantAction
+  - type: Action
     priority: -5
     itemIconStyle: BigAction
     icon:
       sprite: Interface/Actions/actions_ai.rsi
       state: camera_light
+  - type: InstantAction
     event: !type:RelayedActionComponentChangeEvent
       components:
       - type: LightOnCollideCollider
@@ -39,17 +43,17 @@
 
 
 - type: entity
+  parent: BaseMentalAction
   id: ActionAIViewLaws
   name: View Laws
   description: View the laws that you must follow.
   components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     priority: -3
     itemIconStyle: NoItem
     icon:
       sprite: Interface/Actions/actions_ai.rsi
       state: state_laws
-    event: !type:ToggleLawsScreenEvent
     useDelay: 0.5
+  - type: InstantAction
+    event: !type:ToggleLawsScreenEvent

Resources/Prototypes/Actions/types.yml

@@ -1,130 +1,167 @@
 # base actions
 
+# base prototype for all action entities
 - type: entity
-  id: BaseSuicideAction
   abstract: true
+  id: BaseAction
+  components:
+  - type: Action
+
+# an action that is done all in le head and cant be prevented by any means
+- type: entity
+  abstract: true
+  parent: BaseAction
+  id: BaseMentalAction
+  components:
+  - type: Action
+    checkCanInteract: false
+    checkConsciousness: false
+
+- type: entity
+  abstract: true
+  parent: BaseMentalAction
+  id: BaseSuicideAction
   components:
   - type: ConfirmableAction
     popup: suicide-action-popup
 
+- type: entity
+  abstract: true
+  parent: BaseAction
+  id: BaseImplantAction
+  components:
+  - type: InstantAction
+    event: !type:ActivateImplantEvent
+
+- type: entity
+  abstract: true
+  parent: BaseAction
+  id: BaseToggleAction
+  components:
+  - type: InstantAction
+    event: !type:ToggleActionEvent
+
 # actions
 
 - type: entity
+  parent: BaseAction
   id: ActionScream
   name: Scream
   description: AAAAAAAAAAAAAAAAAAAAAAAAA
   components:
-  - type: InstantAction
+  - type: Action
     useDelay: 10
     icon: Interface/Actions/scream.png
-    event: !type:ScreamActionEvent
     checkCanInteract: false
+  - type: InstantAction
+    event: !type:ScreamActionEvent
 
 - type: entity
+  parent: BaseMentalAction
   id: ActionTurnUndead
   name: Turn Undead
   description: Succumb to your infection and become a zombie.
   components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     icon: Interface/Actions/zombie-turn.png
+  - type: InstantAction
     event: !type:ZombifySelfActionEvent
 
 - type: entity
+  parent: BaseToggleAction
   id: ActionToggleLight
   name: Toggle Light
   description: Turn the light on and off.
   components:
-  - type: InstantAction
+  - type: Action
     useDelay: 1
     icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
     iconOn: { sprite: Objects/Tools/flashlight.rsi, state: flashlight-on }
-    event: !type:ToggleActionEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionOpenStorageImplant
   name: Toggle Storage Implant
   description: Opens or closes the storage implant embedded under your skin
   components:
-  - type: InstantAction
+  - type: Action
     itemIconStyle: BigAction
     priority: -20
     icon:
       sprite: Clothing/Back/Backpacks/backpack.rsi
       state: icon
-    event: !type:OpenStorageImplantEvent
     useDelay: 1
+  - type: InstantAction
+    event: !type:OpenStorageImplantEvent
 
 - type: entity
-  parent: BaseSuicideAction
+  parent: [BaseSuicideAction, BaseImplantAction]
   id: ActionActivateMicroBomb
   name: Activate Microbomb
   description: Activates your internal microbomb, completely destroying you and your equipment
   components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     itemIconStyle: BigAction
     priority: -20
     icon:
       sprite: Actions/Implants/implants.rsi
       state: explosive
-    event: !type:ActivateImplantEvent
 
 - type: entity
-  parent: BaseSuicideAction
+  parent: [BaseSuicideAction, BaseImplantAction]
   id: ActionActivateDeathAcidifier
   name: Activate Death-Acidifier
   description: Activates your death-acidifier, completely melting you and your equipment
   components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     itemIconStyle: BigAction
     priority: -20
     icon:
       sprite: Objects/Magic/magicactions.rsi
       state: gib
-    event: !type:ActivateImplantEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionActivateFreedomImplant
   name: Break Free
   description: Activating your freedom implant will free you from any hand restraints
   components:
   - type: LimitedCharges
     maxCharges: 3
-  - type: InstantAction
+  - type: Action
     checkCanInteract: false
     itemIconStyle: BigAction
     priority: -20
     icon:
       sprite: Actions/Implants/implants.rsi
       state: freedom
+  - type: InstantAction
     event: !type:UseFreedomImplantEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionOpenUplinkImplant
   name: Open Uplink
   description: Opens the syndicate uplink embedded under your skin
   components:
-  - type: InstantAction
+  - type: Action
     itemIconStyle: BigAction
     priority: -20
     icon:
       sprite: Objects/Devices/communication.rsi
       state: old-radio
+  - type: InstantAction
     event: !type:OpenUplinkImplantEvent
 
 - type: entity
+  parent: BaseImplantAction
   id: ActionActivateEmpImplant
   name: Activate EMP
   description: Triggers a small EMP pulse around you
   components:
   - type: LimitedCharges
     maxCharges: 3
-  - type: InstantAction
+  - type: Action
     checkCanInteract: false
     useDelay: 5
     itemIconStyle: BigAction
@@ -132,16 +169,16 @@
     icon:
       sprite: Objects/Weapons/Grenades/empgrenade.rsi
       state: icon
-    event: !type:ActivateImplantEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionActivateScramImplant
   name: SCRAM!
   description: Randomly teleports you within a large distance.
   components:
   - type: LimitedCharges
     maxCharges: 2
-  - type: InstantAction
+  - type: Action
     checkCanInteract: false
     useDelay: 5
     itemIconStyle: BigAction
@@ -149,9 +186,11 @@
     icon:
       sprite: Structures/Specific/anomaly.rsi
       state: anom4
+  - type: InstantAction
     event: !type:UseScramImplantEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionActivateDnaScramblerImplant
   name: Scramble DNA
   description:  Randomly changes your name and appearance.
@@ -160,190 +199,226 @@
     popup: dna-scrambler-action-popup
   - type: LimitedCharges
     maxCharges: 1
-  - type: InstantAction
+  - type: Action
     itemIconStyle: BigAction
     priority: -20
     icon:
       sprite: Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi
       state: icon
+  - type: InstantAction
     event: !type:UseDnaScramblerImplantEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionToggleSuitPiece
   name: Toggle Suit Piece
   description: Remember to equip the important pieces of your suit before going into action.
   components:
-  - type: InstantAction
+  - type: Action
     itemIconStyle: BigItem
     useDelay: 1 # equip noise spam.
+  - type: InstantAction
     event: !type:ToggleClothingEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionCombatModeToggle
   name: "[color=red]Combat Mode[/color]"
   description: Enter combat mode
   components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     icon: Interface/Actions/harmOff.png
     iconOn: Interface/Actions/harm.png
-    event: !type:ToggleCombatActionEvent
     priority: -100
+  - type: InstantAction
+    event: !type:ToggleCombatActionEvent
 
 - type: entity
-  id: ActionCombatModeToggleOff
   parent: ActionCombatModeToggle
-  name: "[color=red]Combat Mode[/color]"
-  description: Enter combat mode
+  id: ActionCombatModeToggleOff
   components:
-  - type: InstantAction
+  - type: Action
     enabled: false
     autoPopulate: false
-    priority: -100
 
 - type: entity
+  parent: BaseAction
   id: ActionChangeVoiceMask
   name: Set name
   description: Change the name others hear to something else.
   components:
-  - type: InstantAction
+  - type: Action
     icon: { sprite: Interface/Actions/voice-mask.rsi, state: icon }
+  - type: InstantAction
     event: !type:VoiceMaskSetNameEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionVendingThrow
   name: Dispense Item
   description: Randomly dispense an item from your stock.
   components:
-  - type: InstantAction
+  - type: Action
     useDelay: 30
+  - type: InstantAction
     event: !type:VendingMachineSelfDispenseEvent
 
 - type: entity
+  parent: BaseToggleAction
   id: ActionToggleBlock
   name: Block
   description: Raise or lower your shield.
   components:
-  - type: InstantAction
+  - type: Action
     icon: { sprite: Objects/Weapons/Melee/shields.rsi, state: teleriot-icon }
-    iconOn: Objects/Weapons/Melee/shields.rsi/teleriot-on.png
-    event: !type:ToggleActionEvent
+    iconOn: { sprite: Objects/Weapons/Melee/shields.rsi, state: teleriot-on }
 
 - type: entity
+  parent: BaseMentalAction
   id: ActionClearNetworkLinkOverlays
   name: Clear network link overlays
   description: Clear network link overlays.
   components:
-  - type: InstantAction
+  - type: Action
     clientExclusive: true
-    checkCanInteract: false
-    checkConsciousness: false
     temporary: true
     icon: { sprite: Objects/Tools/multitool.rsi, state: icon }
+  - type: InstantAction
     event: !type:ClearAllOverlaysEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionAnimalLayEgg
   name: Lay egg
   description: Uses hunger to lay an egg.
   components:
-  - type: InstantAction
+  - type: Action
     icon: { sprite: Objects/Consumable/Food/egg.rsi, state: icon }
     useDelay: 60
+  - type: InstantAction
     event: !type:EggLayInstantActionEvent
 
 - type: entity
+  parent: BaseMentalAction
   id: ActionSleep
   name: Sleep
   description: Go to sleep.
   components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
+  - type: InstantAction
     event: !type:SleepActionEvent
 
 - type: entity
+  parent: BaseMentalAction
   id: ActionWake
   name: Wake up
   description: Stop sleeping.
   components:
-  - type: InstantAction
-    icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
-    checkCanInteract: false
-    checkConsciousness: false
-    event: !type:WakeActionEvent
+  - type: Action
     startDelay: true
     useDelay: 2
+    icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
+  - type: InstantAction
+    event: !type:WakeActionEvent
 
 - type: entity
+  parent: BaseImplantAction
   id: ActionActivateHonkImplant
   name: Honk
   description: Activates your honking implant, which will produce the signature sound of the clown.
   components:
-  - type: InstantAction
+  - type: Action
     icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon }
-    event: !type:ActivateImplantEvent
-    useDelay: 1
 
 - type: entity
+  parent: BaseAction
   id: ActionFireStarter
   name: Ignite
   description: Ignites enemies in a radius around you.
   components:
-  - type: InstantAction
+  - type: Action
     priority: -1
     useDelay: 30
     icon: Interface/Actions/firestarter.png
+  - type: InstantAction
     event: !type:FireStarterActionEvent
 
 - type: entity
+  parent: BaseMentalAction
   id: ActionToggleEyes
   name: Open/Close eyes
   description: Close your eyes to protect your peepers, or open your eyes to enjoy the pretty lights.
   components:
-  - type: InstantAction
+  - type: Action
     icon: Interface/Actions/eyeopen.png
     iconOn: Interface/Actions/eyeclose.png
-    event: !type:ToggleEyesActionEvent
     useDelay: 1 # so u cant give yourself and observers eyestrain by rapidly spamming the action
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: InstantAction
+    event: !type:ToggleEyesActionEvent
 
 - type: entity
+  parent: BaseToggleAction
   id: ActionToggleWagging
   name: Wagging Tail
   description: Start or stop wagging your tail.
   components:
-    - type: InstantAction
-      icon: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
-      iconOn: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
-      itemIconStyle: NoItem
-      useDelay: 1 # emote spam
-      event: !type:ToggleActionEvent
+  - type: Action
+    icon: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
+    iconOn: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
+    itemIconStyle: NoItem
+    useDelay: 1 # emote spam
 
 - type: entity
+  parent: BaseAction
   id: FakeMindShieldToggleAction
   name: '[color=green]Toggle Fake Mindshield[/color]'
   description: Turn the Fake Mindshield implant's transmission on/off
   components:
-  - type: InstantAction
+  - type: Action
     icon: { sprite: Interface/Actions/actions_fakemindshield.rsi, state: icon }
     iconOn: { sprite: Interface/Actions/actions_fakemindshield.rsi, state: icon-on }
     itemIconStyle: NoItem
     useDelay: 1
+  - type: InstantAction
     event: !type:FakeMindShieldToggleEvent
+  - type: Tag
+    tags:
+    - FakeMindShieldImplant
 
 - type: entity
+  parent: BaseToggleAction
   id: ActionToggleParamedicSiren
   name: Toggle Paramedic Siren
   description: Toggles the paramedic siren on and off.
   components:
-  - type: InstantAction 
+  - type: Action
     icon:
       sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
       state: icon-siren
     useDelay: 1
     itemIconStyle: BigAction
-    event: !type:ToggleActionEvent
+
+- type: entity
+  parent: BaseToggleAction
+  id: ActionToggleRootable
+  name: action-name-toggle-rootable
+  description: action-description-toggle-rootable
+  components:
+  - type: Action
+    icon: Interface/Actions/rooting.png
+    iconOn: Interface/Actions/rooting.png
+    itemIconStyle: NoItem
+    useDelay: 1
+
+- type: entity
+  id: ActionChameleonController
+  name: Control clothing
+  description: Change your entire outfit fast!
+  components:
+  - type: Action
+    priority: -20
+    icon: { sprite: Actions/Implants/implants.rsi, state: chameleon }
+    itemIconStyle: BigAction
+  - type: InstantAction
+    event: !type:ChameleonControllerOpenMenuEvent

Resources/Prototypes/Alerts/alerts.yml

@@ -25,6 +25,7 @@
     - category: Hunger
     - category: Thirst
     - alertType: Magboots
+    - alertType: Rooted
     - alertType: Pacified
 
 - type: entity

Resources/Prototypes/Alerts/rooted.yml

@@ -0,0 +1,5 @@
+- type: alert
+  id: Rooted
+  icons: [ /Textures/Interface/Alerts/Rooted/rooted.png ]
+  name: alerts-rooted-name
+  description: alerts-rooted-desc

Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml

@@ -4,7 +4,7 @@
     sprite: Structures/Storage/canister.rsi
     state: grey
   product: AirCanister
-  cost: 300
+  cost: 600
   category: cargoproduct-category-name-atmospherics
   group: market
 
@@ -14,7 +14,7 @@
     sprite: Structures/Storage/canister.rsi
     state: blue
   product: OxygenCanister
-  cost: 300
+  cost: 600
   category: cargoproduct-category-name-atmospherics
   group: market
 
@@ -34,7 +34,7 @@
     sprite: Structures/Storage/canister.rsi
     state: red
   product: NitrogenCanister
-  cost: 300
+  cost: 500
   category: cargoproduct-category-name-atmospherics
   group: market
 
@@ -54,7 +54,7 @@
     sprite: Structures/Storage/canister.rsi
     state: black
   product: CarbonDioxideCanister
-  cost: 400 # even though it's poisonous, it comes locked and only damages you slowly even with high amounts (tested)
+  cost: 670 # even though it's poisonous, it comes locked and only damages you slowly even with high amounts (tested)
   category: cargoproduct-category-name-atmospherics
   group: market
 
@@ -94,7 +94,7 @@
     sprite: Structures/Storage/canister.rsi
     state: orange
   product: PlasmaCanister
-  cost: 2500 # for reference, bagel's 3x1 roundstart plasma chamber contains ~16kmol for free, this is $2.5k for 1870mol, so $20k to nearly refill a 3x1 (some are 3x3) chamber
+  cost: 4200 # for reference, bagel's 3x1 roundstart plasma chamber contains ~16kmol for free, this is $4.2k for 2769 mol
   category: cargoproduct-category-name-atmospherics
   group: market
 

Resources/Prototypes/Catalog/Cargo/cargo_food.yml

@@ -4,17 +4,7 @@
     sprite: Objects/Consumable/Food/Baked/pizza.rsi
     state: margherita-slice
   product: CrateFoodPizza
-  cost: 450
-  category: cargoproduct-category-name-food
-  group: market
-
-- type: cargoProduct
-  id: FoodPizzaLarge
-  icon:
-    sprite: Objects/Consumable/Food/Baked/pizza.rsi
-    state: margherita
-  product: CrateFoodPizzaLarge
-  cost: 1800
+  cost: 1600
   category: cargoproduct-category-name-food
   group: market
 
@@ -24,7 +14,7 @@
     sprite: Objects/Consumable/Food/snacks.rsi
     state: nutribrick
   product: CrateFoodMRE
-  cost: 1000
+  cost: 1400
   category: cargoproduct-category-name-food
   group: market
 
@@ -64,17 +54,7 @@
     sprite: Objects/Consumable/Drinks/cola.rsi
     state: icon
   product: CrateFoodSoftdrinks
-  cost: 1200
-  category: cargoproduct-category-name-food
-  group: market
-
-- type: cargoProduct
-  id: FoodSoftdrinksLarge
-  icon:
-    sprite: Objects/Consumable/Drinks/colabottle.rsi
-    state: icon
-  product: CrateFoodSoftdrinksLarge
-  cost: 2400
+  cost: 1500
   category: cargoproduct-category-name-food
   group: market
 
@@ -94,7 +74,7 @@
     sprite: Objects/Consumable/Food/burger.rsi
     state: bigbite
   product: CrateFoodHappyHonkBigBite
-  cost: 1400
+  cost: 2800
   category: cargoproduct-category-name-food
   group: market
 
@@ -104,7 +84,7 @@
     sprite: Objects/Consumable/Food/frozen.rsi
     state: sandwich
   product: CrateFoodIceCream
-  cost: 1200
+  cost: 2000
   category: cargoproduct-category-name-food
   group: market
 
@@ -114,6 +94,6 @@
     sprite: Objects/Consumable/Food/frozen.rsi
     state: cone
   product: CrateFoodSnowcone
-  cost: 1100
+  cost: 2000
   category: cargoproduct-category-name-food
   group: market

Resources/Prototypes/Catalog/Cargo/cargo_materials.yml

@@ -147,3 +147,13 @@
   cost: 1000
   category: cargoproduct-category-name-materials
   group: market
+
+- type: cargoProduct
+  id: AirGrenade
+  icon:
+    sprite: Objects/Weapons/Grenades/airboom.rsi
+    state: icon
+  product: CrateAirGrenade
+  cost: 2500
+  category: cargoproduct-category-name-atmospherics
+  group: market

Resources/Prototypes/Catalog/Cargo/cargo_service.yml

@@ -8,6 +8,16 @@
   category: cargoproduct-category-name-service
   group: market
 
+- type: cargoProduct
+  id: ServiceCleanerGrenades
+  icon:
+    sprite: Objects/Weapons/Grenades/janitor.rsi
+    state: icon
+  product: CrateServiceCleanerGrenades
+  cost: 400
+  category: cargoproduct-category-name-service
+  group: market
+
 - type: cargoProduct
   id: ServiceLightsReplacement
   icon:

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

@@ -211,7 +211,7 @@
         - id: ClothingEyesChameleon
         - id: ClothingHeadsetChameleon
         - id: ClothingShoesChameleon
-        - id: BarberScissors
+        - id: ChameleonControllerImplanter
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle

Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml

@@ -16,14 +16,16 @@
     # Randomly generated books
     - id: BookRandomStory
       amount: !type:RangeNumberSelector
-        range: 0, 4
+        range: 0, 8
     # Guidebooks
     - !type:NestedSelector
+      rolls: !type:RangeNumberSelector
+        range: 0, 2
       tableId: RandomGuidebookTable
     # Handwritten books
     - !type:NestedSelector
       rolls: !type:RangeNumberSelector
-        range: 0, 2
+        range: 0, 3
       tableId: RandomHandwrittenBookTable
 
 - type: entityTable

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

@@ -245,3 +245,14 @@
         tableId: RandomTechBoardTable
         rolls: !type:RangeNumberSelector
           range: 6, 8
+
+- type: entity
+  id: CrateAirGrenade
+  parent: CrateEngineering
+  name: air grenade crate
+  description: A crate containing 3 air grenades.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirGrenade
+      amount: 3

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

@@ -12,20 +12,6 @@
     - id: LidSalami
       prob: 0.01
 
-- type: entity
-  id: CrateFoodPizzaLarge
-  parent: CratePlastic
-  name: disaster pizza delivery
-  description: In the ultimate event that all else has failed, Find comfort in that more pizza solves everything. Includes 16 pizzas.
-  components:
-  - type: StorageFill
-    contents:
-    - id: FoodBoxPizzaFilled
-      amount: 15
-    - id: FoodBoxPizzaCotton
-    - id: LidSalami
-      prob: 0.04
-
 - type: entity
   id: CrateFoodMRE
   parent: CratePlastic
@@ -141,31 +127,6 @@
     - id: DrinkFourteenLokoCan
       amount: 2
 
-- type: entity
-  id: CrateFoodSoftdrinksLarge
-  parent: CratePlastic
-  name: softdrinks bulk crate
-  description: Lots of sodas taken straight out of Centcomm's own vending machines, because you just can't leave your department. Includes 32 sodas.
-  components:
-  - type: EntityStorage
-    capacity: 32 # Slightly over-sized CratePlastic to accomodate over 30 drink cans at once.
-  - type: StorageFill
-    contents:
-      - id: DrinkColaCan
-        amount: 8
-      - id: DrinkGrapeCan
-        amount: 4
-      - id: DrinkRootBeerCan
-        amount: 4
-      - id: DrinkIcedTeaCan
-        amount: 4
-      - id: DrinkLemonLimeCan
-        amount: 4
-      - id: DrinkLemonLimeCranberryCan
-        amount: 4
-      - id: DrinkFourteenLokoCan
-        amount: 4
-
 - type: entity
   id: CrateFoodGetMore
   parent: CratePlastic

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

@@ -181,7 +181,7 @@
     - id: MaterialSiloMachineCircuitboard
     - id: SheetSteel1
       amount: 5
-    - id: MatterBinStockPart
+    - id: MicroManipulatorStockPart
       amount: 4
     - id: CableApcStack1
       amount: 2

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

@@ -21,6 +21,17 @@
         amount: 2
       - id: BoxCleanerGrenades
 
+- type: entity
+  id: CrateServiceCleanerGrenades
+  parent: CratePlastic
+  name: bulk cleanades crate
+  description: Contains two boxes of cleaner grenades, for those deeply-entrenched stains.
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxCleanerGrenades
+        amount: 2
+
 - type: entity
   id: CrateServiceReplacementLights
   parent: CrateGenericSteel

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

@@ -1,49 +1,84 @@
- - type: entity
-   id: ClosetL3Filled
-   suffix: Filled, Generic
-   parent: ClosetL3
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingOuterBioGeneral
-       - id: ClothingHeadHatHoodBioGeneral
+- type: entity
+  id: ClosetL3Filled
+  suffix: Filled, Generic
+  parent: ClosetL3
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearGeneric
 
- - type: entity
-   id: ClosetL3VirologyFilled
-   suffix: Filled, Virology
-   parent: ClosetL3Virology
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingOuterBioVirology
-       - id: ClothingHeadHatHoodBioVirology
+- type: entityTable
+  id: FillBiohazardGearGeneric
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterBioGeneral
+    - id: ClothingHeadHatHoodBioGeneral
 
- - type: entity
-   id: ClosetL3SecurityFilled
-   suffix: Filled, Security
-   parent: ClosetL3Security
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingOuterBioSecurity
-       - id: ClothingHeadHatHoodBioSecurity
+- type: entity
+  id: ClosetL3VirologyFilled
+  suffix: Filled, Virology
+  parent: ClosetL3Virology
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearVirology
 
- - type: entity
-   id: ClosetL3JanitorFilled
-   suffix: Filled, Janitor
-   parent: ClosetL3Janitor
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingOuterBioJanitor
-       - id: ClothingHeadHatHoodBioJanitor
+- type: entityTable
+  id: FillBiohazardGearVirology
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterBioVirology
+    - id: ClothingHeadHatHoodBioVirology
 
- - type: entity
-   id: ClosetL3ScienceFilled
-   suffix: Filled, Science
-   parent: ClosetL3Science
-   components:
-   - type: StorageFill
-     contents:
-       - id: ClothingOuterBioScientist
-       - id: ClothingHeadHatHoodBioScientist
+- type: entity
+  id: ClosetL3SecurityFilled
+  suffix: Filled, Security
+  parent: ClosetL3Security
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearSecurity
+
+- type: entityTable
+  id: FillBiohazardGearSecurity
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterBioSecurity
+    - id: ClothingHeadHatHoodBioSecurity
+
+- type: entity
+  id: ClosetL3JanitorFilled
+  suffix: Filled, Janitor
+  parent: ClosetL3Janitor
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearJanitor
+
+- type: entityTable
+  id: FillBiohazardGearJanitor
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterBioJanitor
+    - id: ClothingHeadHatHoodBioJanitor
+
+- type: entity
+  id: ClosetL3ScienceFilled
+  suffix: Filled, Science
+  parent: ClosetL3Science
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearScience
+
+- type: entityTable
+  id: FillBiohazardGearScience
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterBioScientist
+    - id: ClothingHeadHatHoodBioScientist

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

@@ -3,60 +3,83 @@
   parent: ClosetTool
   suffix: Filled
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterVestHazard
-        prob: 0.4
-      - id: FlashlightLantern
-        prob: 0.7
-      - id: Screwdriver
-        prob: 0.7
-      - id: Wrench
-        prob: 0.7
-      - id: Welder
-        prob: 0.7
-      - id: Crowbar
-        prob: 0.7
-      - id: Wirecutter
-        prob: 0.7
-      - id: Multitool
-        prob: 0.2
-      - id: trayScanner
-        prob: 0.7
-      - id: GasAnalyzer
-        prob: 0.7
-      - id: ClothingBeltUtility
-        prob: 0.2
-      - id: ClothingHandsGlovesColorYellow
-        prob: 0.05
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillClosetTool
+
+- type: entityTable
+  id: FillClosetTool
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterVestHazard
+      prob: 0.4
+    - id: FlashlightLantern
+      prob: 0.7
+    - id: Screwdriver
+      prob: 0.7
+    - id: Wrench
+      prob: 0.7
+    - id: Welder
+      prob: 0.7
+    - id: Crowbar
+      prob: 0.7
+    - id: Wirecutter
+      prob: 0.7
+    - id: Multitool
+      prob: 0.2
+    - id: trayScanner
+      prob: 0.7
+    - id: GasAnalyzer
+      prob: 0.7
+    - id: ClothingBeltUtility
+      prob: 0.2
+    - id: ClothingHandsGlovesColorYellow
+      prob: 0.05
+    - !type:GroupSelector
+      prob: 0.4
+      children:
       - id: ClothingHeadHatHardhatRed
-        prob: 0.4
-      - id: CableApcStack
-        prob: 0.3
-      - id: CableApcStack
-        prob: 0.3
-      - id: CableApcStack
-        prob: 0.3
-      - id: SprayPainter
-        prob: 0.7
+      - id: ClothingHeadHatHardhatBlue
+      - id: ClothingHeadHatHardhatOrange
+      - id: ClothingHeadHatHardhatWhite
+      - id: ClothingHeadHatHardhatYellow
+      - id: ClothingHeadHatHardhatYellowDark
+    - id: CableApcStack
+      prob: 0.3
+      rolls: !type:ConstantNumberSelector
+        value: 3
+    - id: SprayPainter
+      prob: 0.7
 
 - type: entity
   id: LockerElectricalSuppliesFilled
   suffix: Filled
   parent: LockerElectricalSupplies
   components:
-  - type: StorageFill
-    contents:
-      - id: ToolboxElectricalFilled
-        prob: 0.7
-      - id: FirelockElectronics
-        prob: 0.05
-      - id: APCElectronics
-        prob: 0.1
-      - id: CableMVStack
-        prob: 0.2
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillElectricalSupplies
+
+- type: entityTable
+  id: FillElectricalSupplies
+  table: !type:AllSelector
+    children:
+    - id: ToolboxElectricalFilled
+      prob: 0.7
+    - id: FirelockElectronics
+      prob: 0.05
+    - id: APCElectronics
+      prob: 0.1
+    - !type:GroupSelector
+      prob: 0.5
+      children:
       - id: CableApcStack
-        prob: 0.3
+        weight: 5
+      - id: CableMVStack
+      - id: CableHVStack
+        weight: 0.5
 
 - type: entity
   id: LockerWeldingSuppliesFilled
@@ -104,73 +127,139 @@
   suffix: Filled, Hardsuit
   parent: LockerAtmospherics
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterHardsuitAtmos
-      - id: ClothingMaskGasAtmos
-      - id: ClothingOuterSuitAtmosFire
-      - id: ClothingHeadHelmetAtmosFire
-      - id: GasAnalyzer
-      - id: MedkitOxygenFilled
-      - id: HolofanProjector
-      - id: RCD
-      - id: RCDAmmo
-      - id: AirGrenade
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: FillLockerAtmospherics
+        - !type:NestedSelector
+          tableId: FillAtmosphericsHardsuit
 
 - type: entity
   id: LockerAtmosphericsFilled
   suffix: Filled
   parent: LockerAtmospherics
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingMaskGasAtmos
-      - id: ClothingOuterSuitAtmosFire
-      - id: ClothingHeadHelmetAtmosFire
-      - id: GasAnalyzer
-      - id: MedkitOxygenFilled
-      - id: HolofanProjector
-      - id: RCD
-      - id: RCDAmmo
-      - id: AirGrenade
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerAtmospherics
+
+- type: entityTable
+  id: FillLockerAtmospherics
+  table: !type:AllSelector
+    children:
+    - id: ClothingMaskGasAtmos
+    - id: ClothingOuterSuitAtmosFire
+    - id: ClothingHeadHelmetAtmosFire
+    - id: GasAnalyzer
+    - id: MedkitOxygenFilled
+    - id: HolofanProjector
+    - id: RCD
+    - id: RCDAmmo
+    - id: AirGrenade
+
+- type: entityTable
+  id: FillAtmosphericsHardsuit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterHardsuitAtmos
+    - id: OxygenTankFilled
+    - id: ClothingMaskBreath
 
 - type: entity
   id: LockerEngineerFilledHardsuit
   suffix: Filled, Hardsuit
   parent: LockerEngineer
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterHardsuitEngineering
-      - id: ClothingHandsGlovesColorYellow
-      - id: ClothingMaskGas
-      - id: ClothingShoesBootsMag
-      - id: RCD
-      - id: RCDAmmo
-      - id: MetalFoamGrenade
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: FillLockerEngineer
+        - !type:NestedSelector
+          tableId: FillEngineerHardsuit
 
 - type: entity
   id: LockerEngineerFilled
   suffix: Filled
   parent: LockerEngineer
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHandsGlovesColorYellow
-      - id: ClothingMaskGas
-      - id: trayScanner
-      - id: RCD
-      - id: RCDAmmo
-      - id: MetalFoamGrenade
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerEngineer
+
+- type: entityTable
+  id: FillLockerEngineer
+  table: !type:AllSelector
+    children:
+    - id: ClothingHandsGlovesColorYellow
+    - id: ClothingMaskGas
+    - id: trayScanner
+    - id: RCD
+    - id: RCDAmmo
+    - id: MetalFoamGrenade
+
+- type: entityTable
+  id: FillEngineerHardsuit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterHardsuitEngineering
+    - id: OxygenTankFilled
+    - id: ClothingShoesBootsMag
+    - id: ClothingMaskBreath
 
 - type: entity
   id: ClosetRadiationSuitFilled
   parent: ClosetRadiationSuit
   suffix: Filled
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterSuitRad
-        amount: 2
-      - id: GeigerCounter
-        amount: 2
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillRadiationSuit
+
+- type: entityTable
+  id: FillRadiationSuit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterSuitRad
+      amount: !type:ConstantNumberSelector
+        value: 2
+    - id: GeigerCounter
+      amount: !type:ConstantNumberSelector
+        value: 2
+
+- type: entity
+  parent: LockerEvacRepair
+  id: LockerEvacRepairFilled
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerEvacRepair
+
+- type: entity
+  parent: LockerWallEvacRepair
+  id: LockerWallEvacRepairFilled
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerEvacRepair
+
+- type: entityTable
+  id: FillLockerEvacRepair
+  table: !type:AllSelector
+    children:
+    - id: BoxInflatable
+    - id: HolofanProjector
+    - id: MetalFoamGrenade
+      amount: 3
+    - id: AirGrenade
+      amount: 3

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

@@ -3,13 +3,20 @@
   suffix: Filled
   parent: LockerScientist
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingHandsGlovesLatex
-      - id: ClothingHeadsetScience
-      - id: ClothingMaskSterile
-      - id: ClothingOuterCoatRnd
-      - id: AnomalyScanner
-      - id: NodeScanner
-      - id: NetworkConfigurator
-        prob: 0.5
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerScientist
+
+- type: entityTable
+  id: FillLockerScientist
+  table: !type:AllSelector
+    children:
+    - id: ClothingHandsGlovesLatex
+    - id: ClothingHeadsetScience
+    - id: ClothingMaskSterile
+    - id: ClothingOuterCoatRnd
+    - id: AnomalyScanner
+    - id: NodeScanner
+    - id: NetworkConfigurator
+      prob: 0.5

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

@@ -95,12 +95,10 @@
   parent: SuitStorageBase
   suffix: Station Engineer
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingShoesBootsMag
-        - id: ClothingOuterHardsuitEngineering
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillEngineerHardsuit
   - type: AccessReader
     access: [["Engineering"]]
 
@@ -110,11 +108,10 @@
   parent: SuitStorageBase
   suffix: Atmospheric Technician
   components:
-  - type: StorageFill
-    contents:
-        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitAtmos
-        - id: ClothingMaskBreath
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillAtmosphericsHardsuit
   - type: AccessReader
     access: [["Atmospherics"]]
 

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

@@ -8,9 +8,7 @@
     CableApcStack: 2
     FlashlightLantern: 2
     PowerCellSmallPrinted: 3
-    MatterBinStockPart: 4
-    CapacitorStockPart: 4
-    MicroManipulatorStockPart: 4
+    MicroManipulatorStockPart: 12
   contrabandInventory:
     ProximitySensor: 1
     LeftArmBorg: 1

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

@@ -381,14 +381,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

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -281,7 +281,7 @@
   - type: FlashImmunity
   - type: EyeProtection
     protectionTime: 5
-  - type: BlackAndWhiteOverlay
+  - type: NoirOverlay
   - type: Tag
     tags:
     - HamsterWearable

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]

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
@@ -418,6 +418,10 @@
         type: MeleeSpeechBoundUserInterface
   - type: StaticPrice
     price: 0
+  - 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,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - Kangaroo
 
 - type: entity
   name: stun knuckle dusters
@@ -558,15 +566,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 +646,5 @@
       collection: Punch
     animation: WeaponArcFist
   - type: Tag
-    tags: [] # ignore "WhitelistChameleon" tag
-
+    tags:
+    - Kangaroo

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

@@ -29,6 +29,7 @@
     - Bandana
     - ClothMade
     - Recyclable
+    - WhitelistChameleon
 
 - type: entity
   parent: [ClothingHeadBandBase, ClothingMaskBandBlack]

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
@@ -207,7 +209,9 @@
       map: [ "light" ]
   - type: Clothing
     equippedPrefix: off
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
+    spriteLayer: light
+  - type: ItemTogglePointLight
   - type: PointLight
     enabled: false
     radius: 3

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

@@ -74,7 +74,7 @@
     sprite: Clothing/Head/Hardsuits/paramedhelm.rsi
   - type: HandheldLight
     addPrefix: false
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
     spriteLayer: light
     clothingVisuals:
       head:

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
@@ -68,8 +69,8 @@
   - type: HideLayerClothing
     layers:
       Hair: HEAD
-      HeadTop : HEAD
-      HeadSide : HEAD 
+      HeadTop: HEAD
+      HeadSide: HEAD
 
 - type: entity
   parent: ClothingHeadHatHardhatBase

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

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

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

@@ -242,13 +242,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

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

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

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

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

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

@@ -243,7 +243,7 @@
     walkModifier: 0.9
     sprintModifier: 0.9
   #Shoulder mounted flashlight
-  - type: ToggleableLightVisuals
+  - type: ToggleableVisuals
     spriteLayer: light
     clothingVisuals:
       outerClothing:
@@ -252,6 +252,7 @@
       outerClothing-vox:
       - state: equipped-OUTERCLOTHING-light-vox
         shader: unshaded
+  - type: ItemTogglePointLight
   - type: Appearance
   - type: HandheldLight
     addPrefix: false

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

@@ -665,6 +665,7 @@
   - type: Tag
     tags:
     - MonkeyWearable
+    - WhitelistChameleon
 
 #Wizard Hardsuit
 - type: entity

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,13 @@
       - state: equipped-OUTERCLOTHING
       - state: equipped-OUTERCLOTHING-unshaded
         shader: unshaded
+      - state: equipped-OUTERCLOTHING-unshaded
+        shader: shaded
+        #same trick here
   - type: Tag
     tags:
     - HiViz
+    - WhitelistChameleon
 
 #(Bartender) vest
 - type: entity

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
@@ -29,8 +29,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
@@ -115,10 +115,12 @@
     size: Normal
 
 - 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

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

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 ]

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

Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml

@@ -144,6 +144,9 @@
     - MobSpawnCrabIron
     - MobSpawnCrabQuartz
     - MobSpawnCrabSilver
+    - MobSpawnCrabCoal
+    - MobSpawnCrabGold
+    - MobSpawnCrabBananium
 
 - type: entity
   parent: MarkerBase

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

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

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

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

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

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

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

@@ -46,6 +46,7 @@
     - AnomalyRockGold
     - AnomalyRockQuartz
     - AnomalyRockUranium
+    - AnomalyRockBananium
     chance: 1
     offset: 0.15
 

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

@@ -45,9 +45,7 @@
           state: icon
     - type: RandomSpawner
       rarePrototypes:
-        - CapacitorStockPart
         - MicroManipulatorStockPart
-        - MatterBinStockPart
         - CableHVStack10
         - WelderIndustrial
         - PowerCellHigh

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

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

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

@@ -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

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

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

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

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

@@ -315,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
@@ -351,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
@@ -369,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
@@ -387,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
@@ -405,7 +413,8 @@
     iconOn:
       sprite: Interface/Actions/actions_rat_king.rsi
       state: loose
+    priority: 8
+  - type: InstantAction
     event:
       !type:RatKingOrderActionEvent
       type: Loose
-    priority: 8

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

@@ -104,73 +104,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 }

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

@@ -17,6 +17,7 @@
   # traits
   # - LegsParalyzed (you get healed)
   - LightweightDrunk
+  - Monochromacy
   - Muted
   - Narcolepsy
   - Pacified

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

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

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

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

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

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

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-

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

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

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.

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.
 

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

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.

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

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

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

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

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

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

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

Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml

@@ -47,13 +47,20 @@
     - SignalTrigger
   - type: PayloadTrigger
     components:
-    - type: TriggerOnSignal
+    - type: TimerStartOnSignal
     - type: DeviceNetwork
       deviceNetId: Wireless
       receiveFrequencyId: BasicDevice
     - type: WirelessNetworkConnection
       range: 200
     - type: DeviceLinkSink
+    - type: OnUseTimerTrigger
+      delay: 3
+      initialBeepDelay: 0
+      beepSound:
+        path: /Audio/Machines/Nuke/general_beep.ogg
+        params:
+          volume: -2
 
 - type: entity
   parent: BaseItem

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

@@ -12,7 +12,7 @@
       components:
       - Anchorable
       - Item
-      tags: 
+      tags:
       - Bot # for funny bot moments
     blacklist:
       components:
@@ -39,23 +39,27 @@
 
 # actions
 - type: entity
+  parent: BaseAction
   id: ActionDisguiseNoRot
   name: Toggle Rotation
   description: Use this to prevent your disguise from rotating, making it easier to hide in some scenarios.
   components:
-  - type: InstantAction
+  - type: Action
     icon: Interface/VerbIcons/refresh.svg.192dpi.png
     itemIconStyle: BigAction
+  - type: InstantAction
     event: !type:DisguiseToggleNoRotEvent
 
 - type: entity
+  parent: BaseAction
   id: ActionDisguiseAnchor
   name: Toggle Anchored
   description: For many objects you will want to be anchored to not be completely obvious.
   components:
-  - type: InstantAction
+  - type: Action
     icon:
       sprite: Objects/Tools/wrench.rsi
       state: icon
     itemIconStyle: BigAction
+  - type: InstantAction
     event: !type:DisguiseToggleAnchoredEvent

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

@@ -8,7 +8,7 @@
     sprite: Objects/Fun/candy_bucket.rsi
     layers:
     - state: empty_icon
-      map: [ "enum.ToggleVisuals.Layer" ]
+      map: [ "enum.ToggleableVisuals.Layer" ]
   - type: ContainerHeld
     threshold: 1
   - type: Item
@@ -17,8 +17,8 @@
   - type: Appearance
   - type: GenericVisualizer
     visuals:
-     enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+     enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
           True: {state: full_icon}
           False: {state: empty_icon}
   - type: Storage

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

@@ -160,51 +160,51 @@
     node: potatoai
 
 - type: entity
+  parent: BaseMentalAction
   id: ActionPAIOpenShop
   name: Software Catalog
   description: Install new software to assist your owner.
   components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     icon: Interface/Actions/shop.png
+  - type: InstantAction
     event: !type:PAIShopActionEvent
 
 - type: entity
+  parent: BaseMentalAction
   id: ActionPAIMassScanner
   name: Mass Scanner
   description: View a mass scanner interface.
   components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
     itemIconStyle: NoItem
+  - type: InstantAction
     event: !type:OpenUiActionEvent
-        key: enum.RadarConsoleUiKey.Key
+      key: enum.RadarConsoleUiKey.Key
 
 - type: entity
+  parent: BaseMentalAction
   id: ActionPAIPlayMidi
   name: Play MIDI
   description: Open your portable MIDI interface to soothe your owner.
   components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
     icon: Interface/Actions/pai-midi.png
     itemIconStyle: NoItem
+  - type: InstantAction
     event: !type:OpenUiActionEvent
       key: enum.InstrumentUiKey.Key
 
 - type: entity
+  parent: BaseMentalAction
   id: ActionPAIOpenMap
   name: Open Map
   description: Open your map interface and guide your owner.
   components:
-    - type: InstantAction
-      checkCanInteract: false
-      checkConsciousness: false
-      icon: { sprite: Interface/Actions/pai-map.rsi, state: icon }
-      itemIconStyle: NoItem
-      event: !type:OpenUiActionEvent
-        key: enum.StationMapUiKey.Key
+  - type: Action
+    icon: { sprite: Interface/Actions/pai-map.rsi, state: icon }
+    itemIconStyle: NoItem
+  - type: InstantAction
+    event: !type:OpenUiActionEvent
+      key: enum.StationMapUiKey.Key

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

@@ -12,12 +12,12 @@
       - state: screen
         shader: unshaded
         visible: false
-        map: ["enum.ToggleVisuals.Layer"]
+        map: ["enum.ToggleableVisuals.Layer"]
   - type: Appearance
   - type: GenericVisualizer
     visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
           True: { visible: true }
           False: { visible: false }
   - type: ItemToggle

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

@@ -1739,7 +1739,7 @@
       color: white
       netsync: false
     - type: Appearance
-    - type: ToggleableLightVisuals
+    - type: ToggleableVisuals
       spriteLayer: blade
       inhandVisuals:
         left:
@@ -2039,8 +2039,8 @@
   - type: Appearance
   - type: GenericVisualizer
     visuals:
-      enum.ToggleVisuals.Toggled:
-        enum.ToggleVisuals.Layer:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
           True: { state: icon }
           False: { state: icon-off }
   - type: ItemToggle

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

@@ -429,3 +429,4 @@
   components:
   - type: Stack
     count: 1
+