Merge branch 'master' into air-alarm-fixup

2022-08-23 13:21:05 -07:00
parent a8eb929d3c c4d0cddeda
commit f00a5cb17a
498 changed files with 21068 additions and 52226 deletions
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,128 +1,4 @@
 Entries:
- author: metalgearsloth
-  changes:
-  - {message: Anchoring now shows popups, type: Add}
-  id: 1662
-  time: '2022-06-05T23:04:40.0000000+00:00'
- author: WilliamECrew
-  changes:
-  - {message: 'When dumping contents out of a bag, items will now be spread out randomly
-      instead of all being dumped into the same exact spot.', type: Tweak}
-  id: 1663
-  time: '2022-06-06T00:34:44.0000000+00:00'
- author: Rane
-  changes:
-  - {message: Stethoscopes have been ported over from Nyanotrasen. Wear one on your
-      neck and right click on someone else to listen to their chest., type: Add}
-  id: 1664
-  time: '2022-06-06T01:37:29.0000000+00:00'
- author: youarereadingthis
-  changes:
-  - {message: Removed the shuttle powering crate from the cargo ordering console.,
-    type: Remove}
-  id: 1665
-  time: '2022-06-06T08:34:07.0000000+00:00'
- author: Rane
-  changes:
-  - {message: Added mute toxin., type: Add}
-  - {message: Silencer now mutes you., type: Add}
-  id: 1666
-  time: '2022-06-06T08:35:25.0000000+00:00'
- author: Veritius
-  changes:
-  - {message: You can now opt in to being a nukie., type: Fix}
-  id: 1667
-  time: '2022-06-07T02:43:54.0000000+00:00'
- author: Pancake
-  changes:
-  - {message: The Syndicate have gotten more creative with their names., type: Tweak}
-  id: 1668
-  time: '2022-06-07T03:41:22.0000000+00:00'
- author: Zumorica
-  changes:
-  - {message: Fixed shutter construction not working properly when using a wrench
-      on it., type: Fix}
-  id: 1669
-  time: '2022-06-08T07:50:23.0000000+00:00'
- author: Peptide90
-  changes:
-  - {message: Counters and tables now take more damage to destroy., type: Tweak}
-  id: 1670
-  time: '2022-06-08T08:47:30.0000000+00:00'
- author: themias
-  changes:
-  - {message: Fixed an issue where Omnitools and Jaws of Life sometimes don't pry
-      floor tiles, type: Fix}
-  id: 1671
-  time: '2022-06-08T09:25:48.0000000+00:00'
- author: ElectroJr
-  changes:
-  - {message: Matches can once again be lit using match boxes., type: Fix}
-  id: 1672
-  time: '2022-06-09T02:39:29.0000000+00:00'
- author: lapatison
-  changes:
-  - {message: changed color of opened airlock maint. panel, type: Add}
-  id: 1673
-  time: '2022-06-09T02:41:29.0000000+00:00'
- author: juliangiebel
-  changes:
-  - {message: Added network configuration functionality to multitools, type: Add}
-  - {message: 'Air alarms can be tied to specific vents, scrubbers and firelocks',
-    type: Tweak}
-  id: 1674
-  time: '2022-06-10T01:28:24.0000000+00:00'
- author: themias
-  changes:
-  - {message: Captain and HoP PDA pen slots now hold just pens, type: Fix}
-  id: 1675
-  time: '2022-06-10T18:53:56.0000000+00:00'
- author: metalgearsloth
-  changes:
-  - {message: Nukies are fixed again., type: Fix}
-  id: 1676
-  time: '2022-06-11T14:18:58.0000000+00:00'
- author: EmoGarbage404
-  changes:
-  - {message: A greater variety of miscellaneous trash can now be found around the
-      station., type: Tweak}
-  id: 1677
-  time: '2022-06-11T14:25:38.0000000+00:00'
- author: moony
-  changes:
-  - {message: 'Slowed down parallax significiantly. Space should feel much, much vaster
-      now.', type: Tweak}
-  id: 1678
-  time: '2022-06-11T20:59:31.0000000+00:00'
- author: EmoGarbage404
-  changes:
-  - {message: You can no longer eat chocolate bars through their wrappers or spawn
-      infinite wrappers from certain snacks., type: Fix}
-  id: 1679
-  time: '2022-06-12T01:06:52.0000000+00:00'
- author: themias
-  changes:
-  - {message: Stun batons now use internal battery instead of a power cell; can be
-      inserted into a recharger again, type: Tweak}
-  id: 1680
-  time: '2022-06-12T01:20:03.0000000+00:00'
- author: Zumorica
-  changes:
-  - {message: Fixed round end sounds playing even if you have the "Lobby & Round-end
-      Music" option disabled in the game's settings., type: Fix}
-  id: 1681
-  time: '2022-06-12T01:23:29.0000000+00:00'
- author: TimrodDX
-  changes:
-  - {message: Waystation now has cameras., type: Add}
-  id: 1682
-  time: '2022-06-12T01:28:19.0000000+00:00'
- author: ninruB
-  changes:
-  - {message: 'Added ore bags, a funky new bag for salvage specialists that can be
-      found in their lockers!', type: Add}
-  id: 1683
-  time: '2022-06-12T01:57:02.0000000+00:00'
 - author: EmoGarbage404
  changes:
  - {message: Items now correctly pass through plastic flaps. Cargo players rejoice!,
@@ -2932,3 +2808,140 @@ Entries:
  - {message: Removed the ability to point while asleep, type: Fix}
  id: 2161
  time: '2022-08-16T04:22:17.0000000+00:00'
+- author: vulppine
+  changes:
+  - {message: "FunTime Arcade Solutions\u2122 has outfitted NanoTrasen stations with\
+      \ a new supply of arcade toys! Come spend your free time at the arcade machines\
+      \ for exciting, fun objects!", type: Add}
+  id: 2162
+  time: '2022-08-16T09:57:40.0000000+00:00'
+- author: Hoid
+  changes:
+  - {message: Experimental Research Hardsuit now protects more effectively against
+      things that can go wrong in the lab - including explosions., type: Tweak}
+  id: 2163
+  time: '2022-08-16T11:16:18.0000000+00:00'
+- author: martin69420
+  changes:
+  - {message: Fixed missing death sprite for holocarp and magicarp, type: Fix}
+  id: 2164
+  time: '2022-08-16T13:41:26.0000000+00:00'
+- author: martin69420
+  changes:
+  - {message: 'Added descriptions to many entities, including most signs.', type: Add}
+  - {message: Fixed typos on a few descriptions., type: Tweak}
+  id: 2165
+  time: '2022-08-17T00:56:54.0000000+00:00'
+- author: ElectroJr
+  changes:
+  - {message: Fixed guns spawning w/o ammo., type: Fix}
+  id: 2166
+  time: '2022-08-17T03:44:43.0000000+00:00'
+- author: EmoGarbage404
+  changes:
+  - {message: The Syndicate Zombie Bundle has been readded for Nuclear Operatives
+      for 40 TC., type: Add}
+  - {message: Nuclear Operatives can no longer purchase Holoparasites or Surplus bundles.,
+    type: Tweak}
+  - {message: Empty Uplink categories no longer show up in the menu., type: Tweak}
+  id: 2167
+  time: '2022-08-17T04:34:25.0000000+00:00'
+- author: JustinTrotter
+  changes:
+  - {message: 'Uniform printer can now print musician, clown, and mime winter coats',
+    type: Tweak}
+  id: 2168
+  time: '2022-08-18T02:22:30.0000000+00:00'
+- author: JustinTrotter
+  changes:
+  - {message: Nettle soup recipe works now, type: Tweak}
+  id: 2169
+  time: '2022-08-18T02:30:30.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Tweaks to bullet flyby sounds to be less grating., type: Tweak}
+  id: 2170
+  time: '2022-08-18T02:32:39.0000000+00:00'
+- author: metalgearsloth
+  changes:
+  - {message: Roundstart bag filling sounds should no longer play., type: Fix}
+  id: 2171
+  time: '2022-08-18T02:34:52.0000000+00:00'
+- author: EmoGarbage404
+  changes:
+  - {message: Machine boards now have different appearances depending on department.,
+    type: Tweak}
+  id: 2172
+  time: '2022-08-19T00:10:20.0000000+00:00'
+- author: Elijahrane
+  changes:
+  - {message: You no longer get better at pushing people over the worse you are at
+      disarming., type: Fix}
+  id: 2173
+  time: '2022-08-20T02:14:55.0000000+00:00'
+- author: EmoGarbage404
+  changes:
+  - {message: Shot glasses can now only hold 10u of liquid., type: Tweak}
+  id: 2174
+  time: '2022-08-20T02:27:48.0000000+00:00'
+- author: EmoGarbage404
+  changes:
+  - {message: Most circuitry has been resprited., type: Tweak}
+  - {message: Most computers now have department-based sprites for their circuit board.,
+    type: Add}
+  id: 2175
+  time: '2022-08-20T02:50:19.0000000+00:00'
+- author: EmoGarbage404
+  changes:
+  - {message: The blurry effect from eye damage has been replaced with a dim overlay
+      filter., type: Tweak}
+  id: 2176
+  time: '2022-08-20T20:17:58.0000000+00:00'
+- author: EmoGarbage404
+  changes:
+  - {message: 'Added the classic "space station 14" sign, coming to a station near
+      you.', type: Add}
+  id: 2177
+  time: '2022-08-21T11:44:38.0000000+00:00'
+- author: martin69420
+  changes:
+  - {message: Fixed playtime requirement tooltips not showing on roles with no open
+      slots, type: Fix}
+  - {message: Tweaked playtime requirement tooltip text slightly, type: Tweak}
+  id: 2178
+  time: '2022-08-21T19:14:24.0000000+00:00'
+- author: Myctai
+  changes:
+  - {message: 'Barozine in overdose will cause you to vomit, potentially saving you
+      from fatal poisoning!', type: Add}
+  id: 2179
+  time: '2022-08-22T08:50:46.0000000+00:00'
+- author: Flareguy
+  changes:
+  - {message: 'Touched up and re-shaded the Medical, Cargo, and Scientist jumpsuit
+      sprites.', type: Tweak}
+  - {message: Touched up and re-shaded all three labcoats., type: Tweak}
+  - {message: Medical backpacks and satchels now correctly use a blue cross instead
+      of a green one., type: Tweak}
+  - {message: Recolored the Cargo cap to reflect the new colors the jumpsuit has.,
+    type: Tweak}
+  - {message: Gave the Quartermaster a unique recolored cap that reflects his new
+      jumpsuit colors., type: Add}
+  id: 2180
+  time: '2022-08-23T02:28:11.0000000+00:00'
+- author: TekuNut
+  changes:
+  - {message: Xenos can no longer pry doors open from afar., type: Fix}
+  id: 2181
+  time: '2022-08-23T10:31:54.0000000+00:00'
+- author: ElectroJr
+  changes:
+  - {message: Fixed players being unable to suppress their inner ballerina (fix player's
+      getting stuck with angular velocity. no more eternal spinning)., type: Fix}
+  id: 2182
+  time: '2022-08-23T11:59:47.0000000+00:00'
+- author: EmoGarbage404
+  changes:
+  - {message: Shields no longer randomly break upon healing the user., type: Fix}
+  id: 2183
+  time: '2022-08-23T12:00:06.0000000+00:00'
--- a/Resources/Locale/en-US/access/components/id-card-console-component.ftl
+++ b/Resources/Locale/en-US/access/components/id-card-console-component.ftl
@@ -5,7 +5,7 @@ id-card-console-window-save-button = Save
 id-card-console-window-job-title-label = Job title:
 id-card-console-window-eject-button = Eject
 id-card-console-window-insert-button = Insert
-id-card-console-window-job-selection-label = Job presets:
+id-card-console-window-job-selection-label = Job presets (sets department and job icon):

 access-id-card-console-component-no-hands-error = You have no hands.
 id-card-console-privileged-id = Privileged ID
--- a/Resources/Locale/en-US/administration/smites.ftl
+++ b/Resources/Locale/en-US/administration/smites.ftl
@@ -11,6 +11,7 @@ admin-smite-remove-hands-other = {CAPITALIZE($name)}'s hands fall off!
 admin-smite-turned-ash-other = {CAPITALISE($name)} turns into a pile of ash!
 admin-smite-stomach-removal-self = Your stomach feels hollow...
 admin-smite-run-walk-swap-prompt = You have to press shift to run!
+admin-smite-super-speed-prompt = You move at mach 0.8!
 admin-smite-lung-removal-self = You can't breath!


@@ -47,6 +48,7 @@ admin-smite-maid-description = Forcibly converts them into a janitorial cat maid
 admin-smite-zoom-in-description = Zooms in their view so that they can no longer see their surroundings.
 admin-smite-flip-eye-description = Flips their view, effectively reversing their controls and making the game annoying to play.
 admin-smite-run-walk-swap-description = Swaps running and walking, forcing them to hold shift to move fast.
+admin-smite-super-speed-description = Makes them really fast, causing them to turn into gibs when hitting a wall.
 admin-smite-stomach-removal-description = Removes their stomach, rendering them unable to eat.
 admin-smite-speak-backwards-description = Forces them to speak backwards, so they can't call for help.
 admin-smite-lung-removal-description = Removes their lungs, drowning them.
--- a/Resources/Locale/en-US/components/storage-component.ftl
+++ b/Resources/Locale/en-US/components/storage-component.ftl
@@ -1,4 +1,4 @@
-comp-storage-no-item-size = None
+comp-storage-no-item-size = N/A
 comp-storage-cant-insert = Can't insert.
 comp-storage-insufficient-capacity = Insufficient capacity.
 comp-storage-invalid-container = Invalid container for this item.
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -3,9 +3,15 @@ whitelist-not-whitelisted-rp = You are not whitelisted. To become whitelisted, v

 command-whitelistadd-description = Adds the player with the given username to the server whitelist.
 command-whitelistadd-help = whitelistadd <username>
+command-whitelistadd-existing = {$username} is already on the whitelist!
+command-whitelistadd-added = {$username} added to the whitelist
+command-whitelistadd-not-found = Unable to find '{$username}'

 command-whitelistremove-description = Removes the player with the given username from the server whitelist.
 command-whitelistremove-help = whitelistremove <username>
+command-whitelistremove-existing = {$username} is not on the whitelist!
+command-whitelistremove-removed = {$username} removed from the whitelist
+command-whitelistremove-not-found = Unable to find '{$username}'

 command-kicknonwhitelisted-description = Kicks all non-whitelisted players from the server.
 command-kicknonwhitelisted-help = kicknonwhitelisted
--- a/Resources/Locale/en-US/construction/construction-categories.ftl
+++ b/Resources/Locale/en-US/construction/construction-categories.ftl
@@ -1,4 +1,5 @@
-construction-category-furniture = Furniture
+construction-category-all = All
+construction-category-furniture = Furniture
 construction-category-storage = Storage
 construction-category-tools = Tools
 construction-category-materials = Materials
--- a/Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl
+++ b/Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl
@@ -1,5 +1,4 @@
-construction-presenter-category-all = All
-construction-presenter-to-craft = To craft this item, you need to:
+construction-presenter-to-craft = To craft this item, you need to:
 construction-presenter-to-build = To build this, first you need to:

 construction-presenter-step-wrapper = {$step-number}. {$text}
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -169,4 +169,8 @@ ui-options-function-shuttle-brake = Brake

 ## Network menu

-ui-options-net-interp-ratio = Network Smoothing
+ui-options-net-interp-ratio = State buffer size
+ui-options-net-interp-ratio-tooltip = Increasing this will generally make the game
+                                      more resistant to packet-loss, however in doing
+                                      so it effectively adds slightly more latency and
+                                      requires the client to predict more future ticks.
--- a/Resources/Locale/en-US/guardian/guardian.ftl
+++ b/Resources/Locale/en-US/guardian/guardian.ftl
@@ -6,7 +6,8 @@ guardian-already-present-invalid-creation = You are NOT re-living that haunting
 guardian-no-actions-invalid-creation = You don't have the ability to host a guardian!
 guardian-activator-empty-invalid-creation = The injector is spent.
 guardian-activator-empty-examine = [color=#ba1919]The injector is spent.[/color]
-guardian-activator-invalid-target = Only humans can be injected! # Change this once other species can inject it?
+# TODO: Change this once other species can inject it?
+guardian-activator-invalid-target = Only humans can be injected!
 guardian-no-soul = Your guardian has no soul.
 guardian-available = Your guardian now has a soul.

--- a/Resources/Locale/en-US/job/role-timers.ftl
+++ b/Resources/Locale/en-US/job/role-timers.ftl
@@ -1,8 +1,8 @@
-role-timer-department-insufficient = Require {TOSTRING($time, "0")} more minutes in {$department} department.
-role-timer-department-too-high = Requires {TOSTRING($time, "0")} fewer minutes in {$department} department. (Are you trying to play a trainee role?)
-role-timer-overall-insufficient = Require {TOSTRING($time, "0")} more minutes of playtime.
-role-timer-overall-too-high = Require {TOSTRING($time, "0")} fewer minutes of playtime. (Are you trying to play a trainee role?)
-role-timer-role-insufficient = Require {TOSTRING($time, "0")} more minutes with {$job} for this role.
-role-timer-role-too-high = Require {TOSTRING($time, "0")} fewer minutes with {$job} for this role. (Are you trying to play a trainee role?)
+role-timer-department-insufficient = You require {TOSTRING($time, "0")} more minutes in {$department} department to play this role.
+role-timer-department-too-high = You require {TOSTRING($time, "0")} fewer minutes in {$department} department to play this role. (Are you trying to play a trainee role?)
+role-timer-overall-insufficient = You require {TOSTRING($time, "0")} more minutes of playtime to play this role.
+role-timer-overall-too-high = You require {TOSTRING($time, "0")} fewer minutes of playtime to play this role. (Are you trying to play a trainee role?)
+role-timer-role-insufficient = You require {TOSTRING($time, "0")} more minutes with {$job} to play this role.
+role-timer-role-too-high = You require {TOSTRING($time, "0")} fewer minutes with {$job} to play this role. (Are you trying to play a trainee role?)

 role-timer-locked = Locked (hover for details)
--- a/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl
+++ b/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl
@@ -1,16 +1,16 @@
-ent-WeldingFuelTank = Fuel tank
+ent-WeldingFuelTank = fuel tank
    .desc = A fuel tank. It's used to store high amounts of fuel.

 ent-WeldingFuelTankFull = { ent-WeldingFuelTank }
    .desc = { ent-WeldingFuelTank.desc }

-ent-WaterTank = Water tank
+ent-WaterTank = water tank
    .desc = A water tank. It's used to store high amounts of water.

 ent-WaterTankFull = { ent-WaterTank }
    .desc = { ent-WaterTank.desc }

-ent-WaterCooler = Water cooler
+ent-WaterCooler = water cooler
    .desc = Seems like a good place to stand and waste time.

 ent-WaterTankHighCapacity = High-capacity water tank
--- a/Resources/Locale/en-US/reagents/meta/elements.ftl
+++ b/Resources/Locale/en-US/reagents/meta/elements.ftl
@@ -50,7 +50,7 @@ reagent-name-sulfur = sulfur
 reagent-desc-sulfur = A yellow, crystalline solid.

 reagent-name-sodium = sodium
-reagent-desc-sodium = A silvery-white alkali metal. Highly reactive in its pure form. #thanks visne <3
+reagent-desc-sodium = A silvery-white alkali metal. Highly reactive in its pure form.

 reagent-name-uranium = uranium
 reagent-desc-uranium = A grey metallic chemical element in the actinide series, weakly radioactive.
--- a/Resources/Locale/en-US/store/currency.ftl
+++ b/Resources/Locale/en-US/store/currency.ftl
@@ -0,0 +1,14 @@
+store-currency-inserted = {CAPITALIZE(THE($used))} is inserted into the {THE($target)}.
+
+store-currency-free = Free
+store-currency-balance-display-debugdollar = Debug Dollar: {$amount}
+store-currency-price-display-debugdollar = {$amount ->
+    [one] {$amount} Debug Dollar
+    *[other] {$amount} Debug Dollars
+}
+
+store-currency-balance-display-telecrystal = TC: {$amount}
+store-currency-price-display-telecrystal = {$amount} TC
+
+store-currency-balance-display-stolen-essence = Stolen Essence: {$amount}
+store-currency-price-display-stolen-essence = {$amount} Stolen Essence
--- a/Resources/Locale/en-US/store/store.ftl
+++ b/Resources/Locale/en-US/store/store.ftl
@@ -0,0 +1,4 @@
+store-ui-default-title = Store
+store-ui-default-withdraw-text = Withdraw
+
+store-withdraw-button-ui = Withdraw {$currency}
--- a/Resources/Locale/en-US/tools/components/welder-component.ftl
+++ b/Resources/Locale/en-US/tools/components/welder-component.ftl
@@ -1,7 +1,7 @@
 welder-component-welder-not-lit-message = The welder is turned off!
 welder-component-cannot-weld-message = The welder does not have enough fuel for that!
 welder-component-no-fuel-message = The welder has no fuel left!
-welder-component-no-fuel-in-tank = {$owner} is empty
+welder-component-no-fuel-in-tank = The {$owner} is empty.
 welder-component-on-examine-welder-lit-message = [color=orange]Lit[/color]
 welder-component-on-examine-welder-not-lit-message = Not lit
 welder-component-on-examine-detailed-message = Fuel: [color={$colorName}]{$fuelLeft}/{$fuelCapacity}[/color]. {$status}
@@ -10,3 +10,4 @@ welder-component-suicide-lit-message = You weld your every orifice closed!
 welder-component-suicide-unlit-others-message = {$victim} bashes themselves with the unlit welding torch!
 welder-component-suicide-unlit-message = You bash yourself with the unlit welding torch!
 welder-component-after-interact-refueled-message = Refueled!
+welder-component-already-full = The welder is already full.
--- a/Resources/Maps/Salvage/small-4.yml
+++ b/Resources/Maps/Salvage/small-4.yml
@@ -5,56 +5,77 @@ meta:
  postmapinit: false
 tilemap:
  0: Space
-  1: FloorAsteroidCoarseSand0
-  2: FloorAsteroidCoarseSand1
-  3: FloorAsteroidCoarseSand2
-  4: FloorAsteroidCoarseSandDug
-  5: FloorAsteroidSand
-  6: FloorAsteroidTile
-  7: FloorBar
-  8: FloorBlue
-  9: FloorBlueCircuit
-  10: FloorClown
-  11: FloorDark
-  12: FloorElevatorShaft
-  13: FloorFreezer
-  14: FloorGlass
-  15: FloorGold
-  16: FloorGrass
-  17: FloorGreenCircuit
-  18: FloorHydro
-  19: FloorKitchen
-  20: FloorLaundry
-  21: FloorLino
-  22: FloorMime
-  23: FloorMono
-  24: FloorReinforced
-  25: FloorRGlass
-  26: FloorRockVault
-  27: FloorShowroom
-  28: FloorSilver
-  29: FloorSnow
-  30: FloorSteel
-  31: FloorSteelDirty
-  32: FloorTechMaint
-  33: FloorWhite
-  34: FloorWood
-  35: Lattice
-  36: Plating
-  37: Plating
+  1: FloorArcadeBlue
+  2: FloorArcadeBlue2
+  3: FloorArcadeRed
+  4: FloorAsteroidCoarseSand0
+  5: FloorAsteroidCoarseSandDug
+  6: FloorAsteroidIronsand1
+  7: FloorAsteroidIronsand2
+  8: FloorAsteroidIronsand3
+  9: FloorAsteroidIronsand4
+  10: FloorAsteroidSand
+  11: FloorAsteroidTile
+  12: FloorBar
+  13: FloorBlue
+  14: FloorBlueCircuit
+  15: FloorBoxing
+  16: FloorCarpetClown
+  17: FloorCarpetOffice
+  18: FloorCave
+  19: FloorCaveDrought
+  20: FloorClown
+  21: FloorDark
+  22: FloorDirt
+  23: FloorEighties
+  24: FloorElevatorShaft
+  25: FloorFreezer
+  26: FloorGlass
+  27: FloorGold
+  28: FloorGrass
+  29: FloorGrassDark
+  30: FloorGrassJungle
+  31: FloorGrassLight
+  32: FloorGreenCircuit
+  33: FloorGym
+  34: FloorHydro
+  35: FloorKitchen
+  36: FloorLaundry
+  37: FloorLino
+  38: FloorMetalDiamond
+  39: FloorMime
+  40: FloorMono
+  41: FloorRGlass
+  42: FloorReinforced
+  43: FloorRockVault
+  44: FloorShowroom
+  45: FloorShuttleBlue
+  46: FloorShuttleOrange
+  47: FloorShuttlePurple
+  48: FloorShuttleRed
+  49: FloorShuttleWhite
+  50: FloorSilver
+  51: FloorSnow
+  52: FloorSteel
+  53: FloorSteelDirty
+  54: FloorTechMaint
+  55: FloorWhite
+  56: FloorWood
+  57: Lattice
+  58: Plating
 grids:
 - settings:
    chunksize: 16
    tilesize: 1
  chunks:
-  - ind: "-1,-1"
-    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAACQAAAAkAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAkAAAABwAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAABwAAAAcAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAcAAAAHAAAABwAAAA==
-  - ind: "0,-1"
-    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAACQAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAkAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAACQAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-  - ind: "-1,0"
-    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAcAAAAHAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAHAAAABwAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAJAAAAAcAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-  - ind: "0,0"
-    tiles: BwAAAAcAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+  - ind: -1,-1
+    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAADoAAAA6AAAAOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADoAAAA6AAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6AAAADAAAAAwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAwAAAAMAAAADAAAAA==
+  - ind: 0,-1
+    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAADoAAAA5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAA6AAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAADoAAAA6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+  - ind: -1,0
+    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAwAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADoAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5AAAAOgAAAAwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+  - ind: 0,0
+    tiles: DAAAAAwAAAA5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAA5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
 entities:
 - uid: 0
  components:
@@ -63,323 +84,12 @@ entities:
    type: Transform
  - index: 0
    type: MapGrid
-  - linearDamping: 0.1
+  - angularDamping: 0.05
+    linearDamping: 0.05
    fixedRotation: False
    bodyType: Dynamic
    type: Physics
-  - fixtures:
-    - shape: !type:PolygonShape
-        vertices:
-        - -0.01,-3.99
-        - -0.01,-0.01
-        - -3.99,-0.01
-        - -3.99,-3.99
-      id: grid_chunk--3.99--3.99
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 63.3616
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 2.99,-3.99
-        - 2.99,-2.01
-        - 0.01,-2.01
-        - 0.01,-3.99
-      id: grid_chunk-0.01--3.99
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 23.6016
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 1.99,-1.99
-        - 1.99,-1.01
-        - 0.01,-1.01
-        - 0.01,-1.99
-      id: grid_chunk-0.01--1.99
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 7.7616
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 2.99,-0.99
-        - 2.99,-0.01
-        - 0.01,-0.01
-        - 0.01,-0.99
-      id: grid_chunk-0.01--0.99
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 11.681601
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -0.01,0.01
-        - -0.01,2.99
-        - -3.99,2.99
-        - -3.99,0.01
-      id: grid_chunk--3.99-0.01
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 47.4416
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 2.99,0.01
-        - 2.99,0.99
-        - 0.01,0.99
-        - 0.01,0.01
-      id: grid_chunk-0.01-0.01
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 11.681601
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 1.99,1.01
-        - 1.99,1.99
-        - 0.01,1.99
-        - 0.01,1.01
-      id: grid_chunk-0.01-1.01
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 7.7616
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 0.99,2.01
-        - 0.99,2.99
-        - 0.01,2.99
-        - 0.01,2.01
-      id: grid_chunk-0.01-2.01
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 3.8416002
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -3,-3
-        - -3,-1
-        - -4,-1
-        - -4,-3
-      id: grid_chunk--4--3
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 1,-2
-        - 1,-1
-        - 0,-1
-        - 0,-2
-      id: grid_chunk-0--2
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 4
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 0,-3
-        - 0,-2
-        - -1,-2
-        - -1,-3
-      id: grid_chunk--1--3
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 4
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -3,0
-        - -3,2
-        - -4,2
-        - -4,0
-      id: grid_chunk--4-0
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 3,0
-        - 3,2
-        - 2,2
-        - 2,0
-      id: grid_chunk-2-0
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 0,-2
-        - 0,-1
-        - -2,-1
-        - -2,-2
-      id: grid_chunk--2--2
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 0,-4
-        - 0,-3
-        - -4,-3
-        - -4,-4
-      id: grid_chunk--4--4
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 16
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 0,-1
-        - 0,0
-        - -4,0
-        - -4,-1
-      id: grid_chunk--4--1
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 16
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 0,1
-        - 0,2
-        - -1,2
-        - -1,1
-      id: grid_chunk--1-1
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 4
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 3,2
-        - 3,3
-        - 0,3
-        - 0,2
-      id: grid_chunk-0-2
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 1,0
-        - 1,1
-        - 0,1
-        - 0,0
-      id: grid_chunk-0-0
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 4
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 3,-3
-        - 3,-1
-        - 2,-1
-        - 2,-3
-      id: grid_chunk-2--3
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 3,-1
-        - 3,0
-        - 0,0
-        - 0,-1
-      id: grid_chunk-0--1
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 3,-4
-        - 3,-3
-        - 0,-3
-        - 0,-4
-      id: grid_chunk-0--4
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 0,2
-        - 0,3
-        - -4,3
-        - -4,2
-      id: grid_chunk--4-2
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 16
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 0,0
-        - 0,1
-        - -2,1
-        - -2,0
-      id: grid_chunk--2-0
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
+  - fixtures: []
    type: Fixtures
  - gravityShakeSound: !type:SoundPathSpecifier
      path: /Audio/Effects/alert.ogg
@@ -446,10 +156,10 @@ entities:
  - pos: -0.5,-0.5
    parent: 0
    type: Transform
-  - visible: False
-    type: Sprite
  - canCollide: False
    type: Physics
+  - fixtures: []
+    type: Fixtures
 - uid: 11
  type: WallSolid
  components:
@@ -481,8 +191,6 @@ entities:
  - pos: -3.3713274,1.6430573
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 16
  type: SignBar
  components:
@@ -501,30 +209,30 @@ entities:
  - pos: -0.5,0.5
    parent: 0
    type: Transform
-  - visible: False
-    type: Sprite
  - canCollide: False
    type: Physics
+  - fixtures: []
+    type: Fixtures
 - uid: 19
  type: CableApcExtension
  components:
  - pos: 0.5,0.5
    parent: 0
    type: Transform
-  - visible: False
-    type: Sprite
  - canCollide: False
    type: Physics
+  - fixtures: []
+    type: Fixtures
 - uid: 20
  type: CableApcExtension
  components:
  - pos: 1.5,0.5
    parent: 0
    type: Transform
-  - visible: False
-    type: Sprite
  - canCollide: False
    type: Physics
+  - fixtures: []
+    type: Fixtures
 - uid: 21
  type: Poweredlight
  components:
@@ -534,9 +242,11 @@ entities:
    type: Transform
  - powerLoad: 0
    type: ApcPowerReceiver
-  - containers:
-      light_bulb: !type:ContainerSlot {}
-    type: ContainerContainer
+  - inputs:
+      On: []
+      Off: []
+      Toggle: []
+    type: SignalReceiver
 - uid: 22
  type: GrilleBroken
  components:
@@ -579,8 +289,6 @@ entities:
  - pos: -2.5,-2.5
    parent: 0
    type: Transform
-  - enabled: False
-    type: AmbientSound
 - uid: 29
  type: DisposalUnit
  components:
@@ -599,12 +307,6 @@ entities:
    pos: 2.5,-0.5
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
-  - containers:
-      DisposalTransit: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 31
  type: DisposalPipe
  components:
@@ -612,12 +314,6 @@ entities:
    pos: 1.5,-0.5
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
-  - containers:
-      DisposalTransit: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 32
  type: DisposalPipe
  components:
@@ -625,14 +321,6 @@ entities:
    pos: 0.5,-0.5
    parent: 0
    type: Transform
-  - visible: False
-    type: Sprite
-  - canCollide: False
-    type: Physics
-  - containers:
-      DisposalTransit: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 33
  type: DisposalPipe
  components:
@@ -640,14 +328,6 @@ entities:
    pos: -0.5,-0.5
    parent: 0
    type: Transform
-  - visible: False
-    type: Sprite
-  - canCollide: False
-    type: Physics
-  - containers:
-      DisposalTransit: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 34
  type: DisposalPipe
  components:
@@ -655,14 +335,6 @@ entities:
    pos: -1.5,-0.5
    parent: 0
    type: Transform
-  - visible: False
-    type: Sprite
-  - canCollide: False
-    type: Physics
-  - containers:
-      DisposalTransit: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 35
  type: DisposalTrunk
  components:
@@ -670,14 +342,6 @@ entities:
    pos: -2.5,-0.5
    parent: 0
    type: Transform
-  - visible: False
-    type: Sprite
-  - canCollide: False
-    type: Physics
-  - containers:
-      DisposalEntry: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 36
  type: BoozeDispenser
  components:
@@ -685,21 +349,6 @@ entities:
    pos: 0.5,-2.5
    parent: 0
    type: Transform
-  - containers:
-      ReagentDispenser-beaker: !type:ContainerSlot {}
-    type: ContainerContainer
- uid: 37
-  type: KitchenReagentGrinder
-  components:
-  - rot: -1.5707963267948966 rad
-    pos: 1.5,-1.5
-    parent: 0
-    type: Transform
-  - containers:
-      ReagentGrinder-reagentContainerContainer: !type:ContainerSlot {}
-      ReagentGrinder-entityContainerContainer: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 38
  type: AirlockAssembly
  components:
@@ -718,16 +367,12 @@ entities:
  - rot: 1.2938857078552246 rad
    parent: 29
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 41
  type: ClothingHeadHatTophat
  components:
  - pos: -1.4423176,-0.6220329
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 42
  type: OrganHumanEyes
  components:
@@ -735,8 +380,6 @@ entities:
    pos: -0.92498416,-0.5751579
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 43
  type: OrganHumanTongue
  components:
@@ -744,8 +387,6 @@ entities:
    pos: -1.5187342,-1.4814079
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 44
  type: PuddleVomit
  components:
@@ -762,9 +403,11 @@ entities:
    type: Transform
  - powerLoad: 0
    type: ApcPowerReceiver
-  - containers:
-      light_bulb: !type:ContainerSlot {}
-    type: ContainerContainer
+  - inputs:
+      On: []
+      Off: []
+      Toggle: []
+    type: SignalReceiver
 - uid: 46
  type: FoodMeatXenoCutlet
  components:
@@ -777,18 +420,16 @@ entities:
  - pos: -1.640319,0.59786737
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 48
  type: CableApcExtension
  components:
  - pos: -0.5,-2.5
    parent: 0
    type: Transform
-  - visible: False
-    type: Sprite
  - canCollide: False
    type: Physics
+  - fixtures: []
+    type: Fixtures
 - uid: 49
  type: TableFrame
  components:
@@ -802,18 +443,16 @@ entities:
    pos: -1.1875,-1.421875
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 51
  type: CableApcExtension
  components:
  - pos: -0.5,-1.5
    parent: 0
    type: Transform
-  - visible: False
-    type: Sprite
  - canCollide: False
    type: Physics
+  - fixtures: []
+    type: Fixtures
 - uid: 52
  type: FloorTileItemBar
  components:
@@ -821,8 +460,6 @@ entities:
    pos: 1.1162573,1.2208744
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 53
  type: APCBasic
  components:
@@ -842,6 +479,8 @@ entities:
    type: Transform
  - canCollide: False
    type: Physics
+  - fixtures: []
+    type: Fixtures
 - uid: 55
  type: WallSolid
  components:
@@ -856,30 +495,26 @@ entities:
    type: Transform
  - canCollide: False
    type: Physics
+  - fixtures: []
+    type: Fixtures
 - uid: 57
  type: DrinkBottleOfNothingFull
  components:
  - pos: -0.640319,-2.4491396
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 58
  type: DrinkBottleOfNothingFull
  components:
  - pos: -0.280944,-2.4335146
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 59
  type: FoodDonutChaos
  components:
  - pos: -2.0778189,0.69161737
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 60
  type: DrinkFlask
  components:
@@ -887,38 +522,34 @@ entities:
    pos: -1.046569,1.8478675
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 61
  type: FoodMeatXenoCutlet
  components:
  - pos: -2.5569363,1.807127
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 62
  type: FoodMeatXeno
  components:
  - pos: -2.5100613,1.3540019
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 63
  type: FoodMeatXeno
  components:
  - pos: -2.2600613,1.1977519
    parent: 0
    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 64
  type: FoodMeatXeno
  components:
  - pos: 0.4864508,-1.117334
    parent: 0
    type: Transform
+- uid: 65
+  type: KitchenReagentGrinder
+  components:
+  - pos: 1.5,-1.5
+    parent: 0
+    type: Transform
 ...
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -10,6 +10,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 # For primates mainly
 - type: entity
--- a/Resources/Prototypes/Body/Parts/human.yml
+++ b/Resources/Prototypes/Body/Parts/human.yml
@@ -8,6 +8,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: TorsoHuman
--- a/Resources/Prototypes/Body/Parts/reptilian.yml
+++ b/Resources/Prototypes/Body/Parts/reptilian.yml
@@ -8,6 +8,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: TorsoReptilian
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -6,6 +6,11 @@
  components:
  - type: Damageable
    damageContainer: Inorganic
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: LeftArmBorg
--- a/Resources/Prototypes/Body/Parts/skeleton.yml
+++ b/Resources/Prototypes/Body/Parts/skeleton.yml
@@ -7,6 +7,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: TorsoSkeleton
--- a/Resources/Prototypes/Body/Parts/slime.yml
+++ b/Resources/Prototypes/Body/Parts/slime.yml
@@ -7,6 +7,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: TorsoSlime
--- a/Resources/Prototypes/Body/Parts/vox.yml
+++ b/Resources/Prototypes/Body/Parts/vox.yml
@@ -8,6 +8,11 @@
  components:
  - type: Damageable
    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []

 - type: entity
  id: TorsoVox
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -367,10 +367,22 @@
      - id: MagazineShotgunIncendiary
        amount: 6

+# base BallisticAmmoProvider boxes
+- type: entity
+  parent: BoxCardboard
+  id: BoxAmmoProvider
+  abstract: true
+  components:
+  - type: BallisticAmmoProvider
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+      storagebase: !type:Container
+
 # Shotgun Shells
 - type: entity
  name: box of shotgun beanbag cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxBeanbag
  description: A box full of beanbag shots, designed for riot shotguns.
  components:
@@ -384,7 +396,7 @@

 - type: entity
  name: box of shotgun lethal cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxLethalshot
  description: A box full of lethal pellet shots, designed for riot shotguns.
  components:
@@ -398,7 +410,7 @@

 - type: entity
  name: box of shotgun slug cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxShotgunSlug
  description: A box full of shotgun slugs, designed for riot shotguns.
  components:
@@ -412,7 +424,7 @@

 - type: entity
  name: box of shotgun flare cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxShotgunFlare
  description: A box full of shotgun flare cartridges, designed for riot shotguns.
  components:
@@ -426,7 +438,7 @@

 - type: entity
  name: box of shotgun incendiary cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxShotgunIncendiary
  description: A box full of shotgun incendiary cartridges, designed for riot shotguns.
  components:
@@ -440,7 +452,7 @@

 - type: entity
  name: box of shotgun practice cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxShotgunPractice
  description: A box full of shotgun practice cartridges, designed for riot shotguns.
  components:
@@ -454,7 +466,7 @@

 - type: entity
  name: box of tranquilizer cartridges
-  parent: BoxCardboard
+  parent: BoxAmmoProvider
  id: BoxShellTranquilizer
  description: A box full of tranquilizer cartridges, designed for riot shotguns.
  components:
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -14,7 +14,7 @@
        prob: 0.5
      - id: ClothingShoesColorBrown
        prob: 0.7
-      - id: ClothingHeadHatCargosoft
+      - id: ClothingHeadHatQMsoft
        prob: 0.8
      - id: SupplyRequestComputerCircuitboard
      - id: SupplyComputerCircuitboard
--- a/Resources/Prototypes/Catalog/catalog.yml
+++ b/Resources/Prototypes/Catalog/catalog.yml
@@ -0,0 +1,44 @@
+- type: listing
+  id: DebugListing
+  name: debug name
+  description: debug desc
+  categories: 
+    - Debug
+  cost: 
+    DebugDollar: 10
+    Telecrystal: 10
+
+- type: listing
+  id: DebugListing3
+  name: debug name 3
+  description: debug desc 3
+  categories: 
+    - Debug
+  cost: 
+    DebugDollar: 10
+
+- type: listing
+  id: DebugListing5
+  name: debug name 5
+  description: debug desc 5
+  categories: 
+    - Debug
+
+- type: listing
+  id: DebugListing4
+  name: debug name 4
+  description: debug desc 4
+  productAction: Scream
+  categories: 
+    - Debug
+  cost: 
+    DebugDollar: 1
+
+- type: listing
+  id: DebugListing2
+  name: debug name 2
+  description: debug desc 2
+  categories: 
+    - Debug2
+  cost: 
+    DebugDollar: 10
--- a/Resources/Prototypes/Catalog/revenant_catalog.yml
+++ b/Resources/Prototypes/Catalog/revenant_catalog.yml
@@ -1,32 +1,51 @@
-#TODO: generic shop system
- type: revenantListing
-  id: Defile
-  actionId: RevenantDefile
-  listingName: Defile
-  description: Costs 30 Essence per use. Defiles the surrounding area, ripping up floors, damaging windows, opening containers, and throwing items. Using it leaves you vulnerable to attacks for a short period of time.
-  icon: Interface/Actions/defile.png
-  price: 10
+- type: listing
+  id: RevenantDefile
+  name: Defile
+  description: Defiles the surrounding area, ripping up floors, damaging windows, opening containers, and throwing items. Using it leaves you vulnerable to attacks for a short period of time.
+  productAction: RevenantDefile
+  cost: 
+    StolenEssence: 10
+  categories:
+  - RevenantAbilities
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1

- type: revenantListing
-  id: OverloadLights
-  actionId: RevenantOverloadLights
-  listingName: Overload Lights
-  description: Costs 40 Essence per use. Overloads all nearby lights, causing the bulbs to shatter and sending out damaging sparks. Using it leaves you vulnerable to attacks for a long period of time.
-  icon: Interface/Actions/overloadlight.png
-  price: 25
+- type: listing
+  id: RevenantOverloadLights
+  name: Overload Lights
+  description: Overloads all nearby lights, causing the bulbs to shatter and sending out damaging sparks. Using it leaves you vulnerable to attacks for a long period of time.
+  productAction: RevenantOverloadLights
+  cost: 
+    StolenEssence: 25
+  categories:
+  - RevenantAbilities
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1

- type: revenantListing
-  id: Blight
-  actionId: RevenantBlight
-  listingName: Blight
-  description: Costs 50 Essence per use. Infects all nearby organisms with an infectious disease that causes poison and tiredness. Using it leaves you vulnerable to attacks for a medium period of time.
-  icon: Interface/Actions/blight.png
-  price: 75
+- type: listing
+  id: RevenantBlight
+  name: Blight
+  description: Infects all nearby organisms with an infectious disease that causes toxic buildup and tiredness. Using it leaves you vulnerable to attacks for a medium period of time.
+  productAction: RevenantBlight
+  cost: 
+    StolenEssence: 75
+  categories:
+  - RevenantAbilities
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1

- type: revenantListing
-  id: Malfunction
-  actionId: RevenantMalfunction
-  listingName: Malfunction
-  description: Costs 60 Essence per use. Makes most nearby electronics stop working properly. Using it leaves you vulnerable to attacks for a long period of time.
-  icon: Interface/Actions/malfunction.png
-  price: 125
+- type: listing
+  id: RevenantMalfunction
+  name: Malfunction
+  description: Makes nearby electronics stop working properly. Using it leaves you vulnerable to attacks for a long period of time.
+  productAction: RevenantMalfunction
+  cost: 
+    StolenEssence: 125
+  categories:
+  - RevenantAbilities
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1,500 +1,641 @@
 # Guns

- type: uplinkListing
+- type: listing
  id: UplinkPistolViper
-  category: Weapons
-  itemId: WeaponPistolViper
-  listingName: Viper
+  name: Viper
  description: A small, easily concealable, but somewhat underpowered gun. Use pistol magazines (.35 auto).
-  price: 6
+  productEntity: WeaponPistolViper
+  cost:
+    Telecrystal: 6
+  categories:
+  - UplinkWeapons

- type: uplinkListing
+- type: listing
  id: UplinkRevolverPython
-  category: Weapons
-  itemId: WeaponRevolverPython
-  listingName: Python
+  name: Python
  description: A loud and deadly revolver. Uses .40 Magnum.
-  price: 8
+  productEntity: WeaponRevolverPython
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkWeapons

 # Inbuilt suppressor so it's sneaky + more expensive.
- type: uplinkListing
+- type: listing
  id: UplinkPistolCobra
-  category: Weapons
-  itemId: WeaponPistolCobra
-  listingName: Cobra
+  name: Cobra
  description: A rugged, robust operator handgun with inbuilt silencer. Use pistol magazines (.25 caseless).
-  price: 8
+  productEntity: WeaponPistolCobra
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkWeapons

 # Poor accuracy, slow to fire, cheap option
- type: uplinkListing
+- type: listing
  id: UplinkRifleMosin
-  category: Weapons
-  itemId: WeaponSniperMosin
-  listingName: Surplus Rifle
+  name: Surplus Rifle
  description: A bolt action service rifle that has seen many wars. Not modern by any standard, hand loaded, and terrible recoil, but it is cheap.
-  price: 4
+  productEntity: WeaponSniperMosin
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkWeapons

-#- type: uplinkListing
-#  id: UplinkCrossbowEnergyMini
-#  category: Weapons
-#  itemId: CrossbowEnergyMini
-#  price: 8
-
-
- type: uplinkListing
+- type: listing
  id: UplinkEsword
-  category: Weapons
-  itemId: EnergySword
-  listingName: Energy Sword
+  name: Energy Sword
  description: A very dangerous energy sword. Can be stored in pockets when turned off. Makes a lot of noise when used or turned on.
-  price: 8
+  productEntity: EnergySword
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkWeapons

-# bug swept to make
-#- type: uplinkListing
-#  id: UplinkDoubleBladedESword
-#  category: Weapons
-#  itemId: DoubleBladedESword
-#  price: 16
-
- type: uplinkListing
+- type: listing
  id: UplinkEnergyDagger
-  category: Weapons
-  itemId: EnergyDagger
-  listingName: Energy Dagger
+  name: Energy Dagger
  description: A small energy blade conveniently disguised in the form of a pen.
-  price: 2
+  productEntity: EnergyDagger
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkWeapons

- type: uplinkListing
+- type: listing
  id: UplinkFireAxeFlaming
-  category: Weapons
-  itemId: FireAxeFlaming
-  listingName: Fire Axe
+  name: Fire Axe
  description: A classic-style weapon infused with advanced atmos technology to allow it to set targets on fire.
-  price: 10
+  productEntity: FireAxeFlaming
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkWeapons

 # Explosives

- type: uplinkListing
+- type: listing
  id: UplinkExplosiveGrenade
-  category: Explosives
-  itemId: ExGrenade
-  price: 4
+  productEntity: ExGrenade
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkExplosives

- type: uplinkListing
+- type: listing
  id: UplinkExplosiveGrenadeFlash
-  category: Explosives
-  itemId: GrenadeFlashBang
-  price: 2
+  productEntity: GrenadeFlashBang
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkExplosives

- type: uplinkListing
+- type: listing
  id: UplinkSyndieMiniBomb
-  category: Explosives
-  itemId: SyndieMiniBomb
-  price: 7
+  productEntity: SyndieMiniBomb
+  cost:
+    Telecrystal: 7
+  categories:
+    - UplinkExplosives

- type: uplinkListing
+- type: listing
  id: UplinkGrenadePenguin
-  category: Explosives
-  itemId: MobGrenadePenguin
-  price: 6
-  surplus: false # got wrecked by penguins from surplus crate
+  productEntity: MobGrenadePenguin
+  cost:
+    Telecrystal: 6
+  categories:
+    - UplinkExplosives
+  conditions:
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle

- type: uplinkListing
+- type: listing
  id: UplinkC4
-  category: Explosives
-  itemId: C4
-  price: 2
  description: >
    C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls, airlocks or sabotage equipment.
    It can be attached to almost all objects and has a modifiable timer with a minimum setting of 10 seconds.
+  productEntity: C4
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkExplosives

- type: uplinkListing
+- type: listing
  id: UplinkC4Bundle
-  category: Explosives
-  itemId: ClothingBackpackDuffelSyndicateC4tBundle
-  price: 12 # 25% off
  description: Because sometimes quantity is quality. Contains 8 C-4 plastic explosives.
+  productEntity: ClothingBackpackDuffelSyndicateC4tBundle
+  cost:
+    Telecrystal: 12
+  categories:
+  - UplinkExplosives

 # Ammo

- type: uplinkListing
+- type: listing
  id: UplinkPistol9mmMagazine
-  category: Ammo
-  itemId: MagazinePistol
-  price: 2
+  productEntity: MagazinePistol
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkAmmo

 # For the Mandella
- type: uplinkListing
+- type: listing
  id: UplinkMagazinePistolCaselessRifle
-  category: Ammo
-  itemId: MagazinePistolCaselessRifle
-  price: 2
+  productEntity: MagazinePistolCaselessRifle
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkAmmo

 # For the Inspector
- type: uplinkListing
+- type: listing
  id: UplinkSpeedLoaderMagnum
-  category: Ammo
-  itemId: SpeedLoaderMagnum
-  price: 2
  icon: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base.png
+  productEntity: SpeedLoaderMagnum
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkAmmo

 # For the mosin
- type: uplinkListing
+- type: listing
  id: UplinkMosinAmmo
-  category: Ammo
-  itemId: BoxMagazineLightRifle
  description: A box of cartridges for the surplus rifle.
-  price: 2
-
+  productEntity: BoxMagazineLightRifle
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkAmmo

 #Utility

- type: uplinkListing
+- type: listing
  id: UplinkHoloparaKit
-  category: Utility
-  itemId: BoxHoloparasite
-  listingName: Holoparasite Kit
+  name: Holoparasite Kit
  description: The pride and joy of Cybersun. Contains an injector that hosts a sentient metaphysical guardian made of hard light which resides in the user's body when not active. The guardian can punch rapidly and is immune to hazardous environments and bullets, but shares any damage it takes with the user.
  icon: /Textures/Objects/Misc/guardian_info.rsi/icon.png
-  price: 14
+  productEntity: BoxHoloparasite
+  cost:
+    Telecrystal: 14
+  categories:
+  - UplinkUtility
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink

- type: uplinkListing
+- type: listing
  id: UplinkHolster
-  category: Utility
-  itemId: ClothingBeltSyndieHolster
-  listingName: Syndicate Shoulder Holster
+  name: Syndicate Shoulder Holster
  description: A deep shoulder holster capable of holding many types of ballistics.
-  icon: /Textures/Clothing/Belt/syndieholster.rsi/icon.png
-  price: 2
+  productEntity: ClothingBeltSyndieHolster
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkUtility

- type: uplinkListing
+- type: listing
  id: UplinkEmag
-  category: Utility
-  itemId: Emag
+  name: Emag
  description: The business card of the syndicate, this sequencer is able to break open airlocks and tamper with a variety of station devices. Recharges automatically.
-  icon: /Textures/Objects/Tools/emag.rsi/icon.png
-  price: 8
+  productEntity: Emag
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkUtility

- type: uplinkListing
+- type: listing
  id: UplinkAgentIDCard
-  category: Utility
-  itemId: AgentIDCard
-  listingName: Agent ID Card
+  name: Agent ID Card
  description: A modified ID card that can copy accesses from other cards and change its name and job title at-will.
-  icon: Objects/Misc/id_cards.rsi/default.png
-  price: 3
+  productEntity: AgentIDCard
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkUtility

- type: uplinkListing
+- type: listing
  id: UplinkJetpack
-  category: Utility
-  itemId: JetpackBlack
-  listingName: Black Jetpack
+  name: Black Jetpack
  description: A black jetpack. It allows you to fly around in space. Additional fuel not included.
-  icon: Objects/Tanks/Jetpacks/black.rsi/icon.png
-  price: 5
+  productEntity: JetpackBlack
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkUtility

- type: uplinkListing
-  id: ReinforcementTeleporterSyndicate
-  category: Utility
-  itemId: ReinforcementTeleporterSyndicate
-  listingName: Reinforcement Teleporter
+- type: listing
+  id: UplinkReinforcementTeleporterSyndicate
+  name: Reinforcement Teleporter
  description: Teleport in an agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it.
+  productEntity: ReinforcementTeleporterSyndicate
  icon: Objects/Devices/communication.rsi/old-radio.png
-  price: 25
+  cost:
+    Telecrystal: 25
+  categories:
+  - UplinkUtility

 #TODO: Increase the price of this to 4-5/remove it when we get encrpytion keys
- type: uplinkListing
+- type: listing
  id: UplinkHeadset
-  category: Utility
-  itemId: ClothingHeadsetAltSyndicate
-  listingName: Syndicate Overear-Headset
+  name: Syndicate Overear-Headset
  description: A headset that allows you to listen in on departmental channels, or contact other traitors.
-  icon: Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png
-  price: 2
+  productEntity: ClothingHeadsetAltSyndicate
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkUtility

- type: uplinkListing
+- type: listing
  id: UplinkHypopen
-  category: Utility
-  itemId: Hypopen
-  listingName: Hypopen
+  name: Hypopen
  description: A chemical hypospray disguised as a pen, capable of instantly injecting up to 15u of reagents. Starts empty.
-  price: 4
+  productEntity: Hypopen
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkUtility

 # Bundles

- type: uplinkListing
+- type: listing
  id: UplinkC20RBundle
-  category: Bundles
-  itemId: ClothingBackpackDuffelSyndicateFilledSMG
-  price: 25
  icon: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
+  productEntity: ClothingBackpackDuffelSyndicateFilledSMG
+  cost:
+    Telecrystal: 25
+  categories:
+  - UplinkBundles

- type: uplinkListing
+- type: listing
  id: UplinkBulldogBundle
-  category: Bundles
-  itemId: ClothingBackpackDuffelSyndicateFilledShotgun
-  price: 25
  icon: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/icon.png
+  productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
+  cost:
+    Telecrystal: 25
+  categories:
+  - UplinkBundles

- type: uplinkListing
+- type: listing
  id: UplinkGrenadeLauncherBundle
-  category: Bundles
-  itemId: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
-  price: 30
  icon: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png
+  productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
+  cost:
+    Telecrystal: 30
+  categories:
+  - UplinkBundles

- type: uplinkListing
+- type: listing
  id: UplinkL6SawBundle
-  category: Bundles
-  itemId: ClothingBackpackDuffelSyndicateFilledLMG
-  price: 40
  icon: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi/icon.png
+  productEntity: ClothingBackpackDuffelSyndicateFilledLMG
+  cost:
+    Telecrystal: 40
+  categories:
+  - UplinkBundles

-# Add this back in once war ops/separate nukie inventories are added.
-#- type: uplinkListing
-#  id: UplinkZombieBundle
-#  category: Bundles
-#  itemId: ClothingBackpackDuffelZombieBundle
-#  price: 50
-#  icon: /Textures/Structures/Wallmounts/signs.rsi/bio.png
+- type: listing
+  id: UplinkZombieBundle
+  icon: /Textures/Structures/Wallmounts/signs.rsi/bio.png
+  productEntity: ClothingBackpackDuffelZombieBundle
+  cost:
+    Telecrystal: 40
+  categories:
+  - UplinkBundles
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle

- type: uplinkListing
+- type: listing
  id: UplinkSurplusBundle
-  category: Bundles
-  itemId: CrateSyndicateSurplusBundle
  description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good.
-  price: 20
-  surplus: false
+  productEntity: CrateSyndicateSurplusBundle
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkBundles
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle

- type: uplinkListing
+- type: listing
  id: UplinkSuperSurplusBundle
-  category: Bundles
-  itemId: CrateSyndicateSuperSurplusBundle
  description: Contains 125 telecrystals worth of completely random Syndicate items.
-  price: 40
-  surplus: false
-
-#- type: uplinkListing
-#  id: UplinkCarbineBundle
-#  category: Bundles
-#  itemId: ClothingBackpackDuffelSyndicateFilledCarbine
-#  price: 35
-#  icon: /Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png
+  productEntity: CrateSyndicateSuperSurplusBundle
+  cost:
+    Telecrystal: 40
+  categories:
+  - UplinkBundles
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle

 # Tools

- type: uplinkListing
+- type: listing
  id: UplinkToolbox
-  category: Tools
-  itemId: ToolboxSyndicateFilled
-  price: 2
+  productEntity: ToolboxSyndicateFilled
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkTools

- type: uplinkListing
+- type: listing
  id: UplinkSyndicateJawsOfLife
-  category: Tools
-  itemId: SyndicateJawsOfLife
-  price: 2
+  productEntity: SyndicateJawsOfLife
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkTools

- type: uplinkListing
+- type: listing
  id: UplinkDuffelSurgery
-  category: Tools
-  itemId: ClothingBackpackDuffelSyndicateFilledMedical
-  price: 5
+  productEntity: ClothingBackpackDuffelSyndicateFilledMedical
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkTools

- type : uplinkListing
+- type: listing
  id: UplinkPowerSink
-  category: Tools
-  itemId: PowerSink
-  price: 5
+  productEntity: PowerSink
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkTools

- type: uplinkListing
+- type: listing
  id: UplinkCarpDehydrated
-  category: Tools
-  itemId: DehydratedSpaceCarp
-  price: 3
+  productEntity: DehydratedSpaceCarp
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkTools

 # Job Specific

- type: uplinkListing
+- type: listing
  id: uplinkGatfruitSeeds
-  category: Job
-  itemId: GatfruitSeeds
  description: And who says guns don't grow on trees?
-  price: 4
-  jobWhitelist:
-  - Botanist
+  productEntity: GatfruitSeeds
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkJob
+  conditions:
+  - !type:BuyerJobCondition
+    whitelist:
+    - Botanist

- type: uplinkListing
+- type: listing
  id: uplinkNecronomicon
-  category: Job
-  itemId: BibleNecronomicon
  description: An unholy book capable of summoning a demonic familiar.
-  price: 6
-  surplus: false
-  jobWhitelist:
-  - Chaplain
+  productEntity: BibleNecronomicon
+  cost:
+    Telecrystal: 6
+  categories:
+  - UplinkJob
+  conditions:
+  - !type:BuyerJobCondition
+    whitelist:
+    - Chaplain
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle

 # Armor

 # Should be cameleon shoes, change when implemented.
- type: uplinkListing
+- type: listing
  id: UplinkClothingNoSlipsShoes
-  category: Armor
-  itemId: ClothingShoesChameleonNoSlips
-  listingName: no-slip shoes
+  name: no-slip shoes
  description: These protect you from slips while looking like normal sneakers.
-  price: 2
+  productEntity: ClothingShoesChameleonNoSlips
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkArmor

- type: uplinkListing
+- type: listing
  id: UplinkgClothingThievingGloves
-  category: Armor
-  itemId: ThievingGloves
-  listingName: Thieving Gloves
+  name: Thieving Gloves
  description: Discretely steal from pockets and increase your thieving technique with these fancy new gloves, all while looking like normal gloves!
-  price: 4
+  productEntity: ThievingGloves
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkArmor

- type: uplinkListing
+- type: listing
  id: UplinkClothingOuterVestWeb
-  category: Armor
-  itemId: ClothingOuterVestWeb
-  price: 5
+  productEntity: ClothingOuterVestWeb
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkArmor

- type: uplinkListing
+- type: listing
  id: UplinkHardsuitSyndie
-  category: Armor
-  itemId: ClothingBackpackDuffelSyndicateHardsuitBundle
  description: The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant.
-  price: 8
+  productEntity: ClothingBackpackDuffelSyndicateHardsuitBundle
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkArmor

- type: uplinkListing
+- type: listing
  id: UplinkClothingShoesBootsMagSyndie
-  category: Armor
-  itemId: ClothingShoesBootsMagSyndie
  description: A pair of magnetic boots that will keep you on the ground if the gravity fails or is sabotaged, giving you a mobility advantage. If activated with gravity they will protect from slips, but they will slow you down.
-  price: 2
+  productEntity: ClothingShoesBootsMagSyndie
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkArmor

- type: uplinkListing
+- type: listing
  id: UplinkEVASyndie
-  category: Armor
-  itemId: ClothingBackpackDuffelSyndicateEVABundle
  description: A simple EVA suit that offers no protection other than what's needed to survive in space.
-  price: 4
+  productEntity: ClothingBackpackDuffelSyndicateEVABundle
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkArmor

- type: uplinkListing
+- type: listing
  id: UplinkClothingOuterHardsuitJuggernaut
-  category: Armor
-  itemId: ClothingOuterHardsuitJuggernaut
  description: Hyper resilient armor made of materials tested in the Tau chromosphere facility. The only thing that's going to be slowing you down is this suit... and tasers.
-  price: 12
-
+  productEntity: ClothingOuterHardsuitJuggernaut
+  cost:
+    Telecrystal: 12
+  categories:
+  - UplinkArmor

 # Misc

- type: uplinkListing
+- type: listing
  id: UplinkCyberpen
-  category: Misc
-  itemId: CyberPen
  description: Cybersun's legal department pen. Smells vaguely of hard-light and war profiteering.
-  price: 4
+  productEntity: CyberPen
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkMisc

- type: uplinkListing
+- type: listing
  id: UplinkDecoyDisk
-  category: Misc
-  itemId: NukeDiskFake
-  listingName: Decoy nuclear disk
+  name: decoy nuclear disk
  description: A piece of plastic with a lenticular printing, made to look like a nuclear auth disk.
-  price: 1
+  productEntity: NukeDiskFake
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkMisc

- type: uplinkListing
+- type: listing
  id: UplinkRevolverCapGun
-  category: Misc
-  itemId: RevolverCapGun
-  price: 4
+  productEntity: RevolverCapGun
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkMisc

- type: uplinkListing
+- type: listing
  id: UplinkCigarettes
-  category: Misc
-  itemId: CigPackSyndicate
-  price: 2
+  productEntity: CigPackSyndicate
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkMisc

- type: uplinkListing
+- type: listing
  id: UplinkSoapSyndie
-  category: Misc
-  itemId: SoapSyndie
-  price: 1
+  productEntity: SoapSyndie
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkMisc

- type: uplinkListing
+- type: listing
  id: UplinkUltrabrightLantern
-  category: Misc
-  itemId: lanternextrabright
-  price: 2
+  productEntity: lanternextrabright #why is this item id not capitalized???
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkMisc

-#- type: uplinkListing
+#- type: listing
 #  id: UplinkCostumeCentcom
-#  category: Misc
-#  itemId: ClothingBackpackDuffelSyndicateCostumeCentcom
-#  price: 4
+#  productEntity: ClothingBackpackDuffelSyndicateCostumeCentcom
+#  cost:
+#    Telecrystal: 4
+#  categories:
+#  - UplinkMisc

- type: uplinkListing
+- type: listing
  id: UplinkGigacancerScanner
-  category: Misc
-  itemId: HandheldHealthAnalyzerGigacancer
-  listingName: Ultragigacancer Health Analyzer
+  name: Ultragigacancer Health Analyzer
  description: Works like a normal health analyzer, other than giving everyone it scans ultragigacancer.
-  price: 5
+  productEntity: HandheldHealthAnalyzerGigacancer
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkMisc

- type: uplinkListing
+- type: listing
  id: UplinkNocturineChemistryBottle
-  category: Misc
-  itemId: NocturineChemistryBottle
  description: A chemical that makes it very hard for your target to stand up.
-  price: 5
+  productEntity: NocturineChemistryBottle
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkMisc

- type: uplinkListing
+- type: listing
  id: UplinkSyndicateSegwayCrate
-  category: Misc
-  itemId: CrateFunSyndicateSegway
-  listingName: syndicate segway
+  name: syndicate segway
  description: Be an enemy of the corporation, in style!
-  price: 5
-  surplus: false
+  productEntity: CrateFunSyndicateSegway
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkMisc
+  conditions:
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle

 # Pointless

- type: uplinkListing
+- type: listing
  id: UplinkSyndicateStamp
-  category: Pointless
-  itemId: RubberStampSyndicate
-  price: 2
+  productEntity: RubberStampSyndicate
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkPointless

- type: uplinkListing
+- type: listing
  id: UplinkCatEars
-  category: Pointless
-  itemId: ClothingHeadHatCatEars
-  listingName: Cat Ears
-  description: UwU.
-  price: 21
+  name: Cat Ears
+  description: UwU
+  productEntity: ClothingHeadHatCatEars
+  cost:
+    Telecrystal: 21
+  categories:
+  - UplinkPointless

- type: uplinkListing
+- type: listing
  id: UplinkOutlawHat
-  category: Pointless
-  itemId: ClothingHeadHatOutlawHat
-  price: 1
+  productEntity: ClothingHeadHatOutlawHat
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkPointless

- type: uplinkListing
+- type: listing
  id: UplinkCostumePyjama
-  category: Pointless
-  itemId: ClothingBackpackDuffelSyndicatePyjamaBundle
-  price: 4
+  productEntity: ClothingBackpackDuffelSyndicatePyjamaBundle
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkPointless

- type: uplinkListing
+- type: listing
  id: UplinkCostumeClown
-  category: Pointless
-  itemId: ClothingBackpackDuffelSyndicateCostumeClown
-  price: 4
+  productEntity: ClothingBackpackDuffelSyndicateCostumeClown
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkPointless

- type: uplinkListing
+- type: listing
  id: UplinkBalloon
-  category: Pointless
-  itemId: BalloonSyn
-  price: 20
+  productEntity: BalloonSyn
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkPointless
--- a/Resources/Prototypes/Decals/ss14sign.yml
+++ b/Resources/Prototypes/Decals/ss14sign.yml
@@ -0,0 +1,50 @@
+- type: decal
+  id: SpaceStationSign1
+  tags: ["station"]
+  sprite:
+    sprite: Decals/ss14sign.rsi
+    state: ss14sign1
+
+- type: decal
+  id: SpaceStationSign2
+  tags: ["station"]
+  sprite:
+    sprite: Decals/ss14sign.rsi
+    state: ss14sign2
+
+- type: decal
+  id: SpaceStationSign3
+  tags: ["station"]
+  sprite:
+    sprite: Decals/ss14sign.rsi
+    state: ss14sign3
+
+- type: decal
+  id: SpaceStationSign4
+  tags: ["station"]
+  sprite:
+    sprite: Decals/ss14sign.rsi
+    state: ss14sign4
+
+- type: decal
+  id: SpaceStationSign5
+  tags: ["station"]
+  sprite:
+    sprite: Decals/ss14sign.rsi
+    state: ss14sign5
+
+- type: decal
+  id: SpaceStationSign6
+  tags: ["station"]
+  sprite:
+    sprite: Decals/ss14sign.rsi
+    state: ss14sign6
+
+- type: decal
+  id: SpaceStationSign7
+  tags: ["station"]
+  sprite:
+    sprite: Decals/ss14sign.rsi
+    state: ss14sign7
+
+
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -15,6 +15,10 @@
    - back
  - type: Storage
    capacity: 100
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
  - type: UserInterface
    interfaces:
    - key: enum.StorageUiKey.Key
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -15,6 +15,10 @@
    - back
  - type: Storage
    capacity: 120
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
  - type: ClothingSpeedModifier
    walkModifier: 1
    sprintModifier: 0.9
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -15,6 +15,10 @@
    - back
  - type: Storage
    capacity: 100
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
  - type: UserInterface
    interfaces:
    - key: enum.StorageUiKey.Key
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -20,6 +20,10 @@
    capacity: 40
    equipSound:
      path: /Audio/Items/belt_equip.ogg
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
  - type: UserInterface
    interfaces:
    - key: enum.StorageUiKey.Key
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -221,6 +221,10 @@
        Heat: 0.65
        Radiation: 1
  - type: IdentityBlocker
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot {}

 - type: entity
  parent: ClothingHeadLightBase
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -42,6 +42,28 @@
  - type: Clothing
    sprite: Clothing/Head/Soft/cargosoft_flipped.rsi

+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatQMsoft
+  name: quartermaster's cap
+  description: "It's a baseball hat painted in the Quartermaster's colors."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/qmsoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/qmsoft.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatQMsoftFlipped
+  name: quartermaster's cap flipped
+  description: "It's a baseball hat painted in the Quartermaster's colors. Flipped."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
+    
 - type: entity
  parent: ClothingHeadBase
  id: ClothingHeadHatCorpsoft
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -30,6 +30,10 @@
  components:
  - type: Storage
    capacity: 10
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
  - type: UserInterface
    interfaces:
    - key: enum.StorageUiKey.Key
@@ -62,6 +66,9 @@
  - type: DiseaseProtection
    protection: 0.05
  - type: ToggleableClothing
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -32,8 +32,8 @@
 - type: entity
  parent: ClothingOuterHardsuitBase
  id: ClothingOuterHardsuitCap
-  name: captain's armor
-  description: A suit of protective formal armor made for the station's captain.
+  name: captain's armored spacesuit
+  description: A formal armored spacesuit, made for the station's captain.
  components:
  - type: Sprite
    sprite: Clothing/OuterClothing/Hardsuits/capspace.rsi
@@ -83,7 +83,7 @@
        Heat: 0.2
        Radiation: 0.2
  - type: ExplosionResistance
-    damageCoefficient: 0.7
+    damageCoefficient: 0.2
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad

@@ -139,7 +139,7 @@
        Slash: 0.85
        Piercing: 0.8
        Heat: 0.4
-        Radiation: 0.25
+        Radiation: 0.0
  - type: ExplosionResistance
    damageCoefficient: 0.2
  - type: ToggleableClothing
@@ -237,21 +237,21 @@
  - type: Clothing
    sprite: Clothing/OuterClothing/Hardsuits/rd.rsi
  - type: PressureProtection
-    highPressureMultiplier: 0.05
+    highPressureMultiplier: 0.02
    lowPressureMultiplier: 5500
  - type: Armor
    modifiers:
      coefficients:
        Blunt: 0.6
-        Slash: 0.75
+        Slash: 0.8
        Piercing: 0.95
-        Heat: 0.65
-        Radiation: 0.25
+        Heat: 0.3
+        Radiation: 0.1
  - type: ClothingSpeedModifier
    walkModifier: 0.75
    sprintModifier: 0.75
  - type: ExplosionResistance
-    damageCoefficient: 0.3
+    damageCoefficient: 0.1
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHelmetHardsuitRd
  - type: StaticPrice
@@ -345,7 +345,7 @@
  parent: ClothingOuterHardsuitBase
  id: ClothingOuterHardsuitSyndie
  name: blood red hardsuit
-  description: A dual-mode advanced hardsuit designed for work in special operations.
+  description: A heavily armored and agile advanced hardsuit designed for work in special operations.
  components:
  - type: Sprite
    sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -35,6 +35,9 @@
    coefficient: 0.5
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHelmetEVA
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}

 - type: entity
  parent: ClothingOuterBaseLarge
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -15,11 +15,30 @@
    sprite: Objects/Weapons/Guns/Pistols/debug.rsi
  - type: Gun
    fireRate: 100
-  - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-        - Debug
-    proto: MagazinePistolDebug
+    selectedMode: FullAuto
+    availableModes:
+      - SemiAuto
+      - FullAuto
+  - type: AmmoCounter
+  - type: ChamberMagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolDebug
+        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - Debug
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeDebug
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistol

 - type: entity
  id: MagazinePistolDebug
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -8,6 +8,8 @@
  - type: Sprite
    drawdepth: FloorObjects
  - type: SolutionContainerManager
+    solutions:
+      puddle: {}
  - type: Puddle
    spillSound:
      path: /Audio/Effects/Fluids/splat.ogg
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml
@@ -8,6 +8,7 @@
        - state: blue
        - texture: Mobs/Species/Human/parts.rsi/full.png
        - state: ai
+    - type: Timer
    - type: TimedSpawner
      prototypes:
        - MobSpirate
@@ -27,6 +28,7 @@
      - state: blue
      - texture: Mobs/Aliens/Xenos/burrower.rsi/crit.png
      - state: ai
+    - type: Timer
    - type: TimedSpawner
      prototypes:
      - MobXeno
@@ -45,6 +47,7 @@
        - state: blue
        - texture: Mobs/Animals/mouse.rsi/icon-2.png
        - state: timed
+    - type: Timer
    - type: TimedSpawner
      prototypes:
        - MobMouse
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -51,7 +51,7 @@
 - type: entity
  parent: BaseMobHuman
  suffix: Dead
-  save: true
+  save: false # mobs are currently not saveable.
  id: SalvageHumanCorpse
  name: unidentified human
  description: We barely knew ye.
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -60,11 +60,16 @@
    softness: 0.75
  - type: UserInterface
    interfaces:
-    - key: enum.RevenantUiKey.Key
-      type: RevenantBoundUserInterface
+    - key: enum.StoreUiKey.Key
+      type: StoreBoundUserInterface
  - type: MobState
  - type: Visibility
    layer: 2 #ghost vis layer
+  - type: Store
+    categories:
+    - RevenantAbilities
+    currencyWhitelist:
+    - StolenEssence

 - type: entity
  parent: BaseItem
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -4,6 +4,7 @@
  name: GuardianBase
  id: MobGuardianBase
  description: guardian
+  save: false
  components:
    - type: GhostTakeoverAvailable
      makeSentient: true
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -254,27 +254,27 @@
      60: 0.7
      80: 0.5
  - type: HeatResistance
+  - type: DamageVisuals
+    thresholds: [ 20, 40, 100 ]
+    targetLayers:
+      - "enum.HumanoidVisualLayers.Chest"
+      - "enum.HumanoidVisualLayers.Head"
+      - "enum.HumanoidVisualLayers.LArm"
+      - "enum.HumanoidVisualLayers.LLeg"
+      - "enum.HumanoidVisualLayers.RArm"
+      - "enum.HumanoidVisualLayers.RLeg"
+    damageOverlayGroups:
+      Brute:
+        sprite: Mobs/Effects/brute_damage.rsi
+        color: "#FF0000"
+      Burn:
+        sprite: Mobs/Effects/burn_damage.rsi
  - type: Appearance
    visuals:
      - type: RotationVisualizer
      - type: BuckleVisualizer
      - type: CreamPiedVisualizer
        state: creampie_human
-      - type: DamageVisualizer
-        thresholds: [ 20, 40, 100 ]
-        targetLayers:
-          - "enum.HumanoidVisualLayers.Chest"
-          - "enum.HumanoidVisualLayers.Head"
-          - "enum.HumanoidVisualLayers.LArm"
-          - "enum.HumanoidVisualLayers.LLeg"
-          - "enum.HumanoidVisualLayers.RArm"
-          - "enum.HumanoidVisualLayers.RLeg"
-        damageOverlayGroups:
-          Brute:
-            sprite: Mobs/Effects/brute_damage.rsi
-            color: "#FF0000"
-          Burn:
-            sprite: Mobs/Effects/burn_damage.rsi
  - type: FireVisuals
    sprite: Mobs/Effects/onfire.rsi
    normalState: Generic_mob_burning
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -22,6 +22,8 @@
    solution: drink
  - type: RefillableSolution
    solution: drink
+  - type: DrainableSolution
+    solution: drink
  - type: UserInterface
    interfaces:
    - key: enum.TransferAmountUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -27,6 +27,12 @@
      - state: icon
        map: ["enum.DrinkCanVisualLayers.Icon"]
    netsync: false
+  - type: FitsInDispenser
+    solution: drink
+  - type: DrawableSolution
+    solution: drink
+  - type: RefillableSolution
+    solution: drink
  - type: DrainableSolution
    solution: drink
  - type: Appearance
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -15,6 +15,8 @@
    solution: drink
  - type: RefillableSolution
    solution: drink
+  - type: DrainableSolution
+    solution: drink
  - type: SolutionTransfer
    canChangeTransferAmount: true
    maxTransferAmount: 10
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -16,6 +16,8 @@
    solution: drink
  - type: RefillableSolution
    solution: drink
+  - type: DrainableSolution
+    solution: drink
  - type: SolutionTransfer
    canChangeTransferAmount: true
  - type: Spillable
@@ -34,6 +36,13 @@
  name: shot glass
  description: ''
  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 10
+  - type: SolutionTransfer
+    transferAmount: 10
+    minTransferAmount: 10
  - type: Drink
  - type: Sprite
    sprite: Objects/Consumable/Drinks/shotglass.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -19,6 +19,14 @@
    isOpen: true
  - type: Spillable
    solution: drink
+  - type: FitsInDispenser
+    solution: drink
+  - type: DrawableSolution
+    solution: drink
+  - type: RefillableSolution
+    solution: drink
+  - type: DrainableSolution
+    solution: drink
  - type: UserInterface
    interfaces:
    - key: enum.TransferAmountUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -11,6 +11,7 @@
  components:
  - type: Drink
    solution: food
+    refillable: false
    openSounds:
      collection: packetOpenSounds
  - type: DrawableSolution
@@ -19,7 +20,9 @@
    solution: food
  - type: DrainableSolution
    solution: food
-    # Note NOT refillable
+    # Note NOT refillable. 
+    # It be a shame if it turned out ALL drinks were ALWAYS refillable.... ffs.
+    # Well its fixed now, but I want to share my pain.
  - type: SolutionContainerManager
    solutions:
      food:
@@ -331,6 +334,10 @@
    solution: food
    openSounds:
      collection: pop
+  - type: RefillableSolution
+    solution: food
+  - type: DrainableSolution
+    solution: food
  - type: SolutionContainerManager
    solutions:
      food:
@@ -478,6 +485,10 @@
    solution: food
    openSounds:
      collection: pop
+  - type: RefillableSolution
+    solution: food
+  - type: DrainableSolution
+    solution: food
  - type: SolutionContainerManager
    solutions:
      food:
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml
@@ -8,7 +8,7 @@
    - type: MachineBoard
    - type: Sprite
      sprite: Objects/Misc/module.rsi
-      state: id_mod
+      state: generic
    - type: Tag
      tags:
        - DroneUsable
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
@@ -4,6 +4,8 @@
  name: PA end cap board
  description: A machine board for a particle accelerator end cap
  components:
+    - type: Sprite
+      state: engineering
    - type: MachineBoard
      prototype: ParticleAcceleratorEndCapUnfinished
      materialRequirements:
@@ -16,6 +18,8 @@
  name: PA fuel chamber board
  description: A machine board for a particle accelerator fuel chamber
  components:
+    - type: Sprite
+      state: engineering
    - type: MachineBoard
      prototype: ParticleAcceleratorFuelChamberUnfinished
      componentRequirements:
@@ -33,6 +37,8 @@
  name: PA power box board
  description: A machine board for a particle accelerator power box
  components:
+    - type: Sprite
+      state: engineering
    - type: MachineBoard
      prototype: ParticleAcceleratorPowerBoxUnfinished
      materialRequirements:
@@ -47,6 +53,8 @@
  name: PA emitter left board
  description: A machine board for a particle accelerator left emitter
  components:
+    - type: Sprite
+      state: engineering
    - type: MachineBoard
      prototype: ParticleAcceleratorEmitterLeftUnfinished
      materialRequirements:
@@ -59,6 +67,8 @@
  name: PA emitter center board
  description: A machine board for a particle accelerator center emitter
  components:
+    - type: Sprite
+      state: engineering
    - type: MachineBoard
      prototype: ParticleAcceleratorEmitterCenterUnfinished
      materialRequirements:
@@ -71,6 +81,8 @@
  name: PA emitter right board
  description: A machine board for a particle accelerator right emitter
  components:
+    - type: Sprite
+      state: engineering
    - type: MachineBoard
      prototype: ParticleAcceleratorEmitterRightUnfinished
      materialRequirements:
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -35,6 +35,8 @@
  name: security techfab machine board
  description: A machine printed circuit board for a security techfab
  components:
+    - type: Sprite
+      state: security
    - type: MachineBoard
      prototype: SecurityTechFab
      requirements:
@@ -52,6 +54,8 @@
  name: medical techfab machine board
  description: A machine printed circuit board for a medical techfab
  components:
+    - type: Sprite
+      state: medical
    - type: MachineBoard
      prototype: MedicalTechFab
      requirements:
@@ -68,6 +72,8 @@
  parent: BaseMachineCircuitboard
  name: circuit imprinter machine board
  components:
+  - type: Sprite
+    state: science
  - type: MachineBoard
    prototype: CircuitImprinter
    requirements:
@@ -96,6 +102,8 @@
  parent: BaseMachineCircuitboard
  name: vaccinator machine board
  components:
+  - type: Sprite
+    state: medical
  - type: MachineBoard
    prototype: Vaccinator
    requirements:
@@ -114,6 +122,8 @@
  parent: BaseMachineCircuitboard
  name: diagnoser machine board
  components:
+  - type: Sprite
+    state: medical
  - type: MachineBoard
    prototype: DiseaseDiagnoser
    requirements:
@@ -128,6 +138,8 @@
  name: freezer thermomachine machine board
  description: Looks like you could use a screwdriver to change the board type.
  components:
+  - type: Sprite
+    state: engineering
  - type: MachineBoard
    prototype: GasThermoMachineFreezer
    requirements:
@@ -145,6 +157,8 @@
  name: heater thermomachine machine board
  description: Looks like you could use a screwdriver to change the board type.
  components:
+  - type: Sprite
+    state: engineering
  - type: MachineBoard
    prototype: GasThermoMachineHeater
    requirements:
@@ -162,6 +176,8 @@
  name: portable scrubber machine board
  description: A PCB for a portable scrubber.
  components:
+  - type: Sprite
+    state: engineering
  - type: MachineBoard
    prototype: PortableScrubber
    requirements:
@@ -177,6 +193,8 @@
  name: cloning pod machine board
  description: A machine printed circuit board for a cloning pod
  components:
+    - type: Sprite
+      state: medical
    - type: MachineBoard
      prototype: CloningPod
      requirements:
@@ -192,6 +210,8 @@
  name: medical scanner machine board
  description: A machine printed circuit board for a medical scanner
  components:
+    - type: Sprite
+      state: medical
    - type: MachineBoard
      prototype: MedicalScanner
      requirements:
@@ -208,6 +228,8 @@
  name: ChemMaster 4000 machine board
  description: A machine printed circuit board for a ChemMaster 4000
  components:
+    - type: Sprite
+      state: medical
    - type: MachineBoard
      prototype: chem_master
      requirements:
@@ -226,6 +248,8 @@
  name: chem dispenser machine board
  description: A machine printed circuit board for a chem dispenser
  components:
+    - type: Sprite
+      state: medical
    - type: MachineBoard
      prototype: chem_dispenser
      requirements:
@@ -241,6 +265,8 @@
  name: hydroponics tray machine board
  description: A machine printed circuit board for a hydroponics tray
  components:
+    - type: Sprite
+      state: service
    - type: MachineBoard
      prototype: hydroponicsTray
      # See: https://github.com/vgstation-coders/vgstation13/blob/e9a806f30b4db0efa2a68b9eb42e3120d2321b6a/code/modules/hydroponics/hydro_tray.dm#L57
@@ -325,6 +351,8 @@
  parent: BaseMachineCircuitboard
  name: generator (plasma) machine board
  components:
+    - type: Sprite
+      state: engineering
    - type: MachineBoard
      prototype: GeneratorPlasma
      requirements:
@@ -337,6 +365,8 @@
  parent: BaseMachineCircuitboard
  name: generator (uranium) machine board
  components:
+    - type: Sprite
+      state: engineering
    - type: MachineBoard
      prototype: GeneratorUranium
      requirements:
@@ -367,6 +397,8 @@
  parent: BaseMachineCircuitboard
  name: Stasis Bed (Machine Board)
  components:
+    - type: Sprite
+      state: medical
    - type: MachineBoard
      prototype: StasisBed
      requirements:
@@ -389,6 +421,8 @@
  parent: BaseMachineCircuitboard
  name: ore processor machine board
  components:
+    - type: Sprite
+      state: supply
    - type: MachineBoard
      prototype: OreProcessor
      requirements:
@@ -403,6 +437,8 @@
  parent: BaseMachineCircuitboard
  name: microwave machine board
  components:
+    - type: Sprite
+      state: service
    - type: MachineBoard
      prototype: KitchenMicrowave
      requirements:
@@ -417,6 +453,8 @@
  parent: BaseMachineCircuitboard
  name: emitter machine board
  components:
+    - type: Sprite
+      state: engineering
    - type: MachineBoard
      prototype: Emitter
      requirements:
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -18,7 +18,7 @@
  parent: BaseComputerCircuitboard
  id: AlertsComputerCircuitboard
  name: alerts computer board
-  description: A computer printed circuit board for an alerts computer
+  description: A computer printed circuit board for an alerts computer.
  components:
    - type: ComputerBoard
      prototype: ComputerAlert
@@ -27,8 +27,10 @@
  parent: BaseComputerCircuitboard
  id: PowerComputerCircuitboard
  name: power monitoring computer board
-  description: A computer printed circuit board for a power monitoring computer
+  description: A computer printed circuit board for a power monitoring computer.
  components:
+    - type: Sprite
+      state: cpu_engineering
    - type: ComputerBoard
      prototype: ComputerPowerMonitoring

@@ -36,8 +38,10 @@
  parent: BaseComputerCircuitboard
  id: MedicalRecordsComputerCircuitboard
  name: medical records computer board
-  description: A computer printed circuit board for a medical records computer
+  description: A computer printed circuit board for a medical records computer.
  components:
+    - type: Sprite
+      state: cpu_medical
    - type: ComputerBoard
      prototype: ComputerMedicalRecords

@@ -45,8 +49,10 @@
  parent: BaseComputerCircuitboard
  id: CriminalRecordsComputerCircuitboard
  name: criminal records computer board
-  description: A computer printed circuit board for a criminal records computer
+  description: A computer printed circuit board for a criminal records computer.
  components:
+    - type: Sprite
+      state: cpu_security
    - type: ComputerBoard
      prototype: ComputerCriminalRecords

@@ -54,8 +60,10 @@
  parent: BaseComputerCircuitboard
  id: SupplyComputerCircuitboard
  name: supply ordering computer board
-  description: A computer printed circuit board for a supply ordering console
+  description: A computer printed circuit board for a supply ordering console.
  components:
+    - type: Sprite
+      state: cpu_supply
    - type: ComputerBoard
      prototype: ComputerCargoOrders
    - type: StaticPrice
@@ -65,8 +73,10 @@
  parent: BaseComputerCircuitboard
  id: SupplyRequestComputerCircuitboard
  name: supply request computer board
-  description: A computer printed circuit board for a supply request console
+  description: A computer printed circuit board for a supply request console.
  components:
+    - type: Sprite
+      state: cpu_supply
    - type: ComputerBoard
      prototype: ComputerCargoOrders

@@ -74,7 +84,7 @@
  parent: BaseComputerCircuitboard
  id: SurveillanceCameraMonitorCircuitboard
  name: surveillance camera monitor board
-  description: A computer printed circuit board for a surveillance camera monitor
+  description: A computer printed circuit board for a surveillance camera monitor.
  components:
    - type: ComputerBoard
      prototype: ComputerSurveillanceCameraMonitor
@@ -83,7 +93,7 @@
  parent: BaseComputerCircuitboard
  id: SurveillanceWirelessCameraMonitorCircuitboard
  name: surveillance wireless camera monitor board
-  description: A computer printed circuit board for a surveillance wireless camera monitor
+  description: A computer printed circuit board for a surveillance wireless camera monitor.
  components:
    - type: ComputerBoard
      prototype: ComputerSurveillanceWirelessCameraMonitor
@@ -92,7 +102,7 @@
  parent: BaseComputerCircuitboard
  id: ComputerTelevisionCircuitboard
  name: television board
-  description: A computer printed circuit board for a television
+  description: A computer printed circuit board for a television.
  components:
    - type: ComputerBoard
      prototype: ComputerTelevision
@@ -102,6 +112,8 @@
  id: PowerMonitoringComputerCircuitboard
  name: power monitoring computer board
  components:
+    - type: Sprite
+      state: cpu_engineering
    - type: ComputerBoard
      prototype: ComputerPowerMonitoring

@@ -109,8 +121,10 @@
  parent: BaseComputerCircuitboard
  id: ResearchComputerCircuitboard
  name: R&D computer board
-  description: A computer printed circuit board for a R&D console
+  description: A computer printed circuit board for a R&D console.
  components:
+    - type: Sprite
+      state: cpu_science
    - type: ComputerBoard
      prototype: ComputerResearchAndDevelopment

@@ -118,7 +132,7 @@
  parent: BaseComputerCircuitboard
  id: CrewMonitoringComputerCircuitboard
  name: crew monitoring computer board
-  description: A computer printed circuit board for a crew monitoring console
+  description: A computer printed circuit board for a crew monitoring console.
  components:
    - type: ComputerBoard
      prototype: ComputerCrewMonitoring
@@ -127,8 +141,10 @@
  parent: BaseComputerCircuitboard
  id: IDComputerCircuitboard
  name: ID card computer board
-  description: A computer printed circuit board for an ID card console
+  description: A computer printed circuit board for an ID card console.
  components:
+    - type: Sprite
+      state: cpu_command
    - type: ComputerBoard
      prototype: ComputerId
    - type: StaticPrice
@@ -138,8 +154,10 @@
  parent: BaseComputerCircuitboard
  id: BodyScannerComputerCircuitboard
  name: body scanner computer board
-  description: A computer printed circuit board for a body scanner console
+  description: A computer printed circuit board for a body scanner console.
  components:
+    - type: Sprite
+      state: cpu_medical
    - type: ComputerBoard
      prototype: computerBodyScanner

@@ -147,8 +165,10 @@
  parent: BaseComputerCircuitboard
  id: CommsComputerCircuitboard
  name: communications computer board
-  description: A computer printed circuit board for a communications console
+  description: A computer printed circuit board for a communications console.
  components:
+    - type: Sprite
+      state: cpu_command
    - type: ComputerBoard
      prototype: ComputerComms

@@ -156,7 +176,7 @@
  parent: BaseComputerCircuitboard
  id: SyndicateCommsComputerCircuitboard
  name: syndicate communications computer board
-  description: A computer printed circuit board for a syndicate communications console
+  description: A computer printed circuit board for a syndicate communications console.
  components:
    - type: ComputerBoard
      prototype: SyndicateComputerComms
@@ -173,8 +193,10 @@
  parent: BaseComputerCircuitboard
  id: SolarControlComputerCircuitboard
  name: solar control computer board
-  description: A computer printed circuit board for a solar control console
+  description: A computer printed circuit board for a solar control console.
  components:
+    - type: Sprite
+      state: cpu_engineering
    - type: ComputerBoard
      prototype: ComputerSolarControl

@@ -182,7 +204,7 @@
  parent: BaseComputerCircuitboard
  id: SpaceVillainArcadeComputerCircuitboard
  name: space villain arcade board
-  description: A computer printed circuit board for a space villain arcade cabinet
+  description: A computer printed circuit board for a space villain arcade cabinet.
  components:
    - type: ComputerBoard
      prototype: SpaceVillainArcade
@@ -191,7 +213,7 @@
  parent: BaseComputerCircuitboard
  id: BlockGameArcadeComputerCircuitboard
  name: block game arcade board
-  description: A computer printed circuit board for a block game arcade cabinet
+  description: A computer printed circuit board for a block game arcade cabinet.
  components:
    - type: ComputerBoard
      prototype: BlockGameArcade
@@ -200,8 +222,10 @@
  parent: BaseComputerCircuitboard
  id: ParticleAcceleratorComputerCircuitboard
  name: PA control box computer board
-  description: A computer printed circuit board for a particle accelerator control box
+  description: A computer printed circuit board for a particle accelerator control box.
  components:
+    - type: Sprite
+      state: cpu_engineering
    - type: ComputerBoard
      prototype: ParticleAcceleratorControlBoxUnfinished

@@ -209,7 +233,7 @@
  parent: BaseComputerCircuitboard
  id: ShuttleConsoleCircuitboard
  name: shuttle console board
-  description: A computer printed circuit board for a shuttle console
+  description: A computer printed circuit board for a shuttle console.
  components:
    - type: ComputerBoard
      prototype: ComputerShuttle
@@ -218,7 +242,7 @@
  parent: BaseComputerCircuitboard
  id: SyndicateShuttleConsoleCircuitboard
  name: syndicate shuttle console board
-  description: A computer printed circuit board for a syndicate shuttle console
+  description: A computer printed circuit board for a syndicate shuttle console.
  components:
    - type: ComputerBoard
      prototype: ComputerShuttleSyndie
@@ -227,7 +251,9 @@
  parent: BaseComputerCircuitboard
  id: CloningConsoleComputerCircuitboard
  name: cloning console computer board
-  description: A computer printed circuit board for a cloning console
+  description: A computer printed circuit board for a cloning console.
  components:
+    - type: Sprite
+      state: cpu_medical
    - type: ComputerBoard
      prototype: ComputerCloningConsole
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -8,6 +8,10 @@
  - type: ItemCooldown
  - type: UseDelay
    delay: 1.0
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot {}
  - type: PowerCellSlot
    cellSlot:
      startingItem: PowerCellMedium
--- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
@@ -48,6 +48,10 @@
  - type: StaticPrice
    price: 50000 # YOU STOLE A NUCLEAR FISSION EXPLOSIVE?!
  - type: CargoSellBlacklist
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      Nuke: !type:ContainerSlot

 - type: entity
  parent: NuclearBomb
--- a/Resources/Prototypes/Entities/Objects/Devices/payload.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
@@ -76,6 +76,11 @@
        enum.ChemicalPayloadFilledSlots.Left: payload-chemical-left
        enum.ChemicalPayloadFilledSlots.Right: payload-chemical-right
        enum.ChemicalPayloadFilledSlots.Both: payload-chemical-armed
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      BeakerSlotA: !type:ContainerSlot
+      BeakerSlotB: !type:ContainerSlot

 - type: entity
  name: flash payload
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -17,6 +17,11 @@
    state: pda
  - type: Item
    size: 10
+  - type: ContainerContainer
+    containers:
+      PDA-id: !type:ContainerSlot {}
+      PDA-pen: !type:ContainerSlot {}
+  - type: ItemSlots
  - type: Clothing
    quickEquip: false
    slots:
@@ -43,8 +48,8 @@
    interfaces:
    - key: enum.PDAUiKey.Key
      type: PDABoundUserInterface
-    - key: enum.UplinkUiKey.Key
-      type: UplinkBoundUserInterface
+    - key: enum.StoreUiKey.Key
+      type: StoreBoundUserInterface
    - key: enum.RingerUiKey.Key
      type: RingerBoundUserInterface
    - key: enum.InstrumentUiKey.Key
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml
@@ -147,7 +147,7 @@
    state: toms

 - type: entity
-  parent: BasePlaceableInstrument
+  parent: [ BasePlaceableInstrument, ConstructibleMachine]
  id: DawInstrument
  name: digital audio workstation
  description: Cutting edge music technology, straight from the 90s.
@@ -160,11 +160,7 @@
    - state: daw-panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: Appearance
-    visuals:
-    - type: WiresVisualizer
-  - type: Construction
-    graph: Machine
-    node: machine
+  - type: WiresVisuals
  - type: Wires
    BoardName: "DawInstrument"
    LayoutId: DawInstrument
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -487,10 +487,14 @@
  - type: BallisticAmmoProvider
    whitelist:
      tags:
-        - CartridgeRocket
+        - BulletFoam
    capacity: 1
    soundInsert:
      path: /Audio/Weapons/drawbow2.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  parent: BaseItem
@@ -530,6 +534,10 @@
    autoCycle: true
    soundInsert:
      path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  parent: BaseItem
@@ -648,3 +656,49 @@
    size: 24
    sprite: Objects/Fun/toys.rsi
    heldPrefix: orb
+
+- type: entity
+  id: ToySword
+  name: toy sword
+  description: New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing!
+  components:
+    - type: EnergySword
+      isSharp: false
+      colorOptions:
+        - DodgerBlue
+    - type: Sprite
+      sprite: Objects/Weapons/Melee/e_sword.rsi
+      layers:
+        - state: e_sword
+        - state: e_sword_blade
+          color: "#FFFFFF"
+          visible: false
+          shader: unshaded
+          map: [ "blade" ]
+    - type: Item
+      size: 5
+      sprite: Objects/Weapons/Melee/e_sword.rsi
+    - type: UseDelay
+      delay: 1.0
+    - type: PointLight
+      netsync: false
+      enabled: false
+      radius: 2
+      energy: 2
+      color: white
+    - type: Appearance
+    - type: ToggleableLightVisuals
+      spriteLayer: blade
+      inhandVisuals:
+        left:
+          - state: inhand-left-blade
+            shader: unshaded
+        right:
+          - state: inhand-right-blade
+            shader: unshaded
+    - type: DisarmMalus
+      malus: 0
+    - type: MeleeWeapon
+      damage:
+        types:
+          Blunt: 0
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -89,6 +89,7 @@
  parent: SheetGlassBase
  id: SheetRGlass
  name: reinforced glass
+  description: A reinforced sheet of glass.
  suffix: Full
  components:
  - type: Material
@@ -130,6 +131,7 @@
  parent: SheetGlassBase
  id: SheetPGlass
  name: plasma glass
+  description: A sheet of translucent plasma.
  suffix: Full
  components:
  - type: Material
@@ -168,6 +170,7 @@
  parent: SheetGlassBase
  id: SheetRPGlass
  name: reinforced plasma glass
+  description: A reinforced sheet of translucent plasma.
  suffix: Full
  components:
  - type: Material
--- a/Resources/Prototypes/Entities/Objects/Misc/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml
@@ -12,3 +12,6 @@
  - type: Storage
    capacity: 30
    size: 10
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -7,6 +7,7 @@
  - type: HandheldLight
    addPrefix: true
  - type: PowerCellSlot
+  - type: ItemSlots
  - type: ContainerContainer
    containers:
      cell_slot: !type:ContainerSlot
@@ -16,6 +17,7 @@
  - type: Item
    sprite: Objects/Misc/Lights/lights.rsi
    size: 20
+    heldPrefix: off
  - type: PointLight
    netsync: false
    enabled: false
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -67,6 +67,11 @@
          False: {visible: false}
  - type: Pullable
  - type: AntiRottingContainer
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+      paper_label: !type:ContainerSlot

 - type: entity
  id: BodyBag_Folded
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -67,3 +67,8 @@
        - type: StorageVisualizer
          state_open: artifact_container_open
          state_closed: artifact_container_door
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+        paper_label: !type:ContainerSlot
--- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
@@ -15,9 +15,11 @@
    count: 20
    max: 999999 # todo: add support for unlimited stacks
    stackType: Telecrystal
-  - type: Telecrystal
  - type: StackPrice
    price: 200
+  - type: Currency
+    price:
+      Telecrystal: 1

 - type: entity
  parent: Telecrystal
@@ -61,45 +63,55 @@
    heldPrefix: old-radio
  - type: UserInterface
    interfaces:
-    - key: enum.UplinkUiKey.Key
-      type: UplinkBoundUserInterface
-  - type: Uplink
-    activatesInHands: true
-
+    - key: enum.StoreUiKey.Key
+      type: StoreBoundUserInterface
+  - type: ActivatableUI
+    key: enum.StoreUiKey.Key
+  - type: Store
+    preset: StorePresetUplink
+    balance: 
+      Telecrystal: 0
+  
 - type: entity
  parent: BaseUplinkRadio
  id: BaseUplinkRadio20TC
  suffix: 20 TC
  components:
-  - type: Uplink
-    presetInfo:
-      balance: 20
+  - type: Store
+    preset: StorePresetUplink
+    balance:
+      Telecrystal: 20

-
-#Default Nuclear Operative amount, not considering crew count
 - type: entity
  parent: BaseUplinkRadio
  id: BaseUplinkRadio25TC
  suffix: 25 TC
  components:
-  - type: Uplink
-    presetInfo:
-      balance: 25
+  - type: Store
+    preset: StorePresetUplink
+    balance:
+      Telecrystal: 25

+#this uplink MUST be used for nukeops, as it has the tag for filtering the listing.
 - type: entity
  parent: BaseUplinkRadio
  id: BaseUplinkRadio40TC
-  suffix: 40 TC
+  suffix: 40 TC, NukeOps
  components:
-  - type: Uplink
-    presetInfo:
-      balance: 40
+  - type: Store
+    preset: StorePresetUplink
+    balance:
+      Telecrystal: 40
+  - type: Tag
+    tags:
+    - NukeOpsUplink

 - type: entity
  parent: BaseUplinkRadio
  id: BaseUplinkRadioDebug
  suffix: Debug
  components:
-  - type: Uplink
-    presetInfo:
-      balance: 9999
+  - type: Store
+    preset: StorePresetUplink
+    balance:
+      Telecrystal: 99999
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -31,6 +31,7 @@
  - type: ContainerContainer
    containers:
      cell_slot: !type:ContainerSlot
+  - type: ItemSlots
  - type: Sprite
    sprite: Objects/Tools/flashlight.rsi
    netsync: false
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -30,6 +30,10 @@
    - type: PowerCellSlot
      cellSlot:
        startingItem: PowerCellMedium
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot {}

 - type: entity
  name: extra-bright lantern
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -41,7 +41,7 @@
      visible: false
    - state: basic_icon_top
  - type: Item
-    size: 2
+    size: 1
    sprite: Objects/Tools/lighters.rsi
    heldPrefix: off
  - type: ItemCooldown
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -6,7 +6,7 @@
  - type: Storage
    capacity: 10
  - type: Item
-    size: 6
+    size: 10

 - type: entity
  name: match stick
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml
@@ -19,3 +19,7 @@
    steps: 2
    zeroVisible: false
  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
@@ -11,6 +11,10 @@
    capacity: 30
  - type: Sprite
    netsync: false
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 # Boxes
 - type: entity
@@ -20,7 +24,7 @@
  components:
  - type: BallisticAmmoProvider
    capacity: 40
-    proto: BulletDonkSoft
+    proto: BulletFoam
  - type: Sprite
    sprite: Objects/Fun/toys.rsi
    state: foambox
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -4,6 +4,7 @@
  abstract: true
  components:
  - type: Sprite
+    drawdepth: FloorObjects
    netsync: false
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
@@ -1,34 +1,14 @@
 - type: entity
-  id: BaseBulletDonkSoft
+  id: BulletFoam
+  description: I hope you're wearing eye protection.
  name: foam dart
  parent: BaseItem
-  abstract: true
  components:
-  - type: Tag
-    tags:
-      - Cartridge
-      - CartridgeRocket
-  - type: Projectile
-    damage:
-      types:
-        Blunt: 1
-    soundHit:
-      path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
-
- type: entity
-  id: BulletDonkSoft
-  name: foam dart
-  parent: BaseBulletDonkSoft
-  description: I hope you're wearing eye protection.
-  components:
-  - type: CartridgeAmmo
-    proto: BulletFoam
-    deleteOnSpawn: true
-  - type: Sprite
-    sprite: Objects/Fun/toys.rsi
-    layers:
-      - state: foamdart
-  - type: Projectile
-    damage:
-      types:
-        Blunt: 1
+    - type: Tag
+      tags:
+        - BulletFoam
+    - type: Ammo
+    - type: Sprite
+      sprite: Objects/Fun/toys.rsi
+      layers:
+        - state: foamdart
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -11,6 +11,10 @@
    capacity: 6
  - type: Sprite
    netsync: false
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  id: SpeedLoaderMagnum
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
@@ -12,6 +12,10 @@
  - type: Sprite
    netsync: false
    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  id: SpeedLoaderPistol
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
@@ -22,3 +22,7 @@
    steps: 6
    zeroVisible: false
  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml
@@ -21,6 +21,10 @@
    steps: 7
    zeroVisible: false
  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  id: SpeedLoaderCap
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -44,3 +44,7 @@
    steps: 4
    zeroVisible: true
  - type: Appearance
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -37,14 +37,24 @@
    angularDamping: 0
  - type: Fixtures
    fixtures:
-    - shape:
+    - id: projectile
+      shape:
        !type:PhysShapeAabb
        bounds: "-0.1,-0.1,0.1,0.1"
      hard: false
-      id: projectile
      mask:
      - Impassable
      - BulletImpassable
+    - &flybyfixture
+      id: fly-by
+      shape: !type:PhysShapeCircle
+        radius: 1.5
+      layer:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      hard: False
  - type: Projectile
    impactEffect: BulletImpactEffect
    damage:
@@ -76,6 +86,7 @@
      mask:
      - Impassable
      - BulletImpassable
+    - *flybyfixture

 - type: entity
  id: BaseBulletHighVelocity
@@ -142,6 +153,7 @@
      mask:
      - Impassable
      - BulletImpassable
+    - *flybyfixture
  - type: Ammo
  - type: StaminaDamageOnCollide
    damage: 30
@@ -178,6 +190,7 @@
      mask:
      - Impassable
      - Opaque
+    - *flybyfixture
  - type: Projectile
 #   soundHit:  Waiting on serv3
    damage:
@@ -323,24 +336,6 @@
    intensitySlope: 1
    maxIntensity: 10

- type: entity
-  id: BulletFoam
-  name: foam dart
-  parent: BaseBullet
-  noSpawn: true
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/toys.rsi
-    layers:
-      - state: foamdart
-  - type: Projectile
-    deleteOnCollide: true
-    damage:
-      types:
-        Blunt: 2
-    soundHit:
-      path: /Audio/Weapons/Guns/Hits/snap.ogg
-
 - type: entity
  id: BulletCap
  name: cap bullet
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -17,12 +17,17 @@
    - SemiAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
+  - type: ContainerContainer
+    containers:
+      revolver-ammo: !type:Container
  - type: RevolverAmmoProvider
    whitelist:
      tags:
        - CartridgeMagnum
    proto: CartridgeMagnum
    capacity: 7
+    chambers: [ True, True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null, null ]
    soundEject:
      path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg
    soundInsert:
@@ -46,6 +51,8 @@
    sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
  - type: RevolverAmmoProvider
    capacity: 5
+    chambers: [ True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null ]
  - type: MagazineVisuals
    magState: mag
    steps: 4
@@ -64,6 +71,8 @@
    sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
  - type: RevolverAmmoProvider
    capacity: 6
+    chambers: [ True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null ]

 - type: entity
  name: Mateba
@@ -75,8 +84,6 @@
    sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
  - type: Item
    sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
-  - type: RevolverAmmoProvider
-    capacity: 7
  - type: Gun
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
@@ -104,5 +111,10 @@
    sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
  - type: Gun
    fireRate: 1
+  - type: ContainerContainer
+    containers:
+      revolver-ammo: !type:Container
  - type: RevolverAmmoProvider
    capacity: 5
+    chambers: [ True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null ]
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -11,6 +11,7 @@
      - state: icon
        map: [ "enum.GunVisualLayers.Base" ]
  - type: Item
+    # If you update this also update the bulldog's size.
    size: 30
  - type: AmmoCounter
  - type: Gun
@@ -31,6 +32,10 @@
    proto: ShellShotgun
    soundInsert:
      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  name: Bulldog
@@ -49,6 +54,7 @@
      map: ["enum.GunVisualLayers.Mag"]
  - type: Item
    sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
+    size: 30
  - type: Gun
    fireRate: 2
    selectedMode: FullAuto
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -27,6 +27,10 @@
    whitelist:
      tags:
      - CartridgeLightRifle
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []

 - type: entity
  name: Kardashev-Mosin
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -27,3 +27,7 @@
    capacity: 1
    soundInsert:
      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -22,6 +22,7 @@
  - type: Physics
    bodyType: Dynamic
    fixedRotation: false
+    canCollide: false # most entities start asleep.
  - type: Fixtures
    fixtures:
    - shape:
@@ -48,4 +49,8 @@
    interfaces:
    - key: enum.StorageUiKey.Key
      type: StorageBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []

--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -1,6 +1,7 @@
 - type: entity
  abstract: true
  id: ReagentDispenserBase
+  parent: ConstructibleMachine
  placement:
    mode: SnapgridCenter
  components:
@@ -52,3 +53,9 @@
      whitelist:
        components:
        - FitsInDispenser
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
+      ReagentDispenser-beaker: !type:ContainerSlot
--- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -12,9 +12,6 @@
    emagPack: ChemDispenserEmaggedInventory
  - type: ApcPowerReceiver
  - type: ExtensionCableReceiver
-  - type: Construction
-    graph: Machine
-    node: machine
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -61,7 +61,7 @@
  - type: Appearance
    visuals:
    - type: AirlockVisualizer
-    - type: WiresVisualizer
+  - type: WiresVisuals
  - type: ApcPowerReceiver
    powerLoad: 20
  - type: ExtensionCableReceiver
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -20,7 +20,7 @@
  - type: Appearance
    visuals:
    - type: AirlockVisualizer
-    - type: WiresVisualizer
+  - type: WiresVisuals
  - type: PaintableAirlock
    group: External

--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
@@ -53,7 +53,7 @@
  - type: Appearance
    visuals:
    - type: AirlockVisualizer
-    - type: WiresVisualizer
+  - type: WiresVisuals
  - type: ApcPowerReceiver
    powerLoad: 20
  - type: ExtensionCableReceiver
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -77,7 +77,7 @@
        - type: AirlockVisualizer
          animationTime: 0.6
          emergencyAccessLayer: false
-        - type: WiresVisualizer
+    - type: WiresVisuals
    - type: Wires
      BoardName: "Firelock Control"
      LayoutId: Firelock
@@ -85,10 +85,14 @@
      interfaces:
        - key: enum.WiresUiKey.Key
          type: WiresBoundUserInterface
+    - type: Physics
+      canCollide: false
    - type: Airtight
      fixVacuum: true
+      airBlocked: false
      noAirWhenFullyAirBlocked: true
    - type: Occluder
+      enabled: false
    - type: Construction
      graph: Firelock
      node: Firelock
@@ -126,6 +130,7 @@
      sprite: Structures/Doors/edge_door_hazard.rsi
    - type: Airtight
      fixVacuum: true
+      airBlocked: false
      noAirWhenFullyAirBlocked: false
      airBlockedDirection:
        - South
@@ -143,3 +148,5 @@
      enabled: false
    - type: Door
      occludes: false
+    - type: Physics
+      canCollide: false
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -33,3 +33,9 @@
  components:
  - type: Door
    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Physics
+    canCollide: false
+  - type: Airtight
+    airBlocked: false
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -66,6 +66,11 @@
    key: walls
    mode: NoSprite
  - type: DoorSignalControl
+  - type: SignalReceiver
+    inputs:
+      Open: []
+      Close: []
+      Toggle: []
  - type: InteractionPopup
    interactSuccessString: comp-window-knock
    messagePerceivedByOthers: comp-window-knock
@@ -127,6 +132,12 @@
  - type: Construction
    graph: Shutters
    node: ShuttersRadiation
+  - type: Occluder
+    enabled: false
+  - type: Physics
+    canCollide: false
+  - type: Airtight
+    airBlocked: false

 - type: entity
  id: ShuttersWindow
@@ -154,6 +165,10 @@
  - type: Construction
    graph: Shutters
    node: ShuttersWindow
+  - type: Physics
+    canCollide: false
+  - type: Airtight
+    airBlocked: false

 # Frame for construction
 - type: entity
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -101,7 +101,7 @@
        denyAnimationTime: 0.4
        animatedPanel: false
        openUnlitVisible: true
-      - type: WiresVisualizer
+  - type: WiresVisuals
  - type: Airtight
    fixVacuum: true
    noAirWhenFullyAirBlocked: false
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -25,6 +25,9 @@
  - type: PottedPlantHide
  - type: SecretStash
    secretPartName: the plant
+  - type: ContainerContainer
+    containers:
+      stash: !type:ContainerSlot {}
  - type: Pullable
  - type: Damageable
    damageContainer: Inorganic # The pot. Not the plant. Or is it plastic?
--- a/Show More
+++ b/Show More