Merge branch 'master' into ed-17-07-2024-dungenagain

2024-08-05 23:08:01 +03:00
parent aae4be5e7c 37e0ffa173
commit 56affe2f8b
1423 changed files with 219353 additions and 54715 deletions
--- a/Resources/Audio/_CP14/Effects/attributions.yml
+++ b/Resources/Audio/_CP14/Effects/attributions.yml
@@ -16,4 +16,9 @@
 - files: ["thud.ogg"]
  license: "CC0-1.0"
  copyright: 'BMacZero of Freesound.org'
-  source: "https://freesound.org/people/BMacZero/sounds/96138/"
+  source: "https://freesound.org/people/BMacZero/sounds/96138/"
+
+- files: ["aura_scanner.ogg"]
+  license: "CC0-1.0"
+  copyright: 'Breviceps of Freesound.org'
+  source: "https://freesound.org/people/Breviceps/sounds/493162/"
--- a/Resources/Audio/_CP14/Effects/aura_scanner.ogg
+++ b/Resources/Audio/_CP14/Effects/aura_scanner.ogg
--- a/Resources/Audio/_CP14/Items/attributions.yml
+++ b/Resources/Audio/_CP14/Items/attributions.yml
@@ -46,4 +46,9 @@
 - files: ["nailing1.ogg", "nailing2.ogg", "nailing3.ogg", "nailing4.ogg"]
  license: "CC-BY-4.0"
  copyright: 'by InspectorJ of Freesound.org. Cropped and mixed from stereo to mono.'
-  source: "https://freesound.org/people/InspectorJ/sounds/406048/"
+  source: "https://freesound.org/people/InspectorJ/sounds/406048/"
+
+- files: ["sawing1.ogg", "sawing2.ogg", "sawing3.ogg", "sawing4.ogg", "sawing5.ogg"]
+  license: "CC0-1.0"
+  copyright: 'by deleted_user_7146007 of Freesound.org. Cropped and mixed from stereo to mono.'
+  source: "https://freesound.org/people/deleted_user_7146007/sounds/383725/"
--- a/Resources/Audio/_CP14/Items/sawing1.ogg
+++ b/Resources/Audio/_CP14/Items/sawing1.ogg
--- a/Resources/Audio/_CP14/Items/sawing2.ogg
+++ b/Resources/Audio/_CP14/Items/sawing2.ogg
--- a/Resources/Audio/_CP14/Items/sawing3.ogg
+++ b/Resources/Audio/_CP14/Items/sawing3.ogg
--- a/Resources/Audio/_CP14/Items/sawing4.ogg
+++ b/Resources/Audio/_CP14/Items/sawing4.ogg
--- a/Resources/Audio/_CP14/Items/sawing5.ogg
+++ b/Resources/Audio/_CP14/Items/sawing5.ogg
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,489 +1,4 @@
 Entries:
- author: cooldolphin
-  changes:
-  - message: Three variants of glasses are now available in the loadout menu.
-    type: Add
-  id: 6435
-  time: '2024-04-25T23:18:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27286
- author: EmoGarbage404
-  changes:
-  - message: Traitors now have the correct number of objectives.
-    type: Fix
-  - message: Declaring war now gives TC again.
-    type: Fix
-  - message: Latejoining antagonists will now properly exclude command and security
-      staff.
-    type: Fix
-  id: 6436
-  time: '2024-04-26T00:25:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27319
- author: Tayrtahn
-  changes:
-  - message: Fixed Bibles not healing.
-    type: Fix
-  - message: Fixed quick insert and area insert not working on ore/plant/trash bags.
-    type: Fix
-  id: 6437
-  time: '2024-04-26T02:25:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27234
- author: SkaldetSkaeg
-  changes:
-  - message: The handheld radio no longer plays a message spoken into it.
-    type: Tweak
-  id: 6438
-  time: '2024-04-26T07:34:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27046
- author: FungiFellow
-  changes:
-  - message: Added SecBelt whitelist to Sec webbing
-    type: Tweak
-  - message: Added more Ammo holders to SecBelt whitelist
-    type: Tweak
-  id: 6439
-  time: '2024-04-26T07:44:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27303
- author: IlyaElDunaev
-  changes:
-  - message: Ammonia heal blood loss in the Rat King
-    type: Add
-  id: 6440
-  time: '2024-04-26T07:47:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26887
- author: FungiFellow
-  changes:
-  - message: Added Quiver Recipe, go wild Robin Hood.
-    type: Add
-  id: 6441
-  time: '2024-04-26T07:48:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27198
- author: Boaz1111
-  changes:
-  - message: Refactored Cluster's medbay, including cryo in the bottom left room
-    type: Tweak
-  id: 6442
-  time: '2024-04-26T08:01:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27293
- author: metalgearsloth
-  changes:
-  - message: Add predicted UI opening for storage and PDAs.
-    type: Add
-  id: 6443
-  time: '2024-04-26T08:16:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27214
- author: DrSmugleaf
-  changes:
-  - message: Fixed mobs that are able to pry doors not being able to do so by just
-      left clicking on them.
-    type: Fix
-  id: 6444
-  time: '2024-04-26T12:17:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27349
- author: WarMechanic
-  changes:
-  - message: Fixed unwielding overruling gun cycling
-    type: Fix
-  id: 6445
-  time: '2024-04-26T12:31:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27307
- author: wafehling
-  changes:
-  - message: You can now reopen the end of round summary window with F9.
-    type: Tweak
-  id: 6446
-  time: '2024-04-26T12:39:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25884
- author: DrSmugleaf
-  changes:
-  - message: Fixed the game never starting again if it fails to start once.
-    type: Fix
-  id: 6447
-  time: '2024-04-26T13:02:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27359
- author: Dutch-VanDerLinde
-  changes:
-  - message: Monkey reinforcement teleporters can now select between kobold and monkey
-      operative with a verb.
-    type: Tweak
-  - message: Monkey reinforcement teleporters have been renamed to "genetic ancestor
-      reinforcement teleporter".
-    type: Tweak
-  id: 6448
-  time: '2024-04-26T13:06:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25982
- author: fujiwaranao
-  changes:
-  - message: Players may now select the Creepy Long hairstyle and an appropriately
-      creepy dress to go with it can be found in theatrical performances crates.
-    type: Add
-  id: 6449
-  time: '2024-04-26T18:51:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27333
- author: Pgriha
-  changes:
-  - message: Increase limit of characters 10 -> 30.
-    type: Tweak
-  id: 6450
-  time: '2024-04-26T22:58:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27361
- author: AllenTheGreat
-  changes:
-  - message: The Agent ID card will no longer reset the selected job icon between
-      UI loads
-    type: Fix
-  id: 6451
-  time: '2024-04-27T05:13:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27379
- author: Slava0135
-  changes:
-  - message: added cancer mouse! (for real this time)
-    type: Add
-  id: 6452
-  time: '2024-04-27T05:46:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26768
- author: EmoGarbage404
-  changes:
-  - message: Added the welding gas mask to salvage equipment research.
-    type: Add
-  id: 6453
-  time: '2024-04-27T05:47:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27108
- author: VigersRay
-  changes:
-  - message: Angered NPC now can unbuckle, unpull and escape from containers.
-    type: Fix
-  id: 6454
-  time: '2024-04-27T05:58:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26868
- author: Lukasz825700516
-  changes:
-  - message: Fixed undeconstructable objects showing deconstruct verb.
-    type: Fix
-  id: 6455
-  time: '2024-04-27T06:30:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27387
- author: ps3moira
-  changes:
-  - message: Added Canes to the CuraDrobe and Cane Blades for Syndicate Librarians
-    type: Add
-  id: 6456
-  time: '2024-04-27T10:22:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25873
- author: Lukasz825700516
-  changes:
-  - message: Fixed books containing localization keys.
-    type: Fix
-  id: 6457
-  time: '2024-04-27T10:23:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27390
- author: Errant
-  changes:
-  - message: Vox now take significant damage over time while inhaling oxygen.
-    type: Tweak
-  id: 6458
-  time: '2024-04-27T10:33:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26705
- author: TheShuEd
-  changes:
-  - message: Added tomato killers in floral anomaly berries
-    type: Add
-  - message: tweak size and damage of killer tomatoes
-    type: Tweak
-  id: 6459
-  time: '2024-04-27T10:35:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27265
- author: Plykiya
-  changes:
-  - message: You can no longer print singular bullets at the security techfab.
-    type: Remove
-  - message: The security techfab now has recipes for ammunition boxes and pre-filled
-      magazines of every type of ammo.
-    type: Add
-  - message: You can now print empty magazines at the security techfab.
-    type: Add
-  - message: Material costs for printing all ammo and mags were rebalanced.
-    type: Tweak
-  id: 6460
-  time: '2024-04-27T10:38:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26178
- author: Ramlik
-  changes:
-  - message: Added security walkie talkies to the vendor.
-    type: Add
-  id: 6461
-  time: '2024-04-27T13:27:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25913
- author: brainfood1183
-  changes:
-  - message: Centcom advises all crewmembers to please stop putting rodents in the
-      fax machines (rodents can now be inserted into fax machine).
-    type: Add
-  id: 6462
-  time: '2024-04-27T13:50:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/21461
- author: MilenVolf
-  changes:
-  - message: Glass Box now can be constructed and deconstructed!
-    type: Add
-  - message: Glass Box now makes an alarm sound on destruction.
-    type: Tweak
-  - message: Now Antique Laser can be put back in the Glass Box.
-    type: Fix
-  id: 6463
-  time: '2024-04-27T13:53:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25365
- author: metalgearsloth
-  changes:
-  - message: Fix a lot of UI bugs.
-    type: Fix
-  id: 6464
-  time: '2024-04-27T16:32:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27401
- author: RiceMar1244
-  changes:
-  - message: Resprited the captain's antique laser pistol.
-    type: Tweak
-  id: 6465
-  time: '2024-04-27T19:08:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27037
- author: SlamBamActionman
-  changes:
-  - message: Hardsuits and other helmets/hoods should no longer make you bald after
-      toggling.
-    type: Fix
-  id: 6466
-  time: '2024-04-27T19:10:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27404
- author: Plykiya
-  changes:
-  - message: Max amount of traitors dropped from 12 to 8.
-    type: Tweak
-  id: 6467
-  time: '2024-04-28T02:25:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27415
- author: Plykiya
-  changes:
-  - message: The emagged autolathe now has recipes for ammunition boxes and pre-filled
-      magazines of every type of ammo.
-    type: Add
-  - message: You can now print empty magazines at the emagged autolathe.
-    type: Add
-  id: 6468
-  time: '2024-04-28T03:02:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27396
- author: icekot8
-  changes:
-  - message: T3 Portable Microfusion Weaponry research now have a portable charger
-    type: Add
-  id: 6469
-  time: '2024-04-28T03:19:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26655
- author: osjarw
-  changes:
-  - message: Putting a hand labeler in a belt is now predicted correctly.
-    type: Fix
-  id: 6470
-  time: '2024-04-28T04:19:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26660
- author: Dezzzix
-  changes:
-  - message: Added bar spoon, jigger and ice bucket
-    type: Add
-  - message: Bartender tools added in boozeomat
-    type: Add
-  - message: Jigger added in Bartender guidebook
-    type: Add
-  id: 6471
-  time: '2024-04-28T04:40:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27406
- author: KrasnoshchekovPavel
-  changes:
-  - message: Included damage type/group, metabolism type/group localization for weapon
-      damage examination and guidebook reagent effects
-    type: Fix
-  id: 6472
-  time: '2024-04-28T04:48:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27368
- author: Keer-Sar
-  changes:
-  - message: Medal Cases now only hold medals
-    type: Tweak
-  id: 6473
-  time: '2024-04-28T05:04:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27428
- author: EmoGarbage404
-  changes:
-  - message: Lockers can now be deconstructed again.
-    type: Fix
-  id: 6474
-  time: '2024-04-28T05:26:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27431
- author: SlamBamActionman
-  changes:
-  - message: "Removed Exterminators pending redesign. \U0001F525\U0001F44D\U0001F525"
-    type: Remove
-  id: 6475
-  time: '2024-04-28T05:45:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26978
- author: Boaz1111
-  changes:
-  - message: Circuit imprinter recipes now cost less glass
-    type: Tweak
-  id: 6476
-  time: '2024-04-28T05:46:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27310
- author: Piksqu & Boaz1111
-  changes:
-  - message: Added the hyperconvection circuit imprinter
-    type: Add
-  id: 6477
-  time: '2024-04-28T05:49:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27283
- author: exincore
-  changes:
-  - message: Fax machines now copy the labels attached to papers.
-    type: Add
-  - message: Fax machine "Print File" functionality now applies the first line of
-      the file as a label when it begins with `#`.
-    type: Add
-  id: 6478
-  time: '2024-04-28T06:12:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25979
- author: Plykiya
-  changes:
-  - message: Hardsuits, EVA suits, firesuits and other things now protect your feet
-      from dangerous glass shards.
-    type: Tweak
-  id: 6479
-  time: '2024-04-28T07:11:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26764
- author: FungiFellow
-  changes:
-  - message: Bows now fit in Exosuit slot.
-    type: Tweak
-  id: 6480
-  time: '2024-04-28T08:23:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27433
- author: osjarw
-  changes:
-  - message: Fixed some anomaly behaviours pulsing at wrong rates.
-    type: Fix
-  id: 6481
-  time: '2024-04-28T09:28:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27435
- author: Ubaser
-  changes:
-  - message: Pyrotton can now be mutated from cotton.
-    type: Add
-  id: 6482
-  time: '2024-04-28T11:07:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27200
- author: Plykiya
-  changes:
-  - message: You can now pick up Smile and put them in your bag.
-    type: Add
-  id: 6483
-  time: '2024-04-29T02:44:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27458
- author: Beck Thompson, CoffeePoweredPHD
-  changes:
-  - message: Fixed infinite reagent duplication glitch with toilets and drains.
-    type: Fix
-  - message: Dirty water toilets now function correctly as toilets.
-    type: Fix
-  id: 6484
-  time: '2024-04-29T03:08:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27446
- author: Nopey
-  changes:
-  - message: Many more items can now be recycled, including mops, medkits, and stun
-      batons.
-    type: Tweak
-  id: 6485
-  time: '2024-04-29T03:36:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24435
- author: Hanzdegloker
-  changes:
-  - message: '"Denied" and "Approved" stamps are now guaranteed to appear in the lockers
-      of the HoP and QM.'
-    type: Tweak
-  id: 6486
-  time: '2024-04-29T03:38:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25604
- author: Potato1234_x
-  changes:
-  - message: Added rainbow weed. It is obtained by mutating regular weed.
-    type: Add
-  id: 6487
-  time: '2024-04-29T04:06:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25759
- author: Gotimanga
-  changes:
-  - message: Chemists can now create opporozidone, which reverses the effects of rotting
-      in deceased patients while in cryo.
-    type: Add
-  id: 6488
-  time: '2024-04-29T04:13:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24074
- author: Mangohydra
-  changes:
-  - message: Added a new syndicate cyborg module that contains a very dangerous explosive
-      as a 4tc purchase.
-    type: Add
-  id: 6489
-  time: '2024-04-29T04:16:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25815
- author: Morb0
-  changes:
-  - message: Added emote panel (by default Y)
-    type: Add
-  id: 6490
-  time: '2024-04-29T04:38:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26702
- author: MilenVolf
-  changes:
-  - message: Borgs now have brand new voice and walking sounds.
-    type: Add
-  - message: Syndicate assault borgs now have new feature to scare - manic laugher.
-    type: Add
-  id: 6491
-  time: '2024-04-29T04:38:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27205
- author: KrasnoshchekovPavel
-  changes:
-  - message: Fixed formatting of floating point numbers during localization
-    type: Fix
-  id: 6492
-  time: '2024-04-29T04:52:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27441
- author: mirrorcult
-  changes:
-  - message: Random events should now occur much more frequently
-    type: Tweak
-  id: 6493
-  time: '2024-04-29T06:38:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27469
- author: Plykiya
-  changes:
-  - message: Latejoin players now have a chance to roll thief.
-    type: Add
-  id: 6494
-  time: '2024-04-29T06:38:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27466
- author: ElectroJr
-  changes:
-  - message: Fixed actions sometimes disappearing from the hotbar when double clicking
-    type: Fix
-  id: 6495
-  time: '2024-04-29T08:36:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27468
- author: DrSmugleaf
-  changes:
-  - message: Fixed bullets not going exactly where you click when moving.
-    type: Fix
-  id: 6496
-  time: '2024-04-29T13:12:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27484
 - author: FungiFellow
  changes:
  - message: Syndi-Cats now have a Wideswing, 80% Explosion Resist, 6/6/15 Pierce/Slash/Structural
@@ -3805,3 +3320,464 @@
  id: 6934
  time: '2024-07-19T01:08:52.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/30115
