Merge branch 'ion-storm-refactor' of https://github.com/ScarKy0/space-station-14 into ion-storm-refactor

Resources/Prototypes/Actions/polymorph.yml

@@ -40,3 +40,53 @@
     icon:
       sprite: Objects/Fun/immovable_rod.rsi
       state: icon
+
+- type: entity
+  id: ActionPolymorphJaunt
+  name: Ethereal Jaunt
+  description: Melt into the Ethereal Plane for a quick getaway!
+  components:
+  - type: Magic
+  - type: InstantAction
+    useDelay: 30
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
+    itemIconStyle: NoItem
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: jaunt
+    # TODO: Effect ECS (from cardboard box)
+  - type: ActionUpgrade
+    effectedLevels:
+      2: ActionPolymorphJauntII
+      3: ActionPolymorphJauntIII
+
+- type: entity
+  id: ActionPolymorphJauntII
+  parent: ActionPolymorphJaunt
+  name: Ethereal Jaunt II
+  description: Melt into the Ethereal Plane for an even quicker getaway!
+  components:
+  - type: InstantAction
+    useDelay: 25
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
+    itemIconStyle: NoItem
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: jaunt
+
+- type: entity
+  id: ActionPolymorphJauntIII
+  parent: ActionPolymorphJaunt
+  name: Ethereal Jaunt III
+  description: Are you even tangible anymore?
+  components:
+  - type: InstantAction
+    useDelay: 20
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
+    itemIconStyle: NoItem
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: jaunt

Resources/Prototypes/Actions/station_ai.yml

@@ -5,35 +5,20 @@
   description: Sends your eye back to the core.
   components:
   - type: InstantAction
-    priority: -10
+    priority: -9
     itemIconStyle: BigAction
     icon:
       sprite: Interface/Actions/actions_ai.rsi
       state: ai_core
     event: !type:JumpToCoreEvent
 
-- type: entity
-  id: ActionShowJobIcons
-  name: Show job icons
-  description: Shows job icons for crew members.
-  components:
-  - type: InstantAction
-    priority: -5
-    itemIconStyle: BigAction
-    icon:
-      sprite: Interface/Actions/actions_ai.rsi
-      state: job_view
-    event: !type:ActionComponentChangeEvent
-      components:
-      - type: ShowJobIcons
-
 - type: entity
   id: ActionSurvCameraLights
   name: Toggle camera lights
   description: Enable surveillance camera lights near wherever you're viewing.
   components:
   - type: InstantAction
-    priority: -6
+    priority: -5
     itemIconStyle: BigAction
     icon:
       sprite: Interface/Actions/actions_ai.rsi

Resources/Prototypes/Actions/types.yml

@@ -280,6 +280,8 @@
     checkCanInteract: false
     checkConsciousness: false
     event: !type:WakeActionEvent
+    startDelay: true
+    useDelay: 2
 
 - type: entity
   id: ActionActivateHonkImplant

Resources/Prototypes/Alerts/alerts.yml

@@ -13,6 +13,7 @@
     - alertType: Ensnared
     - category: Buckled
     - alertType: Pulling
+    - alertType: Walking
     - category: Piloting
     - alertType: Corporeal
     - alertType: Stun
@@ -126,6 +127,14 @@
   name: alerts-weightless-name
   description: alerts-weightless-desc
 
+- type: alert
+  id: Walking
+  icons:
+  - sprite: /Textures/Interface/Alerts/walking.rsi
+    state: walking
+  name: alerts-walking-name
+  description: alerts-walking-desc
+
 - type: alert
   id: Stun
   icons:

Resources/Prototypes/Body/Organs/Animal/animal.yml

@@ -60,6 +60,9 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
+  - type: Item
+    size: Small
+    heldPrefix: lungs
 
 - type: entity
   id: OrganAnimalStomach
@@ -86,6 +89,9 @@
     groups:
     - id: Food
     - id: Drink
+  - type: Item
+    size: Small
+    heldPrefix: stomach
 
 - type: entity
   id: OrganMouseStomach
@@ -97,6 +103,9 @@
     solutions:
       stomach:
         maxVol: 30
+  - type: Item
+    size: Small
+    heldPrefix: stomach
 
 - type: entity
   id: OrganAnimalLiver
@@ -113,6 +122,9 @@
     groups:
     - id: Alcohol
       rateModifier: 0.1
+  - type: Item
+    size: Small
+    heldPrefix: liver
 
 - type: entity
   id: OrganAnimalHeart
@@ -130,6 +142,9 @@
     - id: Medicine
     - id: Poison
     - id: Narcotic
+  - type: Item
+    size: Small
+    heldPrefix: heart
 
 - type: entity
   id: OrganAnimalKidneys
@@ -146,3 +161,6 @@
     maxReagents: 5
     metabolizerTypes: [ Animal ]
     removeEmpty: true
+  - type: Item
+    size: Small
+    heldPrefix: kidneys

Resources/Prototypes/Body/Organs/arachnid.yml

@@ -34,6 +34,9 @@
   - type: Sprite
     sprite: Mobs/Species/Arachnid/organs.rsi
     state: stomach
+  - type: Item
+    size: Small
+    heldPrefix: stomach
   - type: Stomach
     updateInterval: 1.5
   - type: SolutionContainerManager
@@ -91,6 +94,9 @@
   components:
   - type: Sprite
     state: heart-on
+  - type: Item
+    size: Small
+    heldPrefix: heart
   - type: Metabolizer
     updateInterval: 1.5
     maxReagents: 2
@@ -107,6 +113,9 @@
   description: "Pairing suggestion: chianti and fava beans."
   categories: [ HideSpawnMenu ]
   components:
+  - type: Item
+    size: Small
+    heldPrefix: liver
   - type: Sprite
     state: liver
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
@@ -129,6 +138,9 @@
       - state: kidney-l
       - state: kidney-r
   # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
+  - type: Item
+    size: Small
+    heldPrefix: kidneys
   - type: Metabolizer
     updateInterval: 1.5
     maxReagents: 5
@@ -145,6 +157,9 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
+  - type: Item
+    size: Small
+    heldPrefix: eyeballs
 
 - type: entity
   id: OrganArachnidTongue

Resources/Prototypes/Body/Organs/diona.yml

@@ -29,8 +29,11 @@
   id: OrganDionaBrain
   parent: [BaseDionaOrgan, OrganHumanBrain]
   name: brain
-  description: "The source of incredible, unending intelligence. Honk."
+  description: "The central hub of a diona's pseudo-neurological activity, its root-like tendrils search for its former body."
   components:
+  - type: Item
+    size: Small
+    heldPrefix: brain
   - type: Sprite
     state: brain
   - type: SolutionContainerManager
@@ -64,7 +67,7 @@
   id: OrganDionaStomach
   parent: BaseDionaOrgan
   name: stomach
-  description: "Gross. This is hard to stomach."
+  description: "The diona's equivalent of a stomach, it reeks of asparagus and vinegar."
   components:
   - type: Sprite
     state: stomach
@@ -90,18 +93,21 @@
       - id: Narcotic
       - id: Alcohol
         rateModifier: 0.1
+  - type: Item
+    size: Small
+    heldPrefix: stomach
 
 - type: entity
   id: OrganDionaLungs
   parent: BaseDionaOrgan
   name: lungs
-  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
+  description: "A spongy mess of slimy, leaf-like structures. Capable of breathing both carbon dioxide and oxygen."
   components:
   - type: Sprite
-    sprite: Mobs/Species/Human/organs.rsi
-    layers:
-      - state: lung-l
-      - state: lung-r
+    state: lungs
+  - type: Item
+    size: Small
+    heldPrefix: lungs
   - type: Lung 
   - type: Metabolizer
     removeEmpty: true

Resources/Prototypes/Body/Organs/human.yml

@@ -71,6 +71,9 @@
     entries:
       Burger: Brain
       Taco: Brain
+  - type: Item
+    size: Small
+    heldPrefix: brain
   
 - type: entity
   id: OrganHumanEyes
@@ -82,6 +85,9 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
+  - type: Item
+    size: Small
+    heldPrefix: eyeballs
 
 - type: entity
   id: OrganHumanTongue
@@ -122,6 +128,9 @@
     layers:
       - state: lung-l
       - state: lung-r
+  - type: Item
+    size: Small
+    heldPrefix: lungs
   - type: Lung
   - type: Metabolizer
     removeEmpty: true
@@ -164,6 +173,9 @@
     - id: Medicine
     - id: Poison
     - id: Narcotic
+  - type: Item
+    size: Small
+    heldPrefix: heart
 
 - type: entity
   id: OrganHumanStomach
@@ -173,6 +185,9 @@
   components:
   - type: Sprite
     state: stomach
+  - type: Item
+    size: Small
+    heldPrefix: stomach
   - type: SolutionContainerManager
     solutions:
       stomach:
@@ -202,6 +217,9 @@
   components:
   - type: Sprite
     state: liver
+  - type: Item
+    size: Small
+    heldPrefix: liver
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
     maxReagents: 1
     metabolizerTypes: [Human]
@@ -219,6 +237,9 @@
     layers:
       - state: kidney-l
       - state: kidney-r
+  - type: Item
+    size: Small
+    heldPrefix: kidneys
   # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
   - type: Metabolizer
     maxReagents: 5

Resources/Prototypes/Body/Organs/slime.yml

@@ -33,6 +33,9 @@
           reagents:
           - ReagentId: Slime
             Quantity: 10
+    - type: Item
+      size: Small
+      heldPrefix: brain
 
       
 - type: entity
@@ -70,3 +73,6 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
+  - type: Item
+    size: Small
+    heldPrefix: lungs

Resources/Prototypes/Body/Organs/vox.yml

@@ -1,9 +1,15 @@
 - type: entity
   id: OrganVoxLungs
   parent: OrganHumanLungs
+  description: "The blue, anaerobic lungs of a vox, they intake nitrogen to breathe. Any form of gaseous oxygen is lethally toxic if breathed in."
   suffix: "vox"
   components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
   - type: Metabolizer
     metabolizerTypes: [ Vox ]
   - type: Lung
     alert: LowNitrogen
+  - type: Item
+    size: Small
+    heldPrefix: lungs

Resources/Prototypes/Catalog/Cargo/cargo_vending.yml

@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 2400
+  cost: 2440
   category: cargoproduct-category-name-service
   group: market
 

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

@@ -302,13 +302,19 @@
   components:
   - type: StorageFill
     contents:
+      - id: DefibrillatorSyndicate
       - id: MedkitCombatFilled
-      - id: Defibrillator
+        amount: 4
+      - id: Tourniquet
+        amount: 4
       - id: CombatMedipen
-        amount: 3
-      - id: ClothingHandsGlovesNitrile
-      - id: SyringeTranexamicAcid
-      - id: SyringeHyronalin
+        amount: 4
+      - id: PunctAutoInjector
+        amount: 4
+      - id: PyraAutoInjector
+        amount: 4
+      - id: AirlossAutoInjector
+        amount: 4
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle

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

@@ -46,10 +46,10 @@
   table: !type:AllSelector
     children:
     - id: Stunbaton
-    - id: GrenadeFlashBang
-    - id: TearGasGrenade
     - id: Handcuffs
     - id: Handcuffs
+    - id: HoloprojectorSecurity
+    - id: RadioHandheldSecurity
 
 - type: entity
   id: ClothingBeltSecurityFilled

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

@@ -219,6 +219,7 @@
     - id: MedicalTechFabCircuitboard
     - id: MedkitFilled
     - id: RubberStampCMO
+    - id: MedTekCartridge
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable
@@ -260,6 +261,7 @@
   id: LockerFillResearchDirectorNoHardsuit
   table: !type:AllSelector
     children:
+    - id: Intellicard
     - id: BoxEncryptionKeyScience
     - id: CircuitImprinterMachineCircuitboard
     - id: ClothingBeltUtilityFilled

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

@@ -30,7 +30,7 @@
     - id: MedkitOxygenFilled
       prob: 0.2
     - id: WeaponFlareGun
-      prob: 0.05
+      prob: 0.1
     - id: BoxMRE
       prob: 0.1
 

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

@@ -20,6 +20,7 @@
     BoxCandle: 2
     BoxCandleSmall: 2
     Urn: 5
+    Bible: 1
   emaggedInventory:
     ClothingOuterArmorCult: 1
     ClothingHeadHelmetCult: 1

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

@@ -53,6 +53,8 @@
     ClothingUniformJumpskirtCasualPurple: 2
     ClothingUniformJumpsuitCasualRed: 2
     ClothingUniformJumpskirtCasualRed: 2
+    ClothingUniformJumpsuitCasualGreen: 2
+    ClothingUniformJumpskirtCasualGreen: 2
     # DO NOT ADD MORE, USE UNIFORM DYING
     ClothingShoesColorBlack: 8
     ClothingShoesColorBrown: 4

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

