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

# Conflicts: # Resources/Changelog/Changelog.yml # Resources/Credits/GitHub.txt # Resources/Prototypes/Entities/Mobs/Player/silicon.yml
2024-11-06 16:53:24 +03:00
parent ae27cf7e08 24e6b9f42c
commit 955145a9a5
207 changed files with 2180 additions and 1314 deletions
--- a/Resources/Prototypes/Actions/station_ai.yml
+++ b/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
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/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
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/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
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -20,6 +20,7 @@
    BoxCandle: 2
    BoxCandleSmall: 2
    Urn: 5
+    Bible: 1
  emaggedInventory:
    ClothingOuterArmorCult: 1
    ClothingHeadHelmetCult: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
+++ b/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
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -7,6 +7,7 @@
    Bloodpack: 5
    EpinephrineChemistryBottle: 3
    Syringe: 5
+    BoxBottle: 3
    ClothingEyesHudMedical: 2
    ClothingEyesEyepatchHudMedical: 2

--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/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:
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -487,7 +487,6 @@
        - CartridgeAmmo
        - DoorRemote
        - Whistle
-        - HolosignProjector
        - BalloonPopper
  - type: ItemMapper
    mapLayers:
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/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]
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -853,6 +853,10 @@
  - type: Construction
    graph: WebObjects
    node: coat
+  - type: Butcherable
+    spawned:
+    - id: MaterialWebSilk1
+      amount: 5
  - type: FlavorProfile
    flavors:
      - cobwebs
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
@@ -46,6 +46,8 @@
      - FoodBakedMuffinBerry
      - FoodBakedMuffinCherry
      - FoodBakedMuffinBluecherry
+      - FoodBakedMuffinChocolate
+      - FoodBakedMuffinBanana
      - FoodBakedBunHoney
      - FoodBakedBunHotX
      - FoodBakedBunMeat
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -285,7 +285,6 @@
  - type: AccessReader
    access: [["Command"], ["Research"]]
  - type: ShowJobIcons
-  - type: ShowMindShieldIcons

 - type: entity
  id: BaseBorgChassisSyndicate
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -127,7 +127,7 @@
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
    iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png
    keywords: [ "AI", "console", "interface" ]
-    priority: -7
+    priority: -6
    event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key }

 - type: entity
@@ -151,7 +151,7 @@
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
    iconOn: Interface/Actions/actions_ai.rsi/crew_monitor.png
    keywords: [ "AI", "console", "interface" ]
-    priority: -9
+    priority: -8
    event: !type:ToggleIntrinsicUIEvent { key: enum.CrewMonitoringUIKey.Key }

 - type: entity
@@ -163,5 +163,5 @@
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
    iconOn: Interface/Actions/actions_ai.rsi/station_records.png
    keywords: [ "AI", "console", "interface" ]
-    priority: -8
+    priority: -7
    event: !type:ToggleIntrinsicUIEvent { key: enum.GeneralStationRecordConsoleKey.Key }
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -33,7 +33,6 @@
  - type: ActionGrant
    actions:
    - ActionJumpToCore
-    - ActionShowJobIcons
    - ActionSurvCameraLights
    - ActionAIViewLaws
  - type: UserInterface
@@ -70,6 +69,9 @@
    canShuttle: false
    title: comms-console-announcement-title-station-ai
    color: "#2ed2fd"
+  - type: Speech
+    speechVerb: Robotic
+  - type: ShowJobIcons

 - type: entity
  id: AiHeldIntellicard
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
@@ -12,6 +12,7 @@
      components:
      - Anchorable
      - Item
+      tags: 
      - Bot # for funny bot moments
    blacklist:
      components:
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -121,6 +121,7 @@
    - type: Tag
      tags:
        - HolofanProjector
+        - SecBeltEquip
    - type: StaticPrice
      price: 50

--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -496,7 +496,7 @@
    state: pda-janitor

 - type: entity
-  parent: BaseSecurityPDA
+  parent: BasePDA
  id: CaptainPDA
  name: captain PDA
  description: Surprisingly no different from your PDA.