+- author: deepdarkdepths
+  changes:
+  - message: Removed the description about geras in the Slime guidebook section.
+    type: Remove
+  id: 6935
+  time: '2024-07-19T09:04:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30140
+- author: Blackern5000
+  changes:
+  - message: Nuclear operatives are now able to purchase durable armor which is NOT
+      space-proof.
+    type: Add
+  id: 6936
+  time: '2024-07-19T09:38:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29845
+- author: Plykiya, slarticodefast
+  changes:
+  - message: Explosive pens now correctly embed into their target.
+    type: Fix
+  id: 6937
+  time: '2024-07-19T09:42:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30112
+- author: ThatOneEnby1337
+  changes:
+  - message: News Reporters are now able to use markup tags in their reports without
+      bricking the PDAs of readers
+    type: Fix
+  id: 6938
+  time: '2024-07-19T14:18:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30169
+- author: themias
+  changes:
+  - message: Mailing units are functional again
+    type: Fix
+  id: 6939
+  time: '2024-07-20T02:31:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30174
+- author: Ghagliiarghii
+  changes:
+  - message: Nuclear Operatives' Reinforcements now have a PDA!
+    type: Tweak
+  id: 6940
+  time: '2024-07-20T02:59:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28088
+- author: Plykiya
+  changes:
+  - message: Chameleon scarves now work again.
+    type: Fix
+  id: 6941
+  time: '2024-07-20T03:00:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30156
+- author: Aidenkrz
+  changes:
+  - message: The mass hallucinations event no longer affects non-humanoids.
+    type: Fix
+  id: 6942
+  time: '2024-07-20T05:53:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28748
+- author: buntobaggins
+  changes:
+  - message: Increased light radius on the Spationaut Hardsuit
+    type: Tweak
+  id: 6943
+  time: '2024-07-21T03:29:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30049
+- author: EmoGarbage404
+  changes:
+  - message: Fixed wires not updating UI on the Particle Accelerator.
+    type: Fix
+  id: 6944
+  time: '2024-07-21T05:27:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28750
+- author: CroilBird
+  changes:
+  - message: 6-pack of cola displays correctly when not being handled
+    type: Fix
+  id: 6945
+  time: '2024-07-21T05:49:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29309
+- author: metalgearsloth
+  changes:
+  - message: Fix muzzle flashes not tracking properly.
+    type: Fix
+  id: 6946
+  time: '2024-07-21T06:09:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30163
+- author: metalgearsloth
+  changes:
+  - message: Fix being able to throw items while your cursor is off-screen.
+    type: Fix
+  id: 6947
+  time: '2024-07-21T06:13:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30164
+- author: metalgearsloth
+  changes:
+  - message: Reset the scroll bar in the ghost warp menu whenever you search for a
+      role. Previously it remained at your previous position and you would have to
+      scroll up to see the first entry.
+    type: Tweak
+  id: 6948
+  time: '2024-07-21T06:38:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30159
+- author: Blackern5000
+  changes:
+  - message: The syndicate agent's cyborg weapons module now uses syndicate weaponry
+      rather than NT weaponry.
+    type: Tweak
+  id: 6949
+  time: '2024-07-21T07:04:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26947
+- author: Winkarst-cpu
+  changes:
+  - message: Added ambience to the camera routers and telecommunication servers.
+    type: Add
+  - message: Now server's and router's ambience stops once they are unpowered.
+    type: Fix
+  id: 6950
+  time: '2024-07-21T07:22:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30091
+- author: Scott Dimeling
+  changes:
+  - message: Reduced the number of botanists in some stations, for optimal _workflow_
+    type: Tweak
+  id: 6951
+  time: '2024-07-21T07:23:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29581
+- author: metalgearsloth
+  changes:
+  - message: Escape pods won't show up on shuttle map anymore.
+    type: Tweak
+  id: 6952
+  time: '2024-07-21T07:23:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29758
+- author: IProduceWidgets
+  changes:
+  - message: an arabian lamp!
+    type: Add
+  id: 6953
+  time: '2024-07-21T07:24:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27270
+- author: osjarw
+  changes:
+  - message: NPCs no longer get stuck trying to pick up anchored pipes.
+    type: Fix
+  id: 6954
+  time: '2024-07-21T07:28:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30061
+- author: The Hands Leader - JoJo cat
+  changes:
+  - message: Train map is back into rotation
+    type: Tweak
+  id: 6955
+  time: '2024-07-21T07:44:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30145
+- author: Plykiya
+  changes:
+  - message: Syndicate traitor reinforcements are now specialized to be medics, spies,
+      or thieves.
+    type: Add
+  - message: Reinforcement radios with options now have a radial menu, similar to
+      RCDs.
+    type: Tweak
+  id: 6956
+  time: '2024-07-21T10:32:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29853
+- author: Cojoke-dot
+  changes:
+  - message: Dead Space Dragons no long despawn
+    type: Fix
+  id: 6957
+  time: '2024-07-21T10:46:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29842
+- author: slarticodefast
+  changes:
+  - message: Fixed microwave construction.
+    type: Fix
+  id: 6958
+  time: '2024-07-21T16:20:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30232
+- author: Sphiral&Kezu
+  changes:
+  - message: 'Added a variety of new wall based storages: Shelfs! Build some today!'
+    type: Add
+  id: 6959
+  time: '2024-07-21T17:16:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27858
+- author: valquaint, slarticodefast
+  changes:
+  - message: Fixed borgs being unable to state laws with an activated flashlight.
+    type: Fix
+  id: 6960
+  time: '2024-07-22T03:55:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30183
+- author: Lank
+  changes:
+  - message: Darts can now pop balloons. Keep them away from any monkeys.
+    type: Add
+  id: 6961
+  time: '2024-07-22T05:38:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30088
+- author: Plykiya
+  changes:
+  - message: You can now eat or drink and swap hands without it being interrupted.
+    type: Tweak
+  id: 6962
+  time: '2024-07-22T09:17:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30060
+- author: IProduceWidgets
+  changes:
+  - message: Zookeepers can now possess Nonlethal shotguns according to spacelaw.
+    type: Tweak
+  id: 6963
+  time: '2024-07-22T09:33:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30237
+- author: Plykiya
+  changes:
+  - message: Bag sounds can now only be heard from half the distance and is quieter
+      in general.
+    type: Tweak
+  id: 6964
+  time: '2024-07-22T09:54:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30225
+- author: osjarw
+  changes:
+  - message: Syringes are now 0.5 seconds faster.
+    type: Tweak
+  id: 6965
+  time: '2024-07-22T10:20:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29825
+- author: Errant
+  changes:
+  - message: Replay observers now always spawn on the station.
+    type: Fix
+  id: 6966
+  time: '2024-07-22T19:32:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30252
+- author: Cojoke-dot
+  changes:
+  - message: You can now read the volume of a gas tank in its examine text
+    type: Tweak
+  id: 6967
+  time: '2024-07-22T21:41:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29771
+- author: Cojoke-dot
+  changes:
+  - message: Throwing a jetpack mid-flight will no longer freeze your character
+    type: Fix
+  id: 6968
+  time: '2024-07-22T22:24:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30223
+- author: Flareguy
+  changes:
+  - message: Added vox sprites for a few headwear items, including radiation suits
+      and the paramedic helmet.
+    type: Add
+  id: 6969
+  time: '2024-07-23T02:18:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30150
+- author: Cojoke-dot
+  changes:
+  - message: You can no longer use telescreens and televisions while blind or asleep.
+    type: Fix
+  id: 6970
+  time: '2024-07-23T02:33:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30260
+- author: Cojoke-dot
+  changes:
+  - message: Fix one of the QSI popups
+    type: Fix
+  id: 6971
+  time: '2024-07-23T03:23:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30265
+- author: Errant
+  changes:
+  - message: Players are now notified when trying to insert an incompatible magazine
+      into a gun.
+    type: Add
+  id: 6972
+  time: '2024-07-23T06:36:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29046
+- author: TheKittehJesus
+  changes:
+  - message: The Syndicate Assault Borg can now wield their double esword
+    type: Fix
+  id: 6973
+  time: '2024-07-23T08:13:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30229
+- author: Scribbles0
+  changes:
+  - message: Handless mobs can no longer wipe devices like positronic brains or pAIs.
+    type: Fix
+  id: 6974
+  time: '2024-07-23T17:47:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30149
+- author: Quantus
+  changes:
+  - message: Reagent grinders can no longer auto-grind when unpowered.
+    type: Fix
+  id: 6975
+  time: '2024-07-23T21:02:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30267
+- author: BombasterDS
+  changes:
+  - message: Fixed items disappearing after shelfs and mannequin disassembling
+    type: Fix
+  id: 6976
+  time: '2024-07-24T08:57:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30313
+- author: Cojoke-dot
+  changes:
+  - message: Fix infinite QSI linking range
+    type: Fix
+  id: 6977
+  time: '2024-07-24T20:57:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30332
+- author: deltanedas
+  changes:
+  - message: Borgs can no longer unlock the robotics console or other borgs.
+    type: Tweak
+  id: 6978
+  time: '2024-07-25T03:54:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27888
+- author: themias
+  changes:
+  - message: Fixed the ripley control panel not loading
+    type: Fix
+  id: 6979
+  time: '2024-07-25T05:23:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30325
+- author: Timur2011
+  changes:
+  - message: Space adders are now butcherable.
+    type: Add
+  - message: Snakes now drop snake meat when butchered.
+    type: Fix
+  - message: Snakes now appear lying when in critical state.
+    type: Tweak
+  id: 6980
+  time: '2024-07-25T10:52:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29629
+- author: Plykiya
+  changes:
+  - message: You can now build atmos gas pipes through things like walls.
+    type: Tweak
+  id: 6981
+  time: '2024-07-25T23:26:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28707
+- author: Ilya246
+  changes:
+  - message: Nuclear operative reinforcements now come with full nuclear operative
+      gear (and a toy carp) at no additional cost.
+    type: Tweak
+  - message: Nuclear operative reinforcements now get nuclear operative names.
+    type: Tweak
+  id: 6982
+  time: '2024-07-25T23:37:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30173
+- author: Cojoke-dot
+  changes:
+  - message: Engineering goggles and other similar-looking eyewear now help block
+      identity.
+    type: Tweak
+  - message: Radiation suit's hood now blocks identity.
+    type: Fix
+  id: 6983
+  time: '2024-07-26T05:26:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30305
+- author: Moomoobeef
+  changes:
+  - message: Some radio channel colors have been tweaked in order to be more easily
+      distinguishable.
+    type: Tweak
+  id: 6984
+  time: '2024-07-26T06:47:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30133
+- author: Errant
+  changes:
+  - message: Replay ghosts now actually spawn on the proper station, take two.
+    type: Fix
+  id: 6985
+  time: '2024-07-26T12:59:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30273
+- author: themias
+  changes:
+  - message: Arcade machines are functional again
+    type: Fix
+  id: 6986
+  time: '2024-07-26T17:30:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30376
+- author: themias
+  changes:
+  - message: Zombies now get uncuffed upon transformation
+    type: Fix
+  id: 6987
+  time: '2024-07-26T18:48:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30321
+- author: metalgearsloth
+  changes:
+  - message: Fix grid labels getting spammed from VGRoid.
+    type: Fix
+  id: 6988
+  time: '2024-07-27T01:54:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29946
+- author: GoldenCan
+  changes:
+  - message: Added a Security Clown Mask which is obtainable by hacking a SecDrobe.
+    type: Add
+  id: 6989
+  time: '2024-07-27T04:09:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30249
+- author: Plykiya
+  changes:
+  - message: Thief game rule now properly selects more than one thief.
+    type: Fix
+  id: 6990
+  time: '2024-07-27T07:27:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30393
+- author: BombasterDS
+  changes:
+  - message: Added new plant mutations for apple, sugarcane and galaxythistle
+    type: Add
+  id: 6991
+  time: '2024-07-27T15:08:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28993
+- author: Spessmann
+  changes:
+  - message: Thief objectives for figurines and stamps now require less items
+    type: Tweak
+  id: 6992
+  time: '2024-07-27T23:11:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30390
+- author: metalgearsloth
+  changes:
+  - message: Moved VGRoid from 1,000m away to ~500m.
+    type: Tweak
+  id: 6993
+  time: '2024-07-28T03:14:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29943
+- author: lzk228
+  changes:
+  - message: Fixed pancakes stacks. Before it, splitting not default pancakes stacks
+      would give you default pancakes.
+    type: Fix
+  id: 6994
+  time: '2024-07-28T03:49:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30270
+- author: Plykiya
+  changes:
+  - message: Fixed the client mispredicting people slipping with their magboots turned
+      on
+    type: Fix
+  id: 6995
+  time: '2024-07-28T06:17:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30425
+- author: Katzenminer
+  changes:
+  - message: Pun and similar pets are no longer firemune
+    type: Fix
+  id: 6996
+  time: '2024-07-28T08:32:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30424
--- a/Resources/ConfigPresets/Build/development.toml
+++ b/Resources/ConfigPresets/Build/development.toml
@@ -1,4 +1,7 @@
-[game]
+[cp14]
+arrivals_ship = false
+
+[game]
 # Straight in-game baby
 lobbyenabled = false
 # Dev map for faster loading & convenience
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
@@ -15,7 +15,7 @@ baby_jail.enabled = true
 baby_jail.show_reason = true
 baby_jail.max_account_age = 5256000 # 10 years. Disabling this check specifically isn't currently supported
 baby_jail.max_overall_minutes = 3000 # 50 hours