@@ -11,6 +11,7 @@
     FoodPlate: 10
     FoodPlateSmall: 10
     FoodPlateTin: 5
+    FoodPlateMuffinTin: 5
     FoodKebabSkewer: 5
     DrinkGlass: 5
     Beaker: 5

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

@@ -7,6 +7,7 @@
     Bloodpack: 5
     EpinephrineChemistryBottle: 3
     Syringe: 5
+    BoxBottle: 3
     ClothingEyesHudMedical: 2
     ClothingEyesEyepatchHudMedical: 2
 

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

@@ -8,4 +8,5 @@
   id: TankDispenserEngineeringInventory
   startingInventory:
     PlasmaTankFilled: 10
+    NitrogenTankFilled: 10
     OxygenTankFilled: 10

Resources/Prototypes/Catalog/VendingMachines/advertisements.yml

@@ -130,6 +130,12 @@
     prefix: fat-extractor-fact-
     count: 6
 
+- type: localizedDataset
+  id: FirebotAd
+  values:
+    prefix: advertisement-firebot-
+    count: 4
+
 - type: localizedDataset
   id: GoodCleanFunAds
   values:

Resources/Prototypes/Catalog/spellbook_catalog.yml

@@ -77,6 +77,20 @@
   - !type:ListingLimitedStockCondition
     stock: 1
 
+- type: listing
+  id: SpellbookJaunt
+  name: spellbook-ethereal-jaunt-name
+  description: spellbook-ethereal-jaunt-description
+  productAction: ActionPolymorphJaunt
+  productUpgradeId: SpellbookJauntUpgrade
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookUtility
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
 # Equipment
 - type: listing
   id: SpellbookWandDoor
@@ -138,3 +152,22 @@
   # manual for now
   - !type:ListingLimitedStockCondition
     stock: 2
+
+- type: listing
+  id: SpellbookJauntUpgrade
+  productUpgradeId: SpellbookJauntUpgrade
+  name: spellbook-upgrade-jaunt-name
+  description: spellbook-upgrade-jaunt-description
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: jaunt
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookUtility
+  conditions:
+  - !type:BuyBeforeCondition
+    whitelist:
+    - SpellbookJaunt
+  - !type:ListingLimitedStockCondition
+    stock: 2

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -699,9 +699,9 @@
   productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 12
+    Telecrystal: 16
   cost:
-    Telecrystal: 20
+    Telecrystal: 24
   categories:
   - UplinkChemicals
   conditions:
@@ -773,7 +773,7 @@
   id: UplinkBinaryTranslatorKey
   name: uplink-binary-translator-key-name
   description: uplink-binary-translator-key-desc
-  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: borg_label }
+  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: ai_label }
   productEntity: EncryptionKeyBinarySyndicate
   cost:
     Telecrystal: 1
@@ -887,7 +887,7 @@
   discountDownTo:
     Telecrystal: 2
   cost:
-    Telecrystal: 4
+    Telecrystal: 3
   categories:
   - UplinkDisruption
 
@@ -1085,6 +1085,16 @@
   categories:
     - UplinkDisruption
 
+- type: listing
+  id: UplinkCameraBug
+  name: uplink-cameraBug-name
+  description: uplink-cameraBug-desc
+  productEntity: CameraBug
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkDisruption
+
 # Allies
 
 - type: listing
@@ -1805,6 +1815,17 @@
   categories:
     - UplinkPointless
 
+- type: listing
+  id: UplinkSyndicateBusinessCard
+  name: uplink-business-card-name
+  description: uplink-business-card-desc
+  productEntity: SyndicateBusinessCard
+  categories:
+    - UplinkPointless
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 3
+
 # Job Specific
 
 - type: listing

Resources/Prototypes/Datasets/Names/last.yml

@@ -219,7 +219,6 @@
   - Howe
   - Huey
   - Hughes
-  - Hujsak
   - Hunt
   - Hunter
   - Hussain

Resources/Prototypes/DeviceLinking/sink_ports.yml

@@ -48,6 +48,11 @@
   name: signal-port-name-trigger
   description: signal-port-description-trigger
 
+- type: sinkPort
+  id: Timer
+  name: signal-port-name-timer
+  description: signal-port-description-timer
+
 - type: sinkPort
   id: OrderReceiver
   name: signal-port-name-order-receiver

Resources/Prototypes/DeviceLinking/source_ports.yml

@@ -2,13 +2,13 @@
   id: Pressed
   name: signal-port-name-pressed
   description: signal-port-description-pressed
-  defaultLinks: [ Toggle, Trigger ]
+  defaultLinks: [ Toggle, Trigger, Timer ]
 
 - type: sourcePort
   id: On
   name: signal-port-name-on-transmitter
   description: signal-port-description-on-transmitter
-  defaultLinks: [ On, Open, Forward, Trigger ]
+  defaultLinks: [ On, Open, Forward, Trigger, Timer ]
 
 - type: sourcePort
   id: Off
@@ -25,13 +25,13 @@
   id: Left
   name: signal-port-name-left
   description: signal-port-description-left
-  defaultLinks: [ On, Open, Forward, Trigger ]
+  defaultLinks: [ On, Open, Forward, Trigger, Timer ]
 
 - type: sourcePort
   id: Right
   name: signal-port-name-right
   description: signal-port-description-right
-  defaultLinks: [ On, Open, Reverse, Trigger ]
+  defaultLinks: [ On, Open, Reverse, Trigger, Timer ]
 
 - type: sourcePort
   id: Middle
@@ -76,7 +76,7 @@
   id: Timer
   name: signal-port-name-timer-trigger
   description: signal-port-description-timer-trigger
-  defaultLinks: [ AutoClose, On, Open, Forward, Trigger ]
+  defaultLinks: [ AutoClose, On, Open, Forward, Trigger, Timer ]
 
 - type: sourcePort
   id: Start
@@ -94,7 +94,7 @@
   id: OutputHigh
   name: signal-port-name-logic-output-high
   description: signal-port-description-logic-output-high
-  defaultLinks: [ On, Open, Forward, Trigger ]
+  defaultLinks: [ On, Open, Forward, Trigger, Timer ]
 
 - type: sourcePort
   id: OutputLow

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

@@ -487,7 +487,6 @@
         - CartridgeAmmo
         - DoorRemote
         - Whistle
-        - HolosignProjector
         - BalloonPopper
   - type: ItemMapper
     mapLayers:

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

@@ -13,11 +13,7 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: ShowHealthBars
-    damageContainers:
-    - Biological
   - type: ShowHealthIcons
-    damageContainers:
-    - Biological
 
 - type: entity
   parent: ClothingEyesBase
@@ -223,8 +219,6 @@
     sprite: Clothing/Eyes/Hud/syndagent.rsi
   - type: ShowSyndicateIcons
   - type: ShowHealthBars
-    damageContainers:
-    - Biological
 
 - type: entity
   parent: [ClothingEyesGlassesSunglasses, ShowSecurityIcons]

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

@@ -249,6 +249,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - FireHelmet
   - type: HideLayerClothing
     slots:
     - Hair
@@ -281,6 +282,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - FireHelmet
   - type: HideLayerClothing
     slots:
     - Hair

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

@@ -312,3 +312,14 @@
       - WhitelistChameleon
   - type: StaticPrice
     price: 1
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHairflower
+  name: hairflower
+  description: A beautiful hairflower that can be inserted between locks of hair.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/hairflower.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/hairflower.rsi

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

@@ -35,6 +35,8 @@
       - Snout
     - type: UserInterface
       interfaces:
+        enum.ChameleonUiKey.Key:
+          type: ChameleonBoundUserInterface
         enum.VoiceMaskUIKey.Key:
           type: VoiceMaskBoundUserInterface
 

Resources/Prototypes/Entities/Clothing/Multiple/towel.yml

@@ -0,0 +1,764 @@
+- type: entity
+  id: BaseTowel
+  name: base towel
+  abstract: true
+  description: If you want to survive out here, you gotta know where your towel is.
+  parent: [ UnsensoredClothingUniformBase, ClothingHeadBase, ClothingBeltBase ]
+  components:
+  - type: Sprite
+    sprite: Clothing/Multiple/towel.rsi
+  - type: Clothing
+    sprite: Clothing/Multiple/towel.rsi
+    slots: 
+    - BELT
+    - INNERCLOTHING
+    - HEAD
+    femaleMask: UniformTop
+    equipSound: 
+    unequipSound: 
+  - type: Spillable
+    solution: absorbed
+  - type: Absorbent
+    pickupAmount: 15
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 30
+      absorbed:
+        maxVol: 30
+  - type: Fiber
+    fiberColor: fibers-white
+  - type: DnaSubstanceTrace
+  - type: Item
+    size: Small
+
+- type: entity
+  id: TowelColorWhite
+  name: white towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#EAE8E8"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#EAE8E8"
+      right:
+      - state: inhand-right
+        color: "#EAE8E8"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#EAE8E8"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#EAE8E8"
+      belt:
+      - state: equipped-BELT
+        color: "#EAE8E8"
+  - type: Fiber
+    fiberColor: fibers-white
+
+- type: entity
+  id: TowelColorPurple
+  name: purple towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#9C0DE1"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#9C0DE1"
+      right:
+      - state: inhand-right
+        color: "#9C0DE1"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#9C0DE1"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#9C0DE1"
+      belt:
+      - state: equipped-BELT
+        color: "#9C0DE1"
+  - type: Fiber
+    fiberColor: fibers-purple
+
+- type: entity
+  id: TowelColorRed
+  name: red towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#940000"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#940000"
+      right:
+      - state: inhand-right
+        color: "#940000"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#940000"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#940000"
+      belt:
+      - state: equipped-BELT
+        color: "#940000"
+  - type: Fiber
+    fiberColor: fibers-red
+
+- type: entity
+  id: TowelColorBlue
+  name: blue towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#0089EF"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#0089EF"
+      right:
+      - state: inhand-right
+        color: "#0089EF"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#0089EF"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#0089EF"
+      belt:
+      - state: equipped-BELT
+        color: "#0089EF"
+  - type: Fiber
+    fiberColor: fibers-blue
+    
+- type: entity
+  id: TowelColorDarkBlue
+  name: dark blue towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#3285ba"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#3285ba"
+      right:
+      - state: inhand-right
+        color: "#3285ba"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#3285ba"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#3285ba"
+      belt:
+      - state: equipped-BELT
+        color: "#3285ba"
+  - type: Fiber
+    fiberColor: fibers-blue
+
+- type: entity
+  id: TowelColorLightBlue
+  name: light blue towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#58abcc"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#58abcc"
+      right:
+      - state: inhand-right
+        color: "#58abcc"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#58abcc"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#58abcc"
+      belt:
+      - state: equipped-BELT
+        color: "#58abcc"
+  - type: Fiber
+    fiberColor: fibers-blue
+
+- type: entity
+  id: TowelColorTeal
+  name: teal towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#3CB57C"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#3CB57C"
+      right:
+      - state: inhand-right
+        color: "#3CB57C"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#3CB57C"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#3CB57C"
+      belt:
+      - state: equipped-BELT
+        color: "#3CB57C"
+  - type: Fiber
+    fiberColor: fibers-teal
+
+- type: entity
+  id: TowelColorBrown
+  name: brown towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#723A02"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#723A02"
+      right:
+      - state: inhand-right
+        color: "#723A02"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#723A02"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#723A02"
+      belt:
+      - state: equipped-BELT
+        color: "#723A02"
+  - type: Fiber
+    fiberColor: fibers-brown
+
+- type: entity
+  id: TowelColorLightBrown
+  name: light brown towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#c59431"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#c59431"
+      right:
+      - state: inhand-right
+        color: "#c59431"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#c59431"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#c59431"
+      belt:
+      - state: equipped-BELT
+        color: "#c59431"
+  - type: Fiber
+    fiberColor: fibers-brown
+
+- type: entity
+  id: TowelColorGray
+  name: gray towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#999999"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#999999"
+      right:
+      - state: inhand-right
+        color: "#999999"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#999999"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#999999"
+      belt:
+      - state: equipped-BELT
+        color: "#999999"
+  - type: Fiber
+    fiberColor: fibers-grey
+
+- type: entity
+  id: TowelColorGreen
+  name: green towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#5ABF2F"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#5ABF2F"
+      right:
+      - state: inhand-right
+        color: "#5ABF2F"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#5ABF2F"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#5ABF2F"
+      belt:
+      - state: equipped-BELT
+        color: "#5ABF2F"
+  - type: Fiber
+    fiberColor: fibers-green
+
+- type: entity
+  id: TowelColorDarkGreen
+  name: dark green towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#79CC26"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#79CC26"
+      right:
+      - state: inhand-right
+        color: "#79CC26"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#79CC26"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#79CC26"
+      belt:
+      - state: equipped-BELT
+        color: "#79CC26"
+  - type: Fiber
+    fiberColor: fibers-green
+
+- type: entity
+  id: TowelColorGold
+  name: gold towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#F7C430"
+    - state: iconstripe
+      color: "#535353"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#F7C430"
+      right:
+      - state: inhand-right
+        color: "#F7C430"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#F7C430"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#F7C430"
+      belt:
+      - state: equipped-BELT
+        color: "#F7C430"
+  - type: Fiber
+    fiberColor: fibers-gold
+
+- type: entity
+  id: TowelColorOrange
+  name: orange towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#EF8100"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#EF8100"
+      right:
+      - state: inhand-right
+        color: "#EF8100"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#EF8100"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#EF8100"
+      belt:
+      - state: equipped-BELT
+        color: "#EF8100"
+  - type: Fiber
+    fiberColor: fibers-orange
+
+- type: entity
+  id: TowelColorBlack
+  name: black towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#535353"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#535353"
+      right:
+      - state: inhand-right
+        color: "#535353"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#535353"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#535353"
+      belt:
+      - state: equipped-BELT
+        color: "#535353"
+  - type: Fiber
+    fiberColor: fibers-black
+
+- type: entity
+  id: TowelColorPink
+  name: pink towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#ffa69b"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#ffa69b"
+      right:
+      - state: inhand-right
+        color: "#ffa69b"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#ffa69b"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#ffa69b"
+      belt:
+      - state: equipped-BELT
+        color: "#ffa69b"
+  - type: Fiber
+    fiberColor: fibers-pink
+
+- type: entity
+  id: TowelColorYellow
+  name: yellow towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#ffe14d"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#ffe14d"
+      right:
+      - state: inhand-right
+        color: "#ffe14d"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#ffe14d"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#ffe14d"
+      belt:
+      - state: equipped-BELT
+        color: "#ffe14d"
+  - type: Fiber
+    fiberColor: fibers-yellow
+
+- type: entity
+  id: TowelColorMaroon
+  name: maroon towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#cc295f"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#cc295f"
+      right:
+      - state: inhand-right
+        color: "#cc295f"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#cc295f"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#cc295f"
+      belt:
+      - state: equipped-BELT
+        color: "#cc295f"
+  - type: Fiber
+    fiberColor: fibers-maroon
+
+- type: entity
+  id: TowelColorSilver
+  name: silver towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#d0d0d0"
+    - state: iconstripe
+      color: "#F7C430"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#d0d0d0"
+      right:
+      - state: inhand-right
+        color: "#d0d0d0"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#d0d0d0"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#d0d0d0"
+      belt:
+      - state: equipped-BELT
+        color: "#d0d0d0"
+  - type: Fiber
+    fiberColor: fibers-silver
+
+- type: entity
+  id: TowelColorMime
+  name: silent towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#EAE8E8"
+    - state: iconstripe
+      color: "#535353"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#EAE8E8"
+      right:
+      - state: inhand-right
+        color: "#EAE8E8"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#EAE8E8"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#EAE8E8"
+      belt:
+      - state: equipped-BELT
+        color: "#EAE8E8"
+  - type: Fiber
+    fiberColor: fibers-white
+
+- type: entity
+  id: TowelColorNT
+  name: NanoTrasen brand towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#004787"
+    - state: iconstripe
+      color: "#EAE8E8"
+    - state: NTmono
+      color: "#EAE8E8"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#004787"
+      right:
+      - state: inhand-right
+        color: "#004787"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#004787"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#004787"
+      belt:
+      - state: equipped-BELT
+        color: "#004787"
+  - type: Fiber
+    fiberColor: fibers-regal-blue
+
+- type: entity
+  id: TowelColorCentcom
+  name: centcom towel
+  parent: BaseTowel
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#29722e"
+    - state: iconstripe
+      color: "#F7C430"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#29722e"
+      right:
+      - state: inhand-right
+        color: "#29722e"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#29722e"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#29722e"
+      belt:
+      - state: equipped-BELT
+        color: "#29722e"
+  - type: Fiber
+    fiberColor: fibers-green
+
+- type: entity
+  id: TowelColorSyndicate
+  name: syndicate towel
+  parent: [ BaseTowel, BaseSyndicateContraband ]
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      color: "#535353"
+    - state: iconstripe
+      color: "#940000"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#535353"
+      right:
+      - state: inhand-right
+        color: "#535353"
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        color: "#535353"
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#535353"
+      belt:
+      - state: equipped-BELT
+        color: "#535353"
+  - type: Fiber
+    fiberColor: fibers-black
+    

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