@@ -684,6 +684,13 @@
    accentHColor: "#447987"
  - type: Icon
    state: pda-hos
+  - type: CartridgeLoader
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - WantedListCartridge
+    - LogProbeCartridge

 - type: entity
  parent: BaseSecurityPDA
@@ -732,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
@@ -754,6 +771,8 @@
      - NewsReaderCartridge
      - LogProbeCartridge
      - WantedListCartridge
+      - MedTekCartridge
+      - AstroNavCartridge

 - type: entity
  parent: CentcomPDA
@@ -845,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
@@ -870,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
@@ -910,14 +931,6 @@
  components:
  - type: Pda
    id: ERTMedicIDCard
-  - type: CartridgeLoader
-    uiKey: enum.PdaUiKey.Key
-    preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - MedTekCartridge
-      - WantedListCartridge

 - type: entity
  parent: ERTLeaderPDA
@@ -1019,6 +1032,13 @@
    borderColor: "#774705"
  - type: Icon
    state: pda-detective
+  - type: CartridgeLoader
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - WantedListCartridge
+    - LogProbeCartridge

 - type: entity
  parent: BaseMedicalPDA
@@ -1035,6 +1055,13 @@
    accentVColor: "#d7d7d0"
  - type: Icon
    state: pda-brigmedic
+  - type: CartridgeLoader
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NewsReaderCartridge
+    - WantedListCartridge
+    - MedTekCartridge

 - type: entity
  parent: ClownPDA
@@ -1151,11 +1178,3 @@
    preinstalled:
      - NotekeeperCartridge
      - MedTekCartridge
-    cartridgeSlot:
-      priority: -1
-      name: Cartridge
-      ejectSound: /Audio/Machines/id_swipe.ogg
-      insertSound: /Audio/Machines/id_insert.ogg
-      whitelist:
-        components:
-          - Cartridge
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -35,6 +35,7 @@
    damage:
      types:
        Blunt: 0
+    hidden: true
  - type: PhysicalComposition
    materialComposition:
      Cloth: 100
@@ -598,6 +599,11 @@
      path: /Audio/Effects/bite.ogg
    angle: 0
    animation: WeaponArcBite # Rrrr!
+  - type: Tag
+    tags:
+      - Payload
+      - ClothMade
+      - PlushieCarp

 - type: entity
  parent: PlushieCarp
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -543,12 +543,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
@@ -561,6 +557,12 @@
        solution: food
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: SolutionSpiker
+    sourceSolution: food
+  - type: Extractable
+    grindableSolutionName: food
+  - type: StaticPrice
+    price: 0
  - type: Tag
    tags:
    - Pill
@@ -588,4 +590,7 @@
    areaInsertRadius: 1
    storageInsertSound: /Audio/Effects/pill_insert.ogg
    storageRemoveSound: /Audio/Effects/pill_remove.ogg
+    whitelist: 
+      tags:
+      - Pill
  - type: Dumpable
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: WeaponWaterGunBase
  abstract: true
  parent: BaseItem
@@ -71,7 +71,7 @@
  id: WeaponWaterBlaster
  parent: WeaponWaterGunBase
  name: water blaster
-  description: With this bad boy, you'll be the cooleste kid at the summer barbecue.
+  description: With this bad boy, you'll be the coolest kid at the summer barbecue.
  components:
  - type: Gun
    cameraRecoilScalar: 0 #no recoil
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -103,6 +103,9 @@
        Slash: 10
  - type: Item
    sprite: Objects/Weapons/Melee/combat_knife.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/combat_knife.rsi
  - type: DisarmMalus
    malus: 0.225

@@ -117,6 +120,9 @@
    state: icon
  - type: Item
    sprite: Objects/Weapons/Melee/survival_knife.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/survival_knife.rsi

 - type: entity
  name: kukri knife
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -149,6 +149,7 @@
  - type: GunRequiresWield
  - type: Item
    size: Ginormous