-baby_jail.custom_reason = "Sorry! Only new players can join the servers, try joining another one instead!"
+baby_jail.custom_reason = "Sorry! Only new and whitelisted players can join this server. Apply to be whitelisted in our Discord server (discord.ss14.io) or try joining another server instead!"
 baby_jail.whitelisted_can_bypass = true

 [hub]
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
--- a/Resources/IgnoredPrototypes/cp14-ignoredPrototypes.yml
+++ b/Resources/IgnoredPrototypes/cp14-ignoredPrototypes.yml
@@ -0,0 +1,2 @@
+- /Prototypes/Maps
+- /Prototypes/Traits
--- a/Resources/Locale/en-US/_CP14/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/_CP14/alerts/alerts.ftl
@@ -0,0 +1,2 @@
+cp14-alerts-magic-energy-name = Magic energy
+cp14-alerts-magic-energy-desc = A reserve of your internal magic power that allows you to use spells.
--- a/Resources/Locale/en-US/_CP14/currency/currency_comp.ftl
+++ b/Resources/Locale/en-US/_CP14/currency/currency_comp.ftl
@@ -0,0 +1,4 @@
+cp14-currency-examine-title = Market price:
+cp14-currency-examine-gp = [color=#ebad3b]{$coin}gp[/color]
+cp14-currency-examine-sp = [color=#bad1d6]{$coin}sp[/color]
+cp14-currency-examine-cp = [color=#824e27]{$coin}cp[/color]
--- a/Resources/Locale/en-US/_CP14/job/job.ftl
+++ b/Resources/Locale/en-US/_CP14/job/job.ftl
@@ -1,8 +1,17 @@
 cp14-job-name-captain = Expedition captain
 cp14-job-desc-captain = You are the most important person in this expedition. Organize its participants and manage the processes to complete the task set from the management.

+cp14-job-name-guard-commander = Guard commander
+cp14-job-desc-guard-commander = The most dangerous person on this expedition. Manage a squad of soldiers to ensure the safety of all members of the command.
+
+cp14-job-name-house-keeper = Housekeeper
+cp14-job-desc-house-keeper = Responsible for material resources. Manage the expedition's supplies and finances, directing resources to the mercenaries who do all the dirty work.
+
 cp14-job-name-adventurer = Adventurer
-cp14-job-desc-adventurer = A hunter of thrills, riches and fame, constantly risking his life. Search for valuables in dangerous places and sell them to the settlement.
+cp14-job-desc-adventurer = A hunter for thrills, riches and fame, constantly risking his life. Fulfill the most dangerous orders of the expedition organizers, earning a living by mining resources or killing monsters.

 cp14-job-name-alchemist = Alchemist
-cp14-job-desc-alchemist = A scientist of sorts, exploring the nature of substances. Create poisons and medicines from numerous natural plants and ingredients and sell them to the settlement.
+cp14-job-desc-alchemist = A scientist of sorts, exploring the nature of substances. Create poisons and medicines from numerous natural plants and ingredients and earn money by selling them to people in need.
+
+cp14-job-name-innkeeper = Innkeeper
+cp14-job-desc-innkeeper = Anywhere in Eberron there will be people looking to drink and relax. And you can capitalize on that desire! Find a way to provide people with good rest, food and drink.
--- a/Resources/Locale/en-US/_CP14/keyring/keyring.ftl
+++ b/Resources/Locale/en-US/_CP14/keyring/keyring.ftl
@@ -0,0 +1,21 @@
+cp14-lock-verb-lockpick-use-text = Push: {$height}
+cp14-lock-verb-lockpick-use-message = If you engage the lock prongs in the correct sequence, you can unlock the lock.
+
+cp14-lock-keyring-use-nofit = The key does not fit!
+
+cp14-lock-unlock-lock = You have opened {$lock}
+cp14-lock-lock-lock = You closed {$lock}
+
+cp14-lock-lockpick-success = You have successfully picked the lock!
+cp14-lock-lockpick-failed = {$lock} is reset to its original position.
+cp14-lock-lockpick-failed-damage = {$lock} is reset to its original position, damaging your lockpick.
+cp14-lock-lockpick-failed-break = {$lock} resets to its original position, breaking your lockpick.
+
+cp14-lock-verb-use-key-text-open = Open the lock with {$item}.
+cp14-lock-verb-use-key-text-close = Close the lock with {$item}
+cp14-lock-verb-use-key-message = Use {$item} to lock or unlock the lock.
+
+cp14-lock-examine-lock-slot = {$lock} is hanging here.
+cp14-lock-examine-lock-lockpicked = {$lock} looks shabby.
+
+cp14-lock-examine-key = The {$item} has prongs of the following shape: 
--- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl
+++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl
@@ -12,4 +12,6 @@ cp14-loadout-basic-shoes = Shoes
 # Org

 cp14-loadout-captain-cloak = Captain's cloak
-cp14-loadout-captain-head = Captain's head
+cp14-loadout-captain-head = Captain's head
+
+cp14-loadout-guard-commander-cloak = Guard commander's cloak
--- a/Resources/Locale/en-US/_CP14/magicEnergy/magic-energy.ftl
+++ b/Resources/Locale/en-US/_CP14/magicEnergy/magic-energy.ftl
@@ -4,4 +4,6 @@ cp14-magic-energy-crystal-slot-name = Energy crystal

 cp14-magic-energy-no-crystal = No energy crystal!
 cp14-magic-energy-insufficient = Not enough energy!
-cp14-magic-energy-insufficient-unsafe = Crystal cracks from lack of energy!
+cp14-magic-energy-insufficient-unsafe = Crystal cracks from lack of energy!
+
+cp14-magic-scanner = Polarity of ley lines: {$power}
--- a/Resources/Locale/en-US/_CP14/magicEnergy/magic-focus.ftl
+++ b/Resources/Locale/en-US/_CP14/magicEnergy/magic-focus.ftl
@@ -0,0 +1,7 @@
+cp14-magic-attuning-verb-text = Attune yourself
+cp14-magic-attuning-verb-message = Some magic items require a creature to form a bond with them before their magical properties can be used.
+
+cp14-magic-deattuning-verb-text = Break attune
+
+cp14-magic-attune-oldest-forgot = Your connection to {$item} is weakening ...
+cp14-magic-attune-oldest-forgot-end = Your connection to {$item} has broken...
--- a/Resources/Locale/en-US/_CP14/magicEnergy/magic-spells.ftl
+++ b/Resources/Locale/en-US/_CP14/magicEnergy/magic-spells.ftl
@@ -0,0 +1,13 @@
+cp14-magic-spell-not-enough-mana = Not enough mana!
+
+cp14-magic-spell-not-enough-mana-cast-warning-0 = Everything inside you starts to whine unpleasantly...
+cp14-magic-spell-not-enough-mana-cast-warning-1 = Your head starts to buzz...
+cp14-magic-spell-not-enough-mana-cast-warning-2 = Your hands are shaking...
+cp14-magic-spell-not-enough-mana-cast-warning-3 = Your throat starts to lump...
+cp14-magic-spell-not-enough-mana-cast-warning-4 = Your head becomes heavy...
+
+cp14-magic-energy-damage-burn-out = The pain is piercing your body!
+cp14-magic-energy-damage-burn-out-fall = You pass out from the intense pain!
+
+cp14-magic-spell-need-verbal-component = You can't cast the spell out loud.
+cp14-magic-spell-need-somatic-component = You don't have your hands free.
--- a/Resources/Locale/en-US/_CP14/objectives/condition/expedition.ftl
+++ b/Resources/Locale/en-US/_CP14/objectives/condition/expedition.ftl
@@ -1,4 +1,4 @@
-cp14-objective-issuer-expedition = [color=#fcae38]Expedition oobjective[/color]
+cp14-objective-issuer-expedition = [color=#fcae38]Expedition objective[/color]

 cp14-objective-expedition-collect-title = Collect { $itemName }
 cp14-objective-expedition-collect-desc = Your objective is to collect and deliver { $itemName } to the Elemental Ship.
--- a/Resources/Locale/en-US/_CP14/objectives/condition/issuers.ftl
+++ b/Resources/Locale/en-US/_CP14/objectives/condition/issuers.ftl
@@ -1 +0,0 @@
-objective-issuer-ExpeditionObjective = [color=#d6853a]Expedition Objective[/color]
--- a/Resources/Locale/en-US/_CP14/objectives/condition/personal.ftl
+++ b/Resources/Locale/en-US/_CP14/objectives/condition/personal.ftl
@@ -0,0 +1,4 @@
+cp14-objective-issuer-personal = [color="#95a6c2"]Personal objectives[/color]
+
+cp14-objective-personal-currency-collect-title = Make money
+cp14-objective-personal-currency-collect-desc = I need this expedition primarily as a way to make money. At the very least I plan on making{$coins}
--- a/Resources/Locale/en-US/_CP14/presonal-signature/verbs.ftl
+++ b/Resources/Locale/en-US/_CP14/presonal-signature/verbs.ftl
@@ -0,0 +1 @@
+cp-sign-verb = Sign
--- a/Resources/Locale/en-US/_CP14/sharpening/sharp.ftl
+++ b/Resources/Locale/en-US/_CP14/sharpening/sharp.ftl
@@ -7,3 +7,5 @@ damage-weapon-1 = Looks completely intact
 damage-weapon-2 = Covered in a couple of scratches.
 damageable-weapon-3 = Looks worn.
 damageable-weapon-4 = It's about to break.
+
+sharpening-ready = Perfectly sharpened
--- a/Resources/Locale/en-US/_CP14/tips/tip.ftl
+++ b/Resources/Locale/en-US/_CP14/tips/tip.ftl
@@ -0,0 +1,12 @@
+cp14-tips-1 = Keep an eye on the condition of your weapon! You can inspect it to see its condition and sharpness.
+cp14-tips-2 = If your weapon is dull, you can sharpen it with sharpening stones.
+cp14-tips-3 = Some light weapons, such as daggers or sickles, are effective for dual wield combat.
+cp14-tips-4 = Some magic items can only work after being attuned. To customize the binding, press the RMB and select the desired action.
+cp14-tips-5 = As an alchemist, if you mix some reagents together, you can no longer separate them! Look for the right alchemical reactions that will allow you to edit your solution.
+cp14-tips-6 = As an alchemist, remember to keep your cauldron off the stove or fire. Your potion may boil over, releasing a reagent cloud.
+cp14-tips-7 = DEBUG: To see all crafting recipes available on workbenches - look for them in the context menu on the RMB.
+cp14-tips-8 = If you run out of magic energy, you can still use spells and spend mana, but it will damage you and potentially render you unconscious!
+cp14-tips-9 = There are places in the world with positive or negative magical polarity. In these places, mana regenerates faster, or conversely, can be passively spent. To find such places, use the Aura Scanner.
+cp14-tips-10 = Tall bushes are good for hiding your character! But they slow you down a lot and make a lot of noise if you move in them.
+cp14-tips-11 = Don't forget to lock your doors if you don't want anyone to get in!
+cp14-tips-12 = DEBUG: Be careful with fire! Until we add ways to comfortably put out fires!
--- a/Resources/Locale/en-US/_CP14/workbench/workbench.ftl
+++ b/Resources/Locale/en-US/_CP14/workbench/workbench.ftl
@@ -0,0 +1,5 @@
+cp14-verb-categories-craft = Select recipe:
+
+cp14-workbench-recipe-list = Recipe:
+
+cp14-workbench-no-resource = There aren't enough ingredients!
--- a/Resources/Locale/en-US/actions/actions/polymorph.ftl
+++ b/Resources/Locale/en-US/actions/actions/polymorph.ftl
@@ -0,0 +1 @@
+gera-transformation-popup = This action will transform you. Use it again to confirm.
--- a/Resources/Locale/en-US/character-info/components/character-info-component.ftl
+++ b/Resources/Locale/en-US/character-info/components/character-info-component.ftl
@@ -1,3 +1,4 @@
 character-info-title = Character
 character-info-roles-antagonist-text = Antagonist Roles
 character-info-objectives-label = Objectives
+character-info-no-profession = No Profession
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -197,6 +197,19 @@ ghost-role-information-syndicate-reinforcement-name = Syndicate Agent
 ghost-role-information-syndicate-reinforcement-description = Someone needs reinforcements. You, the first person the syndicate could find, will help them.
 ghost-role-information-syndicate-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you.

+ghost-role-information-syndicate-reinforcement-medic-name = Syndicate Medic
+ghost-role-information-syndicate-reinforcement-medic-description = Someone needs reinforcements. Your task is to keep the agent who called you alive.
+
+ghost-role-information-syndicate-reinforcement-spy-name = Syndicate Spy
+ghost-role-information-syndicate-reinforcement-spy-description = Someone needs reinforcements. Your speciality lies in espionage, do not be discovered.
+
+ghost-role-information-syndicate-reinforcement-thief-name = Syndicate Thief
+ghost-role-information-syndicate-reinforcement-thief-description = Someone needs reinforcements. Your job is to break in and retrieve something valuable for your agent.
+
+ghost-role-information-nukeop-reinforcement-name = Nuclear Operative
+ghost-role-information-nukeop-reinforcement-description = The nuclear operatives need reinforcements. You, a reserve agent, will help them.
+ghost-role-information-nukeop-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the nuclear operatives who summoned you.
+
 ghost-role-information-syndicate-monkey-reinforcement-name = Syndicate Monkey Agent
 ghost-role-information-syndicate-monkey-reinforcement-description = Someone needs reinforcements. You, a trained monkey, will help them.
 ghost-role-information-syndicate-monkey-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you.
--- a/Resources/Locale/en-US/lock/locking-whitelist-component.ftl
+++ b/Resources/Locale/en-US/lock/locking-whitelist-component.ftl
@@ -0,0 +1 @@
+locking-whitelist-component-lock-toggle-deny = You can't toggle the lock.
--- a/Resources/Locale/en-US/mass-media/news-ui.ftl
+++ b/Resources/Locale/en-US/mass-media/news-ui.ftl
@@ -34,4 +34,4 @@ news-write-ui-richtext-tooltip = News articles support rich text
    {"[bullet/]bullet[/color]"}

 news-pda-notification-header = New news article
-news-publish-admin-announcement = {$actor} published news article {$title} by {$author}"
+news-publish-admin-announcement = {$actor} published news article {$title} by {$author}
--- a/Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
+++ b/Resources/Locale/en-US/particle-accelerator/components/ui/particle-accelerator-control-menu.ftl
@@ -2,15 +2,21 @@ particle-accelerator-control-menu-on-button = On
 particle-accelerator-control-menu-off-button = Off
 particle-accelerator-control-menu-service-manual-reference = Refer to p.132 of service manual
 particle-accelerator-control-menu-device-version-label = Mark 2 Particle Accelerator
-particle-accelerator-control-menu-power-label = Power:
-particle-accelerator-control-menu-strength-label = Strength:
-particle-accelerator-control-menu-alarm-control = PARTICLE STRENGTH
-                                                  LIMITER FAILURE
+particle-accelerator-control-menu-power-label = [bold]Power:[/bold]
+particle-accelerator-control-menu-strength-label = [bold]Strength:[/bold]
+particle-accelerator-control-menu-alarm-control-1 = [bold][color=red]PARTICLE STRENGTH[/bold][/color]
+particle-accelerator-control-menu-alarm-control-2 = [bold][color=red]LIMITER FAILURE[/bold][/color]
 particle-accelerator-control-menu-scan-parts-button = Scan Parts
 particle-accelerator-control-menu-check-containment-field-warning = Ensure containment field is active before operation
 particle-accelerator-control-menu-foo-bar-baz = FOO-BAR-BAZ
-particle-accelerator-control-menu-status-label = Status: {$status}
-particle-accelerator-control-menu-status-operational = Operational
-particle-accelerator-control-menu-status-incomplete = Incomplete
-particle-accelerator-control-menu-draw-not-available = Draw: N/A
-particle-accelerator-control-menu-draw = Draw: {$watts}/{$lastReceive} 
+particle-accelerator-control-menu-status-label = [bold]Status:[/bold]
+particle-accelerator-control-menu-status-unknown = [font="Monospace"][color=red]Unknown[/color][/bold]
+particle-accelerator-control-menu-status-operational = [font="Monospace"][color=green]Operational[/color][/bold]
+particle-accelerator-control-menu-status-incomplete = [font="Monospace"][color=red]Incomplete[/color][/bold]
+particle-accelerator-control-menu-draw = [bold]Draw:[/bold]
+particle-accelerator-control-menu-draw-value = [font="Monospace"]{$watts}/{$lastReceive}[/font]
+particle-accelerator-control-menu-draw-not-available = [font="Monospace"][color=gray]N/A[/color][/font]
+
+particle-accelerator-radio-message-on = PA power has been switched on.
+particle-accelerator-radio-message-off = PA power has been switched off.
+particle-accelerator-radio-message-num = PA strength has been set to level {$level}.
--- a/Resources/Locale/en-US/prayers/prayers.ftl
+++ b/Resources/Locale/en-US/prayers/prayers.ftl
@@ -1,16 +1,19 @@
 prayer-verbs-subtle-message = Subtle Message
 prayer-verbs-pray = Pray
 prayer-verbs-call = Call
+prayer-verbs-rub = Rub
 prayer-chat-notify-pray = PRAYER
 prayer-chat-notify-honkmother = HONKMOTHER
 prayer-chat-notify-centcom = CENTCOM
 prayer-chat-notify-syndicate = SYNDICATE
+prayer-chat-notify-lamp = LAMP

 prayer-popup-subtle-default = You hear a voice in your head...

 prayer-popup-notify-honkmother-sent = You left a voicemail message for the Honkmother...
 prayer-popup-notify-centcom-sent = You left a voicemail message for Central Command...
 prayer-popup-notify-syndicate-sent = You left a voicemail message for Syndicate High Command...
+prayer-popup-notify-lamp-sent = Your thoughts seem to echo...
 prayer-popup-notify-pray-sent = Your message has been sent to the gods...
 prayer-popup-notify-pray-locked = You don't feel worthy enough...
 prayer-popup-notify-pray-ui-message = Message
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -58,4 +58,5 @@ humanoid-profile-editor-no-traits = No traits available
 humanoid-profile-editor-trait-count-hint = Points available: [{$current}/{$max}]

 trait-category-disabilities = Disabilities
-trait-category-speech = Speech traits
+trait-category-speech = Speech traits
+trait-category-quirks = Quirks
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -32,6 +32,8 @@ seeds-potato-name = potato
 seeds-potato-display-name = potatoes
 seeds-sugarcane-name = sugarcane
 seeds-sugarcane-display-name = sugarcanes
+seeds-papercane-name = papercane
+seeds-papercane-display-name = papercanes
 seeds-towercap-name = tower cap
 seeds-towercap-display-name = tower caps
 seeds-steelcap-name = steel cap
@@ -48,6 +50,8 @@ seeds-eggplant-name = eggplant
 seeds-eggplant-display-name = eggplants
 seeds-apple-name = apple
 seeds-apple-display-name = apple tree
+seeds-goldenapple-name = golden apple
+seeds-goldenapple-display-name = golden apple tree
 seeds-corn-name = corn
 seeds-corn-display-name = ears of corn
 seeds-onion-name = onion
@@ -88,6 +92,8 @@ seeds-ambrosiadeus-name = ambrosia deus
 seeds-ambrosiadeus-display-name = ambrosia deus
 seeds-galaxythistle-name = galaxythistle
 seeds-galaxythistle-display-name = galaxythistle
+seeds-glasstle-name = glasstle
+seeds-glasstle-display-name = glasstle
 seeds-flyamanita-name = fly amanita
 seeds-flyamanita-display-name = fly amanita
 seeds-gatfruit-name = gatfruit
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -135,3 +135,12 @@ chatsan-replacement-48 = right now

 chatsan-word-49 = atm
 chatsan-replacement-49 = at the moment
+
+chatsan-word-50 = istg
+chatsan-replacement-50 = I swear to god
+
+chatsan-word-51 = rq
+chatsan-replacement-51 = real quick
+
+chatsan-word-52 = dw
+chatsan-replacement-52 = don't worry
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -125,7 +125,10 @@ uplink-reinforcement-radio-ancestor-name = Genetic Ancestor Reinforcement Telepo
 uplink-reinforcement-radio-ancestor-desc =  Call in a trained ancestor of your choosing to assist you. Comes with a single syndicate cigarette.

 uplink-reinforcement-radio-name = Reinforcement Teleporter
-uplink-reinforcement-radio-desc =  Radio in a reinforcement 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.
+uplink-reinforcement-radio-traitor-desc =  Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. Call in a medic or spy or thief to help you out. Good luck.
+
+uplink-reinforcement-radio-nukeops-name = Nuclear Operative Teleporter
+uplink-reinforcement-radio-nukeops-desc =  Radio in a nuclear operative of extremely questionable quality. No off button, buy this if you're ready to party. They have basic nuclear operative gear.

 uplink-reinforcement-radio-cyborg-assault-name = Syndicate Assault Cyborg Teleporter
 uplink-reinforcement-radio-cyborg-assault-desc =  A lean, mean killing machine with access to an Energy Sword, LMG, Cryptographic Sequencer, and a Pinpointer.
@@ -318,6 +321,9 @@ uplink-hardsuit-carp-desc = Looks like an ordinary carp suit, except fully space
 uplink-hardsuit-syndie-name = Syndicate Hardsuit
 uplink-hardsuit-syndie-desc = The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant.

+uplink-syndie-raid-name = Syndicate Raid Suit
+uplink-syndie-raid-desc = A very durable and reasonably flexible suit of blood-red armor, reinforced against all common forms of damage but not capable of space walks. Comes with a sick helmet.
+
 uplink-hardsuit-syndieelite-name = Syndicate Elite Hardsuit
 uplink-hardsuit-syndieelite-desc = An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders.

--- a/Resources/Locale/en-US/weapons/ranged/gun.ftl
+++ b/Resources/Locale/en-US/weapons/ranged/gun.ftl
@@ -6,6 +6,7 @@ gun-selected-mode = Selected {$mode}
 gun-disabled = You can't use guns!
 gun-clumsy = The gun blows up in your face!
 gun-set-fire-mode = Set to {$mode}
+gun-magazine-whitelist-fail = That won't fit into the gun!

 # SelectiveFire
 gun-SemiAuto = semi-auto
--- a/Resources/Locale/en-US/wieldable/wieldable-component.ftl
+++ b/Resources/Locale/en-US/wieldable/wieldable-component.ftl
@@ -18,3 +18,5 @@ wieldable-component-not-in-hands = { CAPITALIZE(THE($item)) } isn't in your hand
 wieldable-component-requires = { CAPITALIZE(THE($item))} must be wielded!

 gunwieldbonus-component-examine = This weapon has improved accuracy when wielded.
+
+gunrequireswield-component-examine = This weapon can only be fired when wielded.
--- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
+++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
@@ -18,14 +18,14 @@ ent-CP14BaseKey = ключ
 ent-CP14BaseLockpick = отмычка
    .desc = Воровской инструмент, при должном умении и сноровке позволяющий взламывать любые замки.

-ent-CP14KeyTavern = ключ от таверны
-    .desc = { ent-CP14BaseKey.desc }
-
 ent-CP14BaseLock = стальной замок
    .desc = Он запирает вещи. И вам потребуется ключ, чтобы открыть их обратно.

-ent-CP14LockTavern = замок от таверны
-    .desc = { ent-CP14BaseLock.desc }
+ent-CP14BaseMagicRune = magic rune
+    .desc = manifestation of magical energy in the physical plane
+
+ent-CP14BaseMagicImpact = magic impact
+    .desc = manifestation of magical energy in the physical plane

 ent-CP14ClothingCloakArmoredRed = бронированная красная накидка
    .desc = Огромные металлические наплечники дают дополнительную защиту от отрубания головы.
@@ -33,6 +33,9 @@ ent-CP14ClothingCloakArmoredRed = бронированная красная на
 ent-CP14ClothingCloakBlacksmithArpon = фартук кузнеца
    .desc = Свободные кожанные полоски, все еще фактически являющиеся одеждой.

+ent-CP14ClothingCloakMaidArpon = фартук горничной
+    .desc = Чистота, порядок и послушание - вот основные черты хорошей горничной.
+
 ent-CP14ClothingCloakFurcapeBlack = меховая накидка
    .desc = Брутальная, выделанная из шерсти, накидка на плечи.

@@ -108,6 +111,21 @@ ent-CP14ClothingPantsAristocratic = штаны аристократа
 ent-CP14ClothingPantsLoincloth = набедренная повязка
    .desc = Свободные, ничего не мешает, да еще и выглядят экстремально брутально

+ent-CP14ClothingDressBlack = черное платье
+    .desc = Просторная женское платье
+
+ent-CP14ClothingRingIceDagger = conductive ring
+    .desc = A standard mana-conductive ring that allows the user to summon ice daggers.
+    .suffix = Ice Dagger
+
+ent-CP14ClothingRingFlameCreation = conductive ring
+    .desc = A standard mana-conductive ring that allows the user to summon artificial flames.
+    .suffix = Flame creation
+
+ent-CP14ClothingRingCureWounds = conductive ring
+    .desc = A standard mana-conductive ring that allows the user to heal physical injuries.
+    .suffix = Cure Wounds
+
 ent-CP14ClothingShirtCottonBlue = хлопковая синяя рубаха
    .desc = { ent-CP14ClothingShirtCottonBlue.desc }

@@ -135,21 +153,40 @@ ent-CP14ClothingShoesBlack = простые черные ботинки
 ent-CP14ClothingShoesAristocraticBlack = аристократичные черные ботинки
    .desc = Они достаточно дороги, чтобы вы не захотели в них ходить по пещерам.

-ent-CP14ClothingShoesSandals = сандали
-    .desc = Сандали, сделанные из грубой кожи и металлических креплений.
+ent-CP14ClothingShoesSandals = сандалии
+    .desc = Сандалии, сделанные из грубой кожи и металлических креплений.

 ent-CP14Mist = облако

 ent-CP14MistVitalExtract = { ent-CP14Mist }
    .desc = { ent-CP14Mist.desc }

-ent-CP14ExpeditionShipTargetPoint = Expedition ship target point
-    .desc = One of the possible arrival points of a ship carrying players
+ent-CP14AuraNodeBase = aura node
+    .desc = An energy node that affects the elemental energy in the surrounding space.
+
+ent-CP14ExpeditionShipTargetPoint = пункт назначения экспедиционного судна
+    .desc = Один из возможных пунктов прибытия корабля с игроками.

 ent-CP14SpawnPointAdventurer = авантюрист

 ent-CP14SpawnPointAlchemist = алхимик

+ent-CP14SpawnPointCaptain = капитан
+
+ent-CP14ConstrainedSpawnerBase = None
+    .desc = lol
+
+ent-CP14ConstrainedSpawnerXeno = xeno constrained spawner
+    .desc = { ent-CP14ConstrainedSpawnerBase.desc }
+
+ent-CP14RandomSpawnerBattleRoyaleLootWeapon = Loot
+    .desc = lol
+    .suffix = Weapon
+
+ent-CP14RandomSpawnerBattleRoyaleLootTools = Loot
+    .desc = lol
+    .suffix = Tools
+
 ent-CP14RandomSpawnerGatherAgaricShroom = спавнер мухоморов

 ent-CP14RandomDirtLootSpawner = спавнер земли
@@ -189,20 +226,17 @@ ent-CP14BaseMobHuman = Мистер Человек

 ent-CP14BaseMobTiefling = Мистер Тифлинг

-ent-CP14OreCopper = медь
+ent-CP14OreCopper = медная руда
    .desc = Кусочек бледной, тяжелой меди.

-ent-CP14OreIron = железо
+ent-CP14OreIron = железная руда
    .desc = Кусочек холодного, тяжелого железа.

-ent-CP14OreSilver = серебро
-    .desc = Кусочек блестящего, теплого серебра.
-
-ent-CP14OreGold = золото
+ent-CP14OreGold = золотая руда
    .desc = Кусочек мягкого, чистого золота.

 ent-CP14CopperCoin = медная корона
-    .desc = Минимальная экономическая единица на просторах Эберрона. Является одной десятой серебрянного соверена.
+    .desc = Минимальная экономическая единица на просторах Эберрона. Является одной десятой серебряного соверена.
    .suffix = 10 монет

 ent-CP14CopperCoin5 = { ent-CP14CopperCoin }
@@ -213,7 +247,7 @@ ent-CP14CopperCoin1 = { ent-CP14CopperCoin }
    .desc = { ent-CP14CopperCoin.desc }
    .suffix = 1 монета

-ent-CP14SilverCoin = серебрянный соверен
+ent-CP14SilverCoin = серебряный соверен
    .desc = Эквивалентен 10 медным коронам, и является одной десятой золотого галифара.
    .suffix = 10 монет

@@ -226,7 +260,7 @@ ent-CP14SilverCoin1 = { ent-CP14SilverCoin }
    .suffix = 1 монета

 ent-CP14GoldCoin = золотой галифар
-    .desc = Эквивалентен 10 серебрянным соверенам, и является одной десятой платинового дракона.
+    .desc = Эквивалентен 10 серебряным соверенам, и является одной десятой платинового дракона.
    .suffix = 10 монет

 ent-CP14GoldCoin5 = { ent-CP14GoldCoin }
@@ -256,6 +290,41 @@ ent-CP14WalletFilledTest = { ent-CP14Wallet }
    .desc = { ent-CP14Wallet.desc }
    .suffix = Filled test

+ent-CP14CopperBar1 = медный слиток
+    .desc = Тяжелый, слегка зеленый кусок обработанной меди.
+    .suffix = 1
+
+ent-CP14CopperBar5 = { ent-CP14CopperBar1 }
+    .desc = { ent-CP14CopperBar1.desc }
+    .suffix = 5
+
+ent-CP14CopperBar10 = { ent-CP14CopperBar1 }
+    .desc = { ent-CP14CopperBar1.desc }
+    .suffix = 10
+
+ent-CP14IronBar1 = iron bar
+    .desc = A heavy piece of refined iron
+    .suffix = 1
+
+ent-CP14IronBar5 = { ent-CP14IronBar1 }
+    .desc = { ent-CP14IronBar1.desc }
+    .suffix = 5
+
+ent-CP14IronBar10 = { ent-CP14IronBar1 }
+    .desc = { ent-CP14IronBar1.desc }
+    .suffix = 10
+
+ent-CP14GoldBar1 = золотой слиток
+    .desc = Теплый на ощупь, мягкий кусок изысканного золота.
+
+ent-CP14GoldBar5 = { ent-CP14GoldBar1 }
+    .desc = { ent-CP14GoldBar1.desc }
+    .suffix = 5
+
+ent-CP14GoldBar10 = { ent-CP14GoldBar1 }
+    .desc = { ent-CP14GoldBar1.desc }
+    .suffix = 10
+
 ent-CP14DirtBlock1 = блок земли
    .desc = Блок великолепной плодородной почвы.

@@ -334,6 +403,36 @@ ent-CP14VialSmallLumiMushroom = { ent-CP14VialTiny }
    .desc = { ent-CP14VialTiny.desc }
    .suffix = Люмигриб

+ent-CP14MeltingMoldBase = форма для выплавки
+    .desc = Деревянная доска для заливки металла в необходимые формы.
+
+ent-CP14MeltingMoldBlank = форма для выплавки заготовок
+    .desc = Пустая форма для литья металла. Вы можете вырезать в ней любую нужную форму на столе для резки деталей.
+
+ent-CP14MeltingMoldDaggers = форма для кинжала
+    .desc = { ent-CP14MeltingMoldBase.desc }
+
+ent-CP14MeltingMoldNails = форма для гвоздей
+    .desc = { ent-CP14MeltingMoldBase.desc }
+
+ent-CP14MeltingMoldPickaxe = форма для кирки
+    .desc = { ent-CP14MeltingMoldBase.desc }
+
+ent-CP14MeltingMoldShovel = форма для лопаты
+    .desc = { ent-CP14MeltingMoldBase.desc }
+
+ent-CP14MeltingMoldSickle = форма для серпа
+    .desc = { ent-CP14MeltingMoldBase.desc }
+
+ent-CP14MeltingMoldSword = форма для меча
+    .desc = { ent-CP14MeltingMoldBase.desc }
+
+ent-CP14MeltingMoldThrowableSpear = форма для метательного копья
+    .desc = { ent-CP14MeltingMoldBase.desc }
+
+ent-CP14MeltingMoldTwoHandedSword = форма для двуручного меча
+    .desc = { ent-CP14MeltingMoldBase.desc }
+
 ent-CP14Wheat = сноп пшеницы
    .desc = У вас есть выбор: посадить семена обратно в землю, либо пустить их в муку.

@@ -356,9 +455,9 @@ ent-CP14LumiMushroom = люмигриб
    .desc = Слабо светящийся гриб. Часто используется алхимиками как средство для концентрации растворов.

 ent-CP14EnergyCrystalBase = None
-    .desc = Обработанные кристаллы кварца являются прекрасными хранителями магической энергии. А специальные разъемы позволяют удобно вставлять их в магические устройства, превращая в энергетические батарейки.
+    .desc = Shards of one of the Khyber dragon, used to bind and control elemental energy.

-ent-CP14EnergyCrystalSmall = маленький энергокристалл
+ent-CP14EnergyCrystalSmall = small Khyber shard
    .desc = { ent-CP14EnergyCrystalBase.desc }
    .suffix = Full

@@ -366,7 +465,7 @@ ent-CP14EnergyCrystalSmallEmpty = { ent-CP14EnergyCrystalSmall }
    .desc = { ent-CP14EnergyCrystalSmall.desc }
    .suffix = Empty

-ent-CP14EnergyCrystalMedium = энергокристалл
+ent-CP14EnergyCrystalMedium = Khyber shard
    .desc = { ent-CP14EnergyCrystalBase.desc }
    .suffix = Full

@@ -374,19 +473,16 @@ ent-CP14EnergyCrystalMediumEmpty = { ent-CP14EnergyCrystalMedium }
    .desc = { ent-CP14EnergyCrystalMedium.desc }
    .suffix = Empty

+ent-CP14AuraScanner = сканер ауры
+    .desc = Сканирует полярность потоков элементальной энергии в этом месте.
+
 ent-CP14Bucket = ведро
    .desc = Старое скучное ведро
-    .suffix = CP14, Нужен респрайт!
+    .suffix = CP14

 ent-CP14OldLantern = Старая Лампа
    .desc = Пережиток прошлого техномагии. Большой, тяжелый, непрактичный. Таким приятно разве что бить по голове.

-ent-CP14Shovel = лопата
-    .desc = Орудие для вскапывания земли, рытья грядок или могил.
-
-ent-CP14Hoe = мотыга
-    .desc = Фермерский инструмент для подготовки почвы под посадки, либо очистки от сорняков.
-
 ent-CP14Rope = веревка
    .desc = Многофункциональная веревка. Ей можно связать что-нить. Или кого-нибудь.

@@ -394,7 +490,7 @@ ent-CP14BaseSharpeningStone = точильный камень
    .desc = Позволит заточить притупленное оружие. Если перестараться, вы вполне можете сточить оружие полностью.

 ent-CP14BaseBattleHammer = боевой молот
-    .desc = A big heavy hammer! Bruh!
+    .desc = Большой тяжелый молот. Лучше вам не стоять у него на пути!

 ent-CP14BaseBattleStaff = боевой посох
    .desc = Нет оружия проще и эффективнее, чем длинная и тяжелая палка!
@@ -429,28 +525,21 @@ ent-CP14BaseTwoHandedSword = двуручный меч
 ent-CP14TwoHandedSwordScythe = коса
    .desc = Большая двуручная коса. Что вы будете косить ею? Пшено, или головы своих врагов?

-ent-CP14WeaponRevolverNavy = револьвер "Марин"
-    .desc = Увесистый капсюльный револьвер серии "Марин". В настоящее время револьверы серии "Марин" стоят баснословные деньги, и их могут позволить себе исключительно преуспевающие моряки и торговцы.
+ent-CP14BaseHoe = мотыга
+    .desc = Фермерский инструмент для подготовки почвы под посадки, либо очистки от сорняков.
+
+ent-CP14BasePickaxe = кирка
+    .desc = Идеально заточена, и готова вгрызаться в земную твердь.
+
+ent-CP14BaseShovel = лопата
+    .desc = Орудие для вскапывания земли, рытья грядок или могил.

 ent-CP14BaseLightCrossbow = легкий арбалет
    .desc = Небольшой, компактный арбалет, который удобно держать одной рукой. Не слишком меткий с обратной стороны.

-ent-CP14WeaponRifleCrush = крушитель
-    .desc = Легкая, дорогая и непростая в обращении винтовка.
-
-ent-CP14WeaponRifleDurandal = дюрандаль
-    .desc = Винтовка среднего размера, дорогая и не очень удобная в использовании.
-
-ent-CP14WeaponRifleLebel = лебел
-    .desc = Тяжелая, дорогая и не очень удобная в использовании винтовка.
-
 ent-CP14Crossbolt = арбалетный болт
    .desc = Стержень с заостренным концом. Без оперения, это вам не лук.

-ent-CP14CartridgeBulletRifle = винтовочный патрон
-
-ent-CP14BulletRifle = винтовочная пуля
-
 ent-CP14DungeonEntrance = спуск в подземелье
    .desc = Темные глубины подземного мира зовут вас.

@@ -463,6 +552,22 @@ ent-CP14BaseSharpeningStoneStructure = стационарный точильны
 ent-CP14Mannequin = манекен
    .desc = Удобная подставка для одежды или доспехов.

+ent-CP14StatueGob = статуя Гоба
+    .desc = Он прекрасен.
+    .suffix = Нормальная
+
+ent-CP14StatueGobVines = статуя Гоба
+    .desc = { ent-CP14StatueGob.desc }
+    .suffix = Нормальная. Заросшая
+
+ent-CP14StatueGobRuined = разрушенная статуя Гоба
+    .desc = { ent-CP14StatueGob.desc }
+    .suffix = Разрушенная
+
+ent-CP14StatueGobRuinedVines = разрушенная статуя Гоба
+    .desc = { ent-CP14StatueGob.desc }
+    .suffix = Разрушенная. Заросшая
+
 ent-CP14WallmountWoodenBoards = доски
    .desc = Прибиты к стене. Зачем? не совсем ясно.

@@ -478,7 +583,7 @@ ent-CP14BaseWoodDoor = деревянная дверь

 ent-CP14WoodDoorOpened = { ent-CP14BaseWoodDoor }
    .desc = { ent-CP14BaseWoodDoor.desc }
-    .suffix = Opened
+    .suffix = Открытая

 ent-CP14WoodDoorTavern = { ent-CP14BaseWoodDoor }
    .desc = { ent-CP14BaseWoodDoor.desc }
@@ -590,7 +695,7 @@ ent-CP14CrystalDiamondsBig = { ent-CP14CrystalBase }
    .suffix = White, Big

 ent-CP14FloorWater = вода
-    .desc = Брух
+    .desc = Впадина с обычной водой. Достаточна чиста для употребления.

 ent-CP14HighBush = высокий куст
    .desc = Высокие и густые заросли. Возможно кто-то наблюдает за тобой из них.
@@ -708,7 +813,7 @@ ent-CP14TableWooden = деревянный стол
    .desc = Простой стол, сколоченный из досок.

 ent-CP14WallmountTorch = настенный факел
-    .desc = Хороший, надеждный источник света. Жаль, недолговечный.
+    .desc = Хороший, надёжный источник света. Жаль, недолговечный.

 ent-CP14WallmountLamp = вечная лампа
    .desc = Хрупкий вечный голубой огонь как доказательство превосходства магии над природой.
@@ -721,6 +826,12 @@ ent-CP14WallmountBarShelfB = { ent-CP14WallmountBarShelfA }
    .desc = { ent-CP14WallmountBarShelfA.desc }
    .suffix = 2

+ent-CP14Workbench = верстак
+    .desc = Стол для создания различного базового инструментария.
+
+ent-CP14WorkbenchMeltingMolds = стол для резки форм
+    .desc = Специализированный стол, позволяющий вырезать формы для выплавки металла.
+
 ent-CP14FrameWooden = каркас деревянной стены
    .desc = Деревянный каркас для деревянных стен любых видов.

@@ -746,7 +857,7 @@ ent-CP14GatherableWildBase = { ent-CP14GatherableBase }
 ent-CP14GatherablePlantBase = { ent-CP14GatherableBase }
    .desc = { ent-CP14GatherableBase.desc }

-ent-CP14PlantWheat = пщеница
+ent-CP14PlantWheat = пшеница
    .desc = Наиболее популярная культура. Непритязательна, и открывает дорогу к разнообразию мучных изделий.

 ent-CP14PlantWheatDeath = мертвая пшеница
@@ -772,6 +883,9 @@ ent-CP14GatherableLumiMushroom = люмигрибы
    .desc = Слабо светящийся гриб. Часто используется алхимиками как средство для концентрации растворов.
    .suffix = Gatherable

+ent-CP14ElementalReactor = elemental reactor
+    .desc = A work of art created by the dwarves of Zilagro and House Lyrandar, controlling the fire elemental and allowing it to produce vast amounts of energy.
+
 ent-CP14ChestGeneric = сундук
    .desc = Chest.

@@ -787,6 +901,15 @@ ent-CP14BrassChest = латунный сундук
 ent-CP14CrateCoffin = гроб
    .desc = Удобный и красивый гроб, чтобы с удобствами дождаться своего воскрешения.

+ent-CP14BaseSmallCrate = { ent-CP14BaseCrate }
+    .desc = { ent-CP14BaseCrate.desc }
+
+ent-CP14LargeWoodenCrate = большой деревянный ящик
+    .desc = Ящик из дерева.
+
+ent-CP14SmallWoodenCrate = малый деревянный ящик
+    .desc = Ящик из дерева.
+
 ent-CP14Cliff = обрыв
    .desc = Серьезные неровности природного ландшафта.
    .suffix = Прямой
@@ -823,21 +946,17 @@ ent-CP14IronGrilleTJunction = { ent-CP14IronGrilleBase }
    .suffix = Т-соединение

 ent-CP14IronGrilleGate = ворота в железной решетке
-    .desc = Do you have any idea what awaits you behind these gates? It can be either a toilet or a luxurious mansion.
+    .desc = Представляете ли вы, что ждет вас за этими воротами? Это может быть как туалет, так и роскошный особняк.

 ent-CP14WallStone = камень
    .desc = Природная стена из цельного камня. В ней ощущается холод пещеры.

 ent-CP14WallDirt = земляной холм
-    .desc = bruh
-
-ent-CP14WallStoneSilverOre = { ent-CP14WallStone }
-    .desc = A solid stone natural wall. You see the tantalizing particles of silver in it.
-    .suffix = silver ore
+    .desc = Высокая куча земли. Можно ли построить из нее дом?

 ent-CP14WallStoneGoldOre = { ent-CP14WallStone }
-    .desc = A solid stone natural wall. You see the tantalizing particles of gold in it.
-    .suffix = gold ore
+    .desc = Природная стена из цельного камня. Вы видите в ней манящие частицы золота.
+    .suffix = золотая руда

 ent-CP14BaseWall = стена
    .desc = Достаточно прочная, чтобы укрыть вас от угрозы или холодного ветра.
@@ -845,6 +964,14 @@ ent-CP14BaseWall = стена
 ent-CP14WallStonebrick = каменная кирпичная стена
    .desc = { ent-CP14BaseWall.desc }

+ent-CP14WallStonebrickCrushedMedium = каменная кирпичная стена
+    .desc = { ent-CP14BaseCrushed.desc }
+    .suffix = CrushedMedium
+
+ent-CP14WallStonebrickCrushedLow = каменная кирпичная стена
+    .desc = { ent-CP14BaseCrushed.desc }
+    .suffix = CrushedLow
+
 ent-CP14WallWhitebrick = белая кирпичная стена
    .desc = { ent-CP14BaseWall.desc }

@@ -898,8 +1025,15 @@ ent-CP14FenceWoodSmallGate = ворота в деревянном заборе
 ent-CP14WindowStoneBrick = окно в стене из каменного кирпича
    .desc = Каменная кирпичная стена, и проделанным в ней стеклянным окном.

-ent-CP14WindowWooden = wooden window
-    .desc = A wooden wall with a glass window in it.
+ent-CP14WindowWooden = деревянное окно
+    .desc = Деревянная стена со стеклянным окном.
+
+ent-CP14OreSilver = серебро
+    .desc = Кусочек блестящего, теплого серебра.
+
+ent-CP14WallStoneSilverOre = { ent-CP14WallStone }
+    .desc = Природная стена из цельного камня. Вы видите в ней манящие частицы серебра.
+    .suffix = серебряная руда

 ent-CP14ClothingHeadWhiteBeret = белый берет
    .desc = Это берет.
@@ -940,3 +1074,43 @@ ent-CP14CardboardWall = стена из картона
 ent-CPBaseSharpeningStoneStructure = стационарный точильный камень
    .desc = прочный, долговечный точильный камень, способный затачивать оружие без особого вреда для него.

+ent-CP14GreenBottle = Зеленая бутылка
+    .desc = Зеленая бутылка, идеально подходит для пива.
+    .suffix = Пустая
+
+ent-CP14BlueVial = Синий флакон
+    .desc = Синий флакон, идеально подходит для рома.
+    .suffix = Пустой
+
+ent-CP14GreenVial = Зеленый флакон
+    .desc = Маленький зеленый флакон.
+    .suffix = Пустой
+
+ent-CP14OrangeBottle = Оранжевая бутылка
+    .desc = Просто оранжевая бутылка.
+    .suffix = Пустая
+
+ent-CP14RedBottle = Красная бутылка
+    .desc = Красная бутылка, идеально подходит для вина.
+    .suffix = Пустая
+
+ent-CP14MetalBeerMug = Металлическая кружка
+    .desc = Самая обычная металлическая кружка.
+
+ent-CP14WoodenBeerMug = Деревянная кружка
+    .desc = Деревянная кружка для пива.
+
+ent-CP14SteelBeerMug = Пивная кружка
+    .desc = Деревянная кружка с железными вкраплениями.
+
+ent-CP14SteelWoodBeerMug = { ent-CP14SteelBeerMug }
+    .desc = { ent-CP14SteelBeerMug.desc }
+
+ent-CP14RawFoodMeat = Сырая баранина
+    .desc = Пахнет странно, но выглядит как обычное мясо...
+
+ent-CP14CookedFoodMeat = Стейк из баранины
+    .desc = Зажаренный кусок мяса. Запах первобытный.
+
+ent-CP14CuttingBoard = Разделочная доска
+    .desc = Поможет вам приготовить еду.
--- a/Resources/Locale/ru-RU/_CP14/alerts/alerts.ftl
+++ b/Resources/Locale/ru-RU/_CP14/alerts/alerts.ftl
@@ -0,0 +1,2 @@
+cp14-alerts-magic-energy-name = Магическая энергия
+cp14-alerts-magic-energy-desc = Запас вашей внутренней магической силы, позволяющий вам использовать заклинания.
--- a/Resources/Locale/ru-RU/_CP14/currency/currency_comp.ftl
+++ b/Resources/Locale/ru-RU/_CP14/currency/currency_comp.ftl
@@ -0,0 +1,4 @@
+cp14-currency-examine-title = Рыночная цена:
+cp14-currency-examine-gp = [color=#ebad3b]{$coin}зм[/color]
+cp14-currency-examine-sp = [color=#bad1d6]{$coin}см[/color]
+cp14-currency-examine-cp = [color=#824e27]{$coin}мм[/color]
--- a/Resources/Locale/ru-RU/_CP14/job/job.ftl
+++ b/Resources/Locale/ru-RU/_CP14/job/job.ftl
@@ -1,8 +1,17 @@
 cp14-job-name-captain = Капитан экспедиции
 cp14-job-desc-captain = Вы - самая важная персона в этой экспедиции. Организуйте ее участников и руководите процессами, чтобы выполнить поставленную от руководства задачу.

+cp14-job-name-guard-commander = Командир стражи
+cp14-job-desc-guard-commander = Самая опасная личность на этой экспедиции. Управляйте отрядом солдат, чтобы обеспечить безопасность всех членов командования.
+
+cp14-job-name-house-keeper = Завхоз
+cp14-job-desc-house-keeper = Ответственный за материальные ресурсы. Заведуйте запасами и финансами экспедиции, направляя ресурсы выполняющим всю грязную работу наемникам.
+
 cp14-job-name-adventurer = Авантюрист
-cp14-job-desc-adventurer = Охотник за острыми эмоциями, богатствами и славой, постоянно рискующий своей жизнью. Ищите ценности в опасных местах, и продавайте их поселению.
+cp14-job-desc-adventurer = Охотник за острыми эмоциями, богатствами и славой, постоянно рискующий своей жизнью. Выполняйте самые опасные заказы организаторов экспедиции, зарабатывая на жизнь добычей ресурсов или убийством монстров.

 cp14-job-name-alchemist = Алхимик
-cp14-job-desc-alchemist = В своем роде ученый, исследующий природу веществ. Создавайте яды и лекарства, из многочисленных природных растений и ингредиентов, и продавайте их поселению.
+cp14-job-desc-alchemist = В своем роде ученый, исследующий природу веществ. Создавайте яды и лекарства, из многочисленных природных растений и ингредиентов, и зарабатывайте деньги, продавая их нуждающимся.
+
+cp14-job-name-innkeeper = Трактирщик
+cp14-job-desc-innkeeper = В любом месте Эберрона найдутся желающие выпить и отдохнуть. И вы можете заработать на этом желании! Найдите способ обеспечить людей хорошим отдыхом, едой и выпивкой.
--- a/Resources/Locale/ru-RU/_CP14/keyring/keyring.ftl
+++ b/Resources/Locale/ru-RU/_CP14/keyring/keyring.ftl
@@ -0,0 +1,21 @@
+cp14-lock-verb-lockpick-use-text = Надавить: {$height}
+cp14-lock-verb-lockpick-use-message = Если вы в правильной последовательности заденете зубчики замка, вы сможете разблокировать его.
+
+cp14-lock-keyring-use-nofit = Ключ не подходит!
+
+cp14-lock-unlock-lock = Вы открыли {$lock}
+cp14-lock-lock-lock = Вы закрыли {$lock}
+
+cp14-lock-lockpick-success = Вы успешно взломали замок!
+cp14-lock-lockpick-failed = {$lock} сбрасывается в исходное положение.
+cp14-lock-lockpick-failed-damage = {$lock} сбрасывается в исходное положение, повреждая вашу отмычку.
+cp14-lock-lockpick-failed-break = {$lock} сбрасывается в исходное положение, ломая вашу отмычку.
+
+cp14-lock-verb-use-key-text-open = Открыть замок при помощи {$item}
+cp14-lock-verb-use-key-text-close = Закрыть замок при помощи {$item}
+cp14-lock-verb-use-key-message = Использовать {$item} чтобы заблокировать или разблокировать замок.
+
+cp14-lock-examine-lock-slot = Здесь висит {$lock}
+cp14-lock-examine-lock-lockpicked = {$lock} выглядит потрепанным.
+
+cp14-lock-examine-key = {$item} имеет зубцы следующей формы: 
--- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl
+++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl
@@ -11,4 +11,7 @@ cp14-loadout-basic-shoes = Обувь

 # Org

-cp14-loadout-captain-cloak = Капитанская накидка
+cp14-loadout-captain-cloak = Капитанская накидка
+cp14-loadout-captain-head = Капитанская шляпа
+
+cp14-loadout-guard-commander-cloak = Накидка командира стражи
--- a/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-energy.ftl
+++ b/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-energy.ftl
@@ -4,4 +4,6 @@ cp14-magic-energy-crystal-slot-name = Энергокристалл

 cp14-magic-energy-no-crystal = Отсутствует энергокристалл!
 cp14-magic-energy-insufficient = Не достаточно энергии!
-cp14-magic-energy-insufficient-unsafe = Кристалл трескается от нехватки энергии!
+cp14-magic-energy-insufficient-unsafe = Кристалл трескается от нехватки энергии!
+
+cp14-magic-scanner = Полярность лей-линий: {$power}
--- a/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-focus.ftl
+++ b/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-focus.ftl
@@ -0,0 +1,7 @@
+cp14-magic-attuning-verb-text = Настроиться на магический предмет
+cp14-magic-attuning-verb-message = Некоторые магические предметы требуют того, чтобы существо образовало с ними связь, прежде чем оно сможет использовать их магические свойства.
+
+cp14-magic-deattuning-verb-text = Разорвать связь с магическим предметом
+
+cp14-magic-attune-oldest-forgot = Ваша связь с {$item} слабеет...
+cp14-magic-attune-oldest-forgot-end = Ваша связь с {$item} оборвалась...
--- a/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-spells.ftl
+++ b/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-spells.ftl
@@ -0,0 +1,13 @@
+cp14-magic-spell-not-enough-mana = Недостаточно магической энергии!
+
+cp14-magic-spell-not-enough-mana-cast-warning-0 = Внутри вас все начинает неприятно ныть...
+cp14-magic-spell-not-enough-mana-cast-warning-1 = Голова начинает шуметь...
+cp14-magic-spell-not-enough-mana-cast-warning-2 = Ваши руки дрожат...
+cp14-magic-spell-not-enough-mana-cast-warning-3 = К горлу подступает ком...
+cp14-magic-spell-not-enough-mana-cast-warning-4 = Голова наливается свинцом...
+
+cp14-magic-energy-damage-burn-out = Боль пронзает ваше тело!
+cp14-magic-energy-damage-burn-out-fall = Вы теряете сознание от сильной боли!
+
+cp14-magic-spell-need-verbal-component = Вы не можете произнести заклинание вслух.
+cp14-magic-spell-need-somatic-component = Вам не хватает свободных рук.
--- a/Resources/Locale/ru-RU/_CP14/objectives/condition/issuers.ftl
+++ b/Resources/Locale/ru-RU/_CP14/objectives/condition/issuers.ftl
@@ -1 +0,0 @@
-objective-issuer-ExpeditionObjective = [color=#d6853a]Цель экспедиции[/color]
--- a/Resources/Locale/ru-RU/_CP14/objectives/condition/personal.ftl
+++ b/Resources/Locale/ru-RU/_CP14/objectives/condition/personal.ftl
@@ -0,0 +1,4 @@
+cp14-objective-issuer-personal = [color="#95a6c2"]Личные цели[/color]
+
+cp14-objective-personal-currency-collect-title = Заработать денег
+cp14-objective-personal-currency-collect-desc = Эта экспедиция нужна мне в первую очередь как способ заработка денег. Как минимум я планирую заработать{$coins}
--- a/Resources/Locale/ru-RU/_CP14/presonal-signature/verbs.ftl
+++ b/Resources/Locale/ru-RU/_CP14/presonal-signature/verbs.ftl
@@ -0,0 +1 @@
+cp-sign-verb = Подписать
--- a/Resources/Locale/ru-RU/_CP14/sharpening/sharp.ftl
+++ b/Resources/Locale/ru-RU/_CP14/sharpening/sharp.ftl
@@ -6,4 +6,6 @@ sharpening-examined-25 = Выглядит крайне сильно затупи
 damageable-weapon-1 = Выглядит полностью целым
 damageable-weapon-2 = Покрыт парой царапин
 damageable-weapon-3 = Выглядит изношенным
-damageable-weapon-4 = Он вот-вот сломается
+damageable-weapon-4 = Он вот-вот сломается
+
+sharpening-ready = Идеально заточен
--- a/Resources/Locale/ru-RU/_CP14/tips/tip.ftl
+++ b/Resources/Locale/ru-RU/_CP14/tips/tip.ftl
@@ -0,0 +1,12 @@
+cp14-tips-1 = Следите за состоянием вашего оружия! Вы можете осмотреть его, чтобы увидеть его состояние и остроту.
+cp14-tips-2 = Если ваше оружие затупилось, вы можете заточить его при помощи точильных камней.
+cp14-tips-3 = Некоторое легкое оружие, такое как кинжалы или серпы, эффективно для боя с двух рук.
+cp14-tips-4 = Некоторые магические предметы могут работать только после привязки. Чтобы настроить привязку, нажмите ПКМ и выберите нужное действие.
+cp14-tips-5 = Будучи алхимиком, если вы смешали какие-то реагенты вместе, вы больше не сможете их разделить! Ищите нужные алхемические реакции, которые позволят вам редактировать ваш раствор.
+cp14-tips-6 = Будучи алхимиком, не забывайте убрать ваш котелок с печки или костра. Ваше зелье может выкипеть, выпустив реагентное облако.
+cp14-tips-7 = DEBUG: Чтобы увидеть все рецепты крафта, доступные на верстаках - ищите из в контекстном меню на ПКМ. 
+cp14-tips-8 = Если у вас кончилась магическая энергия, вы все еще можете использовать заклинания и тратить ману, но это будет наносить вам урон, и потенциально может лишить вас сознания!
+cp14-tips-9 = В мире существуют места, с положительной или отрицательной магической полярностью. В этих местах мана регенерирует быстрее, или наоборот, может пассивно тратиться. Чтобы найти такие места, используйте сканер ауры.
+cp14-tips-10 = Высокие кусты неплохо прячут вашего персонажа! Но сильно замедляют передвижение и шумят, если вы двигаетесь в них.
+cp14-tips-11 = Не забывайте закрывать двери на ключ, если не хотите чтобы туда заходил кто попало!
+cp14-tips-12 = DEBUG: Будьте осторожны с огнем! Пока мы не добавили способов комфортно тушить пожары!
--- a/Resources/Locale/ru-RU/_CP14/workbench/workbench.ftl
+++ b/Resources/Locale/ru-RU/_CP14/workbench/workbench.ftl
@@ -0,0 +1,5 @@
+cp14-verb-categories-craft = Выберите крафт:
+
+cp14-workbench-recipe-list = Рецепт:
+
+cp14-workbench-no-resource = Не хватает ингредиентов!
--- a/Resources/Maps/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/Dungeon/snowy_labs.yml
@@ -10731,7 +10731,7 @@ entities:
      rot: -1.5707963267948966 rad
      pos: 52.5,14.5
      parent: 1653
- proto: MagicalLamp
+- proto: ArabianLamp
  entities:
  - uid: 1204
    components:
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -1625,8 +1625,6 @@ entities:
    - type: GasTileOverlay
    - type: SpreaderGrid
    - type: GridPathfinding
-    - type: BecomesStation
-      id: SyndicateOutpost
  - uid: 1295
    components:
    - type: MetaData
@@ -11002,13 +11000,6 @@ entities:
    - type: Transform
      pos: 18.918644,6.663283
      parent: 104
- proto: SyndicateMicrowave
-  entities:
-  - uid: 10
-    components:
-    - type: Transform
-      pos: 13.5,-6.5
-      parent: 104
 - proto: KitchenReagentGrinder
  entities:
  - uid: 1257
@@ -13234,6 +13225,13 @@ entities:
      - SurveillanceCameraEntertainment
      nameSet: True
      id: Weeh
+- proto: SyndicateMicrowave
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 13.5,-6.5
+      parent: 104
 - proto: SyndicatePersonalAI
  entities:
  - uid: 160
--- a/Resources/Maps/Shuttles/emergency_accordia.yml
+++ b/Resources/Maps/Shuttles/emergency_accordia.yml
--- a/Resources/Maps/Shuttles/emergency_cluster.yml
+++ b/Resources/Maps/Shuttles/emergency_cluster.yml
@@ -38,7 +38,7 @@ entities:
          version: 6
        0,-1:
          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAIgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAHQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAbAAAAAAAbAAAAAACbAAAAAADbAAAAAACcQAAAAABeQAAAAAAHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAADeQAAAAAAbAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAACeQAAAAAAHQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAACJgAAAAAAbAAAAAADbAAAAAACbAAAAAABbAAAAAAAcQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAABIgAAAAACeQAAAAAAJgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAACHQAAAAADHQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACJgAAAAABHQAAAAADZAAAAAADZAAAAAACHQAAAAAAZAAAAAACHQAAAAABZAAAAAACZAAAAAACHQAAAAACJgAAAAADJgAAAAAA
+          tiles: AAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAIgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAHQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAbAAAAAAAbAAAAAACbAAAAAADbAAAAAACcQAAAAABeQAAAAAAHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAADeQAAAAAAbAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAACeQAAAAAAHQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAHQAAAAACJgAAAAAAbAAAAAADbAAAAAACbAAAAAABbAAAAAAAcQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAABIgAAAAACeQAAAAAAJgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAACHQAAAAADHQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACJgAAAAABHQAAAAADZAAAAAADZAAAAAACHQAAAAAAZAAAAAACHQAAAAABZAAAAAACZAAAAAACHQAAAAACJgAAAAADJgAAAAAA
          version: 6
        0,0:
          ind: 0,0
--- a/Resources/Maps/_CP14/Shuttles/test-ship.yml
+++ b/Resources/Maps/_CP14/Shuttles/test-ship.yml
--- a/Resources/Maps/_CP14/alchemy_test.yml
+++ b/Resources/Maps/_CP14/alchemy_test.yml
@@ -7,13 +7,13 @@ tilemap:
  2: CP14FloorDirt
  3: CP14FloorFoundation
  4: CP14FloorGrass
+  10: CP14FloorOakWoodPlanks
+  11: CP14FloorOakWoodPlanksBig
  5: CP14FloorSand
  6: CP14FloorStonebricks
  7: CP14FloorStonebricksSmallCarved1
  8: CP14FloorStonebricksSmallCarved2
  9: CP14FloorStonebricksSquareCarved
-  10: CP14FloorWoodPlanks
-  11: CP14FloorWoodPlanksBig
 entities:
 - proto: ""
  entities:
@@ -2187,6 +2187,13 @@ entities:
      rot: -1.5707963267948966 rad
      pos: 4.5,16.5
      parent: 2
+- proto: CP14BaseShovel
+  entities:
+  - uid: 234
+    components:
+    - type: Transform
+      pos: 7.4584475,-2.61353
+      parent: 2
 - proto: CP14BaseSickle
  entities:
  - uid: 227
@@ -44215,134 +44222,6 @@ entities:
          showEnts: False
          occludes: True
          ent: null
- proto: CP14CartridgeBulletRifle
-  entities:
-  - uid: 781
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 782
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 784
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 785
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 786
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4376
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4377
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4378
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4379
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4380
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4408
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4409
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4410
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4411
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4412
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4413
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4414
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 4415
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: CP14Cauldron
  entities:
  - uid: 185
@@ -44927,6 +44806,22 @@ entities:
    - type: Physics
      canCollide: False
    - type: InsideEntityStorage
+- proto: CP14ClothingShirtCottonBlack
+  entities:
+  - uid: 9832
+    components:
+    - type: Transform
+      parent: 9819
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 9835
+    components:
+    - type: Transform
+      parent: 9819
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: CP14ClothingShirtCottonBlue
  entities:
  - uid: 9836
@@ -44943,22 +44838,6 @@ entities:
    - type: Physics
      canCollide: False
    - type: InsideEntityStorage
- proto: CP14ClothingShirtCottonBlueDark
-  entities:
-  - uid: 9832
-    components:
-    - type: Transform
-      parent: 9819
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 9835
-    components:
-    - type: Transform
-      parent: 9819
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: CP14ClothingShirtCottonPurple
  entities:
  - uid: 9837
@@ -46322,13 +46201,6 @@ entities:
    - type: Transform
      pos: 9.299216,-3.5921
      parent: 2
- proto: CP14Shovel
-  entities:
-  - uid: 234
-    components:
-    - type: Transform
-      pos: 7.4584475,-2.61353
-      parent: 2
 - proto: CP14SpawnPointAdventurer
  entities:
  - uid: 647
@@ -46413,6 +46285,13 @@ entities:
    - type: Transform
      pos: 1.5,0.5
      parent: 2
+- proto: CP14SpawnPointCaptain
+  entities:
+  - uid: 779
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 2
 - proto: CP14TableWooden
  entities:
  - uid: 85
@@ -49136,15 +49015,6 @@ entities:
    - type: Transform
      pos: 2.5,-24.5
      parent: 2
- proto: CP14WeaponRifleCrush
-  entities:
-  - uid: 783
-    components:
-    - type: Transform
-      parent: 779
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: CP14WildSage
  entities:
  - uid: 155
@@ -49367,60 +49237,6 @@ entities:
    - type: Transform
      pos: 7.5,5.5
      parent: 2
- proto: CP14WoodenChest
-  entities:
-  - uid: 779
-    components:
-    - type: Transform
-      pos: 8.5,8.5
-      parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-        - 1.8856695
-        - 7.0937095
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 4408
-          - 4380
-          - 4379
-          - 4409
-          - 4378
-          - 4377
-          - 4376
-          - 783
-          - 4410
-          - 4411
-          - 4412
-          - 4413
-          - 4414
-          - 4415
-          - 786
-          - 785
-          - 784
-          - 782
-          - 781
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: CP14WoodenCupboard
  entities:
  - uid: 9819
--- a/Resources/Maps/_CP14/battle_royale.yml
+++ b/Resources/Maps/_CP14/battle_royale.yml
@@ -140,7 +140,7 @@ entities:
          version: 6
        0,-2:
          ind: 0,-2
-          tiles: HAAAAAAFHAAAAAADHAAAAAABHAAAAAABHAAAAAAACQAAAAAGCQAAAAAFCQAAAAAACQAAAAADCQAAAAALCQAAAAAJCQAAAAAKCQAAAAACCQAAAAAGCQAAAAAMCQAAAAAIHAAAAAADHAAAAAAEHAAAAAABHAAAAAADHAAAAAAECQAAAAANCQAAAAACCQAAAAANCQAAAAAICQAAAAAMCQAAAAAICQAAAAACCQAAAAAFCQAAAAADCQAAAAAFCQAAAAANHAAAAAAFHAAAAAACHAAAAAACHAAAAAAEHAAAAAABCQAAAAANCQAAAAAHCQAAAAAHCQAAAAAECQAAAAAECQAAAAALCQAAAAABCQAAAAAACQAAAAAGCQAAAAAFCQAAAAALHAAAAAAECQAAAAAJCQAAAAAKCQAAAAAJCQAAAAAJCQAAAAAFCQAAAAAACQAAAAAHCQAAAAAFCQAAAAAECQAAAAAFCQAAAAABCQAAAAAMCQAAAAANCQAAAAAFCQAAAAAICQAAAAAMCQAAAAAJCQAAAAAECQAAAAAFCQAAAAANCQAAAAABCQAAAAAGCQAAAAAJCQAAAAANCQAAAAABCQAAAAACCQAAAAAHCQAAAAAFCQAAAAAICQAAAAANCQAAAAAGCQAAAAACCQAAAAAACQAAAAAGCQAAAAAIHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAAMCQAAAAAICQAAAAAHCQAAAAABCQAAAAAGCQAAAAAECQAAAAAFCQAAAAADCQAAAAACCQAAAAAICQAAAAANCQAAAAANHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAAACQAAAAAFCQAAAAAKCQAAAAAACQAAAAAECQAAAAAHCQAAAAAICQAAAAAGCQAAAAABCQAAAAAGCQAAAAADCQAAAAACHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAABCQAAAAAHCQAAAAALCQAAAAAECQAAAAAGCQAAAAADCQAAAAAMCQAAAAAECQAAAAAJCQAAAAADCQAAAAADCQAAAAALCQAAAAAFCQAAAAAICQAAAAAICQAAAAAMCQAAAAAMCQAAAAAGCQAAAAAGCQAAAAAFCQAAAAAJCQAAAAAHCQAAAAAECQAAAAACCQAAAAAECQAAAAAKCQAAAAABCQAAAAADCQAAAAABCQAAAAACCQAAAAAECQAAAAAICQAAAAALCQAAAAAKCQAAAAAMCQAAAAANCQAAAAABCQAAAAALCQAAAAAFCQAAAAAJCQAAAAAGCQAAAAACCQAAAAAICQAAAAAMCQAAAAACCQAAAAADCQAAAAAMCQAAAAAMCQAAAAAKCQAAAAANCQAAAAAICQAAAAAGCQAAAAAHCQAAAAABCQAAAAAECQAAAAALCQAAAAAEHAAAAAAAHAAAAAAAHAAAAAAACQAAAAAMCQAAAAACCQAAAAAMCQAAAAAICQAAAAAECQAAAAAHCQAAAAALCQAAAAAECQAAAAANCQAAAAAKCQAAAAAACQAAAAAICQAAAAAJHAAAAAAAHAAAAAAAHAAAAAAACQAAAAAJCQAAAAABCQAAAAAACQAAAAAICQAAAAANCQAAAAAJCQAAAAAMCQAAAAACCQAAAAAFCQAAAAABCQAAAAAGCQAAAAACCQAAAAAIHAAAAAAAHAAAAAAAHAAAAAAACQAAAAALCQAAAAAACQAAAAAICQAAAAAGCQAAAAAGCQAAAAADCQAAAAAICQAAAAAACQAAAAAJCQAAAAAKCQAAAAAECQAAAAABCQAAAAANCQAAAAALCQAAAAAKCQAAAAAECQAAAAANCQAAAAAHCQAAAAAKCQAAAAADCQAAAAAJCQAAAAAJCQAAAAAECQAAAAAHCQAAAAACCQAAAAAHCQAAAAAJCQAAAAALCQAAAAAECQAAAAAFCQAAAAAFCQAAAAAICQAAAAAKCQAAAAAMCQAAAAACCQAAAAACCQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHQAAAAAAHQAAAAAA
+          tiles: HAAAAAAFHAAAAAADHAAAAAABHAAAAAABHAAAAAAACQAAAAAGCQAAAAAFCQAAAAAACQAAAAADCQAAAAALCQAAAAAJCQAAAAAKCQAAAAACCQAAAAAGCQAAAAAMCQAAAAAIHAAAAAADHAAAAAAEHAAAAAABHAAAAAADHAAAAAAECQAAAAANCQAAAAACCQAAAAANCQAAAAAICQAAAAAMCQAAAAAICQAAAAACCQAAAAAFCQAAAAADCQAAAAAFCQAAAAANHAAAAAAFHAAAAAACHAAAAAACHAAAAAAEHAAAAAABCQAAAAANCQAAAAAHCQAAAAAHCQAAAAAECQAAAAAECQAAAAALCQAAAAABCQAAAAAACQAAAAAGCQAAAAAFCQAAAAALHAAAAAAECQAAAAAJCQAAAAAKCQAAAAAJCQAAAAAJCQAAAAAFCQAAAAAACQAAAAAHCQAAAAAFCQAAAAAECQAAAAAFCQAAAAABCQAAAAAMCQAAAAANCQAAAAAFCQAAAAAICQAAAAAMCQAAAAAJCQAAAAAECQAAAAAFCQAAAAANCQAAAAABCQAAAAAGCQAAAAAJCQAAAAANCQAAAAABCQAAAAACCQAAAAAHCQAAAAAFCQAAAAAICQAAAAANCQAAAAAGCQAAAAACCQAAAAAACQAAAAAGCQAAAAAIHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAAMCQAAAAAICQAAAAAHCQAAAAABCQAAAAAGCQAAAAAECQAAAAAFCQAAAAADCQAAAAACCQAAAAAICQAAAAANCQAAAAANHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAAACQAAAAAFCQAAAAAKCQAAAAAACQAAAAAECQAAAAAHCQAAAAAICQAAAAAGCQAAAAABCQAAAAAGCQAAAAADCQAAAAACHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAABCQAAAAAHCQAAAAALCQAAAAAECQAAAAAGCQAAAAADCQAAAAAMCQAAAAAECQAAAAAJCQAAAAADCQAAAAADCQAAAAALCQAAAAAFCQAAAAAICQAAAAAICQAAAAAMCQAAAAAMCQAAAAAGCQAAAAAGCQAAAAAFCQAAAAAJCQAAAAAHCQAAAAAECQAAAAACCQAAAAAECQAAAAAKCQAAAAABCQAAAAADCQAAAAABCQAAAAACCQAAAAAECQAAAAAICQAAAAALCQAAAAAKCQAAAAAMCQAAAAANCQAAAAABCQAAAAALCQAAAAAFCQAAAAAJCQAAAAAGCQAAAAACCQAAAAAICQAAAAAMCQAAAAACCQAAAAADCQAAAAAMCQAAAAAMCQAAAAAKCQAAAAANCQAAAAAICQAAAAAGCQAAAAAHCQAAAAABCQAAAAAECQAAAAALCQAAAAAEHAAAAAAAHAAAAAAAHAAAAAAACQAAAAAMCQAAAAACCQAAAAAMCQAAAAAICQAAAAAECQAAAAAHCQAAAAALCQAAAAAECQAAAAANCQAAAAAKCQAAAAAACQAAAAAICQAAAAAJHAAAAAAAHAAAAAAAHAAAAAAACQAAAAAJCQAAAAABCQAAAAAACQAAAAAICQAAAAANCQAAAAAJCQAAAAAMCQAAAAACCQAAAAAFCQAAAAABCQAAAAAGCQAAAAACCQAAAAAIHAAAAAAAHAAAAAAAHAAAAAAACQAAAAALCQAAAAAACQAAAAAICQAAAAAGCQAAAAAGCQAAAAADCQAAAAAICQAAAAAACQAAAAAJCQAAAAAKCQAAAAAECQAAAAABCQAAAAANCQAAAAALCQAAAAAKCQAAAAAECQAAAAANCQAAAAAHCQAAAAAKCQAAAAADCQAAAAAJHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAACQAAAAALCQAAAAAECQAAAAAFCQAAAAAFCQAAAAAICQAAAAAKCQAAAAAMCQAAAAACCQAAAAACCQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHQAAAAAAHQAAAAAA
          version: 6
        0,-3:
          ind: 0,-3
@@ -34502,11 +34502,6 @@ entities:
    - type: Transform
      pos: 14.5,-6.5
      parent: 2
-  - uid: 5616
-    components:
-    - type: Transform
-      pos: 14.5,-17.5
-      parent: 2
  - uid: 5617
    components:
    - type: Transform
@@ -34617,11 +34612,6 @@ entities:
    - type: Transform
      pos: 13.5,-6.5
      parent: 2
-  - uid: 5652
-    components:
-    - type: Transform
-      pos: 13.5,-17.5
-      parent: 2
  - uid: 5655
    components:
    - type: Transform
@@ -34722,11 +34712,6 @@ entities:
    - type: Transform
      pos: 12.5,-6.5
      parent: 2
-  - uid: 5688
-    components:
-    - type: Transform
-      pos: 12.5,-17.5
-      parent: 2
  - uid: 5692
    components:
    - type: Transform
@@ -34837,11 +34822,6 @@ entities:
    - type: Transform
      pos: 11.5,-6.5
      parent: 2
-  - uid: 5724
-    components:
-    - type: Transform
-      pos: 11.5,-17.5
-      parent: 2
  - uid: 5728
    components:
    - type: Transform
@@ -34957,11 +34937,6 @@ entities:
    - type: Transform
      pos: 22.5,-7.5
      parent: 2
-  - uid: 5760
-    components:
-    - type: Transform
-      pos: 10.5,-17.5
-      parent: 2
  - uid: 5764
    components:
    - type: Transform
@@ -35062,11 +35037,6 @@ entities:
    - type: Transform
      pos: 22.5,-8.5
      parent: 2
-  - uid: 5796
-    components:
-    - type: Transform
-      pos: 9.5,-17.5
-      parent: 2
  - uid: 5799
    components:
    - type: Transform
@@ -44087,98 +44057,6 @@ entities:
          showEnts: False
          occludes: True
          ent: null
- proto: CP14CartridgeBulletRifle
-  entities:
-  - uid: 762
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.799057,-13.2319355
-      parent: 2
-  - uid: 763
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.529102,-13.198202
-      parent: 2
-  - uid: 774
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.450367,-13.389357
-      parent: 2
-  - uid: 775
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.66408,-13.299402
-      parent: 2
-  - uid: 5645
-    components:
-    - type: Transform
-      pos: 34.14076,8.588783
-      parent: 2
-  - uid: 5646
-    components:
-    - type: Transform
-      pos: 32.749653,14.450079
-      parent: 2
-  - uid: 5647
-    components:
-    - type: Transform
-      pos: 33.797386,8.520859
-      parent: 2
-  - uid: 5651
-    components:
-    - type: Transform
-      pos: 32.48552,14.564526
-      parent: 2
-  - uid: 5653
-    components:
-    - type: Transform
-      pos: 32.221386,14.45888
-      parent: 2
-  - uid: 5679
-    components:
-    - type: Transform
-      pos: 32.749653,14.74936
-      parent: 2
-  - uid: 5680
-    components:
-    - type: Transform
-      pos: 32.85531,14.608534
-      parent: 2
-  - uid: 5681
-    components:
-    - type: Transform
-      pos: 33.56847,8.732098
-      parent: 2
-  - uid: 5687
-    components:
-    - type: Transform
-      pos: 33.09303,14.74936
-      parent: 2
-  - uid: 5689
-    components:
-    - type: Transform
-      pos: 33.86782,8.835229
-      parent: 2
-  - uid: 5717
-    components:
-    - type: Transform
-      pos: 34.211193,8.738411
-      parent: 2
-  - uid: 5718
-    components:
-    - type: Transform
-      pos: 33.806187,8.6327915
-      parent: 2
-  - uid: 6317
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.450367,-12.995804
-      parent: 2
 - proto: CP14Chasm
  entities:
  - uid: 5573
@@ -44288,11 +44166,6 @@ entities:
    - type: InsideEntityStorage
 - proto: CP14CrateCoffin
  entities:
-  - uid: 788
-    components:
-    - type: Transform
-      pos: -37.5,-13.5
-      parent: 2
  - uid: 797
    components:
    - type: Transform
@@ -45457,6 +45330,83 @@ entities:
      rot: 1.5707963267948966 rad
      pos: 0.5,-54.5
      parent: 2
+- proto: CP14LargeWoodenCrateFilled
+  entities:
+  - uid: 762
+    components:
+    - type: Transform
+      pos: 9.5,-17.5
+      parent: 2
+  - uid: 763
+    components:
+    - type: Transform
+      pos: 11.5,-17.5
+      parent: 2
+  - uid: 5644
+    components:
+    - type: Transform
+      pos: -37.5,-13.5
+      parent: 2
+  - uid: 5645
+    components:
+    - type: Transform
+      pos: 33.5,7.5
+      parent: 2
+  - uid: 5646
+    components:
+    - type: Transform
+      pos: 31.5,14.5
+      parent: 2
+  - uid: 5647
+    components:
+    - type: Transform
+      pos: -31.5,-17.5
+      parent: 2
+  - uid: 5678
+    components:
+    - type: Transform
+      pos: 1.5,-51.5
+      parent: 2
+  - uid: 5688
+    components:
+    - type: Transform
+      pos: -1.5,-58.5
+      parent: 2
+  - uid: 6031
+    components:
+    - type: Transform
+      pos: -16.5,29.5
+      parent: 2
+  - uid: 6060
+    components:
+    - type: Transform
+      pos: -25.5,43.5
+      parent: 2
+  - uid: 6061
+    components:
+    - type: Transform
+      pos: -21.5,43.5
+      parent: 2
+  - uid: 6066
+    components:
+    - type: Transform
+      pos: -3.5,31.5
+      parent: 2
+  - uid: 6067
+    components:
+    - type: Transform
+      pos: -1.5,22.5
+      parent: 2
+  - uid: 6097
+    components:
+    - type: Transform
+      pos: 22.5,31.5
+      parent: 2
+  - uid: 6154
+    components:
+    - type: Transform
+      pos: 29.5,-27.5
+      parent: 2
 - proto: CP14Nail1
  entities:
  - uid: 6837
@@ -46074,16 +46024,16 @@ entities:
    - type: Transform
      pos: -26.5,4.5
      parent: 2
+  - uid: 5651
+    components:
+    - type: Transform
+      pos: -37.5,-11.5
+      parent: 2
  - uid: 5654
    components:
    - type: Transform
      pos: 34.5,9.5
      parent: 2
-  - uid: 5714
-    components:
-    - type: Transform
-      pos: 33.5,7.5
-      parent: 2
  - uid: 5719
    components:
    - type: Transform
@@ -46104,6 +46054,11 @@ entities:
    - type: Transform
      pos: 16.5,26.5
      parent: 2
+  - uid: 5724
+    components:
+    - type: Transform
+      pos: -35.5,-10.5
+      parent: 2
  - uid: 5850
    components:
    - type: Transform
@@ -46287,7 +46242,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46318,7 +46272,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46349,7 +46302,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46380,7 +46332,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46411,7 +46362,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46442,7 +46392,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46541,7 +46490,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46572,7 +46520,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46604,7 +46551,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46635,7 +46581,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46732,7 +46677,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46764,7 +46708,6 @@ entities:
      - CP14Crossbolt
      - CP14BaseSharpeningStone
      - CP14BaseSharpeningStone
-      - CP14Shovel
      - CP14OldLantern
      - CP14CopperCoin1
      - CP14CopperCoin1
@@ -46798,6 +46741,218 @@ entities:
    - type: Transform
      pos: -10.5,42.5
      parent: 2
+- proto: CP14SmallWoodenCrateFilled
+  entities:
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 10.5,-17.5
+      parent: 2
+  - uid: 775
+    components:
+    - type: Transform
+      pos: 12.5,-17.5
+      parent: 2
+  - uid: 788
+    components:
+    - type: Transform
+      pos: 13.5,-17.5
+      parent: 2
+  - uid: 5616
+    components:
+    - type: Transform
+      pos: 3.5,-31.5
+      parent: 2
+  - uid: 5650
+    components:
+    - type: Transform
+      pos: -37.5,-21.5
+      parent: 2
+  - uid: 5652
+    components:
+    - type: Transform
+      pos: -37.5,-16.5
+      parent: 2
+  - uid: 5653
+    components:
+    - type: Transform
+      pos: -37.5,-14.5
+      parent: 2
+  - uid: 5679
+    components:
+    - type: Transform
+      pos: 2.5,-51.5
+      parent: 2
+  - uid: 5680
+    components:
+    - type: Transform
+      pos: 6.5,-53.5
+      parent: 2
+  - uid: 5681
+    components:
+    - type: Transform
+      pos: 5.5,-49.5
+      parent: 2
+  - uid: 5687
+    components:
+    - type: Transform
+      pos: -1.5,-55.5
+      parent: 2
+  - uid: 5689
+    components:
+    - type: Transform
+      pos: -8.5,-43.5
+      parent: 2
+  - uid: 5714
+    components:
+    - type: Transform
+      pos: -8.5,-40.5
+      parent: 2
+  - uid: 5717
+    components:
+    - type: Transform
+      pos: -13.5,-32.5
+      parent: 2
+  - uid: 5718
+    components:
+    - type: Transform
+      pos: 0.5,-30.5
+      parent: 2
+  - uid: 5760
+    components:
+    - type: Transform
+      pos: -40.5,-13.5
+      parent: 2
+  - uid: 5796
+    components:
+    - type: Transform
+      pos: -23.5,-11.5
+      parent: 2
+  - uid: 6030
+    components:
+    - type: Transform
+      pos: -15.5,-6.5
+      parent: 2
+  - uid: 6032
+    components:
+    - type: Transform
+      pos: -16.5,30.5
+      parent: 2
+  - uid: 6033
+    components:
+    - type: Transform
+      pos: -19.5,29.5
+      parent: 2
+  - uid: 6034
+    components:
+    - type: Transform
+      pos: -19.5,34.5
+      parent: 2
+  - uid: 6035
+    components:
+    - type: Transform
+      pos: -31.5,43.5
+      parent: 2
+  - uid: 6036
+    components:
+    - type: Transform
+      pos: -27.5,43.5
+      parent: 2
+  - uid: 6062
+    components:
+    - type: Transform
+      pos: -17.5,44.5
+      parent: 2
+  - uid: 6064
+    components:
+    - type: Transform
+      pos: -17.5,52.5
+      parent: 2
+  - uid: 6065
+    components:
+    - type: Transform
+      pos: -10.5,52.5
+      parent: 2
+  - uid: 6068
+    components:
+    - type: Transform
+      pos: -1.5,19.5
+      parent: 2
+  - uid: 6069
+    components:
+    - type: Transform
+      pos: -3.5,30.5
+      parent: 2
+  - uid: 6096
+    components:
+    - type: Transform
+      pos: -1.5,34.5
+      parent: 2
+  - uid: 6119
+    components:
+    - type: Transform
+      pos: 21.5,31.5
+      parent: 2
+  - uid: 6133
+    components:
+    - type: Transform
+      pos: 22.5,32.5
+      parent: 2
+  - uid: 6134
+    components:
+    - type: Transform
+      pos: 18.5,29.5
+      parent: 2
+  - uid: 6135
+    components:
+    - type: Transform
+      pos: 30.5,14.5
+      parent: 2
+  - uid: 6136
+    components:
+    - type: Transform
+      pos: 36.5,14.5
+      parent: 2
+  - uid: 6137
+    components:
+    - type: Transform
+      pos: 32.5,7.5
+      parent: 2
+  - uid: 6138
+    components:
+    - type: Transform
+      pos: 46.5,-10.5
+      parent: 2
+  - uid: 6150
+    components:
+    - type: Transform
+      pos: 49.5,-7.5
+      parent: 2
+  - uid: 6151
+    components:
+    - type: Transform
+      pos: 50.5,-4.5
+      parent: 2
+  - uid: 6152
+    components:
+    - type: Transform
+      pos: 48.5,2.5
+      parent: 2
+  - uid: 6153
+    components:
+    - type: Transform
+      pos: 5.5,-46.5
+      parent: 2
+  - uid: 6155
+    components:
+    - type: Transform
+      pos: 28.5,-32.5
+      parent: 2
+  - uid: 6156
+    components:
+    - type: Transform
+      pos: 25.5,-31.5
+      parent: 2
 - proto: CP14SpawnPointAdventurer
  entities:
  - uid: 796
@@ -46880,6 +47035,13 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -37.5,-19.5
      parent: 2
+- proto: CP14SpawnPointCaptain
+  entities:
+  - uid: 751
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 2
 - proto: CP14TableWooden
  entities:
  - uid: 65
@@ -46973,12 +47135,6 @@ entities:
      rot: -1.5707963267948966 rad
      pos: 32.5,14.5
      parent: 2
-  - uid: 5678
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,14.5
-      parent: 2
  - uid: 5685
    components:
    - type: Transform
@@ -47055,11 +47211,6 @@ entities:
    - type: Transform
      pos: 20.5,34.5
      parent: 2
-  - uid: 8092
-    components:
-    - type: Transform
-      pos: -31.5,-17.5
-      parent: 2
  - uid: 8095
    components:
    - type: Transform
@@ -51592,6 +51743,11 @@ entities:
    - type: Transform
      pos: -17.5,45.5
      parent: 2
+  - uid: 2210
+    components:
+    - type: Transform
+      pos: -20.5,32.5
+      parent: 2
  - uid: 2260
    components:
    - type: Transform
@@ -51607,13 +51763,6 @@ entities:
    - type: Transform
      pos: -20.5,39.5
      parent: 2
- proto: CP14WallStoneSilverOre
-  entities:
-  - uid: 2210
-    components:
-    - type: Transform
-      pos: -20.5,32.5
-      parent: 2
 - proto: CP14WallWhitebrick
  entities:
  - uid: 7061
@@ -51959,31 +52108,6 @@ entities:
    - type: Transform
      pos: -38.5,-12.5
      parent: 2
- proto: CP14WeaponRevolverNavy
-  entities:
-  - uid: 7072
-    components:
-    - type: Transform
-      pos: 11.455918,-12.536671
-      parent: 2
- proto: CP14WeaponRifleDurandal
-  entities:
-  - uid: 751
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.292896,-12.770916
-      parent: 2
-  - uid: 5644
-    components:
-    - type: Transform
-      pos: 31.820044,14.771354
-      parent: 2
-  - uid: 5650
-    components:
-    - type: Transform
-      pos: 35.164196,8.832269
-      parent: 2
 - proto: CP14WindowWooden
  entities:
  - uid: 3611
@@ -52169,30 +52293,6 @@ entities:
          showEnts: False
          occludes: True
          ent: null
- proto: CP14WoodenPlanks1
-  entities:
-  - uid: 6298
-    components:
-    - type: Transform
-      pos: -37.58222,-16.442198
-      parent: 2
-  - uid: 6299
-    components:
-    - type: Transform
-      pos: -37.012318,-16.644596
-      parent: 2
-  - uid: 6300
-    components:
-    - type: Transform
-      pos: -36.967327,-16.142347
-      parent: 2
- proto: CP14WoodenPlanks10
-  entities:
-  - uid: 6297
-    components:
-    - type: Transform
-      pos: -37.357258,-14.47818
-      parent: 2
 - proto: CrateWoodenGrave
  entities:
  - uid: 2082
--- a/Resources/Maps/_CP14/dev_map.yml
+++ b/Resources/Maps/_CP14/dev_map.yml
--- a/Resources/Maps/_CP14/expedition_test.yml
+++ b/Resources/Maps/_CP14/expedition_test.yml
--- a/Resources/Maps/_CP14/meteor-arena.yml
+++ b/Resources/Maps/_CP14/meteor-arena.yml
@@ -22,6 +22,7 @@ entities:
    - type: MetaData
    - type: Transform
    - type: Map
+      mapPaused: True
    - type: PhysicsMap
    - type: GridTree
    - type: MovedGrids
@@ -341,6 +342,20 @@ entities:
        chunkSize: 4
    - type: GasTileOverlay
    - type: RadiationGridResistance
+- proto: CP14SpawnPointAdventurer
+  entities:
+  - uid: 99
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 2
+- proto: CP14SpawnPointCaptain
+  entities:
+  - uid: 241
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 2
 - proto: FenceMetalBroken
  entities:
  - uid: 217
@@ -984,13 +999,6 @@ entities:
    - type: Transform
      pos: -0.5,-0.5
      parent: 2
- proto: CP14SpawnPointAdventurer
-  entities:
-  - uid: 99
-    components:
-    - type: Transform
-      pos: -0.5,-0.5
-      parent: 2
 - proto: WallPlastitaniumIndestructible
  entities:
  - uid: 51
--- a/Resources/Maps/atlas.yml
+++ b/Resources/Maps/atlas.yml
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -18042,6 +18042,12 @@ entities:
    - type: Transform
      pos: 91.5,71.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        31366:
+        - DoorStatus: Close
  - uid: 16663
    components:
    - type: Transform
@@ -18492,12 +18498,24 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -42.5,-55.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12402:
+        - DoorStatus: DoorBolt
  - uid: 12402
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -45.5,-55.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12401:
+        - DoorStatus: DoorBolt
  - uid: 23029
    components:
    - type: Transform
@@ -18512,6 +18530,12 @@ entities:
    - type: Transform
      pos: 99.5,0.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        23457:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlass
  entities:
  - uid: 2870
@@ -18586,11 +18610,23 @@ entities:
    - type: Transform
      pos: 25.5,-59.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15609:
+        - DoorStatus: Close
  - uid: 15612
    components:
    - type: Transform
      pos: 27.5,-59.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15610:
+        - DoorStatus: Close
  - uid: 33581
    components:
    - type: Transform
@@ -18618,11 +18654,23 @@ entities:
    - type: Transform
      pos: 16.5,-36.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        10120:
+        - DoorStatus: DoorBolt
  - uid: 10120
    components:
    - type: Transform
      pos: 16.5,-33.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        10119:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassEngineeringLocked
  entities:
  - uid: 3715
@@ -18649,36 +18697,72 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -45.5,-59.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12421:
+        - DoorStatus: DoorBolt
  - uid: 12404
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -31.5,-47.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12395:
+        - DoorStatus: Close
  - uid: 12420
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -37.5,-62.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12400:
+        - DoorStatus: Close
  - uid: 12421
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -45.5,-62.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12403:
+        - DoorStatus: DoorBolt
  - uid: 12503
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -31.5,-59.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12397:
+        - DoorStatus: Close
  - uid: 12504
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: -32.5,-62.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12399:
+        - DoorStatus: Close
  - uid: 20640
    components:
    - type: Transform
@@ -18713,6 +18797,12 @@ entities:
    - type: Transform
      pos: 96.5,0.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        23458:
+        - DoorStatus: DoorBolt
  - uid: 24737
    components:
    - type: Transform
@@ -18792,6 +18882,8 @@ entities:
    - type: Transform
      pos: -41.5,-1.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
    - type: DeviceLinkSource
      linkedPorts:
        3000:
@@ -18837,21 +18929,53 @@ entities:
    - type: Transform
      pos: 22.5,-50.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        19166:
+        - DoorStatus: DoorBolt
+        19165:
+        - DoorStatus: DoorBolt
  - uid: 19164
    components:
    - type: Transform
      pos: 22.5,-49.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        19166:
+        - DoorStatus: DoorBolt
+        19165:
+        - DoorStatus: DoorBolt
  - uid: 19165
    components:
    - type: Transform
      pos: 20.5,-50.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        19164:
+        - DoorStatus: DoorBolt
+        19163:
+        - DoorStatus: DoorBolt
  - uid: 19166
    components:
    - type: Transform
      pos: 20.5,-49.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        19164:
+        - DoorStatus: DoorBolt
+        19163:
+        - DoorStatus: DoorBolt
  - uid: 26786
    components:
    - type: Transform
@@ -18938,6 +19062,8 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -41.5,32.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalGlassShuttleEscape
  entities:
  - uid: 6767
@@ -19008,38 +19134,80 @@ entities:
    - type: Transform
      pos: -29.5,-48.5
      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        12404:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
  - uid: 12397
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -29.5,-58.5
      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        12503:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
  - uid: 12399
    components:
    - type: Transform
      pos: -32.5,-64.5
      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        12504:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
  - uid: 12400
    components:
    - type: Transform
      pos: -37.5,-64.5
      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        12420:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
  - uid: 15609
    components:
    - type: Transform
      pos: 25.5,-61.5
      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        15611:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
  - uid: 15610
    components:
    - type: Transform
      pos: 27.5,-61.5
      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        15612:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
  - uid: 31366
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: 91.5,74.5
      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        16079:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockExternalLocked
  entities:
  - uid: 3833
@@ -19047,6 +19215,8 @@ entities:
    - type: Transform
      pos: -38.5,16.5
      parent: 13329
+    - type: DeviceLinkSink
+      invokeCounter: 1
    - type: DeviceLinkSource
      linkedPorts:
        3834:
@@ -27381,17 +27551,18 @@ entities:
    - type: Transform
      pos: 63.5,-57.5
      parent: 13329
- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
  entities:
  - uid: 1203
    components:
    - type: Transform
-      pos: -6.5,25.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,28.5
      parent: 13329
  - uid: 1204
    components:
    - type: Transform
-      pos: -7.5,28.5
+      pos: -6.5,25.5
      parent: 13329
  - uid: 3030
    components:
@@ -27401,52 +27572,62 @@ entities:
  - uid: 3758
    components:
    - type: Transform
+      rot: -1.5707963267948966 rad
      pos: -41.5,32.5
      parent: 13329
  - uid: 3759
    components:
    - type: Transform
+      rot: -1.5707963267948966 rad
      pos: -41.5,34.5
      parent: 13329
  - uid: 3760
    components:
    - type: Transform
+      rot: -1.5707963267948966 rad
      pos: -41.5,40.5
      parent: 13329
  - uid: 3761
    components:
    - type: Transform
+      rot: -1.5707963267948966 rad
      pos: -41.5,42.5
      parent: 13329
  - uid: 6764
    components:
    - type: Transform
+      rot: 3.141592653589793 rad
      pos: -4.5,76.5
      parent: 13329
  - uid: 10112
    components:
    - type: Transform
+      rot: -1.5707963267948966 rad
      pos: 1.5,-37.5
      parent: 13329
  - uid: 10113
    components:
    - type: Transform
+      rot: -1.5707963267948966 rad
      pos: 1.5,-35.5
      parent: 13329
  - uid: 12422
    components:
    - type: Transform
+      rot: -1.5707963267948966 rad
      pos: -43.5,-32.5
      parent: 13329
  - uid: 12423
    components:
    - type: Transform
+      rot: -1.5707963267948966 rad
      pos: -43.5,-39.5
      parent: 13329
  - uid: 13166
    components:
    - type: Transform
-      pos: -30.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -37.5,-20.5
      parent: 13329
  - uid: 13167
    components:
@@ -27456,27 +27637,30 @@ entities:
  - uid: 13252
    components:
    - type: Transform
-      pos: -37.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: -30.5,-20.5
      parent: 13329
  - uid: 13282
    components:
    - type: Transform
-      pos: -28.5,-30.5
+      pos: -33.5,-30.5
      parent: 13329
  - uid: 13283
    components:
    - type: Transform
-      pos: -33.5,-30.5
+      rot: 1.5707963267948966 rad
+      pos: 95.5,61.5
      parent: 13329
  - uid: 13284
    components:
    - type: Transform
-      pos: 95.5,61.5
+      rot: 1.5707963267948966 rad
+      pos: 95.5,66.5
      parent: 13329
  - uid: 13285
    components:
    - type: Transform
-      pos: 95.5,66.5
+      pos: -28.5,-30.5
      parent: 13329
 - proto: AtmosFixBlockerMarker
  entities:
@@ -164811,6 +164995,11 @@ entities:
    - type: Transform
      pos: 106.5,-45.5
      parent: 13329
+  - uid: 34593
+    components:
+    - type: Transform
+      pos: 17.5,-35.5
+      parent: 13329
  - uid: 35403
    components:
    - type: Transform
@@ -165044,6 +165233,11 @@ entities:
    - type: Transform
      pos: 36.5,56.5
      parent: 13329
+  - uid: 34228
+    components:
+    - type: Transform
+      pos: 17.5,-34.5
+      parent: 13329
  - uid: 34456
    components:
    - type: Transform
@@ -182222,13 +182416,6 @@ entities:
      pos: 22.5,15.5
      parent: 13329
 - proto: SignAtmos
-  entities:
-  - uid: 26471
-    components:
-    - type: Transform
-      pos: 78.5,-21.5
-      parent: 13329
- proto: SignAtmosMinsky
  entities:
  - uid: 26468
    components:
@@ -182245,6 +182432,11 @@ entities:
    - type: Transform
      pos: 90.5,-19.5
      parent: 13329
+  - uid: 26471
+    components:
+    - type: Transform
+      pos: 78.5,-21.5
+      parent: 13329
 - proto: SignBar
  entities:
  - uid: 1188
@@ -182333,8 +182525,6 @@ entities:
    - type: Transform
      pos: 16.5,39.5
      parent: 13329
- proto: SignChemistry1
-  entities:
  - uid: 18455
    components:
    - type: Transform
@@ -182775,13 +182965,6 @@ entities:
    - type: Transform
      pos: 70.5,42.5
      parent: 13329
- proto: SignDrones
-  entities:
-  - uid: 26692
-    components:
-    - type: Transform
-      pos: 82.5,-21.5
-      parent: 13329
 - proto: SignElectricalMed
  entities:
  - uid: 4728
@@ -182975,21 +183158,17 @@ entities:
      pos: 66.5,46.5
      parent: 13329
 - proto: SignHydro1
-  entities:
-  - uid: 20091
-    components:
-    - type: Transform
-      pos: -11.5,33.5
-      parent: 13329
- proto: SignHydro2
  entities:
  - uid: 20090
    components:
    - type: Transform
      pos: -2.5,37.5
      parent: 13329
- proto: SignHydro3
-  entities:
+  - uid: 20091
+    components:
+    - type: Transform
+      pos: -11.5,33.5
+      parent: 13329
  - uid: 20092
    components:
    - type: Transform
@@ -183068,6 +183247,13 @@ entities:
    - type: Transform
      pos: 14.5,-14.5
      parent: 13329
+- proto: SignMaterials
+  entities:
+  - uid: 26692
+    components:
+    - type: Transform
+      pos: 82.5,-21.5
+      parent: 13329
 - proto: SignMedical
  entities:
  - uid: 10600
@@ -183303,21 +183489,17 @@ entities:
    - type: Transform
      pos: 39.5,-12.5
      parent: 13329
- proto: SignScience1
-  entities:
-  - uid: 20084
-    components:
-    - type: Transform
-      pos: 26.5,-48.5
-      parent: 13329
- proto: SignScience2
-  entities:
  - uid: 19938
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 40.5,-40.5
      parent: 13329
+  - uid: 20084
+    components:
+    - type: Transform
+      pos: 26.5,-48.5
+      parent: 13329
 - proto: SignSecurearea
  entities:
  - uid: 15808
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -140,7 +140,7 @@ entities:
          version: 6
        -4,2:
          ind: -4,2
-          tiles: AAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAegAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACegAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
+          tiles: AAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAegAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACegAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
          version: 6
        -4,3:
          ind: -4,3
@@ -4400,6 +4400,12 @@ entities:
            1037: 5,41
            1386: 22,25
            1387: 22,23
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: StandClear
+          decals:
+            3190: -53,36
        - node:
            color: '#334E6DC8'
            id: ThreeQuarterTileOverlayGreyscale
@@ -9735,6 +9741,12 @@ entities:
    - type: Transform
      pos: -82.5,-60.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        6606:
+        - DoorStatus: Close
  - uid: 17373
    components:
    - type: Transform
@@ -9763,11 +9775,23 @@ entities:
    - type: Transform
      pos: 15.5,30.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1826:
+        - DoorStatus: DoorBolt
  - uid: 1826
    components:
    - type: Transform
      pos: 17.5,30.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1695:
+        - DoorStatus: DoorBolt
  - uid: 22631
    components:
    - type: Transform
@@ -9884,18 +9908,42 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -8.5,-58.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6272:
+        - DoorStatus: DoorBolt
+        7207:
+        - DoorStatus: DoorBolt
  - uid: 6272
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -7.5,-56.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        3531:
+        - DoorStatus: DoorBolt
+        7207:
+        - DoorStatus: DoorBolt
  - uid: 7207
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -6.5,-58.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6272:
+        - DoorStatus: DoorBolt
+        3531:
+        - DoorStatus: DoorBolt
  - uid: 10135
    components:
    - type: Transform
@@ -9939,6 +9987,12 @@ entities:
    - type: Transform
      pos: -63.5,-18.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        17342:
+        - DoorStatus: DoorBolt
  - uid: 5391
    components:
    - type: Transform
@@ -9971,6 +10025,12 @@ entities:
    - type: Transform
      pos: -63.5,-20.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        386:
+        - DoorStatus: DoorBolt
  - uid: 18018
    components:
    - type: Transform
@@ -10065,6 +10125,12 @@ entities:
      rot: 3.141592653589793 rad
      pos: 25.5,43.5
      parent: 30
+  - uid: 11449
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -53.5,36.5
+      parent: 30
 - proto: AirlockExternalGlassShuttleLocked
  entities:
  - uid: 11864
@@ -10087,6 +10153,12 @@ entities:
      rot: 3.141592653589793 rad
      pos: -18.5,46.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1696:
+        - DoorStatus: DoorBolt
  - uid: 5390
    components:
    - type: Transform
@@ -10101,11 +10173,23 @@ entities:
    - type: Transform
      pos: 45.5,16.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15830:
+        - DoorStatus: DoorBolt
  - uid: 15830
    components:
    - type: Transform
      pos: 48.5,16.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15829:
+        - DoorStatus: DoorBolt
  - uid: 16278
    components:
    - type: Transform
@@ -10132,6 +10216,12 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -85.5,-60.5
      parent: 30
+    - type: DeviceLinkSource
+      linkedPorts:
+        841:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockFreezerKitchenHydroLocked
  entities:
  - uid: 460
@@ -10516,6 +10606,18 @@ entities:
    - type: Transform
      pos: -69.5,-54.5
      parent: 30
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 9121
+    components:
+    - type: Transform
+      pos: -52.5,-10.5
+      parent: 30
+  - uid: 11452
+    components:
+    - type: Transform
+      pos: -59.5,-10.5
+      parent: 30
 - proto: AirlockHatchMaintenance
  entities:
  - uid: 9957
@@ -11089,7 +11191,7 @@ entities:
      pos: -20.5,-5.5
      parent: 30
    - type: Door
-      secondsUntilStateChange: -537.51984
+      secondsUntilStateChange: -1046.2256
      state: Opening
    - type: DeviceLinkSource
      lastSignals:
@@ -11276,6 +11378,12 @@ entities:
      rot: 3.141592653589793 rad
      pos: -21.5,46.5
      parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        5070:
+        - DoorStatus: DoorBolt
  - uid: 1756
    components:
    - type: Transform
@@ -12136,8 +12244,6 @@ entities:
      parent: 30
    - type: Apc
      hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
  - uid: 7079
    components:
    - type: MetaData
@@ -12163,8 +12269,6 @@ entities:
      parent: 30
    - type: Apc
      hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
  - uid: 7433
    components:
    - type: MetaData
@@ -12183,8 +12287,6 @@ entities:
      parent: 30
    - type: Apc
      hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
  - uid: 7610
    components:
    - type: MetaData
@@ -13115,28 +13217,68 @@ entities:
    - type: Transform
      pos: -73.5,-38.5
      parent: 30
- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
  entities:
  - uid: 380
    components:
    - type: Transform
-      pos: -59.5,-7.5
+      pos: -52.5,-10.5
+      parent: 30
+  - uid: 868
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,43.5
+      parent: 30
+  - uid: 1083
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-3.5
+      parent: 30
+  - uid: 1475
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-5.5
+      parent: 30
+  - uid: 1490
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -65.5,23.5
+      parent: 30
+  - uid: 1493
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -65.5,15.5
      parent: 30
  - uid: 3707
    components:
    - type: Transform
-      pos: 25.5,43.5
+      rot: -1.5707963267948966 rad
+      pos: -65.5,13.5
      parent: 30
-  - uid: 9121
+  - uid: 11451
    components:
    - type: Transform
-      pos: 38.5,-5.5
+      pos: -59.5,-10.5
      parent: 30
-  - uid: 9122
+  - uid: 11453
    components:
    - type: Transform
-      pos: 38.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: -53.5,36.5
      parent: 30
+  - uid: 11454
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -65.5,21.5
+      parent: 30
+- proto: AtmosDeviceFanTiny
+  entities:
  - uid: 9123
    components:
    - type: Transform
@@ -13147,41 +13289,6 @@ entities:
    - type: Transform
      pos: -19.5,17.5
      parent: 30
-  - uid: 9798
-    components:
-    - type: Transform
-      pos: -52.5,-7.5
-      parent: 30
-  - uid: 16402
-    components:
-    - type: Transform
-      pos: -65.5,23.5
-      parent: 30
-  - uid: 16403
-    components:
-    - type: Transform
-      pos: -65.5,21.5
-      parent: 30
-  - uid: 16404
-    components:
-    - type: Transform
-      pos: -65.5,15.5
-      parent: 30
-  - uid: 16405
-    components:
-    - type: Transform
-      pos: -65.5,13.5
-      parent: 30
-  - uid: 20590
-    components:
-    - type: Transform
-      pos: -52.5,2.5
-      parent: 30
-  - uid: 20591
-    components:
-    - type: Transform
-      pos: -59.5,2.5
-      parent: 30
 - proto: AtmosFixBlockerMarker
  entities:
  - uid: 16997
@@ -14242,7 +14349,7 @@ entities:
    - type: Transform
      pos: -60.353844,-63.575558
      parent: 30
- proto: BookChefGaming
+- proto: BookHowToCookForFortySpaceman
  entities:
  - uid: 9948
    components:
@@ -49781,6 +49888,11 @@ entities:
        - 0
        - 0
        - 0
+  - uid: 11456
+    components:
+    - type: Transform
+      pos: -52.5,37.5
+      parent: 30
  - uid: 11750
    components:
    - type: Transform
@@ -54510,6 +54622,13 @@ entities:
    - type: Transform
      pos: 1.5,-33.5
      parent: 30
+- proto: DefaultStationBeaconEscapePod
+  entities:
+  - uid: 11455
+    components:
+    - type: Transform
+      pos: -52.5,36.5
+      parent: 30
 - proto: DefaultStationBeaconEVAStorage
  entities:
  - uid: 20552
@@ -89848,10 +89967,11 @@ entities:
    - type: Transform
      pos: -42.5,34.5
      parent: 30
-  - uid: 1493
+  - uid: 1476
    components:
    - type: Transform
-      pos: -53.5,34.5
+      rot: -1.5707963267948966 rad
+      pos: -53.5,37.5
      parent: 30
  - uid: 1494
    components:
@@ -91782,6 +91902,12 @@ entities:
    - type: Transform
      pos: 24.5,-34.5
      parent: 30
+  - uid: 9122
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -53.5,35.5
+      parent: 30
  - uid: 9129
    components:
    - type: Transform
@@ -93351,11 +93477,6 @@ entities:
    - type: Transform
      pos: -58.5,36.5
      parent: 30
-  - uid: 16951
-    components:
-    - type: Transform
-      pos: -51.5,36.5
-      parent: 30
  - uid: 17032
    components:
    - type: Transform
@@ -108641,21 +108762,11 @@ entities:
    - type: Transform
      pos: -42.5,34.5
      parent: 30
-  - uid: 1476
-    components:
-    - type: Transform
-      pos: -51.5,36.5
-      parent: 30
  - uid: 1489
    components:
    - type: Transform
      pos: -52.5,34.5
      parent: 30
-  - uid: 1490
-    components:
-    - type: Transform
-      pos: -53.5,34.5
-      parent: 30
  - uid: 1491
    components:
    - type: Transform
@@ -110473,6 +110584,18 @@ entities:
    - type: Transform
      pos: -64.5,16.5
      parent: 30
+  - uid: 11448
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,37.5
+      parent: 30
+  - uid: 11450
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,35.5
+      parent: 30
  - uid: 11602
    components:
    - type: Transform
@@ -113375,6 +113498,11 @@ entities:
      parent: 30
 - proto: SignAtmos
  entities:
+  - uid: 7012
+    components:
+    - type: Transform
+      pos: 8.5,-21.5
+      parent: 30
  - uid: 9082
    components:
    - type: Transform
@@ -113385,13 +113513,6 @@ entities:
    - type: Transform
      pos: 4.5,-32.5
      parent: 30
- proto: SignAtmosMinsky
-  entities:
-  - uid: 7012
-    components:
-    - type: Transform
-      pos: 8.5,-21.5
-      parent: 30
 - proto: SignBar
  entities:
  - uid: 1384
@@ -113447,8 +113568,6 @@ entities:
    - type: Transform
      pos: -10.5,-11.5
      parent: 30
- proto: SignChemistry1
-  entities:
  - uid: 9032
    components:
    - type: Transform
@@ -113909,13 +114028,6 @@ entities:
    - type: Transform
      pos: 47.5,20.5
      parent: 30
- proto: SignDrones
-  entities:
-  - uid: 12263
-    components:
-    - type: Transform
-      pos: -37.5,26.5
-      parent: 30
 - proto: SignElectricalMed
  entities:
  - uid: 3194
@@ -114041,20 +114153,16 @@ entities:
    - type: Transform
      pos: -20.5,13.5
      parent: 30
- proto: SignHydro2
-  entities:
-  - uid: 1386
-    components:
-    - type: Transform
-      pos: -29.5,4.5
-      parent: 30
- proto: SignHydro3
-  entities:
  - uid: 1385
    components:
    - type: Transform
      pos: -22.5,8.5
      parent: 30
+  - uid: 1386
+    components:
+    - type: Transform
+      pos: -29.5,4.5
+      parent: 30
 - proto: SignInterrogation
  entities:
  - uid: 1774
@@ -114090,6 +114198,13 @@ entities:
    - type: Transform
      pos: 18.5,-0.5
      parent: 30
+- proto: SignMaterials
+  entities:
+  - uid: 12263
+    components:
+    - type: Transform
+      pos: -37.5,26.5
+      parent: 30
 - proto: SignMedical
  entities:
  - uid: 6763
@@ -114102,13 +114217,6 @@ entities:
    - type: Transform
      pos: -12.5,0.5
      parent: 30
- proto: SignMinerDock
-  entities:
-  - uid: 8445
-    components:
-    - type: Transform
-      pos: 15.5,-9.5
-      parent: 30
 - proto: SignMorgue
  entities:
  - uid: 6903
@@ -114245,26 +114353,22 @@ entities:
      pos: 16.5,24.5
      parent: 30
 - proto: SignScience
-  entities:
-  - uid: 13389
-    components:
-    - type: Transform
-      pos: 16.5,16.5
-      parent: 30
- proto: SignScience1
  entities:
  - uid: 6576
    components:
    - type: Transform
      pos: 11.5,19.5
      parent: 30
- proto: SignScience2
-  entities:
  - uid: 13388
    components:
    - type: Transform
      pos: 11.5,13.5
      parent: 30
+  - uid: 13389
+    components:
+    - type: Transform
+      pos: 16.5,16.5
+      parent: 30
 - proto: SignSecurearea
  entities:
  - uid: 11895
@@ -114355,6 +114459,13 @@ entities:
    - type: Transform
      pos: -37.5,38.5
      parent: 30
+- proto: SignShipDock
+  entities:
+  - uid: 8445
+    components:
+    - type: Transform
+      pos: 15.5,-9.5
+      parent: 30
 - proto: SignSmoking
  entities:
  - uid: 9125
@@ -123118,11 +123229,6 @@ entities:
    - type: Transform
      pos: -50.5,11.5
      parent: 30
-  - uid: 868
-    components:
-    - type: Transform
-      pos: -59.5,-10.5
-      parent: 30
  - uid: 882
    components:
    - type: Transform
@@ -123223,11 +123329,6 @@ entities:
    - type: Transform
      pos: -61.5,-10.5
      parent: 30
-  - uid: 1083
-    components:
-    - type: Transform
-      pos: -52.5,-10.5
-      parent: 30
  - uid: 1140
    components:
    - type: Transform
@@ -123424,12 +123525,6 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -51.5,34.5
      parent: 30
-  - uid: 1475
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -51.5,35.5
-      parent: 30
  - uid: 1477
    components:
    - type: Transform
@@ -127408,6 +127503,12 @@ entities:
    - type: Transform
      pos: -39.5,-22.5
      parent: 30
+  - uid: 9798
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,34.5
+      parent: 30
  - uid: 9855
    components:
    - type: Transform
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
--- a/Resources/Maps/oasis.yml
+++ b/Resources/Maps/oasis.yml
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -7294,11 +7294,27 @@ entities:
    - type: Transform
      pos: 37.5,-39.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        4391:
+        - DoorStatus: DoorBolt
  - uid: 4391
    components:
    - type: Transform
      pos: 35.5,-37.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        4385:
+        - DoorStatus: DoorBolt
+        4392:
+        - DoorStatus: DoorBolt
+        4390:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalEngineeringLocked
  entities:
  - uid: 69
@@ -7306,21 +7322,45 @@ entities:
    - type: Transform
      pos: 11.5,37.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        70:
+        - DoorStatus: DoorBolt
  - uid: 70
    components:
    - type: Transform
      pos: 11.5,35.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        69:
+        - DoorStatus: DoorBolt
  - uid: 171
    components:
    - type: Transform
      pos: 15.5,-41.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        173:
+        - DoorStatus: DoorBolt
  - uid: 173
    components:
    - type: Transform
      pos: 13.5,-43.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        171:
+        - DoorStatus: DoorBolt
  - uid: 225
    components:
    - type: Transform
@@ -7336,31 +7376,67 @@ entities:
    - type: Transform
      pos: 74.5,45.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2128:
+        - DoorStatus: DoorBolt
  - uid: 2128
    components:
    - type: Transform
      pos: 72.5,45.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1902:
+        - DoorStatus: DoorBolt
  - uid: 4385
    components:
    - type: Transform
      pos: 33.5,-39.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        4391:
+        - DoorStatus: DoorBolt
  - uid: 4392
    components:
    - type: Transform
      pos: 35.5,-41.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        4391:
+        - DoorStatus: DoorBolt
  - uid: 12931
    components:
    - type: Transform
      pos: 33.5,-47.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12932:
+        - DoorStatus: DoorBolt
  - uid: 12932
    components:
    - type: Transform
      pos: 32.5,-49.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        12931:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassCargoLocked
  entities:
  - uid: 258
@@ -7378,21 +7454,53 @@ entities:
    - type: Transform
      pos: 6.5,16.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        7886:
+        - DoorStatus: DoorBolt
+        7881:
+        - DoorStatus: DoorBolt
  - uid: 7674
    components:
    - type: Transform
      pos: 6.5,17.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        7886:
+        - DoorStatus: DoorBolt
+        7881:
+        - DoorStatus: DoorBolt
  - uid: 7881
    components:
    - type: Transform
      pos: 4.5,17.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6863:
+        - DoorStatus: DoorBolt
+        7674:
+        - DoorStatus: DoorBolt
  - uid: 7886
    components:
    - type: Transform
      pos: 4.5,16.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        7674:
+        - DoorStatus: DoorBolt
+        6863:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassLocked
  entities:
  - uid: 2734
@@ -7400,11 +7508,23 @@ entities:
    - type: Transform
      pos: -5.5,-18.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        6839:
+        - DoorStatus: DoorBolt
  - uid: 6839
    components:
    - type: Transform
      pos: -5.5,-15.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2734:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassShuttleArrivals
  entities:
  - uid: 1332
@@ -7448,26 +7568,56 @@ entities:
    - type: Transform
      pos: 1.5,-35.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1370:
+        - DoorStatus: DoorBolt
  - uid: 1370
    components:
    - type: Transform
      pos: -0.5,-35.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1369:
+        - DoorStatus: DoorBolt
  - uid: 3202
    components:
    - type: Transform
      pos: 56.5,49.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2167:
+        - DoorStatus: Close
  - uid: 8728
    components:
    - type: Transform
      pos: 87.5,-20.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        10751:
+        - DoorStatus: DoorBolt
  - uid: 10751
    components:
    - type: Transform
      pos: 84.5,-20.5
      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        8728:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalShuttleLocked
  entities:
  - uid: 2167
@@ -7476,6 +7626,12 @@ entities:
      rot: 3.141592653589793 rad
      pos: 56.5,51.5
      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        3202:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockFreezer
  entities:
  - uid: 10
@@ -9272,47 +9428,61 @@ entities:
    - type: Transform
      pos: 36.5,-21.5
      parent: 2
- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
  entities:
  - uid: 136
    components:
    - type: Transform
-      pos: -2.5,2.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,2.5
      parent: 2
  - uid: 373
    components:
    - type: Transform
+      rot: 3.141592653589793 rad
      pos: -12.5,-10.5
      parent: 2
  - uid: 608
    components:
    - type: Transform
+      rot: 3.141592653589793 rad
      pos: -19.5,-10.5
      parent: 2
  - uid: 2027
    components:
    - type: Transform
-      pos: -4.5,2.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,2.5
+      parent: 2
+  - uid: 5262
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-10.5
      parent: 2
  - uid: 6591
    components:
    - type: Transform
+      rot: 1.5707963267948966 rad
      pos: 32.5,-10.5
      parent: 2
  - uid: 6592
    components:
    - type: Transform
-      pos: 28.5,-10.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,26.5
      parent: 2
-  - uid: 12295
+  - uid: 6874
    components:
    - type: Transform
+      rot: -1.5707963267948966 rad
      pos: 4.5,24.5
      parent: 2
-  - uid: 12296
+  - uid: 6876
    components:
    - type: Transform
-      pos: 4.5,26.5
+      rot: 1.5707963267948966 rad
+      pos: 87.5,4.5
      parent: 2
 - proto: AtmosFixBlockerMarker
  entities:
@@ -10063,7 +10233,7 @@ entities:
    - type: Transform
      pos: 114.5,-17.5
      parent: 2
- proto: BookChefGaming
+- proto: BookHowToCookForFortySpaceman
  entities:
  - uid: 297
    components:
@@ -21935,6 +22105,16 @@ entities:
    - type: Transform
      pos: 16.5,-12.5
      parent: 2
+  - uid: 6938
+    components:
+    - type: Transform
+      pos: 116.5,-15.5
+      parent: 2
+  - uid: 6939
+    components:
+    - type: Transform
+      pos: 116.5,-17.5
+      parent: 2
  - uid: 7148
    components:
    - type: Transform
@@ -31765,6 +31945,14 @@ entities:
      - Steel
      - Glass
      - Gold
+- proto: CleanerDispenser
+  entities:
+  - uid: 6875
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-4.5
+      parent: 2
 - proto: ClosetBombFilled
  entities:
  - uid: 12854
@@ -65770,19 +65958,17 @@ entities:
      pos: 42.47835,25.502422
      parent: 2
 - proto: SignAtmos
-  entities:
-  - uid: 4575
-    components:
-    - type: Transform
-      pos: 28.5,-26.5
-      parent: 2
- proto: SignAtmosMinsky
  entities:
  - uid: 4574
    components:
    - type: Transform
      pos: 37.5,-38.5
      parent: 2
+  - uid: 4575
+    components:
+    - type: Transform
+      pos: 28.5,-26.5
+      parent: 2
 - proto: SignBar
  entities:
  - uid: 11198
@@ -65826,7 +66012,7 @@ entities:
    - type: Transform
      pos: 39.519363,4.4919653
      parent: 2
- proto: SignChemistry1
+- proto: SignChem
  entities:
  - uid: 6817
    components:
@@ -65840,13 +66026,6 @@ entities:
    - type: Transform
      pos: 25.484035,39.437214
      parent: 2
- proto: SignCourt
-  entities:
-  - uid: 13166
-    components:
-    - type: Transform
-      pos: 24.5,28.5
-      parent: 2
 - proto: SignCryogenicsMed
  entities:
  - uid: 11804
@@ -66195,20 +66374,18 @@ entities:
      rot: 3.141592653589793 rad
      pos: 13.5,-2.5
      parent: 2
- proto: SignHydro2
-  entities:
-  - uid: 6651
-    components:
-    - type: Transform
-      pos: 41.5,-2.5
-      parent: 2
- proto: SignHydro3
+- proto: SignHydro1
  entities:
  - uid: 6648
    components:
    - type: Transform
      pos: 47.5,-2.5
      parent: 2
+  - uid: 6651
+    components:
+    - type: Transform
+      pos: 41.5,-2.5
+      parent: 2
 - proto: SignInterrogation
  entities:
  - uid: 11209
@@ -66246,6 +66423,11 @@ entities:
    - type: Transform
      pos: -4.5,-6.5
      parent: 2
+  - uid: 13166
+    components:
+    - type: Transform
+      pos: 24.5,28.5
+      parent: 2
 - proto: SignLibrary
  entities:
  - uid: 11201
@@ -66268,13 +66450,6 @@ entities:
    - type: Transform
      pos: 53.5,1.5
      parent: 2
- proto: SignMinerDock
-  entities:
-  - uid: 7784
-    components:
-    - type: Transform
-      pos: 6.5,18.5
-      parent: 2
 - proto: SignMorgue
  entities:
  - uid: 11196
@@ -66379,6 +66554,11 @@ entities:
      parent: 2
 - proto: SignShipDock
  entities:
+  - uid: 7784
+    components:
+    - type: Transform
+      pos: 6.5,18.5
+      parent: 2
  - uid: 9306
    components:
    - type: Transform
@@ -66493,7 +66673,7 @@ entities:
      rot: 1.5707963267948966 rad
      pos: 28.5,-13.5
      parent: 2
- proto: SignToxins2
+- proto: SignToxins
  entities:
  - uid: 12304
    components:
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -4519,6 +4519,12 @@ entities:
    - type: Transform
      pos: -8.5,-42.5
      parent: 31
+  - uid: 10766
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-16.5
+      parent: 31
 - proto: AirlockExternalGlassShuttleLocked
  entities:
  - uid: 6995
@@ -5740,63 +5746,76 @@ entities:
    - type: Transform
      pos: 5.5,-32.5
      parent: 31
- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
  entities:
+  - uid: 950
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-4.5
+      parent: 31
  - uid: 5157
    components:
    - type: Transform
-      pos: -14.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: -44.5,0.5
      parent: 31
  - uid: 6694
    components:
    - type: Transform
-      pos: -44.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: -44.5,2.5
      parent: 31
  - uid: 7138
    components:
    - type: Transform
-      pos: -44.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -44.5,8.5
      parent: 31
  - uid: 7346
    components:
    - type: Transform
-      pos: -44.5,8.5
+      rot: -1.5707963267948966 rad
+      pos: -44.5,10.5
      parent: 31
  - uid: 7566
    components:
    - type: Transform
-      pos: -44.5,10.5
+      rot: 3.141592653589793 rad
+      pos: 20.5,28.5
      parent: 31
  - uid: 7567
    components:
    - type: Transform
+      rot: 3.141592653589793 rad
      pos: 22.5,28.5
      parent: 31
  - uid: 7943
    components:
    - type: Transform
-      pos: 20.5,28.5
+      rot: 3.141592653589793 rad
+      pos: -12.5,-2.5
      parent: 31
  - uid: 9923
    components:
    - type: Transform
-      pos: -12.5,-2.5
+      pos: -8.5,-42.5
      parent: 31
  - uid: 10583
    components:
    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-42.5
+      pos: -51.5,-12.5
      parent: 31
  - uid: 10765
    components:
    - type: Transform
      pos: -44.5,-12.5
      parent: 31
-  - uid: 10766
+  - uid: 11466
    components:
    - type: Transform
-      pos: -51.5,-12.5
+      rot: 3.141592653589793 rad
+      pos: 31.5,-16.5
      parent: 31
 - proto: AtmosFixBlockerMarker
  entities:
@@ -28720,6 +28739,20 @@ entities:
      parent: 31
    - type: NavMapBeacon
      text: Tesla Storage
+- proto: DefaultStationBeaconEscapePod
+  entities:
+  - uid: 11467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-17.5
+      parent: 31
+  - uid: 11468
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-41.5
+      parent: 31
 - proto: DefaultStationBeaconEVAStorage
  entities:
  - uid: 7640
@@ -56347,8 +56380,6 @@ entities:
    - type: Transform
      pos: 18.5,-3.5
      parent: 31
- proto: SignChemistry2
-  entities:
  - uid: 7291
    components:
    - type: Transform
@@ -56586,13 +56617,6 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -26.497889,6.2645836
      parent: 31
- proto: SignDrones
-  entities:
-  - uid: 7224
-    components:
-    - type: Transform
-      pos: 26.5,2.5
-      parent: 31
 - proto: SignElectrical
  entities:
  - uid: 11377
@@ -56642,7 +56666,7 @@ entities:
    - type: Transform
      pos: 50.5,-1.5
      parent: 31
- proto: SignHydro2
+- proto: SignHydro1
  entities:
  - uid: 10545
    components:
@@ -56685,6 +56709,13 @@ entities:
    - type: Transform
      pos: 32.5,23.5
      parent: 31
+- proto: SignMaterials
+  entities:
+  - uid: 7224
+    components:
+    - type: Transform
+      pos: 26.5,2.5
+      parent: 31
 - proto: SignMedical
  entities:
  - uid: 4151
@@ -56692,14 +56723,6 @@ entities:
    - type: Transform
      pos: 5.5,2.5
      parent: 31
- proto: SignMinerDock
-  entities:
-  - uid: 9941
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 34.5,38.5
-      parent: 31
 - proto: SignMorgue
  entities:
  - uid: 4230
@@ -56792,6 +56815,14 @@ entities:
    - type: Transform
      pos: 54.5,-10.5
      parent: 31
+- proto: SignShipDock
+  entities:
+  - uid: 9941
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,38.5
+      parent: 31
 - proto: SignSomethingOld2
  entities:
  - uid: 1469
@@ -61591,11 +61622,6 @@ entities:
    - type: Transform
      pos: 53.5,-12.5
      parent: 31
-  - uid: 950
-    components:
-    - type: Transform
-      pos: 31.5,-16.5
-      parent: 31
  - uid: 951
    components:
    - type: Transform
--- a/Resources/Maps/train.yml
+++ b/Resources/Maps/train.yml
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -430,6 +430,9 @@
    chatsan-word-47: chatsan-replacement-47
    chatsan-word-48: chatsan-replacement-48
    chatsan-word-49: chatsan-replacement-49
+    chatsan-word-50: chatsan-replacement-50
+    chatsan-word-51: chatsan-replacement-51
+    chatsan-word-52: chatsan-replacement-52
    #CP14-RU-ChatSanitize-Start
    cp14-chatsan-word-1: cp14-chatsan-replacement-1
    cp14-chatsan-word-2: cp14-chatsan-replacement-2
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -166,6 +166,8 @@
  name: Morph into Geras
  description:  Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory.
  components:
+  - type: ConfirmableAction
+    popup: gera-transformation-popup
  - type: InstantAction
    itemIconStyle: BigAction
    useDelay: 10 # prevent spam
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -5,6 +5,7 @@
  id: BaseAlertOrder
  order:
    - category: Health
+    - alertType: CP14MagicEnergy
    - category: Stamina
    - alertType: SuitPower
    - category: Internals
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: BaseAnimalOrganUnGibbable
  parent: BaseItem
  abstract: true
@@ -34,7 +34,7 @@
  id: OrganAnimalLungs
  parent: BaseAnimalOrgan
  name: lungs
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
@@ -65,7 +65,7 @@
  id: OrganAnimalStomach
  parent: BaseAnimalOrgan
  name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: stomach
@@ -91,7 +91,7 @@
  id: OrganMouseStomach
  parent: OrganAnimalStomach
  name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: SolutionContainerManager
    solutions:
@@ -102,7 +102,7 @@
  id: OrganAnimalLiver
  parent: BaseAnimalOrgan
  name: liver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: liver
@@ -118,7 +118,7 @@
  id: OrganAnimalHeart
  parent: BaseAnimalOrgan
  name: heart
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: heart-on
@@ -135,7 +135,7 @@
  id: OrganAnimalKidneys
  parent: BaseAnimalOrgan
  name: kidneys
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
@@ -1,8 +1,8 @@
- type: entity
+- type: entity
  id: OrganBloodsuckerStomach
  parent: OrganAnimalStomach
  name: stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Metabolizer
    metabolizerTypes: [ Bloodsucker ]
@@ -11,7 +11,7 @@
  id: OrganBloodsuckerLiver
  parent: OrganAnimalLiver
  name: liver
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Metabolizer
    metabolizerTypes: [ Bloodsucker ]
@@ -20,7 +20,7 @@
  id: OrganBloodsuckerHeart
  parent: OrganAnimalHeart
  name: heart
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Metabolizer
    metabolizerTypes: [ Bloodsucker ]
--- a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
@@ -1,8 +1,8 @@
- type: entity
+- type: entity
  id: OrganAnimalRuminantStomach
  parent: OrganAnimalStomach
  name: ruminant stomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: SolutionContainerManager
    solutions:
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -105,7 +105,7 @@
  parent: BaseHumanOrgan
  name: liver
  description: "Pairing suggestion: chianti and fava beans."
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    state: liver
@@ -122,7 +122,7 @@
  parent: BaseHumanOrgan
  name: kidneys
  description: "Filters toxins from the bloodstream."
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -126,7 +126,7 @@
 - type: entity
  id: OrganDionaBrainNymph
  parent: OrganDionaBrain
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: brain
  description: "The source of incredible, unending intelligence. Honk."
  components:
@@ -138,7 +138,7 @@
 - type: entity
  id: OrganDionaStomachNymph
  parent: OrganDionaStomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: stomach
  description: "Gross. This is hard to stomach."
  components:
@@ -148,7 +148,7 @@
 - type: entity
  id: OrganDionaLungsNymph
  parent: OrganDionaLungs
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: lungs
  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
  components:
@@ -159,7 +159,7 @@
 - type: entity
  id: OrganDionaNymphBrain
  parent: MobDionaNymph
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: diona nymph
  suffix: Brain
  description: Contains the brain of a formerly fully-formed Diona. Killing this would kill the Diona forever. You monster.
@@ -171,7 +171,7 @@
 - type: entity
  id: OrganDionaNymphStomach
  parent: MobDionaNymphAccent 
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: diona nymph
  suffix: Stomach
  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
@@ -183,7 +183,7 @@
 - type: entity
  id: OrganDionaNymphLungs
  parent: MobDionaNymphAccent
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  name: diona nymph
  suffix: Lungs
  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 
--- a/Resources/Prototypes/Body/Organs/moth.yml
+++ b/Resources/Prototypes/Body/Organs/moth.yml
@@ -1,7 +1,7 @@
- type: entity
+- type: entity
  id: OrganMothStomach
  parent: [OrganAnimalStomach, OrganHumanStomach]
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Stomach
    specialDigestible:
--- a/Resources/Prototypes/Body/Organs/reptilian.yml
+++ b/Resources/Prototypes/Body/Organs/reptilian.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: OrganReptilianStomach
  parent: OrganAnimalStomach
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Stomach
    specialDigestible:
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -36,7 +36,7 @@
  id: HandsAnimal
  name: animal hands
  parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
@@ -50,7 +50,7 @@
  id: LegsAnimal
  name: animal legs
  parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
@@ -64,7 +64,7 @@
  id: FeetAnimal
  name: animal feet
  parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
@@ -77,7 +77,7 @@
  id: TorsoAnimal
  name: animal torso
  parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Body/Parts/rat.yml
+++ b/Resources/Prototypes/Body/Parts/rat.yml
@@ -4,7 +4,7 @@
  id: TorsoRat
  name: "animal torso"
  parent: PartAnimal
-  noSpawn: true
+  categories: [ HideSpawnMenu ]
  components:
  - type: BodyPart
    partType: Torso
--- a/Resources/Prototypes/Body/Prototypes/a_ghost.yml
+++ b/Resources/Prototypes/Body/Prototypes/a_ghost.yml
@@ -1,6 +1,6 @@
 - type: body
  id: Aghost
-  name: "aGhost"
+  name: "aghost"
  root: torso
  slots:
    torso:
--- a/Resources/Prototypes/Body/Prototypes/arachnid.yml
+++ b/Resources/Prototypes/Body/Prototypes/arachnid.yml
@@ -1,6 +1,6 @@
 - type: body
  id: Arachnid
-  name: "Arachnid"
+  name: "arachnid"
  root: torso
  slots:
    head:
--- a/Resources/Prototypes/Body/Prototypes/moth.yml
+++ b/Resources/Prototypes/Body/Prototypes/moth.yml
@@ -1,6 +1,6 @@
 - type: body
  id: Moth
-  name: "Moth"
+  name: "moth"
  root: torso
  slots:
    head:
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -502,6 +502,9 @@
      - TemperatureProtection
      tags:
      - Scarf
+    blacklist:
+      components:
+      - ToggleableClothing

 - type: cargoBounty
  id: BountyBattery
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -247,6 +247,19 @@
      - id: DoubleEmergencyOxygenTankFilled
      - id: DoubleEmergencyNitrogenTankFilled

+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateRaidBundle
+  name: syndicate raid suit bundle
+  description: "Contains the Syndicate's durable raid armor suit."
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterArmorRaid
+      - id: ClothingHeadHelmetRaid
+      - id: ClothingMaskGasSyndicate
+      - id: ClothingHandsGlovesCombat
+
 - type: entity
  parent: ClothingBackpackDuffelSyndicateBundle
  id: ClothingBackpackDuffelSyndicateHardsuitBundle
--- a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml
@@ -0,0 +1,372 @@
+- type: entity
+  name: Perma Escape Crate Spawner
+  id: CratePermaEscapeSpawner
+  parent: CrateEmptySpawner
+  components:
+  - type: RandomSpawner
+    prototypes:
+    # Please note any duplicates & alphabetize <3
+      - CrateEngineeringMiniJetpack
+      - CratePermaEscapeBureaucracy
+      - CratePermaEscapeEVA
+      - CratePermaEscapeGiftsFromSyndicate
+      - CratePermaEscapeGun
+      - CratePermaEscapeLights
+      - CratePermaEscapeMerc
+      - CrateServiceCustomSmokable
+      - CrateTrashCartFilled
+      - CratePermaEscapeComs # x2
+      - CratePermaEscapeComs
+      - CratePermaEscapeDigging # x2
+      - CratePermaEscapeDigging
+      - CratePermaEscapeMats #x2
+      - CratePermaEscapeMats
+      - CratePermaEscapeTowercap # x2
+      - CratePermaEscapeTowercap
+      - ClosetMaintenanceFilledRandom # x3
+      - ClosetMaintenanceFilledRandom
+      - ClosetMaintenanceFilledRandom
+    rarePrototypes:
+      - MobTick # These need to be killable by one dude with a shovel.
+    rareChance: .30
+    chance: 1
+    offset: 0.0
+
+- type: entity
+  id: CratePermaEscapeDigging
+  parent: CrateGenericSteel
+  suffix: Digging
+  components:
+  - type: StorageFill
+    contents:
+      - id: Shovel
+      - id: Pickaxe
+        prob: 0.90
+      - id: Pickaxe
+        prob: 0.40
+      - id: Pickaxe
+        prob: 0.10
+      - id: Shovel
+        prob: 0.50
+      - id: Shovel
+        prob: 0.20
+      - id: HydroponicsToolSpade
+        prob: 0.10
+      - id: HydroponicsToolHatchet
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeEVA
+  parent: CrateGenericSteel
+  suffix: EVAs
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadHelmetEVALarge
+      - id: ClothingOuterHardsuitEVAPrisoner
+      - id: ClothingHeadHelmetEVALarge
+        prob: 0.80
+      - id: ClothingOuterHardsuitEVAPrisoner
+        prob: 0.80
+      - id: ClothingOuterHardsuitVoidParamed
+        prob: 0.10
+      - id: ClothingOuterRedRacoon
+        prob: 0.10
+      - id: ClothingOuterSanta
+        prob: 0.10
+      - id: ClothingOuterHardsuitSyndicate
+        prob: 0.20
+      - id: EmergencyOxygenTankFilled
+        prob: 0.25
+      - id: EmergencyOxygenTank
+        prob: 0.25
+      - id: OxygenTankFilled
+        prob: 0.05
+        
+- type: entity
+  id: CratePermaEscapeGun
+  parent: CrateGenericSteel
+  suffix: Gun
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolMk58
+      prob: 0.15
+      orGroup: gun
+    - id: FoamCrossbow
+      prob: 0.10
+      orGroup: gun
+    - id: WeaponRifleFoam
+      prob: 0.05
+      orGroup: gun
+    - id: WeaponPistolFlintlock
+      prob: 0.20
+      orGroup: gun
+    - id: WeaponShotgunBlunderbuss
+      prob: 0.10
+      orGroup: gun
+    - id: WeaponShotgunBlunderbuss
+      prob: 0.15
+      orGroup: gun
+    - id: WeaponRevolverPirate
+      prob: 0.15
+      orGroup: gun
+    - id: WeaponProtoKineticAccelerator
+      prob: 0.20
+      orGroup: gun
+
+- type: entity
+  id: CratePermaEscapeBureaucracy
+  parent: CrateGenericSteel
+  suffix: Writing
+  components:
+  - type: StorageFill
+    contents:
+      - id: RubberStampApproved
+      - id: RubberStampDenied
+      - id: Pen
+      - id: Pen
+      - id: Pen
+      - id: BoxFolderBase
+        orGroup: folderA
+      - id: BoxFolderBlack
+        orGroup: folderA
+      - id: BoxFolderBlue
+        orGroup: folderA
+      - id: BoxFolderGreen
+        orGroup: folderA
+      - id: BoxFolderGrey
+        orGroup: folderA
+      - id: BoxFolderRed
+        orGroup: folderA
+      - id: BoxFolderWhite
+        orGroup: folderA
+      - id: BoxFolderYellow
+        orGroup: folderA
+      - id: BoxFolderBase
+        orGroup: folderB
+      - id: BoxFolderBlack
+        orGroup: folderB
+      - id: BoxFolderBlue
+        orGroup: folderB
+      - id: BoxFolderGreen
+        orGroup: folderB
+      - id: BoxFolderGrey
+        orGroup: folderB
+      - id: BoxFolderRed
+        orGroup: folderB
+      - id: BoxFolderWhite
+        orGroup: folderB
+      - id: BoxFolderYellow
+        orGroup: folderB
+      - id: CrayonBox
+        prob: 0.50
+      - id: CrayonBox
+        prob: 0.10
+      - id: ClearPDA # change to visitor one day.
+        prob: 0.10
+      - id: PersonalAI
+
+- type: entity
+  id: CratePermaEscapeLights
+  parent: CrateGenericSteel
+  suffix: Glowsticks
+  components:
+  - type: StorageFill
+    contents:
+      - id: GlowstickBlue
+        prob: 0.50
+      - id: GlowstickBlue
+        prob: 0.20
+      - id: GlowstickBlue
+        prob: 0.05
+      - id: GlowstickBase
+        prob: 0.50
+      - id: GlowstickBase
+        prob: 0.20
+      - id: GlowstickBase
+        prob: 0.05
+      - id: GlowstickPurple
+        prob: 0.50
+      - id: GlowstickPurple
+        prob: 0.20
+      - id: GlowstickPurple
+        prob: 0.05
+      - id: GlowstickRed
+        prob: 0.50
+      - id: GlowstickRed
+        prob: 0.20
+      - id: GlowstickRed
+        prob: 0.05
+      - id: GlowstickYellow
+        prob: 0.50
+      - id: GlowstickYellow
+        prob: 0.20
+      - id: GlowstickYellow
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeMats
+  parent: CrateGenericSteel
+  suffix: Mats
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetSteel
+        orGroup: matA
+      - id: PartRodMetal
+        orGroup: matA
+      - id: SheetSteel
+        orGroup: matB
+      - id: PartRodMetal
+        orGroup: matB
+
+- type: entity
+  id: CratePermaEscapeGiftsFromSyndicate
+  parent: CrateGenericSteel
+  suffix: Syndi Gifts
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingEyesGlassesOutlawGlasses
+      - id: ClothingHeadHatOutlawHat
+      - id: HappyHonkNukieSnacks
+      # - id: BaseUplinkRadio # too spicy I think.
+        # prob: 0.50
+      # - id: Telecrystal
+        # prob: 0.80
+      # - id: Telecrystal
+        # prob: 0.80
+      # - id: Telecrystal
+        # prob: 0.70
+      # - id: Telecrystal
+        # prob: 0.50
+      # - id: Telecrystal
+        # prob: 0.20
+      # - id: Telecrystal
+        # prob: 0.10
+      # - id: Telecrystal
+        # prob: 0.05
+      # - id: Telecrystal
+        # prob: 0.01
+      # - id: Telecrystal5
+        # prob: 0.01
+      - id: CyberPen
+        prob: 0.10
+      - id: CockroachCube
+        orGroup: cube
+      - id: AbominationCube
+        prob: 0.20
+        orGroup: cube
+      - id: SpaceCarpCube
+        prob: 0.20
+        orGroup: cube
+      - id: SyndicateSponge
+        prob: 0.20
+        orGroup: cube
+      - id: MindShieldImplanter
+        prob: 0.20
+      - id: ClothingHandsGlovesConducting # funny
+        prob: 0.30
+      - id: CigPackSyndicate
+        prob: 0.80
+      - id: StimpackMini
+        prob: 0.20
+      - id: StimpackMini
+        prob: 0.10
+      - id: CombatMedipen
+        prob: 0.05
+      - id: MedkitCombatFilled
+        prob: 0.01
+      - id: SoapSyndie
+        prob: 0.15
+      - id: DnaScramblerImplanter
+        prob: 0.005
+
+
+- type: entity
+  id: CratePermaEscapeMerc
+  parent: CrateGenericSteel
+  suffix: Merc
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingUniformJumpsuitMercenary
+      - id: ClothingHeadBandMerc
+        prob: 0.50
+      - id: ClothingHeadHatBeretMerc
+        prob: 0.20
+      - id: ClothingHeadHelmetMerc
+        prob: 0.05
+      - id: ClothingEyesGlassesMercenary
+        prob: 0.20
+      - id: ClothingMaskGasMerc
+        prob: 0.10
+      - id: ClothingHandsGlovesMercFingerless
+        prob: 0.20
+      - id: ClothingHandsMercGlovesCombat
+        prob: 0.05
+      - id: ClothingBackpackMerc
+        prob: 0.50
+      - id: ClothingShoesBootsMerc
+        prob: 0.50
+      - id: ClothingOuterVestWebMerc
+        prob: 0.25
+      - id: ClothingBeltMercWebbing
+        prob: 0.05
+
+- type: entity
+  id: CratePermaEscapeComs
+  parent: CrateGenericSteel
+  suffix: Coms
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetMining
+        orGroup: coms
+      - id: ClothingHeadsetGrey
+        orGroup: coms
+      - id: ClothingHeadsetScience
+        orGroup: coms
+      - id: ClothingHeadsetService
+        orGroup: coms
+      - id: ClothingHeadsetEngineering
+        orGroup: coms
+      - id: ClothingHeadsetMedical
+        orGroup: coms
+      - id: EncryptionKeyCargo
+        prob: 0.05
+      - id: EncryptionKeyScience
+        prob: 0.05
+      - id: EncryptionKeyService
+        prob: 0.05
+      - id: EncryptionKeyMedical
+        prob: 0.05
+      - id: EncryptionKeyEngineering
+        prob: 0.05
+      - id: EncryptionKeySecurity
+        prob: 0.01
+
+- type: entity
+  id: CratePermaEscapeTowercap
+  parent: CrateGenericSteel
+  suffix: Towercap
+  components:
+  - type: StorageFill
+    contents:
+      - id: TowercapSeeds
+      - id: TowercapSeeds
+        prob: 0.80
+      - id: TowercapSeeds
+        prob: 0.50
+      - id: TowercapSeeds
+        prob: 0.20
+      - id: SteelcapSeeds
+        prob: 0.10
+      - id: SteelLog
+      - id: HydroponicsToolHatchet
+        prob: 0.75
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -26,7 +26,7 @@
 - type: entity
  id: CrateSalvageAssortedGoodies
  suffix: Filled, Salvage Random
-  noSpawn: true # You should use SalvageMaterialCrateSpawner instead
+  categories: [ HideSpawnMenu ] # You should use SalvageMaterialCrateSpawner instead
  parent: CrateGenericSteel
  components:
  - type: StorageFill
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
@@ -9,6 +9,6 @@
    ClothingHeadHatVioletwizard: 3
    ClothingOuterWizardViolet: 3
    ClothingShoesWizard: 9
-    #TO DO:
+    #TODO:
    #only missing staff
    #and if wizarditis reagent when hacked if we want this.
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -23,3 +23,5 @@
    ClothingEyesBlindfold: 1
    ClothingShoesBootsCombat: 1
    ClothingShoesBootsWinterSec: 2
+  contrabandInventory:
+    ClothingMaskClownSecurity: 1
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -122,7 +122,7 @@
  name: uplink-sniper-bundle-name
  description: uplink-sniper-bundle-desc
  icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base }
-  productEntity: BriefcaseSyndieSniperBundleFilled  
+  productEntity: BriefcaseSyndieSniperBundleFilled
  cost:
    Telecrystal: 12
  categories:
@@ -902,7 +902,7 @@
 - type: listing
  id: UplinkReinforcementRadioSyndicate
  name: uplink-reinforcement-radio-name
-  description: uplink-reinforcement-radio-desc
+  description: uplink-reinforcement-radio-traitor-desc
  productEntity: ReinforcementRadioSyndicate
  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
  cost:
@@ -916,11 +916,11 @@
          - NukeOpsUplink

 - type: listing
-  id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns an agent with the NukeOperative component.
-  name: uplink-reinforcement-radio-name
-  description: uplink-reinforcement-radio-desc
+  id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns another nuclear operative without the uplink.
+  name: uplink-reinforcement-radio-nukeops-name
+  description: uplink-reinforcement-radio-nukeops-desc
  productEntity: ReinforcementRadioSyndicateNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-nukeop }
  cost:
    Telecrystal: 35
  categories:
@@ -1004,7 +1004,7 @@
    Telecrystal: 6
  categories:
    - UplinkAllies
-  
+
 - type: listing
  id: UplinkSyndicatePersonalAI
  name: uplink-syndicate-pai-name
@@ -1298,6 +1298,22 @@
  categories:
  - UplinkWearables

+- type: listing
+  id: UplinkClothingOuterArmorRaid
+  name: uplink-syndie-raid-name
+  description: uplink-syndie-raid-desc
+  icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateRaidBundle
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkWearables
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
 - type: listing
  id: UplinkHardsuitSyndieElite
  name: uplink-hardsuit-syndieelite-name
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`objective-issuer-ExpeditionObjective = [color=#d6853a]Expedition Objective[/color]`
				`@@ -0,0 +1 @@`
				`gera-transformation-popup = This action will transform you. Use it again to confirm.`
				`@@ -0,0 +1 @@`
				`locking-whitelist-component-lock-toggle-deny = You can't toggle the lock.`