@@ -78,3 +78,19 @@
     event: !type:StethoscopeActionEvent
     checkCanInteract: false
     priority: -1
+
+- type: entity
+  parent: ClothingNeckBase
+  id: Dinkystar
+  name: star sticker
+  description: A dinky lil star for only the hardest working security officers! It's not even sticky anymore.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/dinkystar.rsi
+    state: icon
+  - type: Item
+    size: Tiny
+  - type: Tag
+    tags:
+    - Trash
+    - WhitelistChameleon

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

@@ -7,6 +7,10 @@
   components:
   - type: Item
     size: Tiny
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/pins.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Misc/pins.rsi
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -15,14 +19,9 @@
   description: Be gay do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: lgbt
+    state: lgbt
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: lgbt-equipped
+    equippedPrefix: lgbt
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -31,14 +30,9 @@
   description: Be aro do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: aro
+    state: aro
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: aro-equipped
+    equippedPrefix: aro
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -47,14 +41,9 @@
   description: Be ace do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: asex
+    state: asex
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: asex-equipped
+    equippedPrefix: asex
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -63,14 +52,20 @@
   description: Be bi do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: bi
+    state: bi
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: bi-equipped
+    equippedPrefix: bi
+
+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckGayPin
+  name: gay pin
+  description: Be gay~ do crime.
+  components:
+  - type: Sprite
+    state: gay
+  - type: Clothing
+    equippedPrefix: gay
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -79,14 +74,9 @@
   description: Be intersex do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: inter
+    state: inter
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: inter-equipped
+    equippedPrefix: inter
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -95,14 +85,9 @@
   description: Be lesbian do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: les
+    state: les
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: les-equipped
+    equippedPrefix: les
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -111,14 +96,9 @@
   description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101"
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: non
+    state: non
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: non-equipped
+    equippedPrefix: non
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -127,14 +107,9 @@
   description: Be pan do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: pan
+    state: pan
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: pan-equipped
+    equippedPrefix: pan
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -143,14 +118,9 @@
   description: Be trans do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/pins.rsi
-    layers:
-    - state: trans
+    state: trans
   - type: Clothing
-    sprite: Clothing/Neck/Misc/pins.rsi
-    clothingVisuals:
-      neck:
-      - state: trans-equipped
+    equippedPrefix: trans
  
 - type: entity
   parent: ClothingNeckPinBase
@@ -159,14 +129,9 @@
   description: Be autism do crime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/autismpin.rsi
-    layers:
-    - state: autism
+    state: autism
   - type: Clothing
-    sprite: Clothing/Neck/Misc/autismpin.rsi
-    clothingVisuals:
-      neck:
-      - state: autism-equipped
+    equippedPrefix: autism
 
 - type: entity
   parent: ClothingNeckPinBase
@@ -175,11 +140,6 @@
   description: Be autism do warcrime.
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/goldautismpin.rsi
-    layers:
-    - state: goldautism
+    state: goldautism
   - type: Clothing
-    sprite: Clothing/Neck/Misc/goldautismpin.rsi
-    clothingVisuals:
-      neck:
-      - state: goldautism-equipped
+    equippedPrefix: goldautism

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

@@ -90,7 +90,7 @@
     damageCoefficient: 0.9
 
 - type: entity
-  parent: [ClothingOuterArmorHoS, ClothingOuterStorageBase]
+  parent: [ClothingOuterArmorHoS, ClothingOuterStorageBase, BaseSecurityCommandContraband]
   id: ClothingOuterCoatHoSTrench
   name: head of security's armored trenchcoat
   description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence.
@@ -376,7 +376,7 @@
     sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageBase, BaseSyndicateContraband]
   id: ClothingOuterCoatSyndieCap
   name: syndicate's coat
   description: The syndicate's coat is made of durable fabric, with gilded patterns.
@@ -387,7 +387,7 @@
     sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi
 
 - type: entity
-  parent: ClothingOuterCoatHoSTrench
+  parent: [BaseSyndicateContraband, ClothingOuterCoatHoSTrench] # BaseSyndicateContraband as first parent so contraband system takes that as priority, yeah I know
   id: ClothingOuterCoatSyndieCapArmored
   name: syndicate's armored coat
   description: The syndicate's armored coat is made of durable fabric, with gilded patterns.

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

@@ -187,6 +187,9 @@
         name: power-cell-slot-component-slot-name-default
         startingItem: PowerCellSmall
         disableEject: true
+        whitelist:
+          tags:
+            - PowerCell
 
 - type: entity
   parent: ClothingOuterBase

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

@@ -359,7 +359,7 @@
 
 ##########################################################
 - type: entity
-  parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseCommandContraband]
+  parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband]
   id: ClothingOuterWinterHoS
   name: head of security's armored winter coat
   description: A sturdy, utilitarian winter coat designed to protect a head of security from any brig-bound threats and hypothermic events.
@@ -373,7 +373,7 @@
 ##########################################################
 
 - type: entity
-  parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband]
+  parent: [ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband]
   id: ClothingOuterWinterHoSUnarmored
   name: head of security's winter coat
   description: A sturdy coat, a warm coat, but not an armored coat.
@@ -853,6 +853,10 @@
   - type: Construction
     graph: WebObjects
     node: coat
+  - type: Butcherable
+    spawned:
+    - id: MaterialWebSilk1
+      amount: 5
   - type: FlavorProfile
     flavors:
       - cobwebs

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

@@ -187,6 +187,10 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 10
+  - type: Butcherable
+    spawned:
+    - id: MaterialWebSilk1
+      amount: 2
   - type: Construction
     graph: WebObjects
     node: boots
@@ -204,6 +208,8 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepSpurs
+      params:
+        variation: 0.09
 
 - type: entity
   parent: ClothingShoesBootsCowboyBrown

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

@@ -47,8 +47,6 @@
       collection: FootstepDuck
       params:
         variation: 0.07
-  - type: WaddleWhenWorn
-    tumbleIntensity: 10 # smaller than clown shoes
   - type: Construction
     graph: ClothingShoeSlippersDuck
     node: shoes

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

@@ -15,7 +15,6 @@
   parent: [ClothingShoesBaseButcherable, ClothingSlotBase]
   id: ClothingShoesClownBase
   components:
-  - type: WaddleWhenWorn
   - type: ItemSlots
     slots:
       item:
@@ -41,6 +40,8 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepClown
+      params:
+        variation: 0.17
   # for H.O.N.K. construction
   - type: Tag
     tags:
@@ -60,6 +61,8 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepSlip
+      params:
+        variation: 0.10
   - type: Construction
     graph: BananaClownShoes
     node: shoes
@@ -80,6 +83,8 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepClown
+      params:
+        variation: 0.17
   - type: PointLight
     enabled: true
     radius: 3
@@ -216,6 +221,8 @@
     - type: FootstepModifier
       footstepSoundCollection:
         collection: FootstepJester
+        params:
+          variation: 0.07
 
 - type: entity
   parent: ClothingShoesClown
@@ -275,3 +282,5 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepSkates
+      params:
+        variation: 0.08

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

@@ -222,24 +222,24 @@
     sprite: Clothing/Uniforms/Jumpskirt/color.rsi
     layers:
     - state: icon
-      color: "#79CC26"
+      color: "#007923"
     - state: trinkets-icon
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-left
       right:
       - state: inhand-right
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-right
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/color.rsi
     clothingVisuals:
       jumpsuit:
       - state: equipped-INNERCLOTHING
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-equipped-INNERCLOTHING
 
 # Orange Jumpskirt

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

@@ -222,24 +222,24 @@
     sprite: Clothing/Uniforms/Jumpsuit/color.rsi
     layers:
     - state: icon
-      color: "#79CC26"
+      color: "#007923"
     - state: trinkets-icon
   - type: Item
     inhandVisuals:
       left:
       - state: inhand-left
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-left
       right:
       - state: inhand-right
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-inhand-right
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/color.rsi
     clothingVisuals:
       jumpsuit:
       - state: equipped-INNERCLOTHING