+    sprite: Objects/Weapons/Melee/crusher-inhands.rsi
  - type: DisarmMalus
  - type: Prying

@@ -191,3 +192,6 @@
  - type: Tag
    tags:
      - Pickaxe
+  - type: Item
+    size: Ginormous
+    sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -43,7 +43,7 @@
  - type: RCDDeconstructable
    cost: 4
    delay: 2
-    fx: EffectRCDDeconstruct2  
+    fx: EffectRCDDeconstruct2
  - type: Destructible
    thresholds:
    - trigger:
@@ -74,7 +74,7 @@
    mode: SnapgridCenter
    snap:
    - Wallmount
-    
+
 - type: entity
  name: light
  description: "A light fixture. Draws power and produces light when equipped with a light tube."
@@ -400,6 +400,37 @@
      shader: "unshaded"
      visible: false
  - type: Appearance
+  - type: Construction
+    graph: LightFixture
+    node: emergencyLight
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors: #excess damage, don't spawn entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+    - trigger:
+        !type:DamageTrigger
+        damage: 25
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+          ShardGlass:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
  placement:
    mode: SnapgridCenter
    snap:
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -163,6 +163,7 @@
      - FoodPlateSmallPlastic
      - FoodBowlBig
      - FoodPlateTin
+      - FoodPlateMuffinTin
      - FoodKebabSkewer
      - SprayBottle
      - MopItem
--- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
@@ -47,19 +47,30 @@
        whitelist:
          tags:
            - PlushieSharkGrey
-    sprite: Objects/Fun/sharkplush.rsi
+      mopbucket_carpplush:
+        whitelist:
+          tags:
+            - PlushieCarp
+    sprite: Objects/Specific/Janitorial/janitorial.rsi
  - type: Transform
    noRot: true
  - type: ItemSlots
    slots:
-      shark_slot:
-        name: mop-bucket-slot-component-slot-name-shark
+      item_slot:
+        name: mop-bucket-slot-component-slot-name-item
+        ejectVerbText: mop-bucket-slot-component-eject-verb
        whitelist:
          tags:
            - PlushieSharkBlue
            - PlushieSharkPink
            - PlushieSharkGrey
+            - PlushieCarp
+          components:
+            - Rehydratable
        priority: 3 # Higher than drinking priority
+  - type: ReactiveContainer
+    solution: bucket
+    container: item_slot
  - type: Drink
    solution: bucket
  - type: Appearance
@@ -70,7 +81,7 @@
    containers:
      storagebase: !type:Container
        ents: []
-      shark_slot: !type:ContainerSlot {}
+      item_slot: !type:ContainerSlot {}
  - type: GuideHelp
    guides:
    - Janitorial
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml
@@ -29,7 +29,7 @@
      isCollidableWhenOpen: false
      openOnMove: false
      airtight: false
-      capacity: 4 #4 Entities seems like a nice comfy fit for a cardboard box.
+      capacity: 5 #5 entity capacity to fit all of your friends (or teammates on your nuclear operation without reinforcements).
    - type: ContainerContainer
      containers:
        entity_storage: !type:Container
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
@@ -64,8 +64,8 @@
    canEditLabel: true
  - type: TextScreenVisuals
    color: FloralWhite
-    textOffset: 0,8
-    timerOffset: 0,8
+    textOffset: 0,6
+    timerOffset: 0,6
    textLength: 5
    rows: 1
  - type: Sprite
--- a/Resources/Prototypes/Hydroponics/randomMutations.yml
+++ b/Resources/Prototypes/Hydroponics/randomMutations.yml
@@ -19,6 +19,7 @@
      baseOdds: 0.036
      appliesToProduce: false
      effect: !type:PlantSpeciesChange
+      persists: false
    - name: Unviable
      baseOdds: 0.109
      persists: false
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -21,6 +21,13 @@
    back:
    - ClothingHeadHatHairflower

+# Headphones
+- type: loadout
+  id: Headphones
+  storage:
+    back:
+    - ClothingNeckHeadphones
+
 # Plushies
 - type: loadout
  id: PlushieLizard
