Merge branch 'master' into races

2024-04-04 11:09:52 +10:00
parent 3f765f36fd 3c2f198567
commit fc7f92b50d
903 changed files with 18059 additions and 9853 deletions
--- a/Resources/Audio/Effects/Fluids/attributions.yml
+++ b/Resources/Audio/Effects/Fluids/attributions.yml
@@ -12,3 +12,13 @@
  license: "CC0-1.0"
  copyright: "Created by brittmosel"
  source: "https://freesound.org/people/brittmosel/sounds/529300/"
+
+- files: ["splash.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by deadrobotmusic"
+  source: "https://freesound.org/people/deadrobotmusic/sounds/609953/"
+
+- files: ["flush.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by the_toilet_guy"
+  source: "https://freesound.org/people/the_toilet_guy/sounds/98770/"
--- a/Resources/Audio/Effects/Fluids/flush.ogg
+++ b/Resources/Audio/Effects/Fluids/flush.ogg
--- a/Resources/Audio/Effects/Fluids/splash.ogg
+++ b/Resources/Audio/Effects/Fluids/splash.ogg
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -107,3 +107,13 @@
  license: "CC0-1.0"
  copyright: "Bhijn and Myr (github username deathride58)"
  source: "https://github.com/space-wizards/space-station-14/pull/23476"
+
+- files: ["drill_hit.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Created by vanilla with sounds from MinecraftGamerLR and stomachache on freesound.org"
+  source: "https://github.com/space-wizards/space-station-14/pull/26622"
+
+- files: ["drill_use.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by stomachache on freesound.org, processed by vanilla"
+  source: "https://freesound.org/s/262213/"
--- a/Resources/Audio/Items/drill_hit.ogg
+++ b/Resources/Audio/Items/drill_hit.ogg
--- a/Resources/Audio/Items/drill_use.ogg
+++ b/Resources/Audio/Items/drill_use.ogg
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -152,3 +152,12 @@
  license: "CC0-1.0"
  copyright: "dakamakat on freesound.org"
  source: "https://freesound.org/people/Dakamakat/sounds/717370/"
+
+- files:
+  - twobeep.ogg
+  - chime.ogg
+  - buzz-sigh.ogg
+  - buzztwo.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from TG station."
+  source: "https://github.com/tgstation/tgstation/tree/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0"
--- a/Resources/Audio/Machines/buzz-sigh.ogg
+++ b/Resources/Audio/Machines/buzz-sigh.ogg
--- a/Resources/Audio/Machines/buzz-two.ogg
+++ b/Resources/Audio/Machines/buzz-two.ogg
--- a/Resources/Audio/Machines/chime.ogg
+++ b/Resources/Audio/Machines/chime.ogg
--- a/Resources/Audio/Machines/twobeep.ogg
+++ b/Resources/Audio/Machines/twobeep.ogg
--- a/Resources/Audio/Weapons/glug.ogg
+++ b/Resources/Audio/Weapons/glug.ogg
--- a/Resources/Audio/_CP14/Items/attributions.yml
+++ b/Resources/Audio/_CP14/Items/attributions.yml
@@ -0,0 +1,14 @@
+- files: ["key_drop.ogg"]
+  license: "CC0-1.0"
+  copyright: 'Kyanite_ of Freesound.org. Mixed from stereo to mono.'
+  source: "https://freesound.org/people/Kyanite_/sounds/432913/"
+  
+- files: ["lockpick_use.ogg"]
+  license: "CC0-1.0"
+  copyright: 'by Fugeni of Freesound.org. Mixed from stereo to mono.'
+  source: "https://freesound.org/people/Fugeni/sounds/416286/"
+  
+- files: ["lockpick_fail.ogg"]
+  license: "CC0-1.0"
+  copyright: 'by SinusPi of Freesound.org. Cropped and mixed from stereo to mono.'
+  source: "https://freesound.org/people/SinusPi/sounds/545044/"
--- a/Resources/Audio/_CP14/Items/key_drop.ogg
+++ b/Resources/Audio/_CP14/Items/key_drop.ogg
--- a/Resources/Audio/_CP14/Items/lockpick_fail.ogg
+++ b/Resources/Audio/_CP14/Items/lockpick_fail.ogg
--- a/Resources/Audio/_CP14/Items/lockpick_use.ogg
+++ b/Resources/Audio/_CP14/Items/lockpick_use.ogg
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -136,5 +136,13 @@ Entries:
  id: 18
  time: '2024-03-29T05:03:34.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/26500
+- author: Simyon
+  changes:
+  - message: The aghost command now accepts a optional username argument to aghost
+      other people.
+    type: Tweak
+  id: 19
+  time: '2024-03-31T02:05:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26546
 Name: Admin
 Order: 1
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,265 +1,4 @@
 Entries:
- author: Menshin
-  changes:
-  - message: The PA control box should now properly detect the PA parts in all situations
-      (notably on Origin)
-    type: Fix
-  - message: The PA control box now automatically face the control box on part scanning
-    type: Tweak
-  id: 5761
-  time: '2024-01-21T09:17:17.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24356
- author: metalgearsloth
-  changes:
-  - message: Fix revolver prediction.
-    type: Fix
-  id: 5762
-  time: '2024-01-21T11:16:46.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/19649
- author: metalgearsloth
-  changes:
-  - message: Fix shuttle docking highlights being inaccurate.
-    type: Fix
-  id: 5763
-  time: '2024-01-21T12:14:47.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24369
- author: icekot8
-  changes:
-  - message: Increased the size of flatpacks made by the Flatpacker 1001.
-    type: Tweak
-  id: 5764
-  time: '2024-01-21T17:07:59.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24367
- author: Nairodian
-  changes:
-  - message: All vent critter events now have a small delay and alert message before
-      they spawn.
-    type: Add
-  id: 5765
-  time: '2024-01-22T01:33:38.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24383
- author: Flareguy
-  changes:
-  - message: The Research Director's hardsuit now uses its older sprites.
-    type: Tweak
-  id: 5766
-  time: '2024-01-22T01:52:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24377
- author: SonicHDC
-  changes:
-  - message: Added reinforced diagonal!
-    type: Add
-  id: 5767
-  time: '2024-01-22T14:53:19.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24393
- author: Alekshhh
-  changes:
-  - message: Hud eyepatches have been added to BarDrobes, MediDrobes and SecTechs.
-      They're just cooler looking huds.
-    type: Add
-  id: 5768
-  time: '2024-01-22T14:59:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24132
- author: CrigCrag
-  changes:
-  - message: Removed the revolutionaries gamemode pending a rework.
-    type: Remove
-  id: 5769
-  time: '2024-01-23T02:11:09.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24420
- author: themias
-  changes:
-  - message: Added different footstep sounds for blood, soda and juice
-    type: Add
-  id: 5770
-  time: '2024-01-23T04:18:33.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24406
- author: TheShuEd
-  changes:
-  - message: 'Flesh and Rock anom reworked: It should be easier to maintain them now
-      (I guess)'
-    type: Tweak
-  id: 5771
-  time: '2024-01-23T12:32:05.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24381
- author: metalgearsloth
-  changes:
-  - message: Fix thrusters.
-    type: Fix
-  id: 5772
-  time: '2024-01-23T12:49:19.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24446
- author: '0x6273'
-  changes:
-  - message: Hotplates now work again
-    type: Fix
-  id: 5773
-  time: '2024-01-23T13:06:14.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24450
- author: Boaz1111
-  changes:
-  - message: Lizards can now properly eat fruit cakes and banana cream pie slices.
-    type: Fix
-  id: 5774
-  time: '2024-01-23T18:08:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24457
- author: icekot8
-  changes:
-  - message: The bounty of briefcases has been removed
-    type: Remove
-  id: 5775
-  time: '2024-01-23T18:26:28.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24392
- author: Errant
-  changes:
-  - message: '"Not enough oxygen" hud alerts now indicate the proper gas for nitrogen
-      breathers.'
-    type: Fix
-  id: 5776
-  time: '2024-01-23T20:17:41.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24373
- author: themias
-  changes:
-  - message: Cyborgs can no longer spawn with the Wheelchair Bound or Muted trait
-    type: Fix
-  id: 5777
-  time: '2024-01-23T20:18:01.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24459
- author: Nimfar11
-  changes:
-  - message: Adds solo comfy benches in different colors.
-    type: Add
-  id: 5778
-  time: '2024-01-23T22:15:48.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24203
- author: Tin-Man-Tim
-  changes:
-  - message: Attempting to microwave metal now can cause the microwave to spark and
-      explode.
-    type: Tweak
-  id: 5779
-  time: '2024-01-23T22:59:10.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23887
- author: DrMelon
-  changes:
-  - message: The Microwave works as intended after power outages again.
-    type: Fix
-  id: 5780
-  time: '2024-01-24T01:14:55.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23997
- author: Krunk
-  changes:
-  - message: To prevent accidental spills, buckets can no longer be quick-equipped.
-    type: Fix
-  id: 5781
-  time: '2024-01-24T02:35:37.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24472
- author: lzk228
-  changes:
-  - message: Fixed escaping from locked artifact crate.
-    type: Fix
-  id: 5782
-  time: '2024-01-25T00:46:07.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24442
- author: Krunk
-  changes:
-  - message: Players will once again spawn at arrivals instead of cryostorage.
-    type: Fix
-  id: 5783
-  time: '2024-01-25T00:48:58.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24476
- author: Krunk
-  changes:
-  - message: Paper cups can now be worn as party hats!
-    type: Add
-  id: 5784
-  time: '2024-01-25T01:02:33.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24334
- author: Blackern5000
-  changes:
-  - message: Botany's hatchet, spade, and hoe have received a damage decrease to 10,
-      10, and 6 damage respectively.
-    type: Tweak
-  id: 5785
-  time: '2024-01-25T01:37:11.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24481
- author: Minty642
-  changes:
-  - message: Fixed Reinforced Glass Recipe in Ore Processor!
-    type: Fix
-  - message: Added Premium Material that can only be processed by Industrial Ore Processor!
-    type: Add
-  id: 5786
-  time: '2024-01-25T08:33:56.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24345
- author: Blackern5000
-  changes:
-  - message: Smoking now causes mild lung cancer in the form of cellular damage.
-    type: Tweak
-  id: 5787
-  time: '2024-01-25T09:51:26.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24546
- author: metalgearsloth
-  changes:
-  - message: Add title2.ogg to space ambience tracks.
-    type: Tweak
-  id: 5788
-  time: '2024-01-25T13:59:49.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24501
- author: Tayrtahn
-  changes:
-  - message: Glued mobs can no longer struggle free from their captor's hands.
-    type: Tweak
-  id: 5789
-  time: '2024-01-25T14:01:13.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24488
- author: mirrorcult
-  changes:
-  - message: Atomic Amnesia MMX, Vibe Ace, Monument and Marhaba have been removed
-      as lobby music tracks
-    type: Remove
-  id: 5790
-  time: '2024-01-25T14:08:29.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24480
- author: Dutch-VanDerLinde
-  changes:
-  - message: To prevent accidental spills, paper cups can no longer be quick-equipped.
-    type: Fix
-  id: 5791
-  time: '2024-01-25T22:04:31.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24560
- author: Agoichi
-  changes:
-  - message: Bio hoods hiding your face now
-    type: Tweak
-  - message: Bio hoods now can be used as a breath mask
-    type: Tweak
-  - message: You can not eat while you wearing bio hood
-    type: Tweak
-  id: 5792
-  time: '2024-01-26T00:13:42.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24570
- author: yathxyz
-  changes:
-  - message: Updated nixpkgs input
-    type: Tweak
-  id: 5793
-  time: '2024-01-26T01:40:52.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24572
- author: mirrorcult
-  changes:
-  - message: We lied Atomic Amnesia MMX is back
-    type: Add
-  id: 5794
-  time: '2024-01-26T05:48:29.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24575
- author: EmoGarbage404
-  changes:
-  - message: Cigarettes no longer deal cellular damage when smoked.
-    type: Remove
-  id: 5795
-  time: '2024-01-26T09:50:03.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24568
 - author: ERORR404V1
  changes:
  - message: Added mime hardsuit
@@ -3794,3 +3533,280 @@
  id: 6260
  time: '2024-03-30T06:52:27.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/25886
+- author: Flareguy
+  changes:
+  - message: Removed SCAF armor.
+    type: Remove
+  id: 6261
+  time: '2024-03-31T02:01:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26566
+- author: lzk228
+  changes:
+  - message: Syndicate duffelbag storage increased from 8x5 to 9x5.
+    type: Tweak
+  id: 6262
+  time: '2024-03-31T02:21:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26565
+- author: Velcroboy
+  changes:
+  - message: Changed plastic flaps to be completely constructable/deconstructable
+    type: Tweak
+  id: 6263
+  time: '2024-03-31T02:24:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26341
+- author: Flareguy
+  changes:
+  - message: Security glasses have been moved from research to roundstart gear. All
+      officers now start with them instead of sunglasses by default.
+    type: Tweak
+  - message: You can now craft security glasses.
+    type: Add
+  id: 6264
+  time: '2024-03-31T03:00:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26487
+- author: brainfood1183
+  changes:
+  - message: Toilets can now be connected to the disposal system.
+    type: Add
+  id: 6265
+  time: '2024-03-31T03:21:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/22133
+- author: DrMelon
+  changes:
+  - message: Syndicate Uplinks now have a searchbar to help those dirty, rotten antagonists
+      find appropriate equipment more easily!
+    type: Tweak
+  id: 6266
+  time: '2024-03-31T04:09:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24287
+- author: chromiumboy
+  changes:
+  - message: Additional construction options have been added to the Rapid Construction
+      Device (RCD), along with a radial style UI for fast navigation
+    type: Add
+  - message: The number of charges and the length of time required to build a structure
+      with the RCD now vary depending on the complexity of the constructed fixture
+    type: Tweak
+  id: 6267
+  time: '2024-03-31T04:29:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/22799
+- author: UBlueberry
+  changes:
+  - message: Nanotransen is now recruitin' personnel that speak with a Southern drawl.
+    type: Add
+  id: 6268
+  time: '2024-03-31T04:39:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26543
+- author: Tayrtahn
+  changes:
+  - message: You can no longer drink out of or put liquids into buckets worn on your
+      head.
+    type: Fix
+  id: 6269
+  time: '2024-03-31T04:40:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24412
+- author: DrTeaspoon
+  changes:
+  - message: Hypopen no longer shows chemical contents when examined, when not held
+      by the examinee.
+    type: Fix
+  id: 6270
+  time: '2024-03-31T04:59:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26453
+- author: lzk228
+  changes:
+  - message: Hairflower was removed.
+    type: Remove
+  - message: Now you can wear poppy (and other flowers) on your head instead of crafting
+      hairflower with it.
+    type: Tweak
+  id: 6271
+  time: '2024-03-31T05:33:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25475
+- author: EmoGarbage404
+  changes:
+  - message: Borgs, Emitters, and APEs can no longer have their panels opened while
+      locked. APEs and Emitters additionally cannot be unanchored either.
+    type: Add
+  id: 6272
+  time: '2024-03-31T06:34:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26600
+- author: lzk228
+  changes:
+  - message: Flower crown and wreath were combined. Now you can wear wreath both on
+      head and on neck.
+    type: Tweak
+  id: 6273
+  time: '2024-03-31T08:52:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26605
+- author: Ubaser
+  changes:
+  - message: Throwing knives now additionally do armour piercing damage.
+    type: Tweak
+  id: 6274
+  time: '2024-03-31T11:48:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26380
+- author: graevy
+  changes:
+  - message: clicking the brig timer button will now cancel its countdown
+    type: Tweak
+  id: 6275
+  time: '2024-03-31T20:44:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26557
+- author: lzk228
+  changes:
+  - message: Briefcases was added to CuraDrobe and LawDrobe.
+    type: Tweak
+  id: 6276
+  time: '2024-03-31T20:52:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26527
+- author: RiceMar
+  changes:
+  - message: Added milk cartons to the BoozeOMat vendor. Got milk?
+    type: Add
+  id: 6277
+  time: '2024-04-01T00:07:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26635
+- author: nikthechampiongr
+  changes:
+  - message: Radio jammers now actually block suit sensors.
+    type: Fix
+  id: 6278
+  time: '2024-04-01T02:13:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26632
+- author: Flareguy
+  changes:
+  - message: All wheeled objects now have lower friction. Portable items, like fuel
+      canisters & portable scrubbers, should now be easier to carry around.
+    type: Tweak
+  - message: High-capacity reagent tanks are now much heavier.
+    type: Tweak
+  id: 6279
+  time: '2024-04-01T03:23:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26601
+- author: Tayrtahn
+  changes:
+  - message: spears, darts, and hypodarts can inject targets again.
+    type: Fix
+  - message: arrows can no longer inject targets they don't actually hit.
+    type: Fix
+  id: 6280
+  time: '2024-04-01T03:39:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26268
+- author: SoulFN
+  changes:
+  - message: Changed textures of the assault borg modules
+    type: Tweak
+  id: 6281
+  time: '2024-04-01T04:21:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26502
+- author: Keer-Sar
+  changes:
+  - message: Cyborgs now have audio for some emotes.
+    type: Add
+  id: 6282
+  time: '2024-04-01T04:35:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26594
+- author: SlamBamActionman
+  changes:
+  - message: Added Coordinates Disks to the Salvage expeditions console, which are
+      now a requirement for expedition FTL.
+    type: Add
+  id: 6283
+  time: '2024-04-01T04:50:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/23240
+- author: kseandi
+  changes:
+  - message: NT has declassified the documentation for door electronics, now anyone
+      can configure its access using network configurator or multitool.
+    type: Add
+  id: 6284
+  time: '2024-04-01T06:06:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/17778
+- author: musicmanvr
+  changes:
+  - message: Added Sol Dry, 8 new cocktails and coconut water.
+    type: Add
+  id: 6285
+  time: '2024-04-01T06:41:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25367
+- author: f0x-n3rd
+  changes:
+  - message: Added pages for each categories from the chemical page in the guidebook,
+      no more infinite scrolling when looking up certain chemicals.
+    type: Add
+  id: 6286
+  time: '2024-04-01T07:20:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25831
+- author: TheShuEd
+  changes:
+  - message: Added new transformation particles types for APE and CHIMP
+    type: Add
+  - message: Added new anomaly behaviour mechanic. Different behaviors can change
+      the gameplay of an anomaly. Players can get random behaviors by bombarding the
+      anomaly with new particles
+    type: Add
+  id: 6287
+  time: '2024-04-01T08:29:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24683
+- author: Sk1tch
+  changes:
+  - message: Added chat window opacity slider to options.
+    type: Add
+  id: 6288
+  time: '2024-04-01T20:48:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24990
+- author: TheShuEd
+  changes:
+  - message: added procedurally generating books to library.
+    type: Add
+  - message: full books resprite
+    type: Add
+  id: 6289
+  time: '2024-04-01T21:00:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25840
+- author: osjarw
+  changes:
+  - message: Ambuzol plus pills now have different sprites from ambuzol pills. Now
+      CBURN agents and Nukies who bought the syndicate zombie bundle might realize
+      that they also have some ambuzol plus.
+    type: Tweak
+  id: 6290
+  time: '2024-04-02T00:50:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26651
+- author: osjarw
+  changes:
+  - message: Air injectors finally have working indicator lights while enabled.
+    type: Fix
+  id: 6291
+  time: '2024-04-02T05:17:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26654
+- author: Simyon
+  changes:
+  - message: The hands of cyborgs are now explosion proof. Your beakers wont ever
+      break again!
+    type: Fix
+  id: 6292
+  time: '2024-04-02T05:18:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26515
+- author: lzk228
+  changes:
+  - message: Typing indicator now can be shaded by shadows.
+    type: Tweak
+  id: 6293
+  time: '2024-04-03T02:12:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26678
+- author: EmoGarbage404
+  changes:
+  - message: Increased time between pulses for various anomalies.
+    type: Tweak
+  id: 6294
+  time: '2024-04-03T03:15:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26677
+- author: Plykiya
+  changes:
+  - message: Dropped items are no longer rotated to world north.
+    type: Fix
+  id: 6295
+  time: '2024-04-03T05:31:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26662
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
--- a/Resources/Credits/Patrons.yml
+++ b/Resources/Credits/Patrons.yml
@@ -1,13 +1,9 @@
- Name: "Tomeno"
-  Tier: Revolutionary
 - Name: "Daniel Thompson"
  Tier: Revolutionary
 - Name: "Farewell Fire"
  Tier: Syndicate Agent
 - Name: "CPM311"
  Tier: Revolutionary
- Name: "Bobberunio"
-  Tier: Revolutionary
 - Name: "vifs_vestige"
  Tier: Syndicate Agent
 - Name: "Anthony Fleck"
@@ -30,8 +26,6 @@
  Tier: Revolutionary
 - Name: "clyf"
  Tier: Nuclear Operative
- Name: "spinnermaster"
-  Tier: Syndicate Agent
 - Name: "Will M."
  Tier: Revolutionary
 - Name: "The Hateful Flesh"
@@ -78,8 +72,6 @@
  Tier: Syndicate Agent
 - Name: "Saphire"
  Tier: Revolutionary
- Name: "DubzyVEVO"
-  Tier: Revolutionary
 - Name: "Never Solus"
  Tier: Syndicate Agent
 - Name: "Gnomo"
@@ -100,8 +92,6 @@
  Tier: Revolutionary
 - Name: "tokie"
  Tier: Nuclear Operative
- Name: "BlueisDumb"
-  Tier: Nuclear Operative
 - Name: "Enricoc3l"
  Tier: Revolutionary
 - Name: "DadNotTheBelt"
@@ -138,14 +128,10 @@
  Tier: Revolutionary
 - Name: "Adam Smedstad"
  Tier: Revolutionary
- Name: "oBerry"
-  Tier: Nuclear Operative
 - Name: "DireBoar"
  Tier: Revolutionary
 - Name: "Ignoramis"
  Tier: Revolutionary
- Name: "Repo"
-  Tier: Nuclear Operative
 - Name: "612"
  Tier: Revolutionary
 - Name: "Higgtastic"
@@ -208,8 +194,6 @@
  Tier: Revolutionary
 - Name: "Georgia Partyka"
  Tier: Syndicate Agent
- Name: "YuNii"
-  Tier: Syndicate Agent
 - Name: "Nojan Niaki"
  Tier: Revolutionary
 - Name: "nokko"
@@ -284,5 +268,23 @@
  Tier: Revolutionary
 - Name: "Black Rose"
  Tier: Revolutionary
- Name: "Dourbii"
+- Name: "Kim"
+  Tier: Nuclear Operative
+- Name: "Kyu, The Meme Fairy"
+  Tier: Syndicate Agent
+- Name: "Russian TS"
+  Tier: Nuclear Operative
+- Name: "Andrew"
+  Tier: Revolutionary
+- Name: "Jack"
+  Tier: Syndicate Agent
+- Name: "Brandon Roughley"
+  Tier: Syndicate Agent
+- Name: "Sean Lilly"
+  Tier: Syndicate Agent
+- Name: "Dieselmohawk D."
+  Tier: Revolutionary
+- Name: "Hannah Dawson"
+  Tier: Syndicate Agent
+- Name: "Godfiend"
  Tier: Revolutionary
--- a/Resources/Locale/en-US/accent/southern.ftl
+++ b/Resources/Locale/en-US/accent/southern.ftl
@@ -0,0 +1,17 @@
+accent-southern-words-1 = you all
+accent-southern-words-replace-1 = y'all
+
+accent-southern-words-2 = you guys
+accent-southern-words-replace-2 = y'all
+
+accent-southern-words-3 = isn't
+accent-southern-words-replace-3 = ain't
+
+accent-southern-words-4 = is not
+accent-southern-words-replace-4 = ain't
+
+accent-southern-words-5 = aren't
+accent-southern-words-replace-5 = ain't
+
+accent-southern-words-6 = are not
+accent-southern-words-replace-6 = ain't
--- a/Resources/Locale/en-US/administration/commands/aghost.ftl
+++ b/Resources/Locale/en-US/administration/commands/aghost.ftl
@@ -0,0 +1,3 @@
+aghost-description = Makes you an admin ghost.
+aghost-no-mind-self = You can't ghost here!
+aghost-no-mind-other = They can't ghost here!
--- a/Resources/Locale/en-US/anomaly/anomaly.ftl
+++ b/Resources/Locale/en-US/anomaly/anomaly.ftl
@@ -8,20 +8,29 @@ anomaly-particles-delta = Delta particles
 anomaly-particles-epsilon = Epsilon particles
 anomaly-particles-zeta = Zeta particles
 anomaly-particles-omega = Omega particles
+anomaly-particles-sigma = Sigma particles

 anomaly-scanner-component-scan-complete = Scan complete!

 anomaly-scanner-ui-title = anomaly scanner
 anomaly-scanner-no-anomaly = No anomaly currently scanned.
 anomaly-scanner-severity-percentage = Current severity: [color=gray]{$percent}[/color]
+anomaly-scanner-severity-percentage-unknown = Current severity: [color=red]ERROR[/color]
 anomaly-scanner-stability-low = Current anomaly state: [color=gold]Decaying[/color]
 anomaly-scanner-stability-medium = Current anomaly state: [color=forestgreen]Stable[/color]
 anomaly-scanner-stability-high = Current anomaly state: [color=crimson]Growing[/color]
+anomaly-scanner-stability-unknown = Current anomaly state: [color=red]ERROR[/color]
 anomaly-scanner-point-output = Point output: [color=gray]{$point}[/color]
+anomaly-scanner-point-output-unknown = Point output: [color=red]ERROR[/color]
 anomaly-scanner-particle-readout = Particle Reaction Analysis:
 anomaly-scanner-particle-danger = - [color=crimson]Danger type:[/color] {$type}
 anomaly-scanner-particle-unstable = - [color=plum]Unstable type:[/color] {$type}
 anomaly-scanner-particle-containment = - [color=goldenrod]Containment type:[/color] {$type}
+anomaly-scanner-particle-transformation = - [color=#6b75fa]Transformation type:[/color] {$type}
+anomaly-scanner-particle-danger-unknown = - [color=crimson]Danger type:[/color] [color=red]ERROR[/color]
+anomaly-scanner-particle-unstable-unknown = - [color=plum]Unstable type:[/color] [color=red]ERROR[/color]
+anomaly-scanner-particle-containment-unknown = - [color=goldenrod]Containment type:[/color] [color=red]ERROR[/color]
+anomaly-scanner-particle-transformation-unknown = - [color=#6b75fa]Transformation type:[/color] [color=red]ERROR[/color]
 anomaly-scanner-pulse-timer = Time until next pulse: [color=gray]{$time}[/color]

 anomaly-gorilla-core-slot-name = Anomaly core
@@ -65,3 +74,23 @@ anomaly-command-supercritical = Makes a target anomaly go supercritical
 # Flavor text on the footer
 anomaly-generator-flavor-left = Anomaly may spawn inside the operator.
 anomaly-generator-flavor-right = v1.1
+
+anomaly-behavior-unknown = [color=red]ERROR. Cannot be read.[/color]
+
+anomaly-behavior-title = behavior deviation analysis:
+anomaly-behavior-point =[color=gold]Anomaly produces {$mod}% of the points[/color] 
+
+anomaly-behavior-safe = [color=forestgreen]The anomaly is extremely stable. Extremely rare pulsations.[/color]
+anomaly-behavior-slow = [color=forestgreen]The frequency of pulsations is much less frequent.[/color]
+anomaly-behavior-light = [color=forestgreen]Pulsation power is significantly reduced.[/color]
+anomaly-behavior-balanced = No behavior deviations detected.
+anomaly-behavior-delayed-force = The frequency of pulsations is greatly reduced, but their power is increased.
+anomaly-behavior-rapid = The frequency of the pulsation is much higher, but its strength is attenuated.
+anomaly-behavior-reflect = A protective coating was detected.
+anomaly-behavior-nonsensivity = A weak reaction to particles was detected.
+anomaly-behavior-sensivity = Amplified reaction to particles was detected.
+anomaly-behavior-secret = Interference detected. Some data cannot be read
+anomaly-behavior-inconstancy = [color=crimson]Impermanence has been detected. Particle types can change over time.[/color]
+anomaly-behavior-fast = [color=crimson]The pulsation frequency is strongly increased.[/color]
+anomaly-behavior-strenght = [color=crimson]The pulsation power is significantly increased.[/color]
+anomaly-behavior-moving = [color=crimson]Coordinate instability was detected.[/color]
--- a/Resources/Locale/en-US/chemistry/components/scoopable-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/scoopable-component.ftl
@@ -0,0 +1 @@
+scoopable-component-popup = You scoop up {$scooped} into {THE($beaker)}.
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -48,6 +48,8 @@ ui-options-fancy-name-background = Add background to speech bubble names
 ui-options-enable-color-name = Add colors to character names
 ui-options-colorblind-friendly = Colorblind friendly mode
 ui-options-reduced-motion = Reduce motion of visual effects
+ui-options-chat-window-opacity = Chat window opacity
+ui-options-chat-window-opacity-percent = { TOSTRING($opacity, "P0") }
 ui-options-screen-shake-intensity = Screen shake intensity
 ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") }
 ui-options-vsync = VSync
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -188,6 +188,7 @@ flavor-complex-tonic-water = like angry water
 flavor-complex-cola = like cola
 flavor-complex-energy-drink = like battery acid
 flavor-complex-dr-gibb = like malpractice
+flavor-complex-ginger-soda = like ginger
 flavor-complex-grape-soda = like grape soda
 flavor-complex-lemon-lime-soda = like lemon-lime soda
 flavor-complex-pwr-game-soda = like gaming
@@ -200,6 +201,7 @@ flavor-complex-vodka = like fermented grain
 flavor-complex-tequila = like fermented death
 flavor-complex-sake = like sweet, alcoholic rice
 flavor-complex-rum = like fermented sugar
+flavor-complex-coconut-rum = like nutty fermented sugar
 flavor-complex-coffee-liquor = like strong, bitter coffee
 flavor-complex-whiskey = like molasses
 flavor-complex-shitty-wine = like grape rinds
@@ -212,6 +214,11 @@ flavor-complex-ice = like ice
 flavor-complex-mopwata = like stagnant, dirty water

 ## Cocktails
+flavor-complex-arnold-palmer = like a hole-in-one
+flavor-complex-blue-hawaiian = like the tropics
+flavor-complex-cosmopolitan = sweet and tangy
+flavor-complex-painkiller = like spiked pineapple juice
+flavor-complex-pina-colada = like tropical sun
 flavor-complex-long-island = suspiciously like iced tea
 flavor-complex-three-mile-island = like tea brewed in nuclear runoff
 flavor-complex-whiskey-cola = like carbonated molasses
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -164,6 +164,9 @@ ghost-role-information-cerberus-rules = You are an intelligent, demonic dog. Try
 ghost-role-information-ert-leader-name = ERT Leader
 ghost-role-information-ert-leader-description = Lead a team of specialists to resolve the station's issues.

+ghost-role-information-ert-chaplain-name = ERT Chaplain
+ghost-role-information-ert-chaplain-description = Assist with mourning to resolve the station's crew moral issues.
+
 ghost-role-information-ert-janitor-name = ERT Janitor
 ghost-role-information-ert-janitor-description = Assist with custodial efforts to resolve the station's issues.

--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -22,6 +22,14 @@ guide-entry-cargo-bounties = Cargo Bounties
 guide-entry-salvage = Salvage
 guide-entry-survival = Survival
 guide-entry-chemicals = Chemicals
+guide-entry-elements = Elements
+guide-entry-narcotics = Narcotics
+guide-entry-pyrotechnics = Pyrotechnic
+guide-entry-toxins = Toxins
+guide-entry-foods = Foods
+guide-entry-biological = Biological
+guide-entry-others = Others
+guide-entry-botanical = Botanicals
 guide-entry-ss14 = Space Station 14
 guide-entry-janitorial = Janitorial
 guide-entry-bartender = Bartender
--- a/Resources/Locale/en-US/job/job-description.ftl
+++ b/Resources/Locale/en-US/job/job-description.ftl
@@ -19,6 +19,7 @@ job-description-paramedic = Rescue critically injured patients all over the stat
 job-description-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes.
 job-description-doctor = Diagnose and heal crewmembers through medicinal chemicals, advanced medicine, and defibrillators. Make sure the dead don't rot, and that cadavers are in the morgue.
 job-description-engineer = Keep the station's main engine & solars active, optimize the power network, and make emergency repairs using your hardsuit in spaced areas.
+job-description-ertchaplain = Ensure the station crew's last rights are taken care of.
 job-description-ertengineer = Ensure that the station has power and clean air.
 job-description-ertjanitor = Ensure that the station is properly cleaned--for morale.
 job-description-ertleader = Lead the Emergency Response Team in dealing with threats to Nanotrasen assets.
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -38,6 +38,7 @@ job-name-cargotech = Cargo Technician
 job-name-chef = Chef
 job-name-clown = Clown
 job-name-ertleader = ERT Leader
+job-name-ertchaplain = ERT Chaplain
 job-name-ertengineer = ERT Engineer
 job-name-ertsecurity = ERT Security
 job-name-ertmedic = ERT Medic
@@ -63,6 +64,7 @@ JobChiefMedicalOfficer = Chief Medical Officer
 JobClown = Clown
 JobDetective = Detective
 JobBrigmedic = Brigmedic
+JobERTChaplain = ERT Chaplain
 JobERTEngineer = ERT Engineer
 JobERTJanitor = ERT Janitor
 JobERTLeader = ERT Leader
--- a/Resources/Locale/en-US/lock/lock-component.ftl
+++ b/Resources/Locale/en-US/lock/lock-component.ftl
@@ -3,8 +3,9 @@ lock-comp-on-examined-is-unlocked = The {$entityName} seems to be unlocked.
 lock-comp-do-lock-success = You lock the {$entityName}.
 lock-comp-do-unlock-success = You unlock the {$entityName}.
 lock-comp-has-user-access-fail = Access denied
+lock-comp-generic-fail = {CAPITALIZE(SUBJECT($target))} {CONJUGATE-BE($target)} locked.

 ## ToggleLockVerb

 toggle-lock-verb-unlock = Unlock
-toggle-lock-verb-lock = Lock
+toggle-lock-verb-lock = Lock
--- a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
+++ b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
@@ -70,6 +70,9 @@ signal-port-description-set-particle-epsilon = Sets the type of particle this de
 signal-port-name-set-particle-zeta = Set particle type: zeta
 signal-port-description-set-particle-zeta = Sets the type of particle this device emits to zeta.

+signal-port-name-set-particle-sigma = Set particle type: sigma
+signal-port-description-set-particle-sigma = Sets the type of particle this device emits to sigma.
+
 signal-port-name-logic-input-a = Input A
 signal-port-description-logic-input-a = First input of a logic gate.

--- a/Resources/Locale/en-US/paint/paint.ftl
+++ b/Resources/Locale/en-US/paint/paint.ftl
@@ -1,8 +0,0 @@
-paint-success = {THE($target)} has been covered in paint!
-paint-failure = Can't cover {THE($target)} in paint!
-paint-failure-painted = {THE($target)} is already covered in paint!
-paint-empty = {THE($used)} is empty!
-paint-removed = You clean off the paint!
-paint-closed = You must open {THE($used)}  first!
-paint-verb = Paint
-paint-remove-verb = Remove Paint
--- a/Resources/Locale/en-US/paper/story-generation.ftl
+++ b/Resources/Locale/en-US/paper/story-generation.ftl
@@ -0,0 +1,244 @@
+story-gen-book-type1 = book
+story-gen-book-type2 = folio
+story-gen-book-type3 = collection
+story-gen-book-type4 = notes
+story-gen-book-type5 = manuscript
+story-gen-book-type6 = records
+story-gen-book-type7 = tome
+story-gen-book-type8 = journal
+story-gen-book-type9 = archives
+story-gen-book-type10= codex
+story-gen-book-type11= memories
+story-gen-book-type12= compendium
+
+story-gen-book-genre1 = work of crime fiction
+story-gen-book-genre2 = comedy
+story-gen-book-genre3 = horror story
+story-gen-book-genre4 = poem
+story-gen-book-genre5 = novella
+story-gen-book-genre6 = chronicle
+story-gen-book-genre7 = work of science-fiction
+story-gen-book-genre8 = fantasy story
+story-gen-book-genre9 = romance
+story-gen-book-genre10= thriller
+story-gen-book-genre11= work of historical fiction
+story-gen-book-genre12= biography
+story-gen-book-genre13= adventure story
+story-gen-book-genre14= drama
+
+story-gen-book-appearance1 = ancient
+story-gen-book-appearance2 = shabby
+story-gen-book-appearance3 = dirty
+story-gen-book-appearance4 = unusual
+story-gen-book-appearance5 = faded
+story-gen-book-appearance6 = nasty
+story-gen-book-appearance7 = dusty
+story-gen-book-appearance8 = scary
+story-gen-book-appearance9 = bloody
+story-gen-book-appearance10= bright
+story-gen-book-appearance11= dubious
+story-gen-book-appearance12= intriguing
+story-gen-book-appearance13= ugly
+story-gen-book-appearance14= crooked
+story-gen-book-appearance15= crumpled
+story-gen-book-appearance16= dirty
+story-gen-book-appearance17= elegant
+story-gen-book-appearance18= ornate
+story-gen-book-appearance19= weathered
+story-gen-book-appearance20= chrisp
+story-gen-book-appearance21= lavish
+story-gen-book-appearance22= tattered
+story-gen-book-appearance23= polished
+story-gen-book-appearance24= embossed
+story-gen-book-appearance25= mismatched
+story-gen-book-appearance26= gilded
+story-gen-book-appearance27= strange
+
+story-gen-book-character1 = clown
+story-gen-book-character2 = mime
+story-gen-book-character3 = reporter
+story-gen-book-character4 = butcher
+story-gen-book-character5 = bartender
+story-gen-book-character6 = janitor
+story-gen-book-character7 = engineer
+story-gen-book-character8 = scientist
+story-gen-book-character9 = guard
+story-gen-book-character10 = doctor
+story-gen-book-character11 = chemist
+story-gen-book-character12 = prisoner
+story-gen-book-character13 = researcher
+story-gen-book-character14 = trader
+story-gen-book-character15 = captain
+story-gen-book-character16 = lizard
+story-gen-book-character17 = moth
+story-gen-book-character18 = diona
+story-gen-book-character19 = cat-girl
+story-gen-book-character20 = cat
+story-gen-book-character21 = corgi
+story-gen-book-character22 = dog
+story-gen-book-character23 = opossum
+story-gen-book-character24 = sloth
+story-gen-book-character25 = syndicate agent
+story-gen-book-character26 = revenant
+story-gen-book-character27 = rat king
+story-gen-book-character28 = ninja
+story-gen-book-character29 = space dragon
+story-gen-book-character30 = revolutionary
+story-gen-book-character31 = nuclear operative
+story-gen-book-character32 = narsie cultist
+story-gen-book-character33 = ratwar cultist
+story-gen-book-character34 = greytider
+story-gen-book-character35 = arachnid
+story-gen-book-character36 = vox
+story-gen-book-character37 = dwarf
+story-gen-book-character38 = thief
+story-gen-book-character39 = wizard
+story-gen-book-character40 = slime
+
+story-gen-book-character-trait1 = stupid
+story-gen-book-character-trait2 = smart
+story-gen-book-character-trait3 = funny
+story-gen-book-character-trait4 = attractive  
+story-gen-book-character-trait5 = charming
+story-gen-book-character-trait6 = nasty
+story-gen-book-character-trait7 = dying
+story-gen-book-character-trait8 = old
+story-gen-book-character-trait9 = young
+story-gen-book-character-trait10 = rich
+story-gen-book-character-trait11 = poor
+story-gen-book-character-trait12 = popular
+story-gen-book-character-trait13 = absent-minded
+story-gen-book-character-trait14 = stern
+story-gen-book-character-trait15 = сharismatic
+story-gen-book-character-trait16 = stoic
+story-gen-book-character-trait17 = cute
+story-gen-book-character-trait18 = dwarven
+story-gen-book-character-trait19 = beer-smelling 
+story-gen-book-character-trait20 = joyful
+story-gen-book-character-trait21 = painfully beautiful
+story-gen-book-character-trait22 = robotic
+story-gen-book-character-trait23 = holographic
+story-gen-book-character-trait24 = hysterically laughing
+
+story-gen-book-event1 = a zombie outbreak
+story-gen-book-event2 = a nuclear  explosion
+story-gen-book-event3 = a mass murder
+story-gen-book-event4 = a sudden depressurization
+story-gen-book-event5 = a blackout
+story-gen-book-event6 = the starvation of the protagonists
+story-gen-book-event7 = a wasting illness
+story-gen-book-event8 = love at first sight
+story-gen-book-event9 = a rush of inspiration
+story-gen-book-event10 = the occurrence of some mystical phenomena
+story-gen-book-event11 = divine intervention
+story-gen-book-event12 = the characters' own selfish motives
+story-gen-book-event13 = an unforeseen deception
+story-gen-book-event14 = the resurrection of one of these characters from the dead
+story-gen-book-event15 = the terrible torture of the protagonist
+story-gen-book-event16 = the inadvertent loosing of a gravitational singularity
+story-gen-book-event17 = a psychic prediction of future events
+story-gen-book-event18 = an antimatter explosion
+story-gen-book-event19 = a chance meeting with a cat-girl
+story-gen-book-event20 = drinking far too much alcohol
+story-gen-book-event21 = eating way too much pizza
+story-gen-book-event22 = having a quarrel with a close friend
+story-gen-book-event23 = the sudden loss of their home in a fiery blaze
+story-gen-book-event24 = the loss of a PDA
+
+story-gen-book-action1 = share in a kiss with a
+story-gen-book-action2 = strangle to death a
+story-gen-book-action3 = manage to blow apart a
+story-gen-book-action4 = manage to win a game of chess against a
+story-gen-book-action5 = narrowly lose a game of chess against a
+story-gen-book-action6 = reveal the hidden secrets of a
+story-gen-book-action7 = manipulate a
+story-gen-book-action8 = sacrifice upon an altar a
+story-gen-book-action9 = attend the wedding of a
+story-gen-book-action10 = join forces to defeat their common enemy, a
+story-gen-book-action11 = are forced to work together to escape a
+story-gen-book-action12 = give a valuable gift to
+
+story-gen-book-action-trait1 = terribly 
+story-gen-book-action-trait2 = disgustingly 
+story-gen-book-action-trait3 = marvelously
+story-gen-book-action-trait4 = nicely
+story-gen-book-action-trait5 = weirdly
+story-gen-book-action-trait6 = amusingly
+story-gen-book-action-trait7 = fancifully
+story-gen-book-action-trait8 = impressively
+story-gen-book-action-trait9 = irresponsibly 
+story-gen-book-action-trait10 = severely 
+story-gen-book-action-trait11 = ruthlessly 
+story-gen-book-action-trait12 = playfully 
+story-gen-book-action-trait13 = thoughtfully
+
+story-gen-book-location1 = in an underground complex
+story-gen-book-location2 = while on an expedition
+story-gen-book-location3 = while trapped in outer space
+story-gen-book-location4 = while in a news office
+story-gen-book-location5 = in a hidden garden
+story-gen-book-location6 = in the kitchen of a local restaurant
+story-gen-book-location7 = under the counter of the local sports bar 
+story-gen-book-location8 = in an ancient library
+story-gen-book-location9 = while deep in bowels of the space station's maintenance corridors
+story-gen-book-location10 = on the bridge of a starship
+story-gen-book-location11 = while in a grungy public bathroom
+story-gen-book-location12 = while trapped inside a crate
+story-gen-book-location13 = while stuck inside a locker
+story-gen-book-location14 = while stationed on Barratry
+story-gen-book-location15 = while in the hall of rustic church
+story-gen-book-location16 = while in a crematorium
+story-gen-book-location17 = standing too close to an anomaly
+story-gen-book-location18 = while huddling on the evacuation shuttle
+story-gen-book-location19 = standing in freshly fallen snow
+story-gen-book-location20 = lost in the woods
+story-gen-book-location21 = iin the harsh desert
+story-gen-book-location22 = worrying about their social media networks
+story-gen-book-location23 = atop of a mountain
+story-gen-book-location24 = while driving a car
+story-gen-book-location25 = in an escape pod
+story-gen-book-location26 = while abroad in a fictional country
+story-gen-book-location27 = clinging to the wing of an inflight airplane
+story-gen-book-location28 = inside a pocket dimension
+story-gen-book-location29 = onboard a Wizard Federation shuttle
+story-gen-book-location30 = standing atop of a mountain of corpses
+story-gen-book-location31 = while psychically projected into their subconscious
+story-gen-book-location32 = while trapped in a shadow dimension
+story-gen-book-location33 = while trying to escape a destroyed space station
+story-gen-book-location34 = while sandwiched between a Tesla ball and a gravitational singularity
+
+story-gen-book-element1 = The plot
+story-gen-book-element2 = The twist
+story-gen-book-element3 = The climax
+story-gen-book-element4 = The final act
+story-gen-book-element5 = The ending
+story-gen-book-element6 = The moral of the story
+story-gen-book-element7 = The theme of this work
+story-gen-book-element8 = The literary style
+story-gen-book-element9 = The illustrations
+
+story-gen-book-element-trait1 = terrifying
+story-gen-book-element-trait2 = disgusting
+story-gen-book-element-trait3 = wonderful
+story-gen-book-element-trait4 = cute
+story-gen-book-element-trait5 = boring
+story-gen-book-element-trait6 = strange
+story-gen-book-element-trait7 = amusing
+story-gen-book-element-trait8 = whimsical
+story-gen-book-element-trait9 = impressive
+story-gen-book-element-trait10 = interesting
+story-gen-book-element-trait11 = inadequate
+story-gen-book-element-trait12 = sad
+story-gen-book-element-trait13 = rather depressing
+
+
+
+
+
+
+
+
+
+
+
+
--- a/Resources/Locale/en-US/rcd/components/rcd-component.ftl
+++ b/Resources/Locale/en-US/rcd/components/rcd-component.ftl
@@ -1,18 +1,66 @@

 ### UI

-# Shown when an RCD is examined in details range
-rcd-component-examine-detail = It's currently on {$mode} mode.
+rcd-component-examine-mode-details = It's currently set to '{$mode}' mode.
+rcd-component-examine-build-details = It's currently set to build {MAKEPLURAL($name)}.
+

 ### Interaction Messages

-# Shown when changing RCD Mode
-rcd-component-change-mode = The RCD is now set to {$mode} mode.
+# Mode change
+rcd-component-change-mode = The RCD is now set to '{$mode}' mode.
+rcd-component-change-build-mode = The RCD is now set to build {MAKEPLURAL($name)}.

-rcd-component-no-ammo-message = The RCD is out of ammo!
-rcd-component-tile-obstructed-message = That tile is obstructed!
-rcd-component-tile-indestructible-message = That tile can't be destroyed!
+# Ammo count
+rcd-component-no-ammo-message = The RCD has run out of charges!
+rcd-component-insufficient-ammo-message = The RCD doesn't have enough charges left!
+
+# Deconstruction
+rcd-component-tile-indestructible-message = That tile can't be destructed!
 rcd-component-deconstruct-target-not-on-whitelist-message = You can't deconstruct that!
-rcd-component-cannot-build-floor-tile-not-empty-message = You can only build a floor on space!
-rcd-component-cannot-build-wall-tile-not-empty-message = You cannot build a wall on space!
-rcd-component-cannot-build-airlock-tile-not-empty-message = Cannot build an airlock on space!
+rcd-component-nothing-to-deconstruct-message = There's nothing to deconstruct!
+rcd-component-tile-obstructed-message = You can't deconstruct tiles when there's something on top of them!
+
+# Construction
+rcd-component-no-valid-grid = You're too far into open space to build here!
+rcd-component-must-build-on-empty-tile-message = A foundation already exists here!
+rcd-component-cannot-build-on-empty-tile-message = You can't build that without a foundation!
+rcd-component-must-build-on-subfloor-message = You can only build that on exposed subfloor!
+rcd-component-cannot-build-on-subfloor-message = You can't build that on exposed subfloor!
+rcd-component-cannot-build-on-occupied-tile-message = You can't build here, the space is already occupied!
+rcd-component-cannot-build-identical-tile = That tile already exists there!
+
+
+### Category names
+
+rcd-component-walls-and-flooring = Walls and flooring
+rcd-component-windows-and-grilles = Windows and grilles
+rcd-component-airlocks = Airlocks
+rcd-component-electrical = Electrical
+rcd-component-lighting = Lighting
+
+
+### Prototype names (note: constructable items will be puralized)
+
+rcd-component-deconstruct = deconstruct
+rcd-component-wall-solid = solid wall
+rcd-component-floor-steel = steel tile
+rcd-component-plating = hull plate
+rcd-component-catwalk = catwalk
+rcd-component-wall-reinforced = reinforced wall
+rcd-component-grille = grille
+rcd-component-window = window
+rcd-component-window-directional = directional window
+rcd-component-window-reinforced-directional = directional reinforced window
+rcd-component-reinforced-window = reinforced window
+rcd-component-airlock = standard airlock
+rcd-component-airlock-glass = glass airlock
+rcd-component-firelock = firelock
+rcd-component-computer-frame = computer frame
+rcd-component-machine-frame = machine frame
+rcd-component-tube-light = light
+rcd-component-window-bulb-light = small light
+rcd-component-window-lv-cable = LV cable
+rcd-component-window-mv-cable = MV cable
+rcd-component-window-hv-cable = HV cable
+rcd-component-window-cable-terminal = cable terminal
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -82,6 +82,9 @@ reagent-desc-atomic-bomb = Nuclear proliferation never tasted so good.
 reagent-name-b52 = b-52
 reagent-desc-b52 = Coffee, irish cream, and cognac. You will get bombed.

+reagent-name-blue-hawaiian = blue hawaiian
+reagent-desc-blue-hawaiian = Aloha! Does that mean hello or goodbye?
+
 reagent-name-bahama-mama = bahama mama
 reagent-desc-bahama-mama = Tropical cocktail.

@@ -106,6 +109,12 @@ reagent-desc-booger = Ewww...
 reagent-name-brave-bull = brave bull
 reagent-desc-brave-bull = It's just as effective as Dutch-Courage!

+reagent-name-coconut-rum = coconut rum
+reagent-desc-coconut-rum = Rum with coconut for that tropical feel.
+
+reagent-name-cosmopolitan = cosmopolitan
+reagent-desc-cosmopolitan = Even in the worst situations, nothing beats a fresh cosmopolitan.
+
 reagent-name-cuba-libre = cuba libre
 reagent-desc-cuba-libre = Rum, mixed with cola. Viva la revolucion.

@@ -190,9 +199,15 @@ reagent-desc-moonshine = Artisanal homemade liquor. What could go wrong?
 reagent-name-neurotoxin = neurotoxin
 reagent-desc-neurotoxin = A strong neurotoxin that puts the subject into a death-like state.

+reagent-name-painkiller = painkiller
+reagent-desc-painkiller = A cure for what ails you.
+
 reagent-name-patron = patron
 reagent-desc-patron = Tequila with silver in it, a favorite of alcoholic women in the club scene.

+reagent-name-pina-colada = piña colada
+reagent-desc-pina-colada = For getting lost in the rain.
+
 reagent-name-red-mead = red mead
 reagent-desc-red-mead = The true Viking's drink! Even though it has a strange red color.

--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
@@ -4,6 +4,12 @@ reagent-desc-coffee = A drink made from brewed coffee beans. Contains a moderate
 reagent-name-cream = cream
 reagent-desc-cream = The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?

+reagent-name-coconut-water = coconut water
+reagent-desc-coconut-water = A favorite of survivors on deserted islands.
+
+reagent-name-cream-of-coconut = cream of coconut
+reagent-desc-cream-of-coconut = Sweet, syrupy version of coconut cream with added sugar.
+
 reagent-name-cafe-latte = cafe latte
 reagent-desc-cafe-latte = A nice, strong and tasty beverage while you are reading.

@@ -17,7 +23,7 @@ reagent-name-iced-coffee = iced coffee
 reagent-desc-iced-coffee = Coffee and ice, refreshing and cool.

 reagent-name-iced-green-tea = iced green tea
-reagent-desc-iced-green-tea = cold green tea.
+reagent-desc-iced-green-tea = Cold green tea.

 reagent-name-iced-tea = iced tea
 reagent-desc-iced-tea = No relation to a certain rap artist/actor.
@@ -25,6 +31,9 @@ reagent-desc-iced-tea = No relation to a certain rap artist/actor.
 reagent-name-lemonade = lemonade
 reagent-desc-lemonade = Drink using lemon juice, water, and a sweetener such as cane sugar or honey.

+reagent-name-arnold-palmer = arnold palmer
+reagent-desc-arnold-palmer = Now watch this drive.
+
 reagent-name-milk = milk
 reagent-desc-milk = An opaque white liquid produced by the mammary glands of mammals.

@@ -86,4 +95,4 @@ reagent-name-white-gilgamesh = white gilgamesh
 reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood.

 reagent-name-mopwata = mopwata
-reagent-desc-mopwata = Dirty, stagnant mop water.
+reagent-desc-mopwata = Dirty, stagnant mop water.
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
@@ -1,6 +1,9 @@
 reagent-name-cola = cola
 reagent-desc-cola = A sweet, carbonated soft drink. Caffeine free.

+reagent-name-shirley-temple = shirley temple
+reagent-desc-shirley-temple = A favorite amongst younger members of the crew.
+
 reagent-name-changeling-sting = changeling sting
 reagent-desc-changeling-sting = You take a tiny sip and feel a burning sensation...

@@ -28,6 +31,12 @@ reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsparil
 reagent-name-root-beer-float = root beer float
 reagent-desc-root-beer-float = Root beer, but now with ice cream on top. It truly is the magnum opus of Canadian summertime drinks.

+reagent-name-sol-dry = sol dry
+reagent-desc-sol-dry = Sweet ginger soda from outer space!
+
+reagent-name-roy-rogers = roy rogers
+reagent-desc-roy-rogers = Solid proof that there IS something known as too sweet.
+
 reagent-name-space-mountain-wind = Space Mountain Wind
 reagent-desc-space-mountain-wind = Blows right through you like a space wind.

--- a/Resources/Locale/en-US/shell.ftl
+++ b/Resources/Locale/en-US/shell.ftl
@@ -47,3 +47,4 @@ shell-argument-number-invalid = Argument {$index} must be a valid number!

 # Hints
 shell-argument-username-hint = <username>
+shell-argument-username-optional-hint = [username]
--- a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl
+++ b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl
@@ -5,6 +5,7 @@ comp-secret-stash-action-hide-success = You hide { THE($item) } in { $this }
 comp-secret-stash-action-hide-container-not-empty = There's already something in here?!
 comp-secret-stash-action-hide-item-too-big = { THE($item) } is too big to fit in {$stash}!
 comp-secret-stash-action-get-item-found-something = There was something inside {$stash}!
+comp-secret-stash-on-examine-found-hidden-item = There is something hidden inside.

 secret-stash-part-plant = the plant
 secret-stash-part-toilet = the toilet cistern
--- a/Resources/Locale/en-US/store/store.ftl
+++ b/Resources/Locale/en-US/store/store.ftl
@@ -6,3 +6,5 @@ store-ui-traitor-flavor = Copyright (C) NT -30643
 store-ui-traitor-warning = Operatives must lock their uplinks after use to avoid detection.

 store-withdraw-button-ui = Withdraw {$currency}
+
+store-not-account-owner = This {$store} is not bound to you!
--- a/Resources/Locale/en-US/toilet/toilet-component.ftl
+++ b/Resources/Locale/en-US/toilet/toilet-component.ftl
@@ -7,3 +7,5 @@ toilet-component-suicide-message-others = {CAPITALIZE(THE($victim))} bashes them
 toilet-component-suicide-message = You bash yourself with {THE($owner)}!
 toilet-seat-close = Close Seat
 toilet-seat-open = Open Seat
+
+plunger-unblock = You unblock the {THE($target)}!
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -33,5 +33,8 @@ trait-frontal-lisp-desc = You thpeak with a lithp
 trait-socialanxiety-name = Social Anxiety
 trait-socialanxiety-desc = You are anxious when you speak and stutter.

+trait-southern-name = Southern Drawl
+trait-southern-desc = You have a different way of speakin'.
+
 trait-snoring-name = Snoring
 trait-snoring-desc = You will snore while sleeping.
--- a/Resources/Locale/en-US/ui/general.ftl
+++ b/Resources/Locale/en-US/ui/general.ftl
@@ -0,0 +1,3 @@
+### Loc for the various UI-related verbs
+ui-verb-toggle-open = Toggle UI
+verb-instrument-openui = Play Music
--- a/Resources/Locale/ru-RU/lock/lock-component.ftl
+++ b/Resources/Locale/ru-RU/lock/lock-component.ftl
@@ -0,0 +1,9 @@
+lock-comp-on-examined-is-locked = [color=#a84032]Он заперт[/color].
+lock-comp-on-examined-is-unlocked = [color=#32a834]Он открыт[/color].
+lock-comp-do-lock-success = Вы заблокировали { $entityName }.
+lock-comp-do-unlock-success = Вы разблокировали { $entityName }.
+
+## ToggleLockVerb
+
+toggle-lock-verb-unlock = Разблокировать
+toggle-lock-verb-lock = Заблокировать
--- a/Resources/Locale/ru-RU/lock/lock-crystall-punk.ftl
+++ b/Resources/Locale/ru-RU/lock/lock-crystall-punk.ftl
@@ -0,0 +1,29 @@
+cp-lock-slot-component-slot-name-default = Замок
+
+cp-lock-examine-key = Высота зубчиков на ключе выстраивается в следующую последовательность:
+cp-lock-examine-lock-slot = Здесь висит {$lock}.
+cp-lock-examine-lock-null = Сюда можно прикрепить замок.
+cp-lock-examine-lock-lockpicked = [color=#b57c3c]{$lock} выглядит потрепанным, словно в нем кто-то копался.[/color]
+
+
+cp-lock-verb-use-key-text-open = Открыть {$item}
+cp-lock-verb-use-key-text-close = Закрыть {$item}
+cp-lock-verb-use-key-message = Использовать ключ, чтобы попытаться открыть или закрыть {$item}.
+
+cp-lock-unlock-lock = Вы открыли {$lock}
+cp-lock-lock-lock = Вы заблокировали {$lock}
+
+cp-lock-key-use-nofit = Кажется, этот ключ сюда не подходит...
+cp-lock-keyring-use-nofit = Кажется, ни один из ключей отсюда не подходит...
+cp-lock-lock-insert-fail-locked = Сначала разблокируйте {$lock}, чтобы повесить его на {$target}
+cp-lock-lock-remove-fail-locked = Сначала разблокируйте {$lock}, чтобы снять его с {$target}
+cp-lock-target-use-failed-locked = {$target} не открывается
+
+cp-lock-verb-lockpick-use-text = Имитировать:
+cp-lock-verb-lockpick-use-message = Попытаться имитировать элемент формы ключа.
+verb-categories-lockpick = Взлом
+
+cp-lock-lockpick-success = Что-то в замке сдвигается...
+cp-lock-lockpick-failed = {$lock} с громким щелчком встает на место.
+cp-lock-lockpick-failed-damage = {$lock} с громким щелчком встает на место, надломив отмчычку.
+cp-lock-lockpick-failed-break = {$lock} с громким щелчком встает на место, ломая вашу отмычку.
--- a/Resources/Maps/CrystallPunk/dev_map.yml
+++ b/Resources/Maps/CrystallPunk/dev_map.yml
@@ -394,25 +394,25 @@ entities:
    - type: DayCycle
      timeEntries:
      - startColor: "#754a4a" #Рассвет
-        duration: 10
+        duration: 30
        isNight: false
      - startColor: "#e0ba87" #Полдень
-        duration: 10
+        duration: 30
        isNight: false
      - startColor: "#bfeeff" #Полдень
-        duration: 10
+        duration: 30
        isNight: false
      - startColor: "#385163" #Вечер
-        duration: 10
+        duration: 30
        isNight: true
      - startColor: "#060d12" #Ночь
-        duration: 10
+        duration: 30
        isNight: true
      - startColor: "#000000" #Ночь
-        duration: 10
+        duration: 30
        isNight: true
      - startColor: "#120906" #Ночь
-        duration: 10
+        duration: 30
        isNight: false
 - proto: AirAlarm
  entities:
--- a/Resources/Maps/Shuttles/emergency_meta.yml
+++ b/Resources/Maps/Shuttles/emergency_meta.yml
@@ -21,7 +21,7 @@ entities:
  - uid: 1
    components:
    - type: MetaData
-      name: grid
+      name: NT Evac Meta
    - type: Transform
      pos: -2.4375,0.859375
      parent: invalid
--- a/Resources/Maps/reach.yml
+++ b/Resources/Maps/reach.yml
@@ -529,12 +529,14 @@ entities:
            7: 4,-14
            259: 0,11
        - node:
+            cleanable: True
            color: '#FFFFFFFF'
            id: DirtHeavy
          decals:
            222: -18,-4
            275: 1,13
        - node:
+            cleanable: True
            color: '#FFFFFFFF'
            id: DirtLight
          decals:
@@ -574,6 +576,7 @@ entities:
            283: 0,8
            284: 1,7
        - node:
+            cleanable: True
            color: '#FFFFFFFF'
            id: DirtMedium
          decals:
@@ -11786,12 +11789,14 @@ entities:
  - uid: 1030
    components:
    - type: Transform
-      pos: 21.5,-3.5
+      pos: 18.5,-3.5
      parent: 407
+- proto: SpawnMobFoxRenault
+  entities:
  - uid: 1826
    components:
    - type: Transform
-      pos: 18.5,-3.5
+      pos: 21.5,-3.5
      parent: 407
 - proto: SpawnPointAtmos
  entities:
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -367,6 +367,15 @@
    accent-cowboy-words-98: accent-cowboy-replacement-98
    accent-cowboy-words-99: accent-cowboy-replacement-99

+- type: accent
+  id: southern
+  wordReplacements:
+    accent-southern-words-1: accent-southern-words-replace-1
+    accent-southern-words-2: accent-southern-words-replace-2
+    accent-southern-words-3: accent-southern-words-replace-3
+    accent-southern-words-4: accent-southern-words-replace-4
+    accent-southern-words-5: accent-southern-words-replace-5
+    accent-southern-words-6: accent-southern-words-replace-6

 # For the chat sanitization system
 - type: accent
--- a/Resources/Prototypes/Anomaly/behaviours.yml
+++ b/Resources/Prototypes/Anomaly/behaviours.yml
@@ -0,0 +1,208 @@
+- type: weightedRandom
+  id: AnomalyBehaviorList
+  weights:
+  #safe
+    Slow: 0.5
+    Light: 0.5
+    FullSafe: 0.1
+  #balanced
+    Balanced: 3
+    DelayedForce: 1
+    Rapid: 1
+    BalancedSecret: 1
+    Reflect: 1
+    NonSensivity: 1
+    Sensivity: 1
+  #Hard
+    Fast: 0.5
+    Strenght: 0.5
+    Inconstancy: 0.5
+    InconstancyParticle: 0.5
+    FullUnknown: 0.5
+    Jumping: 0.3
+    Moving: 0.1
+  #Complex
+    FastUnknown: 0.2
+    JumpingUnknown: 0.1
+    InconstancyParticleUnknown: 0.1
+
+
+# Easy x0.5 point production
+
+- type: anomalyBehavior
+  id: FullSafe
+  pulseFrequencyModifier: 3
+  pulsePowerModifier: 0.5
+  earnPointModifier: 0.05
+  description: anomaly-behavior-safe
+
+- type: anomalyBehavior
+  id: Slow
+  pulseFrequencyModifier: 2
+  earnPointModifier: 0.5
+  description: anomaly-behavior-slow
+
+- type: anomalyBehavior
+  id: Light
+  pulsePowerModifier: 0.5
+  earnPointModifier: 0.5
+  description: anomaly-behavior-light
+
+# Balanced x1 point production
+
+- type: anomalyBehavior
+  id: Balanced
+  earnPointModifier: 1
+  description: anomaly-behavior-balanced
+
+- type: anomalyBehavior
+  id: DelayedForce
+  earnPointModifier: 1.15
+  description: anomaly-behavior-delayed-force
+  pulseFrequencyModifier: 0.5
+  pulsePowerModifier: 2
+  
+- type: anomalyBehavior
+  id: Rapid
+  earnPointModifier: 1.15
+  description: anomaly-behavior-rapid
+  pulseFrequencyModifier: 2
+  pulsePowerModifier: 0.5
+
+- type: anomalyBehavior
+  id: BalancedSecret
+  earnPointModifier: 1.2
+  description: anomaly-behavior-secret
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 2
+    randomStartSecretMax: 3
+
+- type: anomalyBehavior
+  id: Reflect
+  earnPointModifier: 1.1
+  particleSensivity: 0.5
+  description: anomaly-behavior-reflect
+  components:
+  - type: Reflect
+    reflectProb: 0.5
+    reflects:
+      - Energy
+
+- type: anomalyBehavior
+  id: NonSensivity
+  earnPointModifier: 0.8
+  particleSensivity: 0.5
+  description: anomaly-behavior-nonsensivity
+  
+- type: anomalyBehavior
+  id: Sensivity
+  earnPointModifier: 1.2
+  particleSensivity: 1.5
+  description: anomaly-behavior-sensivity
+
+# Hard x2 point production
+
+- type: anomalyBehavior
+  id: Fast
+  earnPointModifier: 1.9
+  pulseFrequencyModifier: 0.5
+  description: anomaly-behavior-fast
+
+- type: anomalyBehavior
+  id: Strenght
+  pulsePowerModifier: 1.5
+  earnPointModifier: 1.4
+  description: anomaly-behavior-strenght
+
+- type: anomalyBehavior
+  id: Inconstancy
+  earnPointModifier: 1.7
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnPulse: true
+    prob: 1
+
+- type: anomalyBehavior
+  id: InconstancyParticle
+  earnPointModifier: 1.8
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnParticleHit: true
+    prob: 0.8
+
+- type: anomalyBehavior
+  id: Moving
+  earnPointModifier: 2.2
+  description: anomaly-behavior-moving
+  components:
+  - type: RandomWalk
+    minSpeed: 0
+    maxSpeed: 0.3
+  - type: CanMoveInAir
+  - type: Physics
+    bodyType: Dynamic
+    bodyStatus: InAir
+
+- type: anomalyBehavior
+  id: Jumping
+  earnPointModifier: 1.8
+  description: anomaly-behavior-moving
+  components:
+  - type: ChaoticJump
+    jumpMinInterval: 15
+    jumpMaxInterval: 25
+    rangeMin: 1
+    rangeMax: 4
+    effect: PuddleSparkle
+
+- type: anomalyBehavior
+  id: FullUnknown
+  earnPointModifier: 1.9
+  description: anomaly-behavior-secret
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 4
+    randomStartSecretMax: 6
+
+# Complex Effects
+
+- type: anomalyBehavior
+  id: JumpingUnknown
+  earnPointModifier: 1.9
+  description: anomaly-behavior-moving
+  components:
+  - type: ChaoticJump
+    jumpMinInterval: 15
+    jumpMaxInterval: 25
+    rangeMin: 1
+    rangeMax: 1
+    effect: PuddleSparkle
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
+
+
+- type: anomalyBehavior
+  id: FastUnknown
+  earnPointModifier: 1.9
+  pulseFrequencyModifier: 0.5
+  description: anomaly-behavior-fast
+  components:
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
+
+- type: anomalyBehavior
+  id: InconstancyParticleUnknown
+  earnPointModifier: 1.95
+  description: anomaly-behavior-inconstancy
+  components:
+  - type: ShuffleParticlesAnomaly
+    shuffleOnParticleHit: true
+    prob: 0.5
+  - type: SecretDataAnomaly
+    randomStartSecretMin: 3
+    randomStartSecretMax: 5
--- a/Resources/Prototypes/Body/Parts/human.yml
+++ b/Resources/Prototypes/Body/Parts/human.yml
@@ -15,6 +15,7 @@
        Quantity: 10

 - type: entity
+  noSpawn: true
  id: TorsoHuman
  name: "human torso"
  parent: [PartHuman, BaseTorso]
@@ -31,6 +32,7 @@
        Quantity: 20

 - type: entity
+  noSpawn: true
  id: HeadHuman
  name: "human head"
  parent: [PartHuman, BaseHead]
@@ -47,6 +49,7 @@
        Quantity: 10

 - type: entity
+  noSpawn: true
  id: LeftArmHuman
  name: "left human arm"
  parent: [PartHuman, BaseLeftArm]
@@ -56,6 +59,7 @@
    state: "l_arm"

 - type: entity
+  noSpawn: true
  id: RightArmHuman
  name: "right human arm"
  parent: [PartHuman, BaseRightArm]
@@ -65,6 +69,7 @@
    state: "r_arm"

 - type: entity
+  noSpawn: true
  id: LeftHandHuman
  name: "left human hand"
  parent: [PartHuman, BaseLeftHand]
@@ -74,6 +79,7 @@
    state: "l_hand"

 - type: entity
+  noSpawn: true
  id: RightHandHuman
  name: "right human hand"
  parent: [PartHuman, BaseRightHand]
@@ -83,6 +89,7 @@
    state: "r_hand"

 - type: entity
+  noSpawn: true
  id: LeftLegHuman
  name: "left human leg"
  parent: [PartHuman, BaseLeftLeg]
@@ -92,6 +99,7 @@
    state: "l_leg"

 - type: entity
+  noSpawn: true
  id: RightLegHuman
  name: "right human leg"
  parent: [PartHuman, BaseRightLeg]
@@ -101,6 +109,7 @@
    state: "r_leg"

 - type: entity
+  noSpawn: true
  id: LeftFootHuman
  name: "left human foot"
  parent: [PartHuman, BaseLeftFoot]
@@ -110,6 +119,7 @@
    state: "l_foot"

 - type: entity
+  noSpawn: true
  id: RightFootHuman
  name: "right human foot"
  parent: [PartHuman, BaseRightFoot]
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -68,16 +68,6 @@
  category: cargoproduct-category-name-fun
  group: market

- type: cargoProduct
-  id: FunSprayPaints
-  icon:
-    sprite: Objects/Fun/spraycans.rsi
-    state: death2_cap
-  product: CrateFunSprayPaints
-  cost: 2000
-  category: Fun
-  group: market
-
 - type: cargoProduct
  id: FunParty
  icon:
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -82,7 +82,7 @@
  id: ServiceBooks
  icon:
    sprite: Objects/Misc/books.rsi
-    state: book0
+    state: book_icon
  product: CrateServiceBooks
  cost: 1000
  category: cargoproduct-category-name-service
@@ -92,7 +92,7 @@
  id: ServiceGuidebooks
  icon:
    sprite: Objects/Misc/books.rsi
-    state: book_engineering2
+    state: book_icon
  product: CrateServiceGuidebooks
  cost: 1300
  category: cargoproduct-category-name-service
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -328,6 +328,27 @@
        - id: CrowbarRed
        - id: AdvMopItem

+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackERTChaplain
+  id: ClothingBackpackERTChaplainFilled
+  components:
+    - type: StorageFill
+      contents:
+        - id: BoxSurvivalEngineering
+        - id: BoxCandle
+        - id: BoxBodyBag
+        - id: DrinkWaterMelonJuiceJug
+        - id: Lantern
+        - id: Lantern
+        - id: Bible
+        - id: CrowbarRed
+        - id: FoodBakedBunHotX
+        - id: FoodBakedBunHotX
+        - id: FoodBakedBunHotX
+        - id: FoodBakedBunHotX
+        - id: Lighter
+
 # Death Squad

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -5,70 +5,10 @@
  components:
  - type: StorageFill
    contents:
-      - id: BookRandom
-        prob: 0.4
-        amount: 1
-        maxAmount: 4
-      - id: BookNarsieLegend
-        prob: 0.1
-      - id: BookTruth
-        prob: 0.1
-      - id: BookWorld
-        prob: 0.1
-      - id: BookIanAntarctica
-        prob: 0.1
-      - id: BookSlothClownSSS
-        prob: 0.1
-      - id: BookSlothClownPranks
-        prob: 0.1
-      - id: BookSlothClownMMD
-        prob: 0.1
-      - id: BookStruck
-        prob: 0.1
-      - id: BookSun
-        prob: 0.1
-      - id: BookPossum
-        prob: 0.1
-      - id: BookCafe
-        prob: 0.1
-      - id: BookFeather
-        prob: 0.1
-      - id: BookIanLostWolfPup
-        prob: 0.1
-      - id: BookIanRanch
-        prob: 0.1
-      - id: BookIanOcean
-        prob: 0.1
-      - id: BookIanMountain
-        prob: 0.1
-      - id: BookIanCity
-        prob: 0.1
-      - id: BookIanArctic
-        prob: 0.1
-      - id: BookIanDesert
-        prob: 0.1
-      - id: BookNames
-        prob: 0.1
-      - id: BookEarth
-        prob: 0.1
-      - id: BookAurora
-        prob: 0.1
-      - id: BookTemple
-        prob: 0.1
-      - id: BookWatched
-        prob: 0.1
-      - id: BookMedicalOfficer
-        prob: 0.1
-      - id: BookMorgue
-        prob: 0.1
-      - id: BookRufus
-        prob: 0.1
-      - id: BookMap
-        prob: 0.1
-      - id: BookJourney
-        prob: 0.1
-      - id: BookInspiration
-        prob: 0.1
+      - id: BookRandomStory
+        prob: 0.6
+        amount: 2
+        maxAmount: 6
      - id: BookSpaceEncyclopedia
        orGroup: BookPool
      - id: BookTheBookOfControl
@@ -95,3 +35,93 @@
        orGroup: BookPool
      - id: BookChemicalCompendium
        orGroup: BookPool
+      - id: BookNarsieLegend
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookTruth
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookWorld
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanAntarctica
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSlothClownSSS
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSlothClownPranks
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSlothClownMMD
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookStruck
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookSun
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookPossum
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookCafe
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookFeather
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanLostWolfPup
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanRanch
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanOcean
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanMountain
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanCity
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanArctic
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookIanDesert
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookNames
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookEarth
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookAurora
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookTemple
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookWatched
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookMedicalOfficer
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookMorgue
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookRufus
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookMap
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookJourney
+        prob: 0.1
+        orGroup: BookAuthor
+      - id: BookInspiration
+        prob: 0.1
+        orGroup: BookAuthor
--- a/Resources/Prototypes/Catalog/Fills/Books/lore.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/lore.yml
@@ -1,122 +0,0 @@
-# ---- Library Salvage Fills ----
-
- type: entity
-  name: demonomicon
-  parent: BookBase
-  id: BookDemonomicon
-  noSpawn: true
-  description: 'Who knows what dark spells may be contained in these horrid pages?'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_demonomicon
-
- type: entity
-  name: demonomicon
-  parent: BookDemonomicon
-  id: BookDemonomiconRandom
-  suffix: random
-  components:
-  - type: RandomSpawner
-    prototypes:
-    - BookDemonomicon1
-    - BookDemonomicon2
-    - BookDemonomicon3
-    offset: 0.1
-
- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon1
-  suffix: 1
-  components:
-  - type: Paper
-    content: book-text-demonomicon1
-
- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon2
-  suffix: 2
-  components:
-  - type: Paper
-    content: book-text-demonomicon2
-
- type: entity
-  parent: BookDemonomicon
-  id: BookDemonomicon3
-  suffix: 3
-  components:
-  - type: Paper
-    content: book-text-demonomicon3
-
- type: entity
-  name: pharmaceutical manuscript
-  parent: BookBase
-  id: BookChemistryInsane
-  suffix: library salvage
-  description: 'You can tell whoever wrote this was off the desoxy HARD.'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_chemistry
-  - type: Paper
-    content: book-text-chemistry-insane
-
- type: entity
-  name: botanical textbook
-  parent: BookBase
-  id: BookBotanicalTextbook
-  suffix: library salvage
-  description: 'Only a couple pages are left.'
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_hydroponics_pod_people
-  - type: Paper
-    content: book-text-botanics
-
- type: entity
-  parent: BookBase
-  id: BookGnominomicon
-  name: gnominomicon
-  suffix: library salvage
-  description: You don't like the look of this. Looks
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book5
-  - type: Paper
-    content: book-text-gnome
-
- type: entity
-  parent: BookBase
-  id: BookFishing
-  name: Tales from the Fishbowl
-  suffix: library salvage
-  description: This book sucks.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_fish
-  - type: Paper
-    content: book-text-fishing
-
- type: entity
-  parent: BookBase
-  id: BookDetective
-  name: Strokgraeth Holmes, Dwarf Detective
-  suffix: library salvage
-  description: Exciting! Invigorating! This author died after his book career failed.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/books.rsi
-    layers:
-    - state: book_detective
-  - type: Paper
-    content: book-text-detective
-
-# ---- End Library Salvage Fills ----
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -166,8 +166,8 @@
 - type: entity
  id: CrateRCDAmmo
  parent: CrateEngineering
-  name: RCD ammo crate
-  description: 3 RCD ammo, each restoring 5 charges.
+  name: compressed matter crate
+  description: Contains three compressed matter cartridges.
  components:
  - type: StorageFill
    contents:
@@ -178,7 +178,7 @@
  id: CrateRCD
  parent: CrateEngineeringSecure
  name: RCD crate
-  description: A crate containing a single Rapid Construction Device.
+  description: A crate containing a single rapid construction device.
  components:
  - type: StorageFill
    contents:
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -290,21 +290,14 @@
    contents:
      - id: SnapPopBox
      - id: CrazyGlue
+        amount: 2
      - id: PlasticBanana
-      - id: FunnyPaint
-        orGroup: Paint
-        prob: 0.5
-      - id: FunnyPaintYellow
-        orGroup: Paint
-        prob: 0.5
      - id: WhoopieCushion
      - id: ToyHammer
      - id: MrChips
-        prob: 0.5
-        orGroup: Dummy
+        orGroup: GiftPool
      - id: MrDips
-        prob: 0.5
-        orGroup: Dummy
+        orGroup: Giftpool
      - id: RevolverCapGun
      - id: BalloonNT
      - id: ClothingShoesClownLarge
@@ -337,41 +330,6 @@
        amount: 15
        prob: 0.05

- type: entity
-  id: CrateFunSprayPaints
-  name: spray paint crate
-  description: a crate filled with spray paint.
-  parent: CratePlastic
-  suffix: Spray Paint
-  components:
-  - type: StorageFill
-    contents:
-      - id: SprayPaintBlue
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintRed
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintOrange
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintBlack
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintGreen
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintPurple
-        amount: 2
-        prob: 0.33
-      - id: SprayPaintWhite
-        amount: 2
-        prob: 0.33
-      - id: DeathPaint
-        amount: 2
-      - id: DeathPaintTwo
-        amount: 2
-
 - type: entity
  name: dartboard box set
  description: A box with everything you need for a fun game of darts.
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -1,6 +1,5 @@
 - type: entity
  id: BriefcaseBrownFilled
-  name: brown briefcase
  parent: BriefcaseBrown
  suffix: Filled, Paper
  components:
@@ -11,9 +10,8 @@

 - type: entity
  id: BriefcaseSyndieSniperBundleFilled
-  name: brown briefcase
  parent: BriefcaseSyndie
-  suffix: SniperBundle
+  suffix: Syndicate, Sniper Bundle
  components:
  - type: Item
    size: Ginormous
@@ -32,7 +30,6 @@

 - type: entity
  id: BriefcaseSyndieLobbyingBundleFilled
-  name: brown briefcase
  parent: BriefcaseSyndie
  suffix: Syndicate, Spesos
  components:
@@ -52,7 +49,6 @@

 - type: entity
  id: BriefcaseThiefBribingBundleFilled
-  name: brown briefcase
  parent: BriefcaseSyndie
  suffix: Thief, Spesos
  components:
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -255,7 +255,6 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingEyesHudSecurity
      - id: WeaponDisabler
      - id: ClothingOuterCoatHoSTrench
      - id: ClothingMaskNeckGaiter
@@ -263,7 +262,7 @@
      - id: ClothingMaskGasSwat
      - id: ClothingBeltSecurityFilled
      - id: ClothingHeadsetAltSecurity
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
      - id: ClothingShoesBootsJack
      - id: CigarGoldCase
        prob: 0.50
@@ -282,13 +281,12 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingEyesHudSecurity
      - id: WeaponDisabler
      - id: ClothingOuterCoatHoSTrench
      - id: ClothingMaskNeckGaiter
      - id: ClothingBeltSecurityFilled
      - id: ClothingHeadsetAltSecurity
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
      - id: ClothingShoesBootsJack
      - id: CigarGoldCase
        prob: 0.50
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -145,10 +145,6 @@
          prob: 0.25
        - id: StrangePill
          prob: 0.20
-        - id: DeathPaint
-          prob: 0.05
-        - id: DeathPaintTwo
-          prob: 0.05
        - id: DrinkMopwataBottleRandom
          prob: 0.20
        - id: ModularReceiver
@@ -159,6 +155,8 @@
          prob: 0.20
        - id: BarberScissors
          prob: 0.05
+        - id: BookRandomStory
+          prob: 0.1
        # Syndicate loot
        - id: null
          prob: 0.95
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -9,7 +9,7 @@
      - id: WeaponDisabler
      - id: ClothingBeltSecurityFilled
      - id: Flash
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
      - id: ClothingHeadsetAltSecurity
      - id: ClothingHandsGlovesCombat
      - id: ClothingShoesBootsJack
@@ -19,7 +19,6 @@
      - id: DoorRemoteArmory
      - id: ClothingOuterHardsuitWarden
      - id: HoloprojectorSecurity
-      - id: ClothingEyesHudSecurity

 - type: entity
  id: LockerWardenFilled
@@ -32,7 +31,7 @@
      - id: WeaponDisabler
      - id: ClothingBeltSecurityFilled
      - id: Flash
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
      - id: ClothingHeadsetAltSecurity
      - id: ClothingHandsGlovesCombat
      - id: ClothingShoesBootsJack
@@ -41,7 +40,6 @@
      - id: RubberStampWarden
      - id: DoorRemoteArmory
      - id: HoloprojectorSecurity
-      - id: ClothingEyesHudSecurity

 - type: entity
  id: LockerSecurityFilled
@@ -60,13 +58,12 @@
      - id: ClothingBeltSecurityFilled
      - id: Flash
        prob: 0.5
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
      - id: ClothingHeadsetSecurity
      - id: ClothingHandsGlovesColorBlack
      - id: ClothingShoesBootsJack
      - id: WeaponMeleeNeedle
        prob: 0.1
-      - id: ClothingEyesHudSecurity
      - id: HoloprojectorSecurity
        prob: 0.6

@@ -77,7 +74,7 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingEyesHudSecurity
+      - id: ClothingEyesGlassesSecurity
      - id: WeaponDisabler
      - id: TrackingImplanter
        amount: 2
@@ -112,7 +109,7 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingEyesHudSecurity
+      - id: ClothingEyesGlassesSecurity
        prob: 0.3
      - id: ClothingHeadHatFedoraBrown
      - id: ClothingNeckTieDet
--- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
+++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
@@ -1,11 +1,11 @@
 - type: reagentDispenserInventory
  id: SodaDispenserInventory
  inventory:
+  - DrinkCoconutWaterJug
  - DrinkCoffeeJug
  - DrinkColaBottleFull
  - DrinkCreamCartonXL
  - DrinkDrGibbJug
-  - DrinkEnergyDrinkJug
  - DrinkGreenTeaJug
  - DrinkIceJug
  - DrinkJuiceLimeCartonXL
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -13,7 +13,9 @@
    DrinkBeerBottleFull: 5
    DrinkBlueCuracaoBottleFull: 2
    DrinkCognacBottleFull: 4
+    DrinkCoconutWaterCarton: 3
    DrinkColaBottleFull: 4
+    DrinkMilkCarton: 2
    DrinkCreamCarton: 5
    DrinkGinBottleFull: 3
    DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two
@@ -26,6 +28,7 @@
    DrinkPatronBottleFull: 2
    DrinkRumBottleFull: 4
    DrinkSodaWaterCan: 8
+    DrinkSolDryCan: 8
    DrinkSpaceMountainWindBottleFull: 3
    DrinkSpaceUpBottleFull: 3
    DrinkTequilaBottleFull: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
@@ -5,6 +5,7 @@
    DrinkGrapeCan: 2
    DrinkRootBeerCan: 2
    DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
    DrinkLemonLimeCan: 2
    DrinkFourteenLokoCan: 2
  emaggedInventory:
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
@@ -2,6 +2,7 @@
  id: CuraDrobeInventory
  startingInventory:
    BooksBag: 2
+    BriefcaseBrown: 2
    HandLabeler: 2
    ClothingEyesGlasses: 2
    ClothingEyesGlassesJamjar: 2
@@ -12,4 +13,4 @@
    ClothingUniformJumpskirtLibrarian: 3
    ClothingShoesBootsLaceup: 2
    ClothingHeadsetService: 2
-    
+
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
@@ -5,6 +5,7 @@
    DrinkGrapeCan: 2
    DrinkRootBeerCan: 2
    DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
    DrinkLemonLimeCan: 2
    DrinkFourteenLokoCan: 2
  emaggedInventory:
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -14,6 +14,7 @@
    ClothingShoesBootsLaceup: 2
    ClothingHeadsetService: 2
    ClothingNeckLawyerbadge: 2
+    BriefcaseBrown: 2
    LuxuryPen: 2
  contrabandInventory:
    ClothingOuterRobesJudge: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
@@ -6,6 +6,7 @@
    DrinkGrapeCan: 2
    DrinkRootBeerCan: 2
    DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
    DrinkLemonLimeCan: 2
    DrinkFourteenLokoCan: 2
  emaggedInventory:
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
@@ -5,6 +5,7 @@
    DrinkGrapeCan: 2
    DrinkRootBeerCan: 2
    DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
    DrinkLemonLimeCan: 2
    DrinkFourteenLokoCan: 2
  emaggedInventory:
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
@@ -5,6 +5,7 @@
    DrinkGrapeCan: 3
    DrinkRootBeerCan: 3
    DrinkIcedTeaCan: 3
+    DrinkSolDryCan: 3
    DrinkLemonLimeCan: 3
    DrinkFourteenLokoCan: 3
  emaggedInventory:
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
@@ -6,6 +6,7 @@
    DrinkGrapeCan: 2
    DrinkRootBeerCan: 2
    DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
    DrinkLemonLimeCan: 2
    DrinkFourteenLokoCan: 2
  emaggedInventory:
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
@@ -5,6 +5,7 @@
    DrinkGrapeCan: 2
    DrinkRootBeerCan: 2
    DrinkIcedTeaCan: 2
+    DrinkSolDryCan: 2
    DrinkLemonLimeCan: 2
    DrinkFourteenLokoCan: 2
  emaggedInventory:
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -43,7 +43,7 @@
    ClothingMaskScaredMime: 1
    ClothingUniformJumpsuitKimono: 1
    ClothingHeadHatCasa: 1
-    ClothingHeadHatHairflower: 1
+    FoodPoppy: 1
    ClothingHeadHatGladiator: 1
    ClothingUniformJumpsuitGladiator: 1
    ClothingHeadHatCowboyBrown: 1
--- a/Resources/Prototypes/Datasets/story_generation.yml
+++ b/Resources/Prototypes/Datasets/story_generation.yml
@@ -0,0 +1,266 @@
+- type: dataset
+  id: book_type
+  values:
+  - story-gen-book-type1 
+  - story-gen-book-type2 
+  - story-gen-book-type3 
+  - story-gen-book-type4 
+  - story-gen-book-type5 
+  - story-gen-book-type6 
+  - story-gen-book-type7 
+  - story-gen-book-type8 
+  - story-gen-book-type9 
+  - story-gen-book-type10
+  - story-gen-book-type11
+  - story-gen-book-type12
+
+- type: dataset
+  id: book_genre
+  values:
+  - story-gen-book-genre1 
+  - story-gen-book-genre2 
+  - story-gen-book-genre3 
+  - story-gen-book-genre4 
+  - story-gen-book-genre5 
+  - story-gen-book-genre6 
+  - story-gen-book-genre7 
+  - story-gen-book-genre8 
+  - story-gen-book-genre9 
+  - story-gen-book-genre10
+  - story-gen-book-genre11
+  - story-gen-book-genre12
+  - story-gen-book-genre13
+  - story-gen-book-genre14
+
+- type: dataset
+  id: book_hint_appearance
+  values:
+  - story-gen-book-appearance1 
+  - story-gen-book-appearance2 
+  - story-gen-book-appearance3 
+  - story-gen-book-appearance4 
+  - story-gen-book-appearance5 
+  - story-gen-book-appearance6 
+  - story-gen-book-appearance7 
+  - story-gen-book-appearance8 
+  - story-gen-book-appearance9 
+  - story-gen-book-appearance10
+  - story-gen-book-appearance11
+  - story-gen-book-appearance12
+  - story-gen-book-appearance13
+  - story-gen-book-appearance14
+  - story-gen-book-appearance15
+  - story-gen-book-appearance16
+  - story-gen-book-appearance17
+  - story-gen-book-appearance18
+  - story-gen-book-appearance19
+  - story-gen-book-appearance20
+  - story-gen-book-appearance21
+  - story-gen-book-appearance22
+  - story-gen-book-appearance23
+  - story-gen-book-appearance24
+  - story-gen-book-appearance25
+  - story-gen-book-appearance26
+  - story-gen-book-appearance27
+
+- type: dataset
+  id: book_character
+  values:
+  - story-gen-book-character1 
+  - story-gen-book-character2 
+  - story-gen-book-character3 
+  - story-gen-book-character4 
+  - story-gen-book-character5 
+  - story-gen-book-character6 
+  - story-gen-book-character7 
+  - story-gen-book-character8 
+  - story-gen-book-character9 
+  - story-gen-book-character10
+  - story-gen-book-character11
+  - story-gen-book-character12
+  - story-gen-book-character13
+  - story-gen-book-character14
+  - story-gen-book-character15
+  - story-gen-book-character16
+  - story-gen-book-character17
+  - story-gen-book-character18
+  - story-gen-book-character19
+  - story-gen-book-character20
+  - story-gen-book-character21
+  - story-gen-book-character22
+  - story-gen-book-character23
+  - story-gen-book-character24
+  - story-gen-book-character25
+  - story-gen-book-character26
+  - story-gen-book-character27
+  - story-gen-book-character28
+  - story-gen-book-character29
+  - story-gen-book-character30
+  - story-gen-book-character31
+  - story-gen-book-character32
+  - story-gen-book-character33
+  - story-gen-book-character34
+  - story-gen-book-character35
+  - story-gen-book-character36
+  - story-gen-book-character37
+  - story-gen-book-character38
+  - story-gen-book-character39
+  - story-gen-book-character40
+
+- type: dataset
+  id: book_character_trait
+  values:
+  - story-gen-book-character-trait1 
+  - story-gen-book-character-trait2 
+  - story-gen-book-character-trait3 
+  - story-gen-book-character-trait4 
+  - story-gen-book-character-trait5 
+  - story-gen-book-character-trait6 
+  - story-gen-book-character-trait7 
+  - story-gen-book-character-trait8 
+  - story-gen-book-character-trait9 
+  - story-gen-book-character-trait10
+  - story-gen-book-character-trait11
+  - story-gen-book-character-trait12
+  - story-gen-book-character-trait13
+  - story-gen-book-character-trait14
+  - story-gen-book-character-trait15
+  - story-gen-book-character-trait16
+  - story-gen-book-character-trait17
+  - story-gen-book-character-trait18
+  - story-gen-book-character-trait19
+  - story-gen-book-character-trait20
+  - story-gen-book-character-trait21
+  - story-gen-book-character-trait22
+  - story-gen-book-character-trait23
+  - story-gen-book-character-trait24
+
+
+- type: dataset
+  id: book_event
+  values:
+  - story-gen-book-event1 
+  - story-gen-book-event2 
+  - story-gen-book-event3 
+  - story-gen-book-event4 
+  - story-gen-book-event5 
+  - story-gen-book-event6 
+  - story-gen-book-event7 
+  - story-gen-book-event8 
+  - story-gen-book-event9 
+  - story-gen-book-event10
+  - story-gen-book-event11
+  - story-gen-book-event12
+  - story-gen-book-event13
+  - story-gen-book-event14
+  - story-gen-book-event15
+  - story-gen-book-event16
+  - story-gen-book-event17
+  - story-gen-book-event18
+  - story-gen-book-event19
+  - story-gen-book-event20
+  - story-gen-book-event21
+  - story-gen-book-event22
+  - story-gen-book-event23
+  - story-gen-book-event24
+
+- type: dataset
+  id: book_action
+  values:
+  - story-gen-book-action1 
+  - story-gen-book-action2 
+  - story-gen-book-action3 
+  - story-gen-book-action4 
+  - story-gen-book-action5 
+  - story-gen-book-action6 
+  - story-gen-book-action7 
+  - story-gen-book-action8 
+  - story-gen-book-action9 
+  - story-gen-book-action10
+  - story-gen-book-action11
+  - story-gen-book-action12
+
+- type: dataset
+  id: book_action_trait
+  values:
+  - story-gen-book-action-trait1 
+  - story-gen-book-action-trait2 
+  - story-gen-book-action-trait3 
+  - story-gen-book-action-trait4 
+  - story-gen-book-action-trait5 
+  - story-gen-book-action-trait6 
+  - story-gen-book-action-trait7 
+  - story-gen-book-action-trait8 
+  - story-gen-book-action-trait9 
+  - story-gen-book-action-trait10
+  - story-gen-book-action-trait11
+  - story-gen-book-action-trait12
+  - story-gen-book-action-trait13
+
+- type: dataset
+  id: book_location
+  values:
+  - story-gen-book-location1 
+  - story-gen-book-location2 
+  - story-gen-book-location3 
+  - story-gen-book-location4 
+  - story-gen-book-location5 
+  - story-gen-book-location6 
+  - story-gen-book-location7 
+  - story-gen-book-location8 
+  - story-gen-book-location9 
+  - story-gen-book-location10
+  - story-gen-book-location11
+  - story-gen-book-location12
+  - story-gen-book-location13
+  - story-gen-book-location14
+  - story-gen-book-location15
+  - story-gen-book-location16
+  - story-gen-book-location17
+  - story-gen-book-location18
+  - story-gen-book-location19
+  - story-gen-book-location20
+  - story-gen-book-location21
+  - story-gen-book-location22
+  - story-gen-book-location23
+  - story-gen-book-location24
+  - story-gen-book-location25
+  - story-gen-book-location26
+  - story-gen-book-location27
+  - story-gen-book-location28
+  - story-gen-book-location29
+  - story-gen-book-location30
+  - story-gen-book-location31
+  - story-gen-book-location32
+  - story-gen-book-location33
+  - story-gen-book-location34
+
+- type: dataset
+  id: book_story_element
+  values:
+  - story-gen-book-element1
+  - story-gen-book-element2
+  - story-gen-book-element3
+  - story-gen-book-element4
+  - story-gen-book-element5
+  - story-gen-book-element6
+  - story-gen-book-element7
+  - story-gen-book-element8
+  - story-gen-book-element9
+
+- type: dataset
+  id: book_story_element_trait
+  values:
+  - story-gen-book-element-trait1 
+  - story-gen-book-element-trait2 
+  - story-gen-book-element-trait3 
+  - story-gen-book-element-trait4 
+  - story-gen-book-element-trait5 
+  - story-gen-book-element-trait6 
+  - story-gen-book-element-trait7 
+  - story-gen-book-element-trait8 
+  - story-gen-book-element-trait9 
+  - story-gen-book-element-trait10
+  - story-gen-book-element-trait11
+  - story-gen-book-element-trait12
+  - story-gen-book-element-trait13
--- a/Resources/Prototypes/DeviceLinking/sink_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/sink_ports.yml
@@ -107,3 +107,8 @@
  id: SetParticleZeta
  name: signal-port-name-set-particle-zeta
  description: signal-port-description-set-particle-zeta
+
+- type: sinkPort
+  id: SetParticleSigma
+  name: signal-port-name-set-particle-sigma
+  description: signal-port-description-set-particle-sigma
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -248,6 +248,15 @@
  - type: Sprite
    sprite: Clothing/Back/Backpacks/ertclown.rsi

+- type: entity
+  parent: ClothingBackpackERTLeader
+  id: ClothingBackpackERTChaplain
+  name: ERT chaplain backpack
+  description: A spacious backpack with lots of pockets, worn by Chaplains of an Emergency Response Team.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/ertchaplain.rsi
+
 #Syndicate
 - type: entity
  parent: ClothingBackpack
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -167,6 +167,9 @@
    sprite: Clothing/Back/Duffels/syndicate.rsi
  - type: ExplosionResistance
    damageCoefficient: 0.1
+  - type: Storage
+    grid:
+    - 0,0,8,4

 - type: entity
  parent: ClothingBackpackDuffelSyndicate
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -149,6 +149,11 @@
  - type: FlashImmunity
  - type: EyeProtection
    protectionTime: 5
+  - type: Tag
+    tags:
+    - Sunglasses
+    - HamsterWearable
+    - WhitelistChameleon

 - type: entity
  parent: ClothingEyesBase
@@ -163,6 +168,9 @@
  - type: FlashImmunity
  - type: EyeProtection
    protectionTime: 5
+  - type: Construction
+    graph: GlassesSecHUD
+    node: glassesSec
  - type: Tag
    tags:
    - HamsterWearable
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -571,6 +571,21 @@
        Piercing: 0.9
        Heat: 0.9

+#ERT Chaplain Hardsuit
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSyndie
+  id: ClothingHeadHelmetHardsuitERTChaplain
+  name: ERT chaplain hardsuit helmet
+  description: A special hardsuit helmet worn by members of an emergency response team.
+  components:
+  - type: BreathMask
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
+  - type: PointLight
+    color: "#ffffff"
+
 #ERT Engineer Hardsuit
 - type: entity
  parent: ClothingHeadHelmetHardsuitSyndie
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -147,29 +147,6 @@
        Piercing: 0.9
        Heat: 0.9

-#SCAF Helmet
- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHelmetScaf
-  name: scaf helmet
-  description: A robust, strong helmet.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/scaf.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/scaf.rsi
-  - type: IngestionBlocker
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.8
-  - type: Tag
-    tags:
-    - HidesHair
-    - WhitelistChameleon
-
 #Space Ninja Helmet
 - type: entity
  parent: ClothingHeadEVAHelmetBase
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -35,31 +35,20 @@

 - type: entity
  parent: ClothingHeadBase
-  id: ClothingHeadHatFlowerCrown
-  name: flower crown
-  description: A coronet of fresh and fragrant flowers.
+  id: ClothingHeadHatFlowerWreath
+  name: flower wreath
+  description: A wreath of colourful flowers. Can be worn both on head and neck.
  components:
  - type: Sprite
-    sprite: Clothing/Head/Misc/flower-crown.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
  - type: Clothing
-    sprite: Clothing/Head/Misc/flower-crown.rsi
+    sprite: Clothing/Head/Misc/flower-wreath.rsi
+    slots:
+    - HEAD
+    - neck
  - type: Construction
-    graph: flowercrown
-    node: flowercrown
-
- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatHairflower
-  name: hairflower
-  description: A red flower for beautiful ladies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Misc/hairflower.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Misc/hairflower.rsi
-  - type: Construction
-    graph: hairflower
-    node: hairflower
+    graph: flowerwreath
+    node: flowerwreath

 - type: entity
  parent: ClothingHeadLightBase
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -79,17 +79,3 @@
    event: !type:StethoscopeActionEvent
    checkCanInteract: false
    priority: -1
-
- type: entity
-  parent: ClothingNeckBase
-  id: ClothingNeckFlowerWreath
-  name: flower wreath
-  description: A wreath of colourful flowers.
-  components:
-  - type: Sprite
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
-  - type: Clothing
-    sprite: Clothing/Neck/Misc/flower-wreath.rsi
-  - type: Construction
-    graph: flowerwreath
-    node: flowerwreath
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -183,32 +183,6 @@
  - type: Clothing
    sprite: Clothing/OuterClothing/Armor/magusred.rsi

- type: entity
-  parent: ClothingOuterBaseLarge
-  id: ClothingOuterArmorScaf
-  name: scaf suit
-  description: A green and brown tactical suit for combat situations.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Armor/scaf.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.4
-        Heat: 0.9
-        Caustic: 0.9
-  - type: ExplosionResistance
-    damageCoefficient: 0.8
-  - type: GroupExamine
-  - type: Tag
-    tags:
-    - Hardsuit
-    - WhitelistChameleon
-
 - type: entity
  parent: ClothingOuterBaseLarge
  id: ClothingOuterArmorCaptainCarapace
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -767,6 +767,20 @@
  - type: ToggleableClothing
    clothingPrototype: ClothingHeadHelmetHardsuitERTLeader

+#ERT Chaplain Hardsuit
+- type: entity
+  parent: ClothingOuterHardsuitJuggernaut
+  id: ClothingOuterHardsuitERTChaplain
+  name: ERT chaplain's hardsuit
+  description: A protective hardsuit worn by the chaplains of an Emergency Response Team.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi #if you change this, please update the humanoid.yml with a better markers sprite.
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitERTChaplain
+
 #ERT Engineer Hardsuit
 - type: entity
  parent: ClothingOuterHardsuitCBURN
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -1093,6 +1093,17 @@
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpsuit/musician.rsi

+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitERTChaplain
+  name: ERT chaplain uniform
+  description: A special suit made for Central Command's elite chaplain corps.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/ert_chaplain.rsi
+
 - type: entity
  parent: ClothingUniformBase
  id: ClothingUniformJumpsuitERTEngineer
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -9,6 +9,7 @@
  - type: SmokeVisuals
  - type: Transform
    anchored: true
+  - type: Clickable
  - type: Physics
  - type: Fixtures
    fixtures:
@@ -76,6 +77,8 @@
    animationState: foam-dissolve
  - type: Slippery
  - type: StepTrigger
+  - type: ScoopableSolution
+    solution: solutionArea

 - type: entity
  id: MetalFoam
@@ -128,9 +131,10 @@
    snap:
    - Wall
  components:
-  - type: Tag
-    tags:
-    - RCDDeconstructWhitelist
+  - type: RCDDeconstructable
+    cost: 2
+    delay: 2
+    fx: EffectRCDDeconstruct2  
  - type: Clickable
  - type: InteractionOutline
  - type: Sprite
--- a/Resources/Prototypes/Entities/Effects/rcd.yml
+++ b/Resources/Prototypes/Entities/Effects/rcd.yml
@@ -1,16 +1,115 @@
 - type: entity
-  id: EffectRCDConstruction
+  id: EffectRCDBase
+  abstract: true
  noSpawn: true
  components:
  - type: Transform
    anchored: True
  - type: Sprite
+    snapCardinals: true
+    noRot: true
    drawdepth: Effects
    sprite: /Textures/Effects/rcd.rsi
-    state: construct
-  - type: TimedDespawn
-    lifetime: 3.2
+    state: construct0
  - type: Tag
    tags:
    - HideContextMenu
  - type: AnimationPlayer
+  
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstructPreview
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstructPreview
+  
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct0
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct0
+  - type: TimedDespawn
+    lifetime: 1.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct1
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct1
+  - type: TimedDespawn
+    lifetime: 2.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct2
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct2
+  - type: TimedDespawn
+    lifetime: 3.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct3
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct3
+  - type: TimedDespawn
+    lifetime: 4.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDConstruct4
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: construct4
+  - type: TimedDespawn
+    lifetime: 5.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct2
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct2
+  - type: TimedDespawn
+    lifetime: 3.2
+    
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct4
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct4
+  - type: TimedDespawn
+    lifetime: 5.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct6
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct6
+  - type: TimedDespawn
+    lifetime: 7.2
+
+- type: entity
+  parent: EffectRCDBase
+  id: EffectRCDDeconstruct8
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: deconstruct8
+  - type: TimedDespawn
+    lifetime: 9.2
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -19,6 +19,7 @@
      - DrinkAloe
      - DrinkAndalusia
      - DrinkAntifreeze
+      - DrinkArnoldPalmer
      - DrinkB52Glass
      - DrinkBahamaMama
      - DrinkBananaHonkGlass
@@ -27,12 +28,15 @@
      - DrinkBerryJuice
      - DrinkBlackRussianGlass
      - DrinkBlueCuracaoGlass
+      - DrinkBlueHawaiianGlass
      - DrinkBloodyMaryGlass
      - DrinkBooger
      - DrinkBraveBullGlass
      - DrinkCarrotJuice
+      - DrinkCoconutRum
      - DrinkChocolateGlass
      - DrinkCognacGlass
+      - DrinkCosmopolitan
      - DrinkCubaLibreGlass
      - DrinkDeadRumGlass
      - DrinkDevilsKiss
@@ -66,15 +70,19 @@
      - DrinkMilkshake
      - DrinkMojito
      - DrinkNTCahors
+      - DrinkPainkillerGlass
      - DrinkPatronGlass
+      - DrinkPinaColadaGlass
      - DrinkPoscaGlass
      - DrinkRedMeadGlass
      - DrinkRewriter
+      - DrinkRoyRogersGlass
      - DrinkRootBeerFloatGlass
      - DrinkRumGlass
      - DrinkSakeGlass
      - DrinkSbitenGlass
      - DrinkScrewdriverCocktailGlass
+      - DrinkShirleyTempleGlass
      - DrinkSuiDreamGlass
      - DrinkSingulo
      - DrinkSoyLatte
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
@@ -31,6 +31,7 @@
      - DrinkDrGibbCan
      - DrinkEnergyDrinkCan
      - DrinkShamblersJuiceCan
+      - DrinkSolDryCan
      - DrinkPwrGameCan
      - DrinkHotCoco
      - DrinkHotCoffee
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -44,7 +44,6 @@
        - CrateMaterialPlastic
        - CrateMaterialWood
        - CrateMaterialPlasteel
-        - CrateFunSprayPaints
        - CrateFunArtSupplies
        - CrateEngineeringCableLV
        - CrateEngineeringCableMV
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -77,7 +77,7 @@
        - ClothingHeadHatCone
        - ClothingNeckBling
        - ClothingHeadHelmetCosmonaut
-        - ClothingHeadHelmetScaf
+        - ClothingHeadHelmetBasic
        - ClothingShoeSlippersDuck
        - ClothingUnderSocksBee
        - ClothingUnderSocksCoder
@@ -173,12 +173,7 @@
        - MaterialCloth10
        - MaterialWoodPlank10
        - ResearchDisk
-        - DeathPaint
        - Plunger
-        - SprayPaintBlue
-        - SprayPaintRed
-        - SprayPaintGreen
-        - SprayPaintOrange
        - TechnologyDisk
        - PowerCellMedium
        - PowerCellSmall
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -510,6 +510,18 @@
      - state: green
      - state: ertleader

+- type: entity
+  id: SpawnPointERTChaplain
+  parent: SpawnPointJobBase
+  name: ERTchaplain
+  components:
+  - type: SpawnPoint
+    job_id: ERTChaplain
+  - type: Sprite
+    layers:
+      - state: green
+      - state: chaplain
+
 - type: entity
  id: SpawnPointERTEngineer
  parent: SpawnPointJobBase
--- a/Resources/Prototypes/Entities/Markers/construction_ghost.yml
+++ b/Resources/Prototypes/Entities/Markers/construction_ghost.yml
@@ -7,4 +7,4 @@
    color: '#3F38'
  - type: ConstructionGhost
  - type: Clickable
-  - type: InteractionOutline
+  - type: InteractionOutline
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  parent: BaseMob
  id: BaseBorgChassis
  name: cyborg
@@ -83,6 +83,7 @@
    templateId: borg
  - type: Hands
    showInHands: false
+    disableExplosionRecursion: true
  - type: IntrinsicRadioReceiver
  - type: IntrinsicRadioTransmitter
    channels:
@@ -101,8 +102,6 @@
  - type: BorgChassis
  - type: WiresPanel
  - type: ActivatableUIRequiresPanel
-  - type: Wires
-    layoutId: Borg
  - type: NameIdentifier
    group: Silicon
  - type: ContainerContainer
@@ -131,6 +130,9 @@
  - type: Speech
    speechVerb: Robotic
    speechSounds: Pai
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSilicon
  - type: UnblockableSpeech
  - type: Construction
    graph: Cyborg
@@ -140,6 +142,7 @@
  - type: Lock
    locked: true
  - type: ActivatableUIRequiresLock
+  - type: LockedWiresPanel
  - type: Flashable
  - type: Damageable
    damageContainer: Silicon
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -70,7 +70,6 @@
      tags:
        - Carp
        - DoorBumpOpener
-        - NoPaint
    - type: ReplacementAccent
      accent: genericAggressive
    - type: Speech
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -93,6 +93,3 @@
    - RevenantTheme
  - type: Speech
    speechVerb: Ghost
-  - type: Tag
-    tags:
-      - NoPaint
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -104,7 +104,6 @@
    - type: Tag
      tags:
        - CannotSuicide
-        - NoPaint

 # From the uplink injector
 - type: entity
@@ -213,7 +212,6 @@
      tags:
        - CannotSuicide
        - FootstepSound
-        - NoPaint
    - type: Inventory
      templateId: holoclown
    - type: Hands
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -1,11 +1,13 @@
 - type: entity
  save: false
+  noSpawn: true
  name: Urist McHands
  parent: BaseMobHuman
  id: MobHuman

 #Syndie
 - type: entity
+  noSpawn: true
  parent: MobHuman
  id: MobHumanSyndicateAgentBase
  name: syndicate agent
@@ -20,6 +22,7 @@
      - Syndicate

 - type: entity
+  noSpawn: true
  parent: MobHumanSyndicateAgentBase
  id: MobHumanSyndicateAgent
  name: syndicate agent
@@ -31,6 +34,7 @@
      giveObjectives: false

 - type: entity
+  noSpawn: true
  parent: MobHumanSyndicateAgentBase
  id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
  suffix: Human, NukeOps
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`scoopable-component-popup = You scoop up {$scooped} into {THE($beaker)}.`