-        color: "#79CC26"
+        color: "#007923"
       - state: trinkets-equipped-INNERCLOTHING
 
 # Orange Jumpsuit

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

@@ -822,6 +822,36 @@
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtCasualGreen
+  name: casual green jumpskirt
+  description: A loose worn green shirt with a grey skirt, perfect for someone looking to relax.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    layers:
+    - state: icon-jumpskirt
+    - state: icon-shirt
+      color: "#00661D"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-jumpskirt
+      - state: inhand-left-shirt
+        color: "#00661D"
+      right:
+      - state: inhand-right-jumpskirt
+      - state: inhand-right-shirt
+        color: "#00661D"
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING-jumpskirt
+      - state: equipped-INNERCLOTHING-shirt
+        color: "#00661D"
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtOldDress

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

@@ -1347,6 +1347,36 @@
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCasualGreen
+  name: casual green jumpsuit
+  description: A loose worn green shirt with a grey pants, perfect for someone looking to relax.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    layers:
+    - state: icon-jumpsuit
+    - state: icon-shirt
+      color: "#00661D"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-jumpsuit
+      - state: inhand-left-shirt
+        color: "#00661D"
+      right:
+      - state: inhand-right-jumpsuit
+      - state: inhand-right-shirt
+        color: "#00661D"
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING-jumpsuit
+      - state: equipped-INNERCLOTHING-shirt
+        color: "#00661D"
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitFamilyGuy

Resources/Prototypes/Entities/Effects/chemistry_effects.yml

@@ -222,3 +222,16 @@
       state: metal_foam-north
     - map: [ "enum.EdgeLayer.West" ]
       state: metal_foam-west
+
+- type: entity
+  id: ReactionFlash
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: PointLight
+    enabled: true
+    radius: 2
+    energy: 8
+  - type: LightFade
+    duration: 0.5
+  - type: TimedDespawn
+    lifetime: 0.5

Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml

@@ -46,6 +46,8 @@
       - FoodBakedMuffinBerry
       - FoodBakedMuffinCherry
       - FoodBakedMuffinBluecherry
+      - FoodBakedMuffinChocolate
+      - FoodBakedMuffinBanana
       - FoodBakedBunHoney
       - FoodBakedBunHotX
       - FoodBakedBunMeat

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

@@ -144,6 +144,7 @@
         - id: ClothingNeckAromanticPin
         - id: ClothingNeckAsexualPin
         - id: ClothingNeckBisexualPin
+        - id: ClothingNeckGayPin
         - id: ClothingNeckIntersexPin
         - id: ClothingNeckLesbianPin
         - id: ClothingNeckNonBinaryPin
@@ -288,6 +289,7 @@
       - id: ResearchDisk5000
       - id: PetCarrier
       - id: DrinkMopwataBottleRandom
+      - id: SpectralLocator
       - id: LidSalami
         weight: 0.05
 

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

@@ -150,4 +150,10 @@
       - PosterLegitPeriodicTable
       - PosterLegitRenault
       - PosterLegitNTTGC
+      - PosterLegitSafetyMothDelam
+      - PosterLegitSafetyMothEpi
+      - PosterLegitSafetyMothPiping
+      - PosterLegitSafetyMothMeth
+      - PosterLegitSafetyMothHardhat
+      - PosterLegitSafetyMothSSD
     chance: 1

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

@@ -1363,3 +1363,17 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classiclong3
+- type: marking
+  id: HumanHairShaped
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shaped
+- type: marking
+  id: HumanHairLongBow
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longbow

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

@@ -85,6 +85,7 @@
   - type: Hands
     showInHands: false
     disableExplosionRecursion: true
+    canBeStripped: false
   - type: ComplexInteraction
   - type: IntrinsicRadioReceiver
   - type: IntrinsicRadioTransmitter
@@ -121,6 +122,7 @@
     cellSlotId: cell_slot
     fitsInCharger: true
   - type: ItemToggle
+    onActivate: false # You should not be able to turn off a borg temporarily.
     activated: false # gets activated when a mind is added
     onUse: false # no item-borg toggling sorry
   - type: ItemTogglePointLight
@@ -283,7 +285,6 @@
   - type: AccessReader
     access: [["Command"], ["Research"]]
   - type: ShowJobIcons
-  - type: ShowMindShieldIcons
 
 - type: entity
   id: BaseBorgChassisSyndicate

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

@@ -391,8 +391,6 @@
     - type: Construction
       node: syndicatemedical
     - type: ShowHealthBars
-      damageContainers:
-      - Biological
     - type: InteractionPopup
       interactSuccessString: petting-success-syndicate-cyborg
       interactFailureString: petting-failure-syndicate-cyborg

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

@@ -1407,8 +1407,7 @@
   components:
     # make the player a traitor once its taken
   - type: AutoTraitor
-    giveUplink: false
-    giveObjectives: false
+    profile: TraitorReinforcement
 
 - type: entity
   id: MobMonkeySyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
@@ -1432,11 +1431,14 @@
   - type: Speech
     speechSounds: Lizard
     speechVerb: Reptilian
+    allowedEmotes: ['Thump']
   - type: Vocal
     sounds:
       Male: MaleReptilian
       Female: FemaleReptilian
       Unsexed: MaleReptilian
+  - type: BodyEmotes
+    soundsId: ReptilianBodyEmotes
   - type: TypingIndicator
     proto: lizard
   - type: InteractionPopup
@@ -1566,8 +1568,7 @@
   components:
     # make the player a traitor once its taken
   - type: AutoTraitor
-    giveUplink: false
-    giveObjectives: false
+    profile: TraitorReinforcement
 
 - type: entity
   id: MobKoboldSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
@@ -1783,6 +1784,11 @@
   # intended for swarms that eat pills so only temporary
   - type: TimedDespawn
     lifetime: 60
+  - type: Hunger
+    baseDecayRate: 10 # always hungry
+    starvingSlowdownModifier: 1
+  - type: Thirst
+    baseDecayRate: 10 # always thirsty
 
 - type: entity
   parent: MobMouse
@@ -3380,7 +3386,7 @@
   - type: HTN
     rootTask:
       task: RuminantCompound
-      
+
 - type: entity
   name: diona nymph
   parent: [SimpleMobBase, StripableInventoryBase]

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

@@ -50,12 +50,12 @@
       Dead:
         Base: goliath_dead
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.50
-    baseSprintSpeed : 2.50
+    baseWalkSpeed : 2.00
+    baseSprintSpeed : 2.00
   - type: MobThresholds
     thresholds:
       0: Alive
-      300: Dead
+      250: Dead
   - type: MeleeWeapon
     soundHit:
       path: "/Audio/Weapons/smash.ogg"
@@ -64,7 +64,7 @@
     animation: WeaponArcPunch
     damage:
       types:
-        Slash: 15
+        Slash: 10
         Piercing: 10
   - type: NpcFactionMember
     factions:

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

@@ -777,6 +777,7 @@
     name: ghost-role-information-smile-name
     description: ghost-role-information-smile-description
     rules: ghost-role-information-nonantagonist-rules
+    raffle: null
   - type: Grammar
     attributes:
       proper: true

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

@@ -8,6 +8,7 @@
   components:
   - type: Input
     context: "ghost"
+  - type: Spectral
   - type: MovementSpeedModifier
     baseWalkSpeed: 6
     baseSprintSpeed: 6

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

@@ -108,6 +108,53 @@
   - type: NoSlip
   - type: Insulated
 
+- type: entity
+  parent: MobSiliconBase
+  id: MobFireBot
+  name: firebot
+  description: A little fire extinguishing bot. He looks rather anxious.
+  components:
+  - type: Sprite
+    sprite: Mobs/Silicon/Bots/firebot.rsi
+    state: firebot
+  - type: Construction
+    graph: FireBot
+    node: bot
+  - type: HTN
+    rootTask:
+      task: FirebotCompound
+  - type: SolutionContainerManager
+    solutions:
+      spray:
+        maxVol: 10
+        reagents:
+        - ReagentId: Water
+          Quantity: 10
+  - type: SolutionRegeneration
+    solution: spray
+    generated:
+      reagents:
+        - ReagentId: Water
+          Quantity: 10
+  - type: Spray
+    transferAmount: 10
+    pushbackAmount: 60
+    spraySound:
+      path: /Audio/Effects/extinguish.ogg
+    sprayedPrototype: ExtinguisherSpray
+    vaporAmount: 1
+    vaporSpread: 90
+    sprayVelocity: 3.0
+  - type: UseDelay
+    delay: 2
+  - type: InteractionPopup
+    interactSuccessString: petting-success-firebot
+    interactFailureString: petting-failure-firebot
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: Advertise
+    pack: FirebotAd
+
 - type: entity
   parent: MobSiliconBase
   id: MobHonkBot
@@ -119,6 +166,8 @@
     maxInterval: 12
     sound:
       collection: BikeHorn
+      params:
+        variation: 0.125
   - type: Sprite
     sprite: Mobs/Silicon/Bots/honkbot.rsi
     state: honkbot
@@ -163,6 +212,8 @@
     interactFailureString: petting-failure-honkbot
     interactSuccessSound:
       path: /Audio/Items/bikehorn.ogg
+      params:
+        variation: 0.125
 
 - type: entity
   parent: MobHonkBot
@@ -173,6 +224,8 @@
   - type: SpamEmitSound
     sound:
       collection: CluwneHorn
+      params:
+        variation: 0.125
   - type: Sprite
     state: jonkbot
   - type: Construction
@@ -188,6 +241,8 @@
   - type: InteractionPopup
     interactSuccessSound:
       path: /Audio/Items/brokenbikehorn.ogg
+      params:
+        variation: 0.125
   - type: Vocal
     sounds:
       Unsexed: Cluwne
@@ -211,8 +266,6 @@
   - type: Construction
     graph: CleanBot
     node: bot
-  - type: SentienceTarget
-    flavorKind: station-event-random-sentience-flavor-mechanical
   - type: Absorbent
     pickupAmount: 10
   - type: UseDelay
@@ -284,8 +337,6 @@
   - type: Construction
     graph: MediBot
     node: bot
-  - type: SentienceTarget
-    flavorKind: station-event-random-sentience-flavor-mechanical
   - type: Anchorable
   - type: InteractionPopup
     interactSuccessString: petting-success-medibot

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

@@ -1,5 +1,5 @@
 - type: entity
-  parent: [MobObserver, InventoryBase]
+  parent: [MobObserverBase, InventoryBase]
   id: AdminObserver
   name: admin observer
   categories: [ HideSpawnMenu ]
@@ -12,6 +12,7 @@
     - CanPilot
     - BypassInteractionRangeChecks
     - BypassDropChecks
+    - NoConsoleSound
   - type: Input
     context: "aghost"
   - type: Ghost
@@ -96,7 +97,7 @@
 - type: entity
   id: ActionAGhostShowSolar
   name: Solar Control Interface
-  description: View a solar control interface.
+  description: View a Solar Control Interface.
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -108,7 +109,7 @@
 - type: entity
   id: ActionAGhostShowCommunications
   name: Communications Interface
-  description: View a communications interface.
+  description: View a Communications Interface.
   components:
   - type: InstantAction
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
@@ -120,19 +121,19 @@
 - type: entity
   id: ActionAGhostShowRadar
   name: Mass Scanner Interface
-  description: View a mass scanner interface.
+  description: View a Mass Scanner Interface.
   components:
   - type: InstantAction
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
     iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png
     keywords: [ "AI", "console", "interface" ]
-    priority: -7
+    priority: -6
     event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key }
 
 - type: entity
   id: ActionAGhostShowCargo
   name: Cargo Ordering Interface
-  description: View a cargo ordering interface.
+  description: View a Cargo Ordering Interface.
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -144,23 +145,23 @@
 - type: entity
   id: ActionAGhostShowCrewMonitoring
   name: Crew Monitoring Interface
-  description: View a crew monitoring interface.
+  description: View a Crew Monitoring Interface.
   components:
   - type: InstantAction
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
     iconOn: Interface/Actions/actions_ai.rsi/crew_monitor.png
     keywords: [ "AI", "console", "interface" ]
-    priority: -9
+    priority: -8
     event: !type:ToggleIntrinsicUIEvent { key: enum.CrewMonitoringUIKey.Key }
 
 - type: entity
   id: ActionAGhostShowStationRecords
   name: Station Records Interface
-  description: View a station records Interface.
+  description: View a Station Records Interface.
   components:
   - type: InstantAction
     icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
     iconOn: Interface/Actions/actions_ai.rsi/station_records.png
     keywords: [ "AI", "console", "interface" ]
-    priority: -8
+    priority: -7
     event: !type:ToggleIntrinsicUIEvent { key: enum.GeneralStationRecordConsoleKey.Key }

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