@@ -165,7 +172,7 @@
      !type:OverallPlaytimeRequirement
      time: 36000 # 10hr
  storage:
-    back: 
+    back:
    - TowelColorWhite

 - type: loadout
@@ -176,9 +183,9 @@
      !type:OverallPlaytimeRequirement
      time: 1800000 # 500hr
  storage:
-    back: 
+    back:
    - TowelColorSilver
-    
+
 - type: loadout
  id: TowelColorGold
  effects:
@@ -187,7 +194,7 @@
      !type:OverallPlaytimeRequirement
      time: 3600000 # 1000hr
  storage:
-    back: 
+    back:
    - TowelColorGold

 - type: loadout
@@ -199,7 +206,7 @@
      department: Cargo
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorLightBrown

 - type: loadout
@@ -211,7 +218,7 @@
      department: Civilian
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorGreen

 - type: loadout
@@ -223,7 +230,7 @@
      department: Command
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorDarkBlue

 - type: loadout
@@ -235,9 +242,9 @@
      department: Engineering
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorOrange
-    
+
 - type: loadout
  id: TowelColorLightBlue
  effects:
@@ -247,7 +254,7 @@
      department: Medical
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorLightBlue

 - type: loadout
@@ -259,7 +266,7 @@
      department: Science
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorPurple

 - type: loadout
@@ -271,7 +278,7 @@
      department: Security
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorRed

 - type: loadout
@@ -283,7 +290,7 @@
      role: JobPassenger
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorGray

 - type: loadout
@@ -295,7 +302,7 @@
      role: JobChaplain
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorBlack

 - type: loadout
@@ -307,7 +314,7 @@
      role: JobLibrarian
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorDarkGreen

 - type: loadout
@@ -319,7 +326,7 @@
      role: JobLawyer
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorMaroon

 - type: loadout
@@ -331,7 +338,7 @@
      role: JobClown
      time: 360000 # 100hr
  storage:
-    back: 
+    back:
    - TowelColorYellow

 - type: loadout
@@ -343,5 +350,5 @@
      role: JobMime
      time: 360000 # 100hr
  storage:
-    back: 
-    - TowelColorMime
+    back:
+    - TowelColorMime
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -7,6 +7,7 @@
  loadouts:
  - FlowerWreath
  - Hairflower
+  - Headphones
  - PlushieLizard
  - PlushieSpaceLizard
  - Lighter
@@ -42,7 +43,6 @@
  - TowelColorPurple
  - TowelColorRed
  - TowelColorSilver
-  - TowelColorLightBlue
  - TowelColorWhite
  - TowelColorYellow

--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
@@ -24,6 +24,14 @@
            - material: Steel
              amount: 1
              doAfter: 2.0
+        - to: emergencyLight
+          steps:
+            - material: Steel
+              amount: 1
+              doAfter: 1.0
+            - material: Glass
+              amount: 1
+              doAfter: 1.0
    - node: tubeLight
      entity: PoweredlightEmpty
      edges:
@@ -83,4 +91,19 @@
            - !type:SpawnPrototype
              prototype: SheetSteel1
              amount: 1
-            - !type:DeleteEntity {}
+            - !type:DeleteEntity {}
+    - node: emergencyLight
+      entity: EmergencyLight
+      edges:
+        - to: start
+          steps:
+            - tool: Screwing
+              doAfter: 2.0
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetSteel1
+              amount: 1
+            - !type:SpawnPrototype
+              prototype: SheetGlass1
+              amount: 1
+            - !type:DeleteEntity {}
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -1456,6 +1456,24 @@
  # Same here. - 20kdc
    - !type:TileNotBlocked

+- type: construction
+  name: emergency light
+  id: EmergencyLightFixture
+  graph: LightFixture
+  startNode: start
+  targetNode: emergencyLight
+  category: construction-category-structures
+  description: An emergency light.
+  icon:
+    sprite: Structures/Wallmounts/Lighting/emergency_light.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
  name: ground light post
  id: LightGroundFixture
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1779,6 +1779,67 @@
    FoodOrange: 1
    FoodAmbrosiaVulgaris: 1