@@ -150,7 +150,9 @@
     tags:
     - CannotSuicide
     - DoorBumpOpener
-
+  - type: Puller
+    needsHands: false
+    
 - type: entity
   parent: BaseMobDragon
   id: MobDragon

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

@@ -31,8 +31,7 @@
   components:
   # make the player a traitor once its taken
   - type: AutoTraitor
-    giveUplink: false
-    giveObjectives: false
+    profile: TraitorReinforcement
 
 - type: entity
   parent: MobHumanSyndicateAgent

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

@@ -0,0 +1,40 @@
+- type: entity
+  name: jaunt
+  parent: [Incorporeal, BaseMob]
+  id: BaseMobJaunt
+  description: Faint traces of a humanoid figure linger here
+  suffix: Ethereal
+  components:
+  - type: ContentEye
+    maxZoom: 1.44,1.44
+  - type: Eye
+    drawFov: false
+  - type: Input
+    context: "ghost"
+  - type: InputMover
+  - type: MovementSpeedModifier
+    baseSprintSpeed: 12
+    baseWalkSpeed: 8
+  - type: Visibility
+    layer: 2
+  - type: Spectral
+
+# Should be slow, for balance
+- type: entity
+  name: jaunt
+  parent: BaseMobJaunt
+  id: EtherealJaunt
+  suffix: Wizard
+  components:
+  - type: Sprite
+    sprite: Mobs/Ghosts/ghost_human.rsi
+    color: "#60f7eb"
+    layers:
+    - state: animated
+      shader: unshaded
+    noRot: true
+    overrideContainerOcclusion: true
+    drawdepth: Ghosts
+  - type: MovementSpeedModifier
+    baseSprintSpeed: 6
+    baseWalkSpeed: 4

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

@@ -28,11 +28,13 @@
         layer:
         - GhostImpassable
 
+# shared parent between aghosts, replay spectators and normal observers
 - type: entity
   parent:
   - Incorporeal
   - BaseMob
-  id: MobObserver
+  id: MobObserverBase
+  abstract: true
   name: observer
   description: Boo!
   categories: [ HideSpawnMenu ]
@@ -61,6 +63,13 @@
     tags:
     - BypassInteractionRangeChecks
 
+# proto for player ghosts specifically
+- type: entity
+  parent: MobObserverBase
+  id: MobObserver
+  components:
+  - type: Spectral
+
 - type: entity
   id: ActionGhostBoo
   name: Boo!
@@ -70,6 +79,7 @@
     icon: Interface/Actions/scream.png
     checkCanInteract: false
     event: !type:BooActionEvent
+    startDelay: true
     useDelay: 120
 
 - type: entity

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

@@ -1,5 +1,5 @@
 - type: entity
-  parent: MobObserver
+  parent: MobObserverBase
   id: ReplayObserver
   categories: [ HideSpawnMenu ]
   save: false

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

@@ -33,7 +33,6 @@
   - type: ActionGrant
     actions:
     - ActionJumpToCore
-    - ActionShowJobIcons
     - ActionSurvCameraLights
     - ActionAIViewLaws
   - type: UserInterface
@@ -70,7 +69,28 @@
     canShuttle: false
     title: comms-console-announcement-title-station-ai
     color: "#2ed2fd"
+  - type: ShowJobIcons
 
+- type: entity
+  id: AiHeldIntellicard
+  description: Components added / removed from an entity that gets inserted into an Intellicard.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Binary
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
+  - type: ActionGrant
+    actions:
+    - ActionAIViewLaws
+  - type: UserInterface
+    interfaces:
+      enum.SiliconLawsUiKey.Key:
+        type: SiliconLawBoundUserInterface
 
 # Ai
 - type: entity
@@ -82,7 +102,8 @@
   - type: StationAiHolder
     slot:
       name: station-ai-mind-slot
-      locked: true
+      locked: false
+      disableEject: true
       whitelist:
         tags:
         - StationAi
@@ -239,6 +260,7 @@
     state: std_mod
   - type: SiliconLawProvider
     laws: AntimovLawset
+    lawUploadSound: /Audio/Ambience/Antag/silicon_lawboard_antimov.ogg
 
 - type: entity
   id: NutimovCircuitBoard
@@ -255,13 +277,16 @@
 # Items
 - type: entity
   id: Intellicard
-  name: Intellicard
+  name: intellicard
   description: A storage device for AIs.
   parent:
   - BaseItem
   - AiHolder
   suffix: Empty
   components:
+  - type: ContainerComp
+    proto: AiHeldIntellicard
+    container: station_ai_mind_slot
   - type: Sprite
     sprite: Objects/Devices/ai_card.rsi
     layers:
@@ -276,6 +301,7 @@
         unshaded:
           Empty: { state: empty }
           Occupied: { state: full }
+  - type: Intellicard
 
 - type: entity
   id: PlayerStationAiEmpty
@@ -360,7 +386,6 @@
       enum.SiliconLawsUiKey.Key:
         type: SiliconLawBoundUserInterface
   - type: ComplexInteraction
-  - type: DoorRemote
   - type: Actions
   - type: Access
     groups:
@@ -369,10 +394,14 @@
     drawFov: false
   - type: Examiner
   - type: InputMover
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Borg
   - type: Tag
     tags:
     - HideContextMenu
     - StationAi
+    - NoConsoleSound
 
 # Hologram projection that the AI's eye tracks.
 - type: entity

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

@@ -30,6 +30,7 @@
   - type: Speech
     speechSounds: Lizard
     speechVerb: Reptilian
+    allowedEmotes: ['Thump']
   - type: TypingIndicator
     proto: lizard
   - type: Vocal
@@ -37,6 +38,8 @@
       Male: MaleReptilian
       Female: FemaleReptilian
       Unsexed: MaleReptilian
+  - type: BodyEmotes
+    soundsId: ReptilianBodyEmotes
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Scale

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml

@@ -135,6 +135,10 @@
           Quantity: 5
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Tag
+    tags:
+    - Cake
+    - Vegetable
 
 - type: entity
   name: slice of carrot cake
@@ -155,6 +159,11 @@
           Quantity: 1
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Cake
+    - Vegetable
+    - Slice
 
 # Tastes like sweetness, cake, carrot.
 
@@ -168,7 +177,10 @@
     state: brain
   - type: SliceableFood
     slice: FoodCakeBrainSlice
-
+  - type: Tag
+    tags:
+    - Cake
+    - Meat
 
 - type: entity
   name: slice of brain cake
@@ -178,6 +190,11 @@
   components:
   - type: Sprite
     state: brain-slice
+  - type: Tag
+    tags:
+    - Cake
+    - Meat
+    - Slice
 # Tastes like sweetness, cake, brains.
 
 - type: entity
@@ -429,6 +446,10 @@
     state: slime
   - type: SliceableFood
     slice: FoodCakeSlimeSlice
+  - type: Tag
+    tags:
+    - Cake
+    - Meat
 
 - type: entity
   name: slice of slime cake
@@ -438,6 +459,11 @@
   components:
   - type: Sprite
     state: slime-slice
+  - type: Tag
+    tags:
+    - Cake
+    - Meat
+    - Slice
 # Tastes like sweetness, cake, slime.
 
 - type: entity
@@ -498,6 +524,10 @@
     state: christmas
   - type: SliceableFood
     slice: FoodCakeChristmasSlice
+  - type: Tag
+    tags:
+    - Cake
+    - Fruit
 
 - type: entity
   name: slice of christmas cake
@@ -506,6 +536,11 @@
   components:
   - type: Sprite
     state: christmas-slice
+  - type: Tag
+    tags:
+    - Cake
+    - Fruit
+    - Slice
 # Tastes like sweetness, cake, christmas.
 
 - type: entity
@@ -634,7 +669,7 @@
           Quantity: 20
         - ReagentId: Vitamin
           Quantity: 5
-        - ReagentId: Omnizine #This is a really rare cake with healing stuff and we don't have any of its chems yet
+        - ReagentId: PolypyryliumOligomers
           Quantity: 15
 
 - type: entity
@@ -654,7 +689,7 @@
           Quantity: 4
         - ReagentId: Vitamin
           Quantity: 1
-        - ReagentId: Omnizine
+        - ReagentId: PolypyryliumOligomers
           Quantity: 3
 # Tastes like sweetness, cake, jam.
 

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml

@@ -19,44 +19,84 @@
   - type: Item
     size: Tiny
 
-# Muffins/Buns
+# Muffins
 
 - type: entity
   name: muffin
-  parent: FoodBakedBase
+  parent: FoodInjectableBase
   id: FoodBakedMuffin
   description: A delicious and spongy little cake.
   components:
+  - type: Food
+    trash: 
+    - FoodPlateMuffinTin
   - type: Sprite
+    sprite: Objects/Consumable/Food/Baked/misc.rsi
     state: muffin
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+  - type: FlavorProfile
+    flavors:
+      - sweet
+  - type: Item
+    size: Tiny
 
 - type: entity
   name: berry muffin
-  parent: FoodBakedBase
+  parent: FoodBakedMuffin
   id: FoodBakedMuffinBerry
   description: A delicious and spongy little cake, with berries.
   components:
   - type: Sprite
     state: muffin-berry
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: JuiceBerry
+          Quantity: 2
   - type: Tag
     tags:
     - Fruit
 
 - type: entity
   name: cherry muffin
-  parent: FoodBakedBase
+  parent: FoodBakedMuffin
   id: FoodBakedMuffinCherry
   description: A sweet muffin with cherry bits.
   components:
   - type: Sprite
     state: muffin-cherry
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: JuiceCherry
+          Quantity: 2
   - type: Tag
     tags:
     - Fruit
 
 - type: entity
   name: bluecherry muffin
-  parent: FoodBakedBase
+  parent: FoodBakedMuffin
   id: FoodBakedMuffinBluecherry
   description: Blue cherries inside a delicious muffin.
   components:
@@ -66,6 +106,51 @@
     tags:
     - Fruit
 
+- type: entity
+  name: chocolate muffin
+  parent: FoodBakedMuffin
+  id: FoodBakedMuffinChocolate
+  description: A delicious and spongy chocolate muffin.
+  components:
+  - type: Sprite
+    state: muffin-chocolate
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: CocoaPowder
+          Quantity: 2
+
+- type: entity
+  name: banana muffin
+  parent: FoodBakedMuffin
+  id: FoodBakedMuffinBanana
+  description: A delicious and spongy banana muffin.
+  components:
+  - type: Sprite
+    state: muffin-banana
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: JuiceBanana
+          Quantity: 2
+  - type: Tag
+    tags:
+    - Fruit
+
+# Buns
+
 - type: entity
   name: honey bun #TODO honey
   parent: FoodBakedBase
@@ -685,4 +770,4 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones
+        Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml

@@ -23,7 +23,7 @@
         - ReagentId: Vitamin
           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: 
+    trash:
     - FoodPlateTin
   - type: SliceableFood
     count: 4
@@ -317,6 +317,43 @@
     - Slice
 # Tastes like pie, meat.
 
+- type: entity
+  name: pumpkin pie
+  parent: FoodPieBase
+  id: FoodPiePumpkin
+  description: Someone should turn this into a latte!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - pumpkin
+  - type: Sprite
+    layers:
+    - state: tin
+    - state: pumpkin
+  - type: SliceableFood
+    slice: FoodPiePumpkinSlice
+  - type: Tag
+    tags:
+    - Pie
+
+- type: entity
+  name: slice of pumpkin pie
+  parent: FoodPieSliceBase
+  id: FoodPiePumpkinSlice
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - pumpkin
+  - type: Sprite
+    layers:
+    - state: pumpkin-slice
+  - type: Tag
+    tags:
+    - Pie
+    - Slice
+
 - type: entity
   name: xeno pie
   parent: FoodPieBase

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml

@@ -21,6 +21,10 @@
       visible: false
   - type: MixableSolution
     solution: food
+  - type: Drink
+    solution: food
+    useSound:
+      path: /Audio/Items/drink.ogg
   - type: DamageOnLand
     damage:
       types:

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml

@@ -178,3 +178,27 @@
     materialComposition:
       Steel: 60
   - type: SpaceGarbage
+
+# Muffin Tin
+
+- type: entity
+  name: muffin tin
+  parent: BaseItem
+  id: FoodPlateMuffinTin
+  description: A cheap foil tin for muffins.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/plates.rsi
+    state: muffin-tin
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    storedOffset: 0,-3
+  - type: Tag
+    tags:
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 30
+  - type: SpaceGarbage

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

@@ -525,6 +525,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Sprite
     state: snake
   - type: SolutionContainerManager
@@ -700,6 +701,36 @@
         - ReagentId: Water
           Quantity: 4 #It makes saline if you add salt!
 