+# Muffins
+
+- type: microwaveMealRecipe
+  id: RecipeMuffin
+  name: muffin recipe
+  result: FoodBakedMuffin
+  time: 15
+  solids:
+    FoodPlateMuffinTin: 1
+    FoodDoughSlice: 1
+  reagents:
+    Sugar: 10
+
+- type: microwaveMealRecipe
+  id: RecipeMuffinChocolate
+  name: chocolate muffin recipe
+  result: FoodBakedMuffinChocolate
+  time: 15
+  solids:
+    FoodPlateMuffinTin: 1
+    FoodDoughSlice: 1
+    FoodSnackChocolateBar: 1
+  reagents:
+    Sugar: 10
+
+- type: microwaveMealRecipe
+  id: RecipeMuffinBerry
+  name: berry muffin recipe
+  result: FoodBakedMuffinBerry
+  time: 15
+  solids:
+    FoodPlateMuffinTin: 1
+    FoodDoughSlice: 1
+    FoodBerries: 1
+  reagents:
+    Sugar: 10
+
+- type: microwaveMealRecipe
+  id: RecipeMuffinBanana
+  name: banana muffin recipe
+  result: FoodBakedMuffinBanana
+  time: 15
+  solids:
+    FoodPlateMuffinTin: 1
+    FoodDoughSlice: 1
+    FoodBanana: 1
+  reagents:
+    Sugar: 10
+
+- type: microwaveMealRecipe
+  id: RecipeMuffinCherry
+  name: cherry muffin recipe
+  result: FoodBakedMuffinCherry
+  time: 15
+  solids:
+    FoodPlateMuffinTin: 1
+    FoodDoughSlice: 1
+    FoodCherry: 3
+  reagents:
+    Sugar: 10
+
 # NOT ACTUAL FOOD

 - type: microwaveMealRecipe
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml
@@ -8,6 +8,6 @@
      steps:
      - material: Cloth
        amount: 2
-        doAfter: 10
+        doAfter: 3
  - node: gauze
    entity: Gauze1
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml
@@ -41,13 +41,13 @@
      - material: WebSilk
        amount: 12
        doAfter: 6
-        
+
    - to: boots
      steps:
      - material: WebSilk
        amount: 2
        doAfter: 4
-        
+
  # Deconstruction
  - node: tile
    entity: FloorTileItemWeb
--- a/Resources/Prototypes/Recipes/Lathes/botany.yml
+++ b/Resources/Prototypes/Recipes/Lathes/botany.yml
@@ -1,39 +1,39 @@
+# Base prototypes
+
 - type: latheRecipe
-  id: MiniHoe
-  result: HydroponicsToolMiniHoe
-  completetime: 2
+  abstract: true
+  parent: BaseToolRecipe
+  id: BaseHydroToolRecipe
  materials:
    Steel: 200
    Plastic: 100

+# Recipes
+
 - type: latheRecipe
+  parent: BaseHydroToolRecipe
+  id: HydroponicsToolMiniHoe
+  result: HydroponicsToolMiniHoe
+
+- type: latheRecipe
+  parent: BaseHydroToolRecipe
  id: HydroponicsToolScythe
  result: HydroponicsToolScythe
-  completetime: 2
  materials:
    Steel: 300
    Plastic: 200

 - type: latheRecipe
+  parent: BaseHydroToolRecipe
  id: HydroponicsToolHatchet
  result: HydroponicsToolHatchet
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 100

 - type: latheRecipe
-  id: Spade
+  parent: BaseHydroToolRecipe
+  id: HydroponicsToolSpade
  result: HydroponicsToolSpade
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 100
-    
+
 - type: latheRecipe
-  id: Clippers
+  parent: BaseHydroToolRecipe
+  id: HydroponicsToolClippers
  result: HydroponicsToolClippers
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 100
--- a/Resources/Prototypes/Recipes/Lathes/cooking.yml
+++ b/Resources/Prototypes/Recipes/Lathes/cooking.yml
@@ -1,67 +1,65 @@
 - type: latheRecipe
+  parent: BaseToolRecipe
  id: ButchCleaver
  result: ButchCleaver
-  completetime: 2
  materials:
    Steel: 300
    Plastic: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: KitchenKnife
  result: KitchenKnife
-  completetime: 2
  materials:
    Steel: 200
    Plastic: 50

 - type: latheRecipe
-  id: DrinkMug
-  result: DrinkMug
+  abstract: true
+  id: BaseGlasswareRecipe
  completetime: 0.8
  materials:
    Glass: 100

 - type: latheRecipe
+  parent: BaseGlasswareRecipe
+  id: DrinkMug
+  result: DrinkMug
+
+- type: latheRecipe
+  parent: DrinkMug
  id: DrinkMugMetal
  result: DrinkMugMetal
-  completetime: 0.8
  materials:
    Steel: 100

 - type: latheRecipe
+  parent: DrinkMug
  id: DrinkGlass
  result: DrinkGlass
-  completetime: 0.8
-  materials:
-    Glass: 100

 - type: latheRecipe
+  parent: DrinkMug
  id: DrinkShotGlass
  result: DrinkShotGlass
  completetime: 0.4
-  materials:
-    Glass: 100

 - type: latheRecipe
+  parent: DrinkMug
  id: DrinkGlassCoupeShaped
  result: DrinkGlassCoupeShaped
-  completetime: 0.8
-  materials:
-    Glass: 100

- type: latheRecipe 
-  id: CustomDrinkJug 
-  result: CustomDrinkJug 
-  completetime: 2 
-  materials: 
-    Plastic: 200
-    
 - type: latheRecipe
+  id: CustomDrinkJug
+  result: CustomDrinkJug
+  completetime: 2
+  materials:
+    Plastic: 200
+
+- type: latheRecipe
+  parent: BaseGlasswareRecipe
  id: FoodPlate
  result: FoodPlate
-  completetime: 0.8
-  materials:
-    Glass: 100

 - type: latheRecipe
  id: FoodPlateSmall
@@ -71,25 +69,23 @@
    Glass: 50

 - type: latheRecipe
+  parent: FoodPlate
  id: FoodPlatePlastic
  result: FoodPlatePlastic
-  completetime: 0.8
  materials:
    Plastic: 100

 - type: latheRecipe
+  parent: FoodPlateSmall
  id: FoodPlateSmallPlastic
  result: FoodPlateSmallPlastic
-  completetime: 0.4
  materials:
    Plastic: 50

 - type: latheRecipe
+  parent: FoodPlate
  id: FoodBowlBig
  result: FoodBowlBig
-  completetime: 0.8
-  materials:
-    Glass: 100

 - type: latheRecipe
  id: FoodPlateTin
@@ -98,6 +94,13 @@
  materials:
    Steel: 100

+- type: latheRecipe
+  parent: FoodPlateTin
+  id: FoodPlateMuffinTin
+  result: FoodPlateMuffinTin
+  materials:
+    Steel: 50
+
 - type: latheRecipe
  id: FoodKebabSkewer
  result: FoodKebabSkewer
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -1,51 +1,46 @@
+# Base prototypes
+
 - type: latheRecipe
+  abstract: true
+  parent: BaseToolRecipe
+  id: BaseSurgicalRecipe
+  materials:
+    Steel: 200
+
+# Recipes
+
+- type: latheRecipe
+  parent: BaseSurgicalRecipe
  id: Scalpel
  result: Scalpel
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200

 - type: latheRecipe
+  parent: BaseSurgicalRecipe
  id: Retractor
  result: Retractor
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200

 - type: latheRecipe
+  parent: BaseSurgicalRecipe
  id: Cautery
  result: Cautery
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Drill
  result: Drill