+- type: entity
+  name: anomalous meat mass
+  parent: FoodMeatRawBase
+  id: FoodMeatAnomaly
+  description: An impossibly dense slab of meat. Just looking at it makes you uncomfortable.
+  components:
+  - type: Sprite
+    state: anomalymeat
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 90
+        - ReagentId: Fat
+          Quantity: 90
+  - type: SliceableFood
+    count: 10
+    sliceTime: 5
+    slice: FoodMeat #That's... So much meat
+  - type: InternalTemperature
+    conductivity: 0.43
+  - type: Construction
+    graph: AnomalyMeatSteak
+    node: start
+    defaultTarget: anomaly steak
+  - type: Tag
+    tags:
+    - Meat
+
 # Cooked
 
 - type: entity
@@ -1172,6 +1203,35 @@
       Burger: MeatSnail
       Taco: MeatSnail
 
+- type: entity
+  name: anomalous steak
+  parent: FoodMeatBase
+  id: FoodMeatAnomalyCooked
+  description: A gigantic mass of cooked meat. A meal for a dinner party, or someone REALLY hungry. 
+  components:
+  - type: Tag
+    tags:
+    - Cooked
+    - Meat
+  - type: Sprite
+    layers:
+    - state: anomalymeat-cooked #Kinda hard to cook this... thing evenly
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 100
+        - ReagentId: Protein
+          Quantity: 50
+  - type: SliceableFood
+    count: 10
+    sliceTime: 5
+    slice: FoodMeatCooked
+  - type: Construction
+    graph: AnomalyMeatSteak
+    node: anomaly steak
+
 # Cutlets
 
 # Raw

Resources/Prototypes/Entities/Objects/Decoration/present.yml

@@ -64,6 +64,8 @@
         orGroup: GiftPool
       - id: PlushieLizard #Weh!
         orGroup: GiftPool
+      - id: PlushieRainbowLizard
+        orGroup: GiftPool
       - id: PlushieNar
         orGroup: GiftPool
       - id: PlushieCarp

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

@@ -0,0 +1,25 @@
+- type: entity
+  id: CameraBug
+  parent: [ BaseItem, BaseSyndicateContraband ]
+  name: camera bug
+  description: An illegal syndicate device that allows you to hack into the station's camera network.
+  components:
+  - type: Sprite
+    sprite: Objects/Devices/camera_bug.rsi
+    layers:
+    - state: camera_bug
+  - type: Item
+  - type: ActivatableUI
+    requireActiveHand: false
+    inHandsOnly: true
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.SurveillanceCameraMonitorUiKey.Key:
+        type: SurveillanceCameraMonitorBoundUserInterface
+  - type: DeviceNetwork
+    deviceNetId: Wired
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WiredNetworkConnection
+  - type: SurveillanceCameraMonitor

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

@@ -117,6 +117,25 @@
   - type: StealTarget
     stealGroup: WantedListCartridge
 
+- type: entity
+  parent: BaseItem
+  id: MedTekCartridge
+  name: MedTek cartridge
+  description: A program that provides medical diagnostic tools.
+  components:
+    - type: Sprite
+      sprite: Objects/Devices/cartridge.rsi
+      state: cart-med
+    - type: Icon
+      sprite: Objects/Devices/cartridge.rsi
+      state: cart-med
+    - type: Cartridge
+      programName: med-tek-program-name
+      icon:
+        sprite: Objects/Specific/Medical/healthanalyzer.rsi
+        state: icon
+    - type: MedTekCartridge
+
 - type: entity
   parent: BaseItem
   id: AstroNavCartridge

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

@@ -12,19 +12,17 @@
       components:
       - Anchorable
       - Item
+      tags: 
       - Bot # for funny bot moments
     blacklist:
       components:
       - ChameleonDisguise # no becoming kleiner
-      - InsideEntityStorage # no clark kent going in phone booth and becoming superman
       - MindContainer # no
       - Pda # PDAs currently make you invisible /!\
-    polymorph:
-      entity: ChameleonDisguise
+    disguiseProto: ChameleonDisguise
 
 - type: entity
   categories: [ HideSpawnMenu ]
-  parent: BaseMob
   id: ChameleonDisguise
   name: Urist McKleiner
   components:
@@ -32,20 +30,11 @@
   - type: Sprite
     sprite: /Textures/Mobs/Species/Human/parts.rsi
     state: full
-  # so people can attempt to pick it up
-  - type: Item
-  # so it can take damage
-  # projector system sets health to be proportional to mass
+  - type: Transform
+    noRot: true # players rotation and anchor is used instead
+  - type: InteractionOutline
+  - type: Clickable
   - type: Damageable
-  - type: MobState
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      1: Critical
-      200: Dead
-  - type: MovementSpeedModifier
-    baseWalkSpeed: 1 # precise movement for the perfect spot
-    baseSprintSpeed: 5 # the jig is up
   - type: ChameleonDisguise
 
 # actions
@@ -56,6 +45,7 @@
   components:
   - type: InstantAction
     icon: Interface/VerbIcons/refresh.svg.192dpi.png
+    itemIconStyle: BigAction
     event: !type:DisguiseToggleNoRotEvent
 
 - type: entity
@@ -67,4 +57,5 @@
     icon:
       sprite: Objects/Tools/wrench.rsi
       state: icon
+    itemIconStyle: BigAction
     event: !type:DisguiseToggleAnchoredEvent

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

@@ -227,7 +227,7 @@
   - type: Sprite
     layers:
     - state: crypt_silver
-    - state: borg_label
+    - state: ai_label
 
 - type: entity
   parent: [ EncryptionKey, BaseSyndicateContraband ]
@@ -242,7 +242,7 @@
   - type: Sprite
     layers:
     - state: crypt_red
-    - state: borg_label
+    - state: ai_label
 
 - type: entity
   parent: EncryptionKey

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

@@ -121,6 +121,7 @@
     - type: Tag
       tags:
         - HolofanProjector
+        - SecBeltEquip
     - type: StaticPrice
       price: 50
 

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

@@ -131,12 +131,13 @@
   id: BaseMedicalPDA
   abstract: true
   components:
-  - type: ItemToggle
-    onUse: false
-  - type: HealthAnalyzer
-    scanDelay: 1
-    scanningEndSound:
-      path: "/Audio/Items/Medical/healthscanner.ogg"
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
 
 - type: entity
   parent: BasePDA
@@ -169,7 +170,7 @@
   parent: BaseMedicalPDA
   id: MedicalInternPDA
   name: medical intern PDA
-  description: Why isn't it white? Has a built-in health analyzer.
+  description: Why isn't it white?
   components:
   - type: Pda
     id: MedicalInternIDCard
@@ -495,7 +496,7 @@
     state: pda-janitor
 
 - type: entity
-  parent: BaseSecurityPDA
+  parent: BasePDA
   id: CaptainPDA
   name: captain PDA
   description: Surprisingly no different from your PDA.
@@ -569,7 +570,7 @@
   parent: BaseMedicalPDA
   id: CMOPDA
   name: chief medical officer PDA
-  description: Extraordinarily shiny and sterile. Has a built-in health analyzer.
+  description: Extraordinarily shiny and sterile.
   components:
   - type: Pda
     id: CMOIDCard
@@ -585,7 +586,7 @@
   parent: BaseMedicalPDA
   id: MedicalPDA
   name: medical PDA
-  description: Shiny and sterile. Has a built-in health analyzer.
+  description: Shiny and sterile.
   components:
   - type: Pda
     id: MedicalIDCard
@@ -612,7 +613,7 @@
   parent: BaseMedicalPDA
   id: ParamedicPDA
   name: paramedic PDA
-  description: Shiny and sterile. Has a built-in rapid health analyzer.
+  description: Shiny and sterile.
   components:
   - type: Pda
     id: ParamedicIDCard
@@ -683,6 +684,13 @@
     accentHColor: "#447987"
   - type: Icon
     state: pda-hos
+  - type: CartridgeLoader
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - WantedListCartridge
+    - LogProbeCartridge
 
 - type: entity
   parent: BaseSecurityPDA
@@ -731,6 +739,16 @@
     borderColor: "#00842e"
   - type: Icon
     state: pda-centcom
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
+      - WantedListCartridge
+      - LogProbeCartridge
+      - AstroNavCartridge
 
 - type: entity
   parent: CentcomPDA
@@ -753,6 +771,8 @@
       - NewsReaderCartridge
       - LogProbeCartridge
       - WantedListCartridge
+      - MedTekCartridge
+      - AstroNavCartridge
 
 - type: entity
   parent: CentcomPDA
@@ -844,14 +864,6 @@
     uiKey: enum.PdaUiKey.Key
     preinstalled:
       - NotekeeperCartridge
-    cartridgeSlot:
-      priority: -1
-      name: Cartridge
-      ejectSound: /Audio/Machines/id_swipe.ogg
-      insertSound: /Audio/Machines/id_insert.ogg
-      whitelist:
-        components:
-          - Cartridge
 
 - type: entity
   parent: BaseSecurityPDA
@@ -869,6 +881,16 @@
     accentVColor: "#447987"
   - type: Icon
     state: pda-ert
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
+      - WantedListCartridge
+      - LogProbeCartridge
+      - AstroNavCartridge
 
 - type: entity
   parent: ERTLeaderPDA
@@ -905,14 +927,10 @@
   id: ERTMedicPDA
   name: ERT Medic PDA
   suffix: Medic
-  description: Red for firepower, it's shiny and sterile. Has a built-in rapid health analyzer.
+  description: Red for firepower, it's shiny and sterile.
   components:
   - type: Pda
     id: ERTMedicIDCard
-  - type: HealthAnalyzer
-    scanDelay: 1
-    scanningEndSound:
-      path: "/Audio/Items/Medical/healthscanner.ogg"
 
 - type: entity
   parent: ERTLeaderPDA
@@ -1014,12 +1032,19 @@
     borderColor: "#774705"
   - type: Icon
     state: pda-detective
+  - type: CartridgeLoader
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - WantedListCartridge
+    - LogProbeCartridge
 
 - type: entity
   parent: BaseMedicalPDA
   id: BrigmedicPDA
   name: brigmedic PDA
-  description: I wonder whose pulse is on the screen? I hope he doesnt stop... PDA has a built-in health analyzer.
+  description: I wonder whose pulse is on the screen? I hope it doesn't stop...
   components:
   - type: Pda
     id: BrigmedicIDCard
@@ -1030,6 +1055,13 @@
     accentVColor: "#d7d7d0"
   - type: Icon
     state: pda-brigmedic
+  - type: CartridgeLoader
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - WantedListCartridge
+    - MedTekCartridge
 
 - type: entity
   parent: ClownPDA
@@ -1089,7 +1121,7 @@
   parent: BaseMedicalPDA
   id: SeniorPhysicianPDA
   name: senior physician PDA
-  description: Smells faintly like iron and chemicals. Has a built-in health analyzer.
+  description: Smells faintly like iron and chemicals.
   components:
   - type: Pda
     id: SeniorPhysicianIDCard
@@ -1145,11 +1177,4 @@
     uiKey: enum.PdaUiKey.Key
     preinstalled:
       - NotekeeperCartridge
-    cartridgeSlot:
-      priority: -1
-      name: Cartridge
-      ejectSound: /Audio/Machines/id_swipe.ogg
-      insertSound: /Audio/Machines/id_insert.ogg
-      whitelist:
-        components:
-          - Cartridge
+      - MedTekCartridge

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

@@ -639,3 +639,11 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-escape-pod
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconVox
+  suffix: Vox
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-vox

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml

@@ -54,6 +54,7 @@
     instrumentList:
       "Aah": {52: 0}
       "Ooh": {53: 0}
+      "Kweh": {4: 1}
   - type: Sprite
     sprite: Objects/Fun/Instruments/microphone.rsi
     state: icon

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

@@ -17,8 +17,6 @@
   - type: Tag
     tags:
     - Figurine
-  - type: StealTarget
-    stealGroup: Figurines
   - type: UseDelay
     delay: 10
   - type: Speech

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

@@ -69,6 +69,10 @@
           Searching: { state: pai-searching-overlay }
           On: { state: pai-on-overlay }
   - type: StationMap
+  - type: ChangeVoiceInContainer
+    whitelist:
+      components:
+        - SecretStash
 
 - type: entity
   parent: [ PersonalAI, BaseSyndicateContraband]

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

@@ -0,0 +1,58 @@
+- type: entity
+  id: SpectralLocatorUnpowered
+  parent: BaseItem
+  name: spectral locator
+  description: Appears to be a modified anomaly locator. Seems very old.
+  suffix: Unpowered
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/spectrallocator.rsi
+    layers:
+      - state: icon
+      - state: screen
+        shader: unshaded
+        visible: false
+        map: ["enum.ToggleVisuals.Layer"]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+  - type: ItemToggle
+  - type: ProximityBeeper
+  - type: ProximityDetector
+    range: 12
+    criteria:
+      components:
+      - Spectral # reacts to AI eye, intentional
+  - type: Beeper
+    isMuted: true
+    minBeepInterval: 0.25
+    maxBeepInterval: 0.5
+    beepSound:
+      path: "/Audio/Items/locator_beep.ogg"
+      params:
+        maxDistance: 1
+        volume: -8
+
+- type: entity
+  id: SpectralLocator
+  parent: [ SpectralLocatorUnpowered, PowerCellSlotSmallItem ]
+  suffix: Powered
+  components:
+  - type: PowerCellDraw
+    drawRate: 1
+    useRate: 0
+  - type: ToggleCellDraw
+
+- type: entity
+  id: SpectralLocatorEmpty
+  parent: SpectralLocator
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default

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

@@ -35,6 +35,7 @@
     damage:
       types:
         Blunt: 0
+    hidden: true
   - type: PhysicalComposition
     materialComposition:
       Cloth: 100
@@ -52,6 +53,24 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 10
+  - type: ContainerContainer
+    containers:
+      stash: !type:ContainerSlot {}
+  - type: Speech
+    speechVerb: Default # for pais (In the secret stash)
+  - type: SecretStash
+    secretStashName: secret-stash-plushie
+    blacklist:
+      components:
+      - SecretStash # Prevents being able to insert plushies inside each other (infinite plush)!
+      - NukeDisk # Could confuse the nukies if they don't know that plushies have a stash.
+      tags:
+      - QuantumSpinInverter # It will cause issues with the grinder...
+      - FakeNukeDisk # So you can't tell if the nuke disk is real or fake depending on if it can be inserted or not.
+  - type: ToolOpenable
+    openToolQualityNeeded: Slicing
+    closeToolQualityNeeded: Slicing # Should probably be stitching or something if that gets added
+    name: secret-stash-plushie
 
 - type: entity
   parent: BasePlushie
@@ -323,6 +342,25 @@
     equippedPrefix: lizard
     slots:
     - HEAD
+  - type: Speech
+    speechVerb: Reptilian # for pais (In the secret stash)
+
+- type: entity
+  parent: PlushieLizard
+  id: PlushieRainbowLizard #Weh but gay
+  description: An adorable stuffed toy that resembles a lizardperson of every color. You just might trip while staring at it...
+  name: rainbow lizard plushie
+  components:
+  - type: PointLight
+    radius: 1.5
+    energy: 2
+  - type: RgbLightController
+    layers: [ 0 ]
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: lizard-equipped-HELMET
+        shader: unshaded
 
 - type: entity
   parent: PlushieLizard
@@ -561,6 +599,11 @@
       path: /Audio/Effects/bite.ogg
     angle: 0
     animation: WeaponArcBite # Rrrr!
+  - type: Tag
+    tags:
+      - Payload
+      - ClothMade
+      - PlushieCarp
 
 - type: entity
   parent: PlushieCarp

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

@@ -0,0 +1,26 @@
+- type: entity
+  id: SyndicateBusinessCard
+  name: syndicate business card
+  parent: Paper
+  description: A black card with the syndicate's logo. There's something written on the back.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/bureaucracy.rsi
+      layers:
+      - state: syndicate_card
+      - state: syndicate_card
+        map: ["enum.PaperVisualLayers.Writing"]
+        visible: false
+      - state: paper_stamp-generic
+        map: ["enum.PaperVisualLayers.Stamp"]
+        visible: false
+    - type: Paper
+      content: syndicate-business-card-base
+    - type: PaperVisuals
+      headerImagePath: "/Textures/Interface/Paper/paper_heading_syndicate_logo.svg.96dpi.png"
+      headerMargin: 0.0, 0.0, 0.0, 2.0
+      backgroundImagePath: "/Textures/Interface/Paper/paper_background_black.svg.96dpi.png"
+      backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0
+      contentMargin: 4.0, 4.0, 4.0, 4.0
+      maxWritableArea: 400.0, 256.0
+

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

@@ -35,3 +35,6 @@
     state: icon
   - type: StaticPrice
     price: 1 # it's worth even less than normal items. Perfection.
+  - type: Tag
+    tags:
+    - FakeNukeDisk

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

@@ -1,19 +0,0 @@
-- type: entity
-  parent: ClothingNeckBase
-  id: Dinkystar
-  name: star sticker
-  description: A dinky lil star for only the hardest working security officers! It's not even sticky anymore.
-  components:
-    - type: Sprite
-      sprite: Clothing/Neck/Misc/dinkystar.rsi
-      state: icon
-    - type: Clothing
-      sprite: Clothing/Neck/Misc/dinkystar.rsi
-      clothingVisuals:
-        neck:
-          - state: star-equipped
-    - type: Item
-      size: Tiny
-    - type: Tag
-      tags:
-        - Trash

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

@@ -62,6 +62,9 @@
     - Rolling
     speedModifier: 0.5 # its very big, awkward to use
   - type: Appearance
+  - type: Tag
+    tags:
+      - FireExtinguisher
   - type: GenericVisualizer
     visuals:
       enum.ToggleVisuals.Toggled:
@@ -94,7 +97,7 @@
   name: pocket fire extinguisher
   parent: FireExtinguisher
   id: FireExtinguisherMini
-  description: A light and compact fibreglass-framed model fire extinguisher. It holds less water then its bigger brother.
+  description: A light and compact fibreglass-framed model fire extinguisher. It holds less water than its bigger brother.
   components:
   - type: Sprite
     sprite: Objects/Misc/fire_extinguisher_mini.rsi

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

@@ -443,7 +443,7 @@
     - state: default
     - state: idvisitor
   - type: IdCard
-    jobTitle: Visitor
+    jobTitle: job-title-visitor
     jobIcon: JobIconVisitor
   - type: PresetIdCard
     job: Visitor
@@ -741,7 +741,7 @@
     - state: default
     - state: idcluwne
   - type: IdCard
-    jobTitle: Cluwne
+    jobTitle: job-title-cluwne
   - type: Unremoveable
 
 - type: entity
@@ -801,7 +801,7 @@
   - type: Item
     heldPrefix: green
   - type: IdCard
-    jobTitle: Universal
+    jobTitle: job-title-universal
     jobIcon: JobIconAdmin
   - type: Access
     groups:

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

@@ -1286,6 +1286,22 @@
   - type: Stack
     stackType: FloorTileBCircuit
 
+- type: entity
+  name: red circuit floor
+  parent: FloorTileItemBase
+  id: FloorTileItemRCircuit
+  components:
+  - type: Sprite
+    state: rcircuit
+  - type: Item
+    heldPrefix: rcircuit
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorRedCircuit
+  - type: Stack
+    stackType: FloorTileRCircuit
+
 # Circuits stacks
 
 - type: entity
@@ -1304,6 +1320,14 @@
   - type: Stack
     count: 4
 
+- type: entity
+  parent: FloorTileItemRCircuit
+  id: FloorTileItemRCircuit4
+  suffix: 4
+  components:
+  - type: Stack
+    count: 4
+
 # Terrain
 - type: entity
   name: grass tile

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

@@ -129,6 +129,7 @@
   - type: Tag
     tags:
     - LightBulb
+    - Trash
 
 - type: entity
   parent: BaseLightbulb
@@ -147,6 +148,7 @@
   - type: Tag
     tags:
     - LightBulb
+    - Trash
 
 - type: entity
   parent: LightBulb
@@ -160,9 +162,6 @@
     lightEnergy: 0.3 # old incandescents just arent as bright
     lightRadius: 6
     lightSoftness: 1.1
-  - type: Tag
-    tags:
-    - LightBulb
 
 - type: entity
   suffix: Broken
@@ -190,6 +189,7 @@
   - type: Tag
     tags:
     - LightBulb
+    - Trash
 
 - type: entity
   parent: BaseLightTube

Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml

@@ -20,8 +20,6 @@
         density: 15
         mask:
           - MachineMask
-  - type: CargoPallet
-    palletType: All
   - type: StaticPrice
     price: 100
   - type: Sprite

Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml

@@ -167,6 +167,8 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepClown
+      params:
+        variation: 0.17
   - type: Mech
     baseState: honker
     openState: honker-open

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

@@ -71,3 +71,69 @@
   id: DefibrillatorOneHandedUnpowered
   parent: BaseDefibrillator
   suffix: One-Handed, Unpowered
+
+- type: entity
+  id: DefibrillatorCompact # This should be a research item at some point
+  parent: [ BaseDefibrillator, PowerCellSlotMediumItem ]
+  name: compact defibrillator
+  description: Now in fun size!
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/defibsmall.rsi
+    layers:
+      - state: icon
+      - state: screen
+        map: [ "enum.ToggleVisuals.Layer" ]
+        visible: false
+        shader: unshaded
+      - state: ready
+        map: ["enum.PowerDeviceVisualLayers.Powered"]
+        shader: unshaded
+  - type: Item
+    size: Normal
+  - type: ToggleCellDraw
+  - type: PowerCellDraw
+    useRate: 100
+  - type: Defibrillator
+    zapHeal:
+      types:
+        Asphyxiation: -40
+    doAfterDuration: 6
+  - type: DoAfter
+  - type: UseDelay
+
+- type: entity
+  id: DefibrillatorSyndicate
+  parent: DefibrillatorCompact
+  name: interdyne defibrillator
+  description: Doubles as a self-defense weapon against war-crime inclined tiders.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/defibsyndi.rsi
+    layers:
+      - state: icon
+      - state: screen
+        map: [ "enum.ToggleVisuals.Layer" ]
+        visible: false
+        shader: unshaded
+      - state: ready
+        map: ["enum.PowerDeviceVisualLayers.Powered"]
+        shader: unshaded
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 8
+  - type: ItemToggleMeleeWeapon
+    activatedSoundOnHit:
+      path: /Audio/Items/Defib/defib_zap.ogg
+      params:
+        variation: 0.250
+    activatedSoundOnHitNoDamage:
+      path: /Audio/Items/Defib/defib_zap.ogg
+      params:
+        variation: 0.250
+        volume: -10
+    activatedDamage:
+      types:
+        Blunt: 8
+        Shock: 16

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

@@ -271,7 +271,6 @@
     transferAmount: 20
     onlyAffectsMobs: false
     injectOnly: true
-
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -284,6 +283,102 @@
   - type: Tag
     tags: []
 
+- type: entity
+  name: puncturase auto-injector
+  parent: ChemicalMedipen
+  id: PunctAutoInjector
+  description: A rapid dose of puncturase and tranexamic acid, intended for combat applications.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: punctpen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: punctpen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 15
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 15
+        reagents:
+        - ReagentId: Puncturase
+          Quantity: 10
+        - ReagentId: TranexamicAcid
+          Quantity: 5
+  - type: Tag
+    tags: []
+
+- type: entity
+  name: pyrazine auto-injector
+  parent: ChemicalMedipen
+  id: PyraAutoInjector
+  description: A rapid dose of pyrazine and dermaline, intended for combat applications.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: pyrapen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: pyrapen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 20
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 20
+        reagents:
+        - ReagentId: Pyrazine
+          Quantity: 10
+        - ReagentId: Dermaline
+          Quantity: 10
+  - type: Tag
+    tags: []
+
+- type: entity
+  name: airloss auto-injector
+  parent: ChemicalMedipen
+  id: AirlossAutoInjector
+  description: A rapid dose of saline and dexalin plus, intended to get someone up quickly.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: dexpen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: dexpen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 40
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 40
+        reagents:
+        - ReagentId: Saline
+          Quantity: 20
+        - ReagentId: DexalinPlus
+          Quantity: 20
+  - type: Tag
+    tags: []
+
 - type: entity
   name: space medipen
   parent: ChemicalMedipen

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

@@ -68,6 +68,10 @@
   components:
   - type: Sharp
     butcherDelayModifier: 1.5 # Butchering with a scalpel, regardless of the type, will take 50% longer
+  - type: Tool
+    qualities:
+    - Slicing
+    speedModifier: 0.66 # pretend the sixes go on forever :)
   - type: Utensil
     types:
       - Knife

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

@@ -10,6 +10,8 @@
   - type: Sprite
     sprite: Objects/Specific/Robotics/borgmodule.rsi
   - type: BorgModule
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: no-action }
   - type: StaticPrice
     price: 100
   - type: Tag
@@ -35,7 +37,7 @@
   description: Select this module, enabling you to use the tools it provides.
   components:
   - type: InstantAction
-    itemIconStyle: BigItem
+    itemIconStyle: BigAction
     useDelay: 0.5
     event: !type:BorgModuleActionSelectedEvent
 