-  category: Tools
-  completetime: 2
  materials:
    Steel: 200
    Plastic: 100

 - type: latheRecipe
+  parent: BaseSurgicalRecipe
  id: Saw
  result: Saw
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200

 - type: latheRecipe
+  parent: BaseSurgicalRecipe
  id: Hemostat
  result: Hemostat
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200

 - type: latheRecipe
  id: BodyBag
@@ -75,7 +70,7 @@
  result: Gauze1
  completetime: 1
  materials:
-    Cloth: 200
+    Cloth: 100 # lathe more efficient than handcrafting

 - type: latheRecipe
  id: HandheldHealthAnalyzer
@@ -140,66 +135,51 @@
    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitBurn
  result: MedkitBurn
  name: lathe-recipe-MedkitBurn-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitToxin
  result: MedkitToxin
  name: lathe-recipe-MedkitToxin-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitO2
  result: MedkitO2
  name: lathe-recipe-MedkitO2-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitBrute
  result: MedkitBrute
  name: lathe-recipe-MedkitBrute-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitAdvanced
  result: MedkitAdvanced
  name: lathe-recipe-MedkitAdvanced-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitRadiation
  result: MedkitRadiation
  name: lathe-recipe-MedkitRadiation-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: Medkit
  id: MedkitCombat
  result: MedkitCombat
  name: lathe-recipe-MedkitCombat-name
-  completetime: 2
-  materials:
-    Plastic: 300

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: HandLabeler
  result: HandLabeler
-  category: Tools
-  completetime: 2
  materials:
    Plastic: 100

@@ -219,20 +199,14 @@
    Plastic: 300

 - type: latheRecipe
+  parent: RollerBedSpawnFolded
  id: CheapRollerBedSpawnFolded
  result: CheapRollerBedSpawnFolded
-  completetime: 1
-  materials:
-    Steel: 600
-    Plastic: 300

 - type: latheRecipe
+  parent: RollerBedSpawnFolded
  id: EmergencyRollerBedSpawnFolded
  result: EmergencyRollerBedSpawnFolded
-  completetime: 1
-  materials:
-    Steel: 600
-    Plastic: 300

 - type: latheRecipe
  id: WhiteCane
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -1,40 +1,51 @@
+# Base prototypes
+
 - type: latheRecipe
+  abstract: true
+  id: BaseToolRecipe
+  category: Tools
+  completetime: 2
+  materials:
+    Steel: 200
+    Plastic: 50
+
+- type: latheRecipe
+  abstract: true
+  parent: BaseToolRecipe
+  id: BaseBigToolRecipe
+  materials:
+    Steel: 800
+    Glass: 300
+
+# Recipes
+
+- type: latheRecipe
+  parent: BaseToolRecipe
  id: Wirecutter
+  result: Wirecutter
  icon:
    sprite: Objects/Tools/wirecutters.rsi
    state: cutters-map
-  result: Wirecutter
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Screwdriver
+  result: Screwdriver
  icon:
    sprite: Objects/Tools/screwdriver.rsi
    state: screwdriver-map
-  result: Screwdriver
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Welder
  result: Welder
-  category: Tools
-  completetime: 2
  materials:
    Steel: 400

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Wrench
  result: Wrench
-  category: Tools
-  completetime: 2
  materials:
    Steel: 200

@@ -42,155 +53,122 @@
  id: CableStack
  result: CableApcStack1
  category: Parts
-  completetime: 2
+  completetime: 0.1
  materials:
    Steel: 30

 - type: latheRecipe
+  parent: CableStack
  id: CableMVStack
  result: CableMVStack1
-  category: Parts
-  completetime: 2
-  materials:
-    Steel: 30

 - type: latheRecipe
+  parent: CableStack
  id: CableHVStack
  result: CableHVStack1
-  category: Parts
-  completetime: 2
-  materials:
-    Steel: 30

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: CrowbarGreen
  result: CrowbarGreen
-  category: Tools
-  completetime: 2
  materials:
    Steel: 200

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Pickaxe
  result: Pickaxe
-  category: Tools
  completetime: 4
  materials:
    Steel: 1000
    Wood: 500

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Shovel
  result: Shovel
-  category: Tools
-  completetime: 2
  materials:
    Steel: 200
    Wood: 100

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: Multitool
  result: Multitool
-  category: Tools
-  completetime: 2
  materials:
    Steel: 200
    Plastic: 200

 - type: latheRecipe
+  parent: Multitool
  id: NetworkConfigurator
  result: NetworkConfigurator
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 200
-    Plastic: 200

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: PowerDrill
  result: PowerDrill
-  category: Tools
-  completetime: 2
  materials:
    Steel: 600
    Plastic: 200

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: RCD
  result: RCDEmpty
-  category: Tools
  completetime: 4
  materials:
    Steel: 1000
    Plastic: 300

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: RCDAmmo
  result: RCDAmmo
-  category: Tools
-  completetime: 2.4
  materials:
    Steel: 500
    Plastic: 250

 - type: latheRecipe
+  parent: BaseBigToolRecipe
  id: HandHeldMassScanner
  result: HandHeldMassScannerEmpty
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 800
-    Glass: 300

 - type: latheRecipe
+  parent: BaseBigToolRecipe
  id: HandheldGPSBasic
  result: HandheldGPSBasic
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 800
-    Glass: 300

 - type: latheRecipe
+  parent: BaseBigToolRecipe
  id: TRayScanner
  result: trayScanner
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 800
-    Glass: 300

 - type: latheRecipe
+  parent: BaseBigToolRecipe
  id: GasAnalyzer
  result: GasAnalyzer
-  category: Tools
-  completetime: 2
-  materials:
-    Steel: 800
-    Glass: 300

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: SprayPainter
  result: SprayPainter
-  category: Tools
-  completetime: 2
  materials:
    Steel: 300
    Plastic: 100

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: UtilityBelt
  result: ClothingBeltUtility
-  category: Tools
-  completetime: 2
  materials:
    Cloth: 100
    Steel: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: HolofanProjector
  result: HolofanProjectorEmpty
-  category: Tools
  completetime: 8
  materials:
    Steel: 300
@@ -198,18 +176,18 @@
    Plastic: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: WelderExperimental
  result: WelderExperimental
-  category: Tools
  completetime: 6
  materials:
    Steel: 800
    Plasma: 200

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: JawsOfLife
  result: JawsOfLife
-  category: Tools
  completetime: 6
  materials:
    Steel: 1000
@@ -218,9 +196,9 @@
    Gold: 50

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: HoloprojectorField
  result: HoloprojectorFieldEmpty
-  category: Tools
  completetime: 3
  materials:
    Steel: 500
@@ -228,9 +206,9 @@
    Glass: 100

 - type: latheRecipe
+  parent: BaseToolRecipe
  id: WeaponParticleDecelerator
  result: WeaponParticleDecelerator
-  category: Tools
  completetime: 6
  materials:
    Steel: 750
--- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
@@ -1,4 +1,4 @@
- type: job
+- type: job
  id: ServiceWorker
  name: job-name-serviceworker
  description: job-description-serviceworker
@@ -7,7 +7,6 @@
  startingGear: ServiceWorkerGear
  icon: "JobIconServiceWorker"
  supervisors: job-supervisors-service
-  canBeAntag: false
  access:
  - Service
  - Maintenance
--- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
@@ -49,10 +49,6 @@
  permanentComponents:
  - type: Item
    size: Huge
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: [ ]
  - type: Storage
    maxItemSize: Huge
    grid:
@@ -163,9 +159,6 @@
    components:
    - Item
  permanentComponents:
-  - type: ContainerContainer
-    containers:
-      revolver-ammo: !type:Container
  - type: RevolverAmmoProvider
    whitelist:
      tags:
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1071,6 +1071,9 @@
 - type: Tag
  id: Plunger

+- type: Tag
+  id: PlushieCarp
+
 - type: Tag
  id: PlushieGhost