@@ -119,6 +121,8 @@
     - CableHVStackLingering10
     - Wirecutter
     - trayScanner
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: wire-module }
 
 - type: entity
   id: BorgModuleFireExtinguisher
@@ -132,6 +136,8 @@
   - type: ItemBorgModule
     items:
     - FireExtinguisher
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: extinguisher-module }
 
 - type: entity
   id: BorgModuleGPS
@@ -147,6 +153,8 @@
     - HandheldGPSBasic
     - HandHeldMassScannerBorg
     - HandheldStationMapUnpowered
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: gps-module }
 
 - type: entity
   id: BorgModuleRadiationDetection
@@ -160,6 +168,8 @@
   - type: ItemBorgModule
     items:
     - GeigerCounter
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: geiger-module }
 
 - type: entity
   id: BorgModuleTool
@@ -178,6 +188,8 @@
     - Wirecutter
     - Multitool
     - WelderIndustrial
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: tool-module }
 
 # cargo modules
 - type: entity
@@ -192,6 +204,8 @@
   - type: ItemBorgModule
     items:
     - AppraisalTool
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: appraisal-module }
 
 - type: entity
   id: BorgModuleMining
@@ -210,6 +224,8 @@
     - OreBag
     - Crowbar
     - RadioHandheld
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: mining-module }
 
 - type: entity
   id: BorgModuleGrapplingGun
@@ -224,6 +240,8 @@
     items:
     - WeaponGrapplingGun
     - HandheldGPSBasic
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: grappling-module }
 
 # engineering modules
 - type: entity
@@ -237,12 +255,15 @@
     - state: icon-tools-adv
   - type: ItemBorgModule
     items:
-    - Omnitool
+    - JawsOfLife
+    - PowerDrill
+    - Multitool
     - WelderExperimental
-    - NetworkConfigurator
     - RemoteSignaller
     - GasAnalyzer
     - GeigerCounter
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-tools-module }
 
 - type: entity
   id: BorgModuleConstruction
@@ -259,6 +280,8 @@
     - SheetGlassLingering0
     - PartRodMetalLingering0
     - FloorTileItemSteelLingering0
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: construction-module }
 
 - type: entity
   id: BorgModuleRCD
@@ -272,6 +295,8 @@
   - type: ItemBorgModule
     items:
     - RCDRecharging
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: rcd-module }
 
 # janitorial modules (this gets its own unique things because janis are epic)
 - type: entity
@@ -288,6 +313,8 @@
     - LightReplacer
     - Crowbar
     - Screwdriver
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: light-replacer-module }
 
 - type: entity
   id: BorgModuleCleaning
@@ -303,6 +330,8 @@
     - MopItem
     - Bucket
     - TrashBag
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: cleaning-module }
 
 - type: entity
   id: BorgModuleAdvancedCleaning
@@ -320,6 +349,8 @@
     - SprayBottleSpaceCleaner
     - Dropper
     - TrashBag
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-cleaning-module }
 
 # medical modules
 - type: entity
@@ -335,6 +366,8 @@
     items:
     - HandheldHealthAnalyzerUnpowered
     - ClothingNeckStethoscope
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: diagnosis-module }
 
 - type: entity
   id: BorgModuleTreatment
@@ -353,6 +386,8 @@
     - Gauze10Lingering
     - Bloodpack10Lingering
     - Syringe
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: treatment-module }
 
 - type: entity
   id: BorgModuleDefibrillator
@@ -366,6 +401,8 @@
   - type: ItemBorgModule
     items:
     - DefibrillatorOneHandedUnpowered
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: defib-module }
 
 - type: entity
   id: BorgModuleAdvancedTreatment
@@ -383,6 +420,8 @@
     - Beaker
     - BorgDropper
     - BorgHypo
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-diagnosis-module }
 
 # science modules
 # todo: if science ever gets their own custom robot, add more "sci" modules.
@@ -398,6 +437,8 @@
   - type: ItemBorgModule
     items:
     - NodeScanner
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: node-scanner-module }
 
 - type: entity
   id: BorgModuleAnomaly
@@ -415,6 +456,8 @@
     - AnomalyLocatorWideUnpowered
     - RemoteSignaller
     - Multitool
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: anomaly-module }
 
 # service modules
 - type: entity
@@ -434,6 +477,8 @@
     - Lighter
     - DrinkShaker
     - BorgDropper
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module }
 
 - type: entity
   id: BorgModuleMusique
@@ -449,6 +494,8 @@
     - SynthesizerInstrument
     - ElectricGuitarInstrument
     - SaxophoneInstrument
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: musical-module }
 
 - type: entity
   id: BorgModuleGardening
@@ -465,6 +512,8 @@
     - HydroponicsToolSpade
     - HydroponicsToolClippers
     - Bucket
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: gardening-module }
 
 - type: entity
   id: BorgModuleHarvesting
@@ -480,6 +529,8 @@
     - HydroponicsToolScythe
     - HydroponicsToolHatchet
     - PlantBag
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: harvesting-module }
 
 - type: entity
   id: BorgModuleClowning
@@ -495,6 +546,8 @@
     - BikeHorn
     - ClownRecorder
     - BikeHornInstrument
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: clowning-module }
 
 #syndicate modules
 - type: entity
@@ -510,6 +563,8 @@
     items:
     - WeaponPistolEchis
     - EnergyDaggerLoud
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module }
 
 - type: entity
   id: BorgModuleOperative
@@ -526,6 +581,8 @@
       - Crowbar
       - Emag
       - PinpointerSyndicateNuclear
+    - type: BorgModuleIcon
+      icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-operative-module }
 
 - type: entity
   id: BorgModuleEsword
@@ -541,6 +598,8 @@
       items:
       - CyborgEnergySwordDouble
       - PinpointerSyndicateNuclear
+    - type: BorgModuleIcon
+      icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-esword-module }
 
 - type: entity
   id: BorgModuleL6C
@@ -556,6 +615,8 @@
       items:
         - WeaponLightMachineGunL6C
         - PinpointerSyndicateNuclear
+    - type: BorgModuleIcon
+      icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-l6c-module }
 
 - type: entity
   id: BorgModuleMartyr
@@ -570,3 +631,5 @@
     - type: ItemBorgModule
       items:
         - SelfDestructSeq
+    - type: BorgModuleIcon
+      icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module }

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

@@ -49,6 +49,10 @@
     guides:
     - Cyborgs
     - Robotics
+  - type: ChangeVoiceInContainer
+    whitelist:
+      components:
+      - SecretStash
 
 - type: entity
   parent: MMI
@@ -127,3 +131,7 @@
       guides:
       - Cyborgs
       - Robotics
+    - type: ChangeVoiceInContainer
+      whitelist:
+        components:
+        - SecretStash

Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml

@@ -5,60 +5,65 @@
   description: A strange alien device.
   abstract: true
   components:
-    - type: Sprite
-      drawdepth: SmallObjects
-      sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
-      noRot: true
-      layers:
-      - state: ano30
-        map: [ "enum.ArtifactsVisualLayers.Base" ]
-      - state: ano30_on
-        map: [ "enum.ArtifactsVisualLayers.Effect" ]
-        visible: false
-    - type: Damageable
-    - type: Physics
-      bodyType: Dynamic
-    - type: Transform
-      noRot: true
-    - type: UserInterface #needs to be here for certain effects
-      interfaces:
-        enum.StorageUiKey.Key:
-          type: StorageBoundUserInterface
-        enum.TransferAmountUiKey.Key:
-          type: TransferAmountBoundUserInterface
-        enum.InstrumentUiKey.Key:
-          type: InstrumentBoundUserInterface
-        enum.IntercomUiKey.Key:
-          type: IntercomBoundUserInterface
-    - type: Reactive
-      groups:
-        Acidic: [Touch]
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape:
-            !type:PhysShapeCircle
-            radius: 0.45
-          density: 75
-          layer: # doesn't collide with artifact storage
-          - Opaque
-          mask:
-          - MachineMask
-    - type: InteractionOutline
-    - type: Artifact
-    - type: RandomArtifactSprite
-      maxSprite: 36
-    - type: RandomSprite
-      available:
-      - enum.ArtifactsVisualLayers.Effect:
-          ano01_on: Rainbow
-    - type: Appearance
-    - type: Actions
-    - type: GuideHelp
-      guides:
-      - Xenoarchaeology
-    - type: StealTarget
-      stealGroup: XenoArtifact
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
+    noRot: true
+    layers:
+    - state: ano30
+      map: [ "enum.ArtifactsVisualLayers.Base" ]
+    - state: ano30_on
+      map: [ "enum.ArtifactsVisualLayers.Effect" ]
+      visible: false
+  - type: Damageable
+  - type: Physics
+    bodyType: Dynamic
+  - type: Transform
+    noRot: true
+  - type: UserInterface #needs to be here for certain effects
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+      enum.TransferAmountUiKey.Key:
+        type: TransferAmountBoundUserInterface
+      enum.InstrumentUiKey.Key:
+        type: InstrumentBoundUserInterface
+      enum.IntercomUiKey.Key:
+        type: IntercomBoundUserInterface
+  - type: Reactive
+    groups:
+      Acidic: [Touch]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        density: 75
+        layer: # doesn't collide with artifact storage
+        - Opaque
+        mask:
+        - MachineMask
+  - type: InteractionOutline
+  - type: Artifact
+  - type: RandomArtifactSprite
+    maxSprite: 36
+  - type: RandomSprite
+    available:
+    - enum.ArtifactsVisualLayers.Effect:
+        ano01_on: Rainbow
+  - type: Appearance
+  - type: Actions
+  - type: GuideHelp
+    guides:
+    - Xenoarchaeology
+  - type: StealTarget
+    stealGroup: XenoArtifact
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container # needed for the EffectStorage artifactEffect
+        ents: [ ]
+      revolver-ammo: !type:Container # needed for the EffectBigIron artifactEffect
 
 - type: entity
   parent: BaseXenoArtifact

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

@@ -283,6 +283,7 @@
   - type: Injector
     injectOnly: false
     ignoreMobs: true
+    ignoreClosed: false
     minTransferAmount: 1
     maxTransferAmount: 5
     transferAmount: 1
@@ -386,6 +387,66 @@
     - Syringe
     - Trash
 
+- type: entity
+  name: mini syringe
+  parent: Syringe
+  description: A regular syringe, reshaped to fit inside of a gun.
+  id: MiniSyringe
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chemistry/syringe.rsi
+    layers:
+      - state: minisyringe1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+      - state: syringeproj
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: minisyringe
+    inHandsMaxFillLevels: 3
+    inHandsFillBaseName: -fill-
+  - type: EmbeddableProjectile
+    offset: "-0.1,0"
+    minimumSpeed: 3
+    removalTime: 0.25
+    embedOnThrow: false
+  - type: SolutionInjectWhileEmbedded
+    transferAmount: 1
+    solution: injector
+    updateInterval: 2
+  - type: SolutionInjectOnEmbed
+    transferAmount: 2
+    solution: injector
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 5
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.3,0.1,0.3"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Projectile
+    deleteOnCollide: false
+    onlyCollideWhenShot: true
+    damage:
+      types:
+        Piercing: 5
+  - type: Tag
+    tags:
+    - Syringe
+    - Trash
+    - SyringeGunAmmo
+
 - type: entity
   parent: BaseSyringe
   id: PrefilledSyringe
@@ -481,12 +542,8 @@
     solutions:
       food:
         maxVol: 20
-  - type: SolutionSpiker
-    sourceSolution: food
-  - type: Extractable
-    grindableSolutionName: food
-  - type: StaticPrice
-    price: 0
+  - type: ExplosionResistance
+    damageCoefficient: 0.025 # survives conventional explosives but not minibombs and nukes
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -499,6 +556,12 @@
         solution: food
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: SolutionSpiker
+    sourceSolution: food
+  - type: Extractable
+    grindableSolutionName: food
+  - type: StaticPrice
+    price: 0
   - type: Tag
     tags:
     - Pill
@@ -526,4 +589,7 @@
     areaInsertRadius: 1
     storageInsertSound: /Audio/Effects/pill_insert.ogg
     storageRemoveSound: /Audio/Effects/pill_remove.ogg
+    whitelist: 
+      tags:
+      - Pill
   - type: Dumpable

Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml

@@ -54,10 +54,10 @@
     beepSound: /Audio/Machines/Nuke/general_beep.ogg
     startOnStick: true
     canToggleStartOnStick: true
-  - type: TriggerOnSignal
+  - type: TimerStartOnSignal
   - type: DeviceLinkSink
     ports:
-      - Trigger
+      - Timer
   - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating.
     explosionType: DemolitionCharge
     totalIntensity: 60