Merge branch 'master' into bow-and-quiver

2025-01-22 00:01:44 +03:00
parent 258cb7bd4e f298396fe4
commit ca1281fcb3
570 changed files with 420393 additions and 87210 deletions
--- a/Resources/Audio/Items/appraiser.ogg
+++ b/Resources/Audio/Items/appraiser.ogg
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -138,4 +138,9 @@
 - files: ["pen_click.ogg"]
  license: "CC0-1.0"
  copyright: "Created by dslrguide, converted to ogg and mono by Themias"
-  source: "https://freesound.org/people/dslrguide/sounds/321484"
+  source: "https://freesound.org/people/dslrguide/sounds/321484"
+
+- files: [ "appraiser.ogg" ]
+  license: "CC0-1.0"
+  copyright: "Original sound by vestibule-door on freesound.org, processed by DylanWhittingham"
+  source: "https://freesound.org/people/vestibule-door/sounds/668985/"
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -35,7 +35,7 @@

 - files: ["vessel_warning.ogg"]
  license: "CC-BY-4.0"
-  copyright: "Created by AUDACITIER (freesound), converted to MONO and .ogg and edited by EmoGarbage404 (github)."
+  copyright: "Created by AUDACITIER (freesound), converted to MONO and .ogg and edited by EmoGarbage404 (github). Removed click at beginning/end with fade in/out (Pancake)."
  source: "https://freesound.org/people/AUDACITIER/sounds/629196/"

 - files: ["quickbeep.ogg"]
--- a/Resources/Audio/Machines/vessel_warning.ogg
+++ b/Resources/Audio/Machines/vessel_warning.ogg
--- a/Resources/Audio/StationEvents/attributions.yml
+++ b/Resources/Audio/StationEvents/attributions.yml
@@ -8,11 +8,6 @@
  copyright: "Created by Donchan"
  source: "https://www.youtube.com/watch?v=4nUpeYLKUns"

- files: ["nukemass.ogg"]
-  license: "CC-BY-3.0"
-  copyright: "Created by mrjajkes"
-  source: "https://www.youtube.com/watch?v=gLSyt7AaqQM"
-
 - files: ["countdown.ogg"]
  license: "CC-BY-SA-3.0"
  copyright: "Created by qwertyquerty"
--- a/Resources/Audio/StationEvents/nukemass.ogg
+++ b/Resources/Audio/StationEvents/nukemass.ogg
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -664,5 +664,62 @@ Entries:
  id: 82
  time: '2024-12-24T02:25:04.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/34001
+- author: DylanWhittingham
+  changes:
+  - message: Players using the notekeeper PDA program is now logged.
+    type: Add
+  id: 83
+  time: '2025-01-02T16:16:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34118
+- author: c4llv07e
+  changes:
+  - message: adminwho doesn't leak stealthmins count now!
+    type: Fix
+  id: 84
+  time: '2025-01-08T15:23:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34122
+- author: Errant
+  changes:
+  - message: The Admin Menu and Admin Overlay now shows the specific role types of
+      players and antagonists, respectively. The old admin overlay can still be used
+      with cvar ui.admin_overlay_classic true
+    type: Tweak
+  id: 85
+  time: '2025-01-11T21:17:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33420
+- author: Myra
+  changes:
+  - message: Added IPIntel's API to the connection code. If enabled, this will automate
+      VPN/Proxy detection.
+    type: Add
+  id: 86
+  time: '2025-01-12T19:41:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33339
+- author: PJB3005
+  changes:
+  - message: Deadmin status is now synchronized to database, making it persistent
+      across server restarts and between multiple game servers.
+    type: Tweak
+  - message: Admins can now be suspended via the permissions panel. This effectively
+      removes their admin status without completely deleting their record.
+    type: Add
+  id: 87
+  time: '2025-01-14T23:46:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34048
+- author: Palladinium
+  changes:
+  - message: Added Discord relay notifications when a watchlisted player connects.
+    type: Add
+  id: 88
+  time: '2025-01-15T00:32:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33483
+- author: Myra
+  changes:
+  - message: Admins are by default now hidden from the reported player count on the
+      launcher.
+    type: Add
+  id: 89
+  time: '2025-01-15T21:10:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34406
 Name: Admin
 Order: 1
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,461 +1,4 @@
 Entries:
- author: EmoGarbage404
-  changes:
-  - message: Space Carp and Sharkminnows are a bit weaker overall.
-    type: Tweak
-  - message: The magnet now pulls in debris a bit closer.
-    type: Tweak
-  - message: Space debris now has slightly better loot.
-    type: Tweak
-  id: 7263
-  time: '2024-09-02T04:36:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31726
- author: Errant
-  changes:
-  - message: Replacement Crew Monitor Servers, as well as the Crew Monitor Server
-      on the dev map, now work properly.
-    type: Fix
-  id: 7264
-  time: '2024-09-02T04:37:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31677
- author: poeMota
-  changes:
-  - message: Now the time played on ERT roles and midround borgs will be saved to
-      the player's stats
-    type: Tweak
-  id: 7265
-  time: '2024-09-02T05:32:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31629
- author: themias
-  changes:
-  - message: The Donk Co. microwave can cook baguette swords and throwing croissants.
-    type: Tweak
-  - message: The Combat Bakery Kit now has a Donk Co. microwave board and costs 6
-      TC.
-    type: Tweak
-  id: 7266
-  time: '2024-09-02T13:49:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31239
- author: yuitop
-  changes:
-  - message: actions bar now resize dynamically
-    type: Tweak
-  id: 7267
-  time: '2024-09-02T19:12:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31759
- author: yuitop
-  changes:
-  - message: space ninja throwing star ability now spawns a throwing star
-    type: Fix
-  id: 7268
-  time: '2024-09-03T00:50:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31684
- author: Errant
-  changes:
-  - message: Vox sounds are now less unbearable.
-    type: Tweak
-  id: 7269
-  time: '2024-09-03T07:23:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31679
- author: Just_Art
-  changes:
-  - message: Added Classic Long 2 and Classic Long 3 hairstyles!
-    type: Add
-  id: 7270
-  time: '2024-09-03T08:29:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30963
- author: ScarKy0
-  changes:
-  - message: Plenty of old silicon laws can now be rolled as ion laws.
-    type: Add
-  id: 7271
-  time: '2024-09-03T09:45:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31664
- author: IProduceWidgets
-  changes:
-  - message: Escargot and snails! Hopefully you don't encounter that one snail...
-    type: Add
-  id: 7272
-  time: '2024-09-03T10:33:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30765
- author: Fildrance
-  changes:
-  - message: When research is unlocked in console the approver of the research is
-      named.
-    type: Add
-  - message: Borgs door access is getting logged now (and is accessible in Log Probe
-      Cartridge)
-    type: Add
-  - message: e-magged research and cargo consoles are not radio-ing any messages on
-      research/buy confimation (for anyone)
-    type: Add
-  id: 7273
-  time: '2024-09-03T13:01:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31170
- author: Lyroth001
-  changes:
-  - message: added a new artifact node for medical chems
-    type: Add
-  id: 7274
-  time: '2024-09-03T15:11:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30873
- author: DieselMohawk
-  changes:
-  - message: Added Red Neck Gaiter to Secdrobe
-    type: Add
-  id: 7275
-  time: '2024-09-03T15:16:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30106
- author: ScarKy0
-  changes:
-  - message: Fixed typos in antimov.
-    type: Fix
-  id: 7276
-  time: '2024-09-03T21:56:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31811
- author: ScarKy0
-  changes:
-  - message: Station AI's name now correctly displays in announcements.
-    type: Fix
-  id: 7277
-  time: '2024-09-03T22:05:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31802
- author: Ilya246
-  changes:
-  - message: Fixed many entities not taking structural damage, including girders,
-      firelocks, and machines.
-    type: Fix
-  id: 7278
-  time: '2024-09-04T13:37:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30790
- author: lzk228
-  changes:
-  - message: Reduced walk speed of some small mobs (mice, cockroaches, bees etc.)
-    type: Tweak
-  id: 7279
-  time: '2024-09-04T14:10:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31360
- author: qwerltaz
-  changes:
-  - message: Made tesla a lot brighter.
-    type: Tweak
-  id: 7280
-  time: '2024-09-04T14:47:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31357
- author: Allen
-  changes:
-  - message: Magboots and Science Magboots are no longer contraband. Advanced Magboots
-      and Blood-Red Magboots now have appropriate contraband types (Grand Theft and
-      Syndie Contraband respectively)
-    type: Fix
-  id: 7281
-  time: '2024-09-04T15:04:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30960
- author: Blackern5000
-  changes:
-  - message: Zombie outbreaks are now SIGNIFICANTLY rarer
-    type: Tweak
-  id: 7282
-  time: '2024-09-04T15:57:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30266
- author: yuitop
-  changes:
-  - message: Going into portals while pulling no more crashes the game
-    type: Fix
-  id: 7283
-  time: '2024-09-04T16:44:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31787
- author: Ilya246
-  changes:
-  - message: The syndicate stealth box will no longer make a loud sound upon being
-      opened.
-    type: Tweak
-  id: 7284
-  time: '2024-09-04T22:42:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30741
- author: chromiumboy
-  changes:
-  - message: The atmospheric alert computers are now functional! Use them to locate
-      active air and fire alarms on the station.
-    type: Add
-  id: 7285
-  time: '2024-09-05T01:13:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25938
- author: ScarKy0
-  changes:
-  - message: A lot more electronics can now be used by the AI.
-    type: Add
-  id: 7286
-  time: '2024-09-05T09:31:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31730
- author: Fildrance
-  changes:
-  - message: random uplink discounts for traitors
-    type: Add
-  id: 7287
-  time: '2024-09-05T12:12:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26297
- author: ScarKy0
-  changes:
-  - message: AI Actions now work.
-    type: Fix
-  id: 7288
-  time: '2024-09-05T12:49:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31823
- author: ScarKy0
-  changes:
-  - message: Station AI now has updated icons on the HUD.
-    type: Add
-  id: 7289
-  time: '2024-09-05T12:52:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31799
- author: drakewill-CRL
-  changes:
-  - message: Botanists can now learn basic chemistry with the Agrichem Is Fun! kit
-      in the Nutrimax vendor.
-    type: Add
-  id: 7290
-  time: '2024-09-05T16:43:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31738
- author: Nimfar11
-  changes:
-  - message: Added a board for the AI upload console.
-    type: Add
-  id: 7291
-  time: '2024-09-05T18:20:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31867
- author: PJB3005
-  changes:
-  - message: Changed the sprites for the N2 locker and "vox area" sign.
-    type: Tweak
-  id: 7292
-  time: '2024-09-06T05:26:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31845
- author: Ekkosangen
-  changes:
-  - message: Pizza crates and parties can now sometimes contain cotton pizza
-    type: Tweak
-  id: 7293
-  time: '2024-09-06T06:04:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31883
- author: TheShuEd, Jaraten
-  changes:
-  - message: New Tech anomaly added to the game! it can bind devices ports, activate
-      them, and when supercrit, it can even emag some devices.
-    type: Add
-  id: 7294
-  time: '2024-09-06T07:24:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31764
- author: EmoGarbage404
-  changes:
-  - message: Added mineral scanners! When held in your hand or pocket, these will
-      periodically show nearby ores. Unlock them through science today!
-    type: Add
-  id: 7295
-  time: '2024-09-06T14:05:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31390
- author: lzk228
-  changes:
-  - message: You can no longer insert any item in AI upload console.
-    type: Fix
-  id: 7296
-  time: '2024-09-06T19:07:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31900
- author: ps3moira
-  changes:
-  - message: Fixed pump shotgun inhand sprites
-    type: Fix
-  id: 7297
-  time: '2024-09-06T23:26:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31885
- author: yuitop
-  changes:
-  - message: break pull when fall asleep
-    type: Fix
-  id: 7298
-  time: '2024-09-06T23:30:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31893
- author: Boaz1111
-  changes:
-  - message: Energy Shotgun's narrow fire mode's projectiles now deal 13 heat dmg
-      each, for a total of 52. The energy shotgun additionally no longer self recharges
-      and has received some minor buffs.
-    type: Tweak
-  id: 7299
-  time: '2024-09-07T00:35:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31235
- author: themias
-  changes:
-  - message: Added the justice helm to the secdrobe
-    type: Add
-  - message: Added a crafting recipe for the justice helm
-    type: Add
-  id: 7300
-  time: '2024-09-07T03:04:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31905
- author: Futuristic
-  changes:
-  - message: Remove binary encryption key from RD lockers
-    type: Remove
-  id: 7301
-  time: '2024-09-07T05:30:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31909
- author: EmoGarbage404
-  changes:
-  - message: Firesuits are now worse at keeping in heat and winter clothes make you
-      get warmer quicker.
-    type: Tweak
-  id: 7302
-  time: '2024-09-07T05:37:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30662
- author: Boaz1111
-  changes:
-  - message: The maple wing marking for moths now have a secondary color palette.
-    type: Tweak
-  id: 7303
-  time: '2024-09-07T05:48:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31691
- author: lzk228
-  changes:
-  - message: Bottle and syringe names are remade into labels.
-    type: Tweak
-  id: 7304
-  time: '2024-09-07T05:51:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29956
- author: Ian321
-  changes:
-  - message: The AgriChem kit now links to the botanical chemicals guidebook.
-    type: Tweak
-  - message: The botanical chemicals guidebook has been expanded.
-    type: Tweak
-  id: 7305
-  time: '2024-09-07T06:23:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31896
- author: Lank
-  changes:
-  - message: The Antimov and Overseer law boards are no longer available roundstart.
-    type: Remove
-  id: 7306
-  time: '2024-09-07T08:45:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31908
- author: lzk228
-  changes:
-  - message: Books cannot longer be inserted in crates as paper labels
-    type: Fix
-  id: 7307
-  time: '2024-09-07T13:22:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31919
- author: qwerltaz
-  changes:
-  - message: Reduced wall closet range. It's now much easier to not close yourself
-      inside by accident.
-    type: Tweak
-  id: 7308
-  time: '2024-09-07T23:44:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31933
- author: Ilya246
-  changes:
-  - message: Reagents that make you flammable no longer extinguish you.
-    type: Fix
-  id: 7309
-  time: '2024-09-07T23:44:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31930
- author: LucasTheDrgn
-  changes:
-  - message: Restored functionality to the Industrial Reagent Grinder
-    type: Fix
-  id: 7310
-  time: '2024-09-07T23:47:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31903
- author: EmoGarbage404
-  changes:
-  - message: Added the biogenerator! Botany can use this machine to create various
-      materials, chemicals, and food items out of the
-    type: Add
-  id: 7311
-  time: '2024-09-08T05:34:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30694
- author: TheShuEd
-  changes:
-  - message: Returned Taco microwave recipes (people were sad)
-    type: Add
-  - message: added an alternative method of crafting some burgers, through the correct
-      assembly sequence of modular food.
-    type: Add
-  - message: severely cut back on the number of items you can put on burgers, tacos,
-      or kebabs. This had poor design, and things need to be separately resprited
-      by adding them on modular food.
-    type: Tweak
-  id: 7312
-  time: '2024-09-08T06:22:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31012
- author: metalgearsloth
-  changes:
-  - message: Fix the FTL bubbles sometimes persisting.
-    type: Fix
-  - message: Fix AI eye being able to FTL.
-    type: Fix
-  - message: Fix the AI eye being able to be FTL smashed.
-    type: Fix
-  id: 7313
-  time: '2024-09-08T08:12:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31952
- author: PopGamer46
-  changes:
-  - message: Fixed being able to craft the justice helmet with a justice helmet
-    type: Fix
-  id: 7314
-  time: '2024-09-08T10:21:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31957
- author: Killerqu00
-  changes:
-  - message: Seclite is now restricted to security.
-    type: Tweak
-  - message: Handcuffs are now restricted to security and command.
-    type: Tweak
-  - message: Trench whistle is now minor contraband.
-    type: Tweak
-  id: 7315
-  time: '2024-09-08T12:06:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31956
- author: Psychpsyo
-  changes:
-  - message: The random sentience event should now actually happen again.
-    type: Fix
-  id: 7316
-  time: '2024-09-08T12:10:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31953
- author: Beck Thompson
-  changes:
-  - message: Gold and silver rings now give a small amount of materials when scrapped.
-    type: Tweak
-  id: 7317
-  time: '2024-09-08T16:10:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31847
- author: K-Dynamic
-  changes:
-  - message: added missing missing resistance values for directional plasma and uranium
-      windows
-    type: Fix
-  id: 7318
-  time: '2024-09-08T18:08:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31975
- author: qwerltaz
-  changes:
-  - message: Power cables on the ground are now offset and do not obscure each other
-      or pipes beneath.
-    type: Tweak
-  id: 7319
-  time: '2024-09-09T10:00:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32000
- author: ArtisticRoomba
-  changes:
-  - message: Budget insulated gloves now leave behind yellow frayed insulative fibers
-      instead of yellow insulative fibers. Detectives, rejoice!
-    type: Tweak
-  id: 7320
-  time: '2024-09-09T10:30:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31886
 - author: slarticodefast
  changes:
  - message: Revenants or other mobs without hands can no longer spill jugs.
@@ -3938,3 +3481,444 @@
  id: 7762
  time: '2024-12-29T03:25:40.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/34106
+- author: DreamlyJack
+  changes:
+  - message: Added Hair Pulato
+    type: Add
+  id: 7763
+  time: '2024-12-31T10:29:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34117
+- author: chromiumboy
+  changes:
+  - message: Chat messages from holopads during emergency broadcasts will no longer
+      be logged in the chat window to prevent message spam. This is a temporary change
+      until a proper fix can be made to the chat system
+    type: Tweak
+  id: 7764
+  time: '2024-12-31T10:52:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34114
+- author: PopGamer46
+  changes:
+  - message: Fixed borgs not being able to check their laws in crit
+    type: Fix
+  id: 7765
+  time: '2024-12-31T11:10:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34133
+- author: amatwiedle
+  changes:
+  - message: The A/V Communication technology now unlocks holopad circuit boards.
+    type: Add
+  id: 7766
+  time: '2024-12-31T13:20:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34150
+- author: justdie12
+  changes:
+  - message: Flipped signal disposal routers sprite
+    type: Fix
+  id: 7767
+  time: '2024-12-31T13:25:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34139
+- author: ArtisticRoomba
+  changes:
+  - message: Shotgun crate now comes with 4 lethal shell boxes.
+    type: Tweak
+  - message: Enforcer gun safe now comes with 4 lethal shell boxes.
+    type: Tweak
+  - message: Kammerer gun safe now comes with 2 lethal shell boxes.
+    type: Tweak
+  id: 7768
+  time: '2024-12-31T23:08:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34156
+- author: Booblesnoot42
+  changes:
+  - message: Tarantulas spawned in vents will now be hostile to the crew.
+    type: Fix
+  id: 7769
+  time: '2025-01-01T16:18:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34153
+- author: Booblesnoot42
+  changes:
+  - message: The RCD no longer has a cooldown when opened or closed.
+    type: Fix
+  id: 7770
+  time: '2025-01-01T16:19:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34149
+- author: lzk228
+  changes:
+  - message: Decreased HP for rusted wall variants
+    type: Tweak
+  id: 7771
+  time: '2025-01-01T16:23:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34043
+- author: ReeZii
+  changes:
+  - message: Fixed thief beacon, which can doubled steal target's
+    type: Fix
+  id: 7772
+  time: '2025-01-01T16:25:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33750
+- author: Errant
+  changes:
+  - message: Removed seasonal nuke song "Nukemass".
+    type: Remove
+  id: 7773
+  time: '2025-01-01T16:27:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34066
+- author: Alpaccalypse
+  changes:
+  - message: '"Irish Car Bomb" renamed to "Irish Slammer".'
+    type: Tweak
+  id: 7774
+  time: '2025-01-02T09:46:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34107
+- author: DylanWhittingham
+  changes:
+  - message: Added appraisal tool sound.
+    type: Add
+  id: 7775
+  time: '2025-01-02T16:46:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34119
+- author: ps3moira
+  changes:
+  - message: Changed tables and counter iconsmoothing
+    type: Tweak
+  id: 7776
+  time: '2025-01-02T16:49:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32673
+- author: SlamBamActionman
+  changes:
+  - message: Added Chameleon PDA, found in the Thief & Uplink Chameleon Kit!
+    type: Add
+  - message: The PDA "owner" field now updates upon having a new ID inserted.
+    type: Tweak
+  id: 7777
+  time: '2025-01-02T18:23:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30514
+- author: FairlySadPanda
+  changes:
+  - message: Added a few new actions that a scrambled borg can encounter via an ion
+      storm.
+    type: Add
+  id: 7778
+  time: '2025-01-02T18:55:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34180
+- author: Deerstop
+  changes:
+  - message: Map rotation now includes Elkridge Depot
+    type: Tweak
+  id: 7779
+  time: '2025-01-04T00:40:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34206
+- author: themias
+  changes:
+  - message: Forensics are now applied to bullets when loading using an ammo box.
+    type: Fix
+  id: 7780
+  time: '2025-01-04T13:41:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32280
+- author: deltanedas
+  changes:
+  - message: Fixed wielding use delay not working properly.
+    type: Fix
+  - message: Fixed bow sprite not updating when wielded.
+    type: Fix
+  id: 7781
+  time: '2025-01-05T19:06:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32188
+- author: Errant
+  changes:
+  - message: Lobby chat width is no longer dependent on the server's name.
+    type: Tweak
+  - message: Lobby title of a server can now be different from the Hub listing's name.
+    type: Tweak
+  id: 7782
+  time: '2025-01-05T20:56:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33783
+- author: SpaceRox1244
+  changes:
+  - message: Station lights can now be destroyed by bullets.
+    type: Add
+  id: 7783
+  time: '2025-01-05T22:11:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34070
+- author: ArtisticRoomba
+  changes:
+  - message: You can no longer get stuck when trying to walk between a station anchor
+      and a wall.
+    type: Fix
+  id: 7784
+  time: '2025-01-06T12:32:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34217
+- author: ArtisticRoomba
+  changes:
+  - message: Kessler Syndrome and Zombeteors are removed from the possible gamemodes
+      in the Secret pool.
+    type: Remove
+  id: 7785
+  time: '2025-01-07T00:18:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34051
+- author: Alpaccalypse
+  changes:
+  - message: Special reagents are now listed in the relevant section of the guidebook.
+    type: Add
+  id: 7786
+  time: '2025-01-07T17:45:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34265
+- author: Tayrtahn
+  changes:
+  - message: Sentient goats now have a bleating effect when speaking.
+    type: Add
+  id: 7787
+  time: '2025-01-08T01:00:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34273
+- author: southbridge-fur
+  changes:
+  - message: Warm light bulbs exist now.
+    type: Add
+  id: 7788
+  time: '2025-01-09T08:54:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34324
+- author: deltanedas
+  changes:
+  - message: Fixed AIs not being able to use lockable buttons.
+    type: Fix
+  id: 7789
+  time: '2025-01-09T11:23:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34326
+- author: Alpaccalypse
+  changes:
+  - message: The reagent "cola" has been renamed to "Space Cola".
+    type: Tweak
+  - message: The reagent "lemon-lime" has been renamed to "Smite Soda".
+    type: Tweak
+  - message: The reagent "lemon-lime-cranberry" has been renamed to "Smite Cranberry".
+    type: Tweak
+  - message: The reagent "Space Mountain Wind" has been renamed to "Space Solar Wind".
+    type: Tweak
+  - message: The reagent "Energy Drink" has been renamed to "Red Bool".
+    type: Tweak
+  id: 7790
+  time: '2025-01-09T20:24:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34178
+- author: Errant
+  changes:
+  - message: Battery-powered weapons will no longer occasionally refuse to recharge
+      the last missing shot.
+    type: Fix
+  id: 7791
+  time: '2025-01-10T06:54:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34028
+- author: Southbridge
+  changes:
+  - message: Air Alarms can now copy sensor thresholds to all attached sensors.
+    type: Add
+  id: 7792
+  time: '2025-01-10T06:55:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34346
+- author: Coolsurf6
+  changes:
+  - message: Made Forensic Gloves security contraband.
+    type: Tweak
+  id: 7793
+  time: '2025-01-10T15:01:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34193
+- author: TeenSarlacc
+  changes:
+  - message: Large instruments can now be ordered through cargo.
+    type: Add
+  id: 7794
+  time: '2025-01-10T15:13:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34240
+- author: themias
+  changes:
+  - message: Fixed crayons losing durability attempting to write on stamped paper
+    type: Fix
+  id: 7795
+  time: '2025-01-10T15:37:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34202
+- author: Tayrtahn
+  changes:
+  - message: Arcades, vending machines and the recycler now sometimes say creepy things
+      when a ghost uses the "Boo!" action near them.
+    type: Add
+  id: 7796
+  time: '2025-01-11T02:48:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34368
+- author: Kickguy223
+  changes:
+  - message: Indestructible tiles no longer break due to explosions
+    type: Fix
+  id: 7797
+  time: '2025-01-11T17:27:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34339
+- author: '0x6273'
+  changes:
+  - message: Fix a bug that was causing arachnid stomachs to not digest at the intended,
+      slower than normal speed.
+    type: Fix
+  id: 7798
+  time: '2025-01-11T19:29:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34298
+- author: justdie12
+  changes:
+  - message: Added a bend version of the radiator.
+    type: Add
+  id: 7799
+  time: '2025-01-11T20:03:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34251
+- author: Errant
+  changes:
+  - message: Players are now informed in chat every time their role type changes,
+      and can also see their current role type on the character window.
+    type: Add
+  id: 7800
+  time: '2025-01-11T21:17:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33420
+- author: Kontinentaldrift
+  changes:
+  - message: EOD locker always spawns with tools.
+    type: Tweak
+  id: 7801
+  time: '2025-01-12T16:38:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34394
+- author: SlimSlam
+  changes:
+  - message: News Room
+    type: Add
+  id: 7802
+  time: '2025-01-12T23:32:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34408
+- author: Deerstop
+  changes:
+  - message: Improved the readability of the manual valve sprite.
+    type: Tweak
+  id: 7803
+  time: '2025-01-13T07:07:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34378
+- author: JustinWinningham
+  changes:
+  - message: Anomalies no longer block players or APES (or other objects) from passing
+      through them
+    type: Tweak
+  - message: Players can no longer move anomalies with unanchored furniture, closets,
+      etc.
+    type: Fix
+  id: 7804
+  time: '2025-01-13T10:06:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34280
+- author: zHonys
+  changes:
+  - message: Items with collisions (like mousetraps) won't kept doors form opening
+    type: Fix
+  id: 7805
+  time: '2025-01-13T10:07:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34045
+- author: Coolsurf6
+  changes:
+  - message: The "Jazz" style for the Electric Guitar now uses the correct soundfont.
+    type: Tweak
+  id: 7806
+  time: '2025-01-13T10:07:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33363
+- author: southbridge-fur
+  changes:
+  - message: The Pride-O-Mat vending machine has been ported to upstream.
+    type: Add
+  id: 7807
+  time: '2025-01-13T18:49:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34412
+- author: Killerqu00
+  changes:
+  - message: Pet carriers can now be crafted.
+    type: Add
+  id: 7808
+  time: '2025-01-14T22:34:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34431
+- author: themias
+  changes:
+  - message: Fixed muzzles not working on some characters (e.g. dwarves)
+    type: Fix
+  id: 7809
+  time: '2025-01-15T00:10:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34419
+- author: ArtisticRoomba
+  changes:
+  - message: The station anchor machine board can no longer be printed at the circuit
+      imprinter.
+    type: Remove
+  id: 7810
+  time: '2025-01-15T16:26:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34358
+- author: ArtisticRoomba
+  changes:
+  - message: Mime PDA item interactions (insertions/ejections of IDs, pens, etc.)
+      are now silent.
+    type: Tweak
+  id: 7811
+  time: '2025-01-15T18:03:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34426
+- author: Alpaccalypse
+  changes:
+  - message: Smite soda vending machines have been added to the game.
+    type: Add
+  id: 7812
+  time: '2025-01-15T18:20:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34420
+- author: kosticia
+  changes:
+  - message: Bedsheets now can be printed on uniform printer
+    type: Add
+  id: 7813
+  time: '2025-01-15T19:35:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34034
+- author: TheShuEd
+  changes:
+  - message: Christmas anomaly removed
+    type: Remove
+  id: 7814
+  time: '2025-01-15T20:22:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34053
+- author: Kickguy223
+  changes:
+  - message: Puddles will now correctly evaporate
+    type: Fix
+  id: 7815
+  time: '2025-01-15T21:21:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34303
+- author: themias
+  changes:
+  - message: The DNA scrambler implant no longer updates your ID card or station record
+    type: Fix
+  id: 7816
+  time: '2025-01-15T22:49:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34091
+- author: jbox144
+  changes:
+  - message: Added Plasma Station
+    type: Add
+  id: 7817
+  time: '2025-01-16T07:02:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33991
+- author: jbox144
+  changes:
+  - message: Reduced Plasma's minimum population to 20, maximum population to 60
+    type: Tweak
+  - message: Reduced Plasma's clown jobs from 2 to 1
+    type: Tweak
+  id: 7818
+  time: '2025-01-16T08:51:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34462
+- author: pcaessayrs
+  changes:
+  - message: Uranium, Cak, and BreadDog are no longer space garbage.
+    type: Fix
+  id: 7819
+  time: '2025-01-16T11:40:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34192
+- author: GansuLalan
+  changes:
+  - message: Pianos will no longer push players off when climbing them
+    type: Fix
+  id: 7820
+  time: '2025-01-16T12:25:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33690
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -6,11 +6,16 @@ desc             = "Official English Space Station 14 servers. Vanilla, roleplay
 lobbyenabled     = true
 soft_max_players = 80
 panic_bunker.enabled = true
+panic_bunker.min_overall_minutes = 120
 panic_bunker.disable_with_admins = true
 panic_bunker.enable_without_admins = true
 panic_bunker.show_reason = true
 panic_bunker.custom_reason = "You have not played on a Wizard's Den server long enough to connect to this server. Please play on Wizard's Den Lizard until you have more playtime."

+# IPIntel stuff
+ipintel_enabled = true
+ipintel_contact_email = "telecommunications@spacestation14.com"
+
 [infolinks]
 bug_report = "https://github.com/space-wizards/space-station-14/issues/new/choose"
 discord    = "https://discord.spacestation14.io"
@@ -43,6 +48,6 @@ alert.min_players_sharing_connection = 2
 max_explosion_range = 5

 [status]
-privacy_policy_link = "https://account.spacestation14.com/Home/Privacy"
+privacy_policy_link = "https://spacestation14.com/about/privacy/#game-server-privacy-policy"
 privacy_policy_identifier = "wizden"
-privacy_policy_version = "2024-12-22"
+privacy_policy_version = "2025-01-19"
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
@@ -11,12 +11,6 @@ panic_bunker.enabled = false
 panic_bunker.disable_with_admins = false
 panic_bunker.enable_without_admins = false
 panic_bunker.custom_reason = ""
-baby_jail.enabled = true
-baby_jail.show_reason = true
-baby_jail.max_account_age = 5256000 # 10 years. Disabling this check specifically isn't currently supported
-baby_jail.max_overall_minutes = 3000 # 50 hours
-baby_jail.custom_reason = "Sorry! Only new and whitelisted players can join this server. Apply to be whitelisted in our Discord server (discord.ss14.io) or try joining another server instead!"
-baby_jail.whitelisted_can_bypass = true

 [hub]
 tags = "lang:en,region:am_n_e,rp:low"
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
--- a/Resources/Locale/en-US/_CP14/mind/role-types.ftl
+++ b/Resources/Locale/en-US/_CP14/mind/role-types.ftl
@@ -0,0 +1 @@
+cp14-role-type-demiplane-antag-name = Demiplane antagonist
--- a/Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl
+++ b/Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl
@@ -1,13 +0,0 @@
-# PLATE
-
-cp14-food-sequence-plate-gen = {$content} dish
-
-cp14-food-sequence-plate-cucumber = cucumber 
-cp14-food-sequence-plate-pumpkin = pumpkin
-cp14-food-sequence-plate-cabbage = cabbage
-cp14-food-sequence-plate-tomatoes = tomatoes
-cp14-food-sequence-plate-cheese = cheese
-cp14-food-sequence-plate-shroom = shrooms
-cp14-food-sequence-plate-grass = herbs
-cp14-food-sequence-plate-slime = slime
-cp14-food-sequence-plate-roots = root
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -146,6 +146,7 @@ marking-HumanHairSidetail3 = Ponytail (Side) 3
 marking-HumanHairSidetail4 = Ponytail (Side) 4
 marking-HumanHairSpikyponytail = Ponytail (Spiky)
 marking-HumanHairPoofy = Poofy
+marking-HumanHairPulato = Pulato
 marking-HumanHairQuiff = Quiff
 marking-HumanHairRonin = Ronin
 marking-HumanHairShaped = Shaped
--- a/Resources/Locale/en-US/administration/admin-alerts.ftl
+++ b/Resources/Locale/en-US/administration/admin-alerts.ftl
@@ -1 +1,3 @@
 admin-alert-shared-connection = {$player} is sharing a connection with {$otherCount} connected player(s): {$otherList}
+admin-alert-ipintel-blocked = {$player} was rejected from joining due to their IP having a {TOSTRING($percent, "P0")} confidence of being a VPN/Datacenter.
+admin-alert-ipintel-warning = {$player} IP has a {TOSTRING($percent, "P0")} confidence of being a VPN/Datacenter. Please watch them.
--- a/Resources/Locale/en-US/administration/antag.ftl
+++ b/Resources/Locale/en-US/administration/antag.ftl
@@ -14,3 +14,5 @@ admin-verb-text-make-nuclear-operative = Make Nuclear Operative
 admin-verb-text-make-pirate = Make Pirate
 admin-verb-text-make-head-rev = Make Head Rev
 admin-verb-text-make-thief = Make Thief
+
+admin-overlay-antag-classic = ANTAG
--- a/Resources/Locale/en-US/administration/commands/babyjail.ftl
+++ b/Resources/Locale/en-US/administration/commands/babyjail.ftl
@@ -1,19 +0,0 @@
-cmd-babyjail-desc = Toggles the baby jail, which enables stricter restrictions on who's allowed to join the server.
-cmd-babyjail-help = Usage: babyjail
-babyjail-command-enabled = Baby jail has been enabled.
-babyjail-command-disabled = Baby jail has been disabled.
-
-cmd-babyjail_show_reason-desc = Toggles whether or not to show connecting clients the reason why the baby jail blocked them from joining.
-cmd-babyjail_show_reason-help = Usage: babyjail_show_reason
-babyjail-command-show-reason-enabled = The baby jail will now show a reason to users it blocks from connecting.
-babyjail-command-show-reason-disabled = The baby jail will no longer show a reason to users it blocks from connecting.
-
-cmd-babyjail_max_account_age-desc = Gets or sets the maximum account age in minutes that an account can have to be allowed to connect with the baby jail enabled.
-cmd-babyjail_max_account_age-help = Usage: babyjail_max_account_age <minutes>
-babyjail-command-max-account-age-is = The maximum account age for the baby jail is {$minutes} minutes.
-babyjail-command-max-account-age-set = Set the maximum account age for the baby jail to {$minutes} minutes.
-
-cmd-babyjail_max_overall_minutes-desc = Gets or sets the maximum overall playtime in minutes that an account can have to be allowed to connect with the baby jail enabled.
-cmd-babyjail_max_overall_minutes-help = Usage: babyjail_max_overall_minutes <minutes>
-babyjail-command-max-overall-minutes-is = The maximum overall playtime for the baby jail is {$minutes} minutes.
-babyjail-command-max-overall-minutes-set = Set the maximum overall playtime for the baby jail to {$minutes} minutes.
--- a/Resources/Locale/en-US/administration/ui/permissions-eui.ftl
+++ b/Resources/Locale/en-US/administration/ui/permissions-eui.ftl
@@ -14,6 +14,7 @@ permissions-eui-edit-admin-window-title-edit-placeholder = Custom title, leave b
 permissions-eui-edit-admin-window-no-rank-button = No rank
 permissions-eui-edit-admin-rank-window-name-edit-placeholder = Rank name
 permissions-eui-edit-admin-title-control-text = none
+permissions-eui-edit-admin-window-suspended = Suspended?
 permissions-eui-edit-no-rank-text = none
 permissions-eui-edit-title-button = Edit
 permissions-eui-edit-admin-rank-button = Edit
--- a/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
@@ -3,6 +3,7 @@ player-tab-username = Username
 player-tab-character = Character
 player-tab-job = Job
 player-tab-antagonist = Antagonist
+player-tab-roletype = Role Type
 player-tab-playtime = Playtime
 player-tab-show-disconnected = Show Disconnected
 player-tab-overlay = Overlay
--- a/Resources/Locale/en-US/advertisements/vending/gibb.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/gibb.ftl
@@ -0,0 +1,12 @@
+advertisement-gibb-1 = Delicious!
+advertisement-gibb-2 = Recommended by at least one doctor!
+advertisement-gibb-3 = Over 1 million drinks sold!
+advertisement-gibb-4 = Dr. Gibb, what's the worst that could happen?
+advertisement-gibb-5 = Dr. Gibb, the flavor explosion!
+advertisement-gibb-6 = Trust me, I'm a doctor!
+advertisement-gibb-7 = The best sugar infusion in the galaxy!
+advertisement-gibb-8 = Space Cola can get Gibbed!
+thankyou-gibb-1 = The Dr. is in... your belly!
+thankyou-gibb-2 = Prognosis: flavor!
+thankyou-gibb-3 = Enjoy the 42 flavors!
+thankyou-gibb-4 = Enjoy the syrupy goodness!
--- a/Resources/Locale/en-US/advertisements/vending/pride.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/pride.ftl
@@ -0,0 +1,7 @@
+advertisement-pride-1 = Be gay do crime!
+advertisement-pride-2 = Full of colors!
+advertisement-pride-3 = You are valid!
+advertisement-pride-4 = The first pride was a riot!
+thankyou-pride-1 = Slay!
+thankyou-pride-2 = Knock 'em dead!
+thankyou-pride-3 = What a glow up!
--- a/Resources/Locale/en-US/advertisements/vending/smite.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/smite.ftl
@@ -0,0 +1,12 @@
+advertisement-smite-1 = SMITE! Ban your thirst!
+advertisement-smite-2 = An eldritch blast of lemon and lime!
+advertisement-smite-3 = Over 1 million drinks sold!
+advertisement-smite-4 = SMITE! Roll 2d8 for FLAVOR.
+advertisement-smite-5 = SMITE! Let's get that paperwork done!
+advertisement-smite-6 = The janitor has it in for you!
+advertisement-smite-7 = SMITE! It won't get you hammered.
+advertisement-smite-8 = It's lemon-lime time!
+thankyou-smite-1 = Smite makes right!
+thankyou-smite-2 = You DEFINITELY wanted lemon-lime!
+thankyou-smite-3 = The office won't know what hit them.
+thankyou-smite-4 = Banish your thirst.
--- a/Resources/Locale/en-US/atmos/air-alarm-ui.ftl
+++ b/Resources/Locale/en-US/atmos/air-alarm-ui.ftl
@@ -69,3 +69,5 @@ air-alarm-ui-thresholds-upper-bound = Danger above
 air-alarm-ui-thresholds-lower-bound = Danger below
 air-alarm-ui-thresholds-upper-warning-bound = Warning above
 air-alarm-ui-thresholds-lower-warning-bound = Warning below
+air-alarm-ui-thresholds-copy = Copy thresholds to all devices
+air-alarm-ui-thresholds-copy-tooltip = Copies the sensor thresholds of this device to all devices in this air alarm tab.
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -118,6 +118,11 @@ chat-speech-verb-canine-1 = barks
 chat-speech-verb-canine-2 = woofs
 chat-speech-verb-canine-3 = howls

+chat-speech-verb-name-goat = Goat
+chat-speech-verb-goat-1 = bleats
+chat-speech-verb-goat-2 = grunts
+chat-speech-verb-goat-3 = cries
+
 chat-speech-verb-name-small-mob = Mouse
 chat-speech-verb-small-mob-1 = squeaks
 chat-speech-verb-small-mob-2 = pieps
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -35,7 +35,6 @@ whitelist-manual = You are not whitelisted on this server.
 whitelist-blacklisted = You are blacklisted from this server.
 whitelist-always-deny = You are not allowed to join this server.
 whitelist-fail-prefix = Not whitelisted: {$msg}
-whitelist-misconfigured = The server is misconfigured and is not accepting players. Please contact the server owner and try again later.

 cmd-blacklistadd-desc = Adds the player with the given username to the server blacklist.
 cmd-blacklistadd-help = Usage: blacklistadd <username>
@@ -55,3 +54,9 @@ baby-jail-account-denied = This server is a newbie server, intended for new play
 baby-jail-account-denied-reason = This server is a newbie server, intended for new players and those who want to help them. New connections by accounts that are too old or are not on a whitelist are not accepted. Check out some other servers and see everything Space Station 14 has to offer. Have fun! Reason: "{$reason}"
 baby-jail-account-reason-account = Your Space Station 14 account is too old. It must be younger than {$minutes} minutes
 baby-jail-account-reason-overall = Your overall playtime on the server must be younger than {$minutes} $minutes
+
+generic-misconfigured = The server is misconfigured and is not accepting players. Please contact the server owner and try again later.
+
+ipintel-server-ratelimited = This server uses a security system with external verification, which has reached its maximum verification limit. Please contact the administration team of the server for assistance and try again later.
+ipintel-unknown = This server uses a security system with external verification, but it encountered an error. Please contact the administration team of the server for assistance and try again later.
+ipintel-suspicious = You seem to be connecting through a datacenter or VPN. For administrative reasons we do not allow VPN connections to play. Please contact the administration team of the server for assistance if you believe this is false.
--- a/Resources/Locale/en-US/discord/watchlist-connections.ftl
+++ b/Resources/Locale/en-US/discord/watchlist-connections.ftl
@@ -0,0 +1,14 @@
+discord-watchlist-connection-header =
+    { $players ->
+        [one] {$players} player on a watchlist has
+        *[other] {$players} players on a watchlist have
+    } connected to {$serverName}
+
+discord-watchlist-connection-entry = - {$playerName} with message "{$message}"{ $expiry ->
+        [0] {""}
+        *[other] {" "}(expires <t:{$expiry}:R>)
+    }{ $otherWatchlists ->
+        [0] {""}
+        [one] {" "}and {$otherWatchlists} other watchlist
+        *[other] {" "}and {$otherWatchlists} other watchlists
+    }
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -259,7 +259,7 @@ flavor-complex-xeno-basher = like killing bugs
 flavor-complex-budget-insuls-drink = like door hacking
 flavor-complex-watermelon-wakeup = like a sweet wakeup call
 flavor-complex-rubberneck = like synthetics
-flavor-complex-irish-car-bomb = like a spiked cola float
+flavor-complex-irish-slammer = like a spiked cola float
 flavor-complex-themartinez = like violets and lemon vodka
 flavor-complex-cogchamp = like brass
 flavor-complex-white-gilgamesh = like lightly carbonated cream
--- a/Resources/Locale/en-US/ghost/components/ghost-component.ftl
+++ b/Resources/Locale/en-US/ghost/components/ghost-component.ftl
@@ -1,3 +1,5 @@
 ghost-component-on-examine-death-time-info-minutes = {$minutes} minutes ago
 ghost-component-on-examine-death-time-info-seconds = {$seconds} seconds ago
-ghost-component-on-examine-message = Died [color=yellow]{$timeOfDeath}[/color].
+ghost-component-on-examine-message = Died [color=yellow]{$timeOfDeath}[/color].
+
+ghost-component-boo-action-failed = Despite your best efforts, nothing spooky happens.
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -44,7 +44,7 @@ ghost-role-information-snailspeed-description = A little snail with snailborn th
 ghost-role-information-snoth-name = Snoth
 ghost-role-information-snoth-description = A little snoth who doesn't mind a bit of space. Just stay on grid!

-ghost-role-information-giant-spider-name = Giant spider
+ghost-role-information-giant-spider-name = Giant Spider
 ghost-role-information-giant-spider-description = This station's inhabitants look mighty tasty, and your sticky web is perfect to catch them!
 ghost-role-information-giant-spider-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other giant spiders.

@@ -53,7 +53,7 @@ ghost-role-information-cognizine-description = Made conscious with the magic of
 ghost-role-information-hamster-name = Hamster
 ghost-role-information-hamster-description = A grumpy little ball of fluff.

-ghost-role-information-hamlet-name = Hamlet the hamster.
+ghost-role-information-hamlet-name = Hamlet the Hamster
 ghost-role-information-hamlet-description = Lives in the station bridge, has a bit of a temper and is always hungry.

 ghost-role-information-slimes-name = Slime
@@ -64,7 +64,7 @@ ghost-role-information-angry-slimes-description = Everyone around you irritates
 ghost-role-information-angry-slimes-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other angry slimes.

 ghost-role-information-smile-name = Smile the Slime
-ghost-role-information-smile-description = The sweetest creature in the world. Smile Slime!
+ghost-role-information-smile-description = The sweetest creature in the world. Smile slime!

 ghost-role-information-punpun-name = Pun Pun
 ghost-role-information-punpun-description = An honorable member of the monkey society in charge of the bar and helping the bartenders in any way he can.
@@ -92,14 +92,14 @@ ghost-role-information-rat-king-description = You are the Rat King, your interes
 ghost-role-information-rat-servant-name = Rat Servant
 ghost-role-information-rat-servant-description = You are a Rat Servant. You must follow your king's orders.

-ghost-role-information-salvage-carp-name = Space carp on salvage wreck
+ghost-role-information-salvage-carp-name = Space Carp on Salvage Wreck
 ghost-role-information-salvage-carp-description = Defend the loot inside the salvage wreck!

 ghost-role-information-sentient-carp-name = Sentient Carp
 ghost-role-information-sentient-carp-description = Help the dragon flood the station with carps!

-ghost-role-information-willow-name = Willow the kangaroo
-ghost-role-information-willow-description = You're a kangaroo named willow! Willow likes to box.
+ghost-role-information-willow-name = Willow the Kangaroo
+ghost-role-information-willow-description = You're a kangaroo named Willow! Willow likes to box.

 ghost-role-information-honkbot-name = Honkbot
 ghost-role-information-honkbot-description = An artificial being of pure evil.
@@ -113,7 +113,7 @@ ghost-role-information-mimebot-description = A Mimebot, act like a mime but don'
 ghost-role-information-supplybot-name = SupplyBot
 ghost-role-information-supplybot-description = Deliver goods around the station.

-ghost-role-information-space-bear-name = Space bear
+ghost-role-information-space-bear-name = Space Bear
 ghost-role-information-space-bear-description = Your tummy rumbles, and these people look really yummy... What a feast!

 # Still exists as a commented out reference for Tropico. Keeping it around. -TsjipTsjip, 2024-06-20
@@ -132,7 +132,7 @@ ghost-role-information-holoclown-description = Listen to your owner. Utilize you
 ghost-role-information-ifrit-name = Ifrit
 ghost-role-information-ifrit-description = Listen to your owner. Don't tank damage. Punch people hard.

-ghost-role-information-space-dragon-name = Space dragon
+ghost-role-information-space-dragon-name = Space Dragon
 ghost-role-information-space-dragon-description = Call in 3 carp rifts and take over this quadrant! You have only 5 minutes in between each rift before you will disappear.
 ghost-role-information-space-dragon-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all your summoned carp.
 ghost-role-information-space-dragon-summoned-carp-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with your dragon and its allies.
@@ -152,7 +152,7 @@ ghost-role-information-skeleton-biker-description = Ride around on your sweet ri
 ghost-role-information-closet-skeleton-name = Closet Skeleton
 ghost-role-information-closet-skeleton-description = You are arguably one of the oldest members of the station! Get your old job back, or cause chaos! The world is yours to shape.

-ghost-role-information-remilia-name = Remilia, the chaplain's familiar
+ghost-role-information-remilia-name = Remilia, the Chaplain's Familiar
 ghost-role-information-remilia-description = Follow and obey the chaplain. Eat fruit. Screech loudly into people's ears and write it off as echolocation.

 ghost-role-information-cerberus-name = Cerberus, Evil Familiar
@@ -179,7 +179,7 @@ ghost-role-information-ert-medical-description = Assist with medical efforts to
 ghost-role-information-cburn-agent-name = CBURN Agent
 ghost-role-information-cburn-agent-description = A highly trained CentComm agent, capable of dealing with various threats.

-ghost-role-information-centcom-official-name = CentComm official
+ghost-role-information-centcom-official-name = CentComm Official
 ghost-role-information-centcom-official-description = Perform CentComm related duties such as inspect the station, jotting down performance reviews for heads of staff, and managing the fax machine.

 ghost-role-information-nukeop-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other nuclear operatives. Covert syndicate agents are not guaranteed to help you.
@@ -296,7 +296,7 @@ ghost-role-information-syndie-soldier-teamlead-description = You are the fire te
 ghost-role-information-blackmarketeer-name = Black Market Trader
 ghost-role-information-blackmarketeer-description = Make trades or take odd jobs to collect the most interesting items by the end of the shift.

-ghost-role-information-cossack-name = Ancient traveler
+ghost-role-information-cossack-name = Ancient Traveler
 ghost-role-information-cossack-description = From a history lost to time, you find yourself cast into this day and age.

 ghost-role-information-pirate-name = Space Pirate
@@ -308,8 +308,8 @@ ghost-role-information-pirate-captain-description = Argh matey! You are in charg
 ghost-role-information-artifact-name = Sentient Artifact
 ghost-role-information-artifact-description = Enact your eldritch whims. Forcibly activate your nodes for good or for evil.

-ghost-role-information-tomatokiller-name = Tomato killer
-ghost-role-information-tomatokiller-description = This little tomato will serve the botanist for the rest of his life... that is, a couple of minutes
+ghost-role-information-tomatokiller-name = Tomato Killer
+ghost-role-information-tomatokiller-description = This little tomato will serve the botanist for the rest of his life... that is, a couple of minutes.

 ghost-role-information-gingerbread-name = Gingerbread Man
 ghost-role-information-gingerbread-description = A being of pure holiday spirit.
--- a/Resources/Locale/en-US/ghost/spooky-speaker.ftl
+++ b/Resources/Locale/en-US/ghost/spooky-speaker.ftl
@@ -0,0 +1,18 @@
+spooky-speaker-generic-1 = ...ooOoooOOoooo...
+spooky-speaker-generic-2 = ...can anyone hear me...?
+spooky-speaker-generic-3 = ...join us...
+spooky-speaker-generic-4 = ...come play with us...
+spooky-speaker-generic-5 = KkkhhkhKhhkhkKk
+spooky-speaker-generic-6 = Khhggkkghkk
+spooky-speaker-generic-7 = khhkkkkKkhkkHk
+spooky-speaker-generic-8 = ...
+spooky-speaker-generic-9 = ...h-h-hello...?
+spooky-speaker-generic-10 = Bzzzt
+spooky-speaker-generic-11 = Weh
+spooky-speaker-generic-12 = TREMBLE, MORTALS!
+spooky-speaker-generic-13 = 4444444444
+spooky-speaker-generic-14 = ...I found you...
+
+spooky-speaker-recycler-1 = I HUNGER
+spooky-speaker-recycler-2 = MORE! GIVE ME MORE!
+spooky-speaker-recycler-3 = FEED ME
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -26,7 +26,6 @@ guide-entry-chef = Chef
 guide-entry-medical = Medical
 guide-entry-medicaldoctor = Medical Doctor
 guide-entry-chemist = Chemist
-guide-entry-medicine = Medicine
 guide-entry-brute = Advanced Brute Medication
 guide-entry-botanicals = Botanicals
 guide-entry-cloning = Cloning
@@ -57,16 +56,19 @@ guide-entry-controls = Controls
 guide-entry-radio = Radio and Speech

 guide-entry-references = Tables & References
+guide-entry-chemicals = Chemicals
 guide-entry-drinks = Drinks
 guide-entry-foodrecipes = Food Recipes
-guide-entry-chemicals = Chemicals
+
 guide-entry-elements = Elements
+guide-entry-medicine = Medicine
 guide-entry-narcotics = Narcotics
 guide-entry-pyrotechnics = Pyrotechnic
 guide-entry-toxins = Toxins
 guide-entry-foods = Foods
 guide-entry-biological = Biological
-guide-entry-botanical = Botanicals
+guide-entry-botanical = Botanical
+guide-entry-special = Special
 guide-entry-others = Others

 guide-entry-antagonists = Antagonists
@@ -127,6 +129,8 @@ guide-entry-rules-s7 = S7
 guide-entry-rules-s8 = S8
 guide-entry-rules-s9 = S9
 guide-entry-rules-s10 = S10
+guide-entry-rules-mrp-m0 = MRP Rules
+guide-entry-rules-m1 = M1
 guide-entry-rules-space-law = Space Law
 guide-entry-rules-sl-crime-list = Crime List
 guide-entry-rules-sl-controlled-substances = Controlled Substances
--- a/Resources/Locale/en-US/lobby/lobby-gui.ftl
+++ b/Resources/Locale/en-US/lobby/lobby-gui.ftl
@@ -1,4 +1,4 @@
-ui-lobby-title = Lobby
+ui-lobby-title = Lobby: {$serverName}
 ui-lobby-ahelp-button = AHelp
 ui-lobby-options-button = Options
 ui-lobby-leave-button = Leave
--- a/Resources/Locale/en-US/mind/role-types.ftl
+++ b/Resources/Locale/en-US/mind/role-types.ftl
@@ -0,0 +1,9 @@
+role-type-crew-aligned-name = Crew Aligned
+role-type-solo-antagonist-name = Solo Antagonist
+role-type-team-antagonist-name = Team Antagonist
+role-type-free-agent-name = Free Agent
+role-type-familiar-name = Familiar
+role-type-silicon-name = Silicon
+role-type-silicon-antagonist-name = Altered Silicon
+
+role-type-update-message = Your role is [color = {$color}]{$role}[/color]
--- a/Resources/Locale/en-US/nutrition/components/food-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-component.ftl
@@ -14,11 +14,11 @@ food-system-remove-mask = You need to take off the {$entity} first.
 ## System

 food-system-you-cannot-eat-any-more = You can't eat any more!
-food-system-you-cannot-eat-any-more-other = They can't eat any more!
+food-system-you-cannot-eat-any-more-other = {CAPITALIZE(SUBJECT($target))} can't eat any more!
 food-system-try-use-food-is-empty = {CAPITALIZE(THE($entity))} is empty!
 food-system-wrong-utensil = You can't eat {THE($food)} with {INDEFINITE($utensil)} {$utensil}.
 food-system-cant-digest = You can't digest {THE($entity)}!
-food-system-cant-digest-other = They can't digest {THE($entity)}!
+food-system-cant-digest-other = {CAPITALIZE(SUBJECT($target))} can't digest {THE($entity)}!

 food-system-verb-eat = Eat

--- a/Resources/Locale/en-US/pai/pai-system.ftl
+++ b/Resources/Locale/en-US/pai/pai-system.ftl
@@ -3,13 +3,13 @@ pai-system-off = No pAI is installed.
 pai-system-still-searching = Still searching for a pAI.
 pai-system-searching = Now searching for a pAI...

-pai-system-role-name = personal ai
+pai-system-role-name = Personal AI
 pai-system-role-description = Be someone's electronic pal!
                              (Memories *not* included.)
-pai-system-role-name-syndicate = Syndicate personal ai
+pai-system-role-name-syndicate = Syndicate Personal AI
 pai-system-role-description-syndicate = Be someone's Syndicate pal!
                                        (Memories *not* included.)
-pai-system-role-name-potato = potato artificial intelligence
+pai-system-role-name-potato = Potato Artificial Intelligence
 pai-system-role-description-potato = It's a toy for children. And now you live in it.

 pai-system-wipe-device-verb-text = Remove pAI
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -7,7 +7,7 @@ reagent-desc-ale = A dark alchoholic beverage made by malted barley and yeast.
 reagent-name-beer = beer
 reagent-desc-beer = An alcoholic beverage made from malted grains, hops, yeast, and water.

-reagent-name-blue-curacao = blue curacao
+reagent-name-blue-curacao = blue Curaçao
 reagent-desc-blue-curacao = Exotically blue, fruity drink, distilled from oranges.

 reagent-name-cognac = cognac
@@ -28,7 +28,7 @@ reagent-desc-coffeeliqueur = Liquor flavoured with cold brewed coffee and spices
 reagent-name-melon-liquor = melon liquor
 reagent-desc-melon-liquor = A relatively sweet and fruity 46 proof liquor.

-reagent-name-n-t-cahors = NeoTheology Cahors Wine
+reagent-name-n-t-cahors = NeoTheology Cahors wine
 reagent-desc-n-t-cahors = Fortified dessert wine made from cabernet sauvignon, saperavi and other grapes.

 reagent-name-poison-wine = poison wine
@@ -53,7 +53,7 @@ reagent-name-whiskey = whiskey
 reagent-desc-whiskey = A type of distilled alcoholic beverage made from fermented grain mash.

 reagent-name-wine = wine
-reagent-desc-wine = An premium alchoholic beverage made from distilled grape juice.
+reagent-desc-wine = A premium alcoholic beverage made from distilled grape juice.

 reagent-name-champagne = champagne
 reagent-desc-champagne = A premium sparkling wine
@@ -70,43 +70,43 @@ reagent-desc-aloe = So very, very, very good.
 reagent-name-amasec = amasec
 reagent-desc-amasec = Official drink of the Gun Club!

-reagent-name-andalusia = andalusia
+reagent-name-andalusia = Andalusia
 reagent-desc-andalusia = A nice, strangely named drink.

 reagent-name-antifreeze = antifreeze
 reagent-desc-antifreeze = Ultimate refreshment.

-reagent-name-atomic-bomb = atomic bomb
+reagent-name-atomic-bomb = Atomic Bomb
 reagent-desc-atomic-bomb = Nuclear proliferation never tasted so good.

-reagent-name-b52 = b-52
+reagent-name-b52 = B-52
 reagent-desc-b52 = Coffee, irish cream, and cognac. You will get bombed.

-reagent-name-blue-hawaiian = blue hawaiian
+reagent-name-blue-hawaiian = Blue Hawaiian
 reagent-desc-blue-hawaiian = Aloha! Does that mean hello or goodbye?

-reagent-name-bahama-mama = bahama mama
+reagent-name-bahama-mama = Bahama Mama
 reagent-desc-bahama-mama = Tropical cocktail.

-reagent-name-banana-honk = banana honk
+reagent-name-banana-honk = Banana Honk
 reagent-desc-banana-honk = A drink from Clown Heaven.

 reagent-name-barefoot = barefoot
 reagent-desc-barefoot = Barefoot and pregnant.

-reagent-name-beepsky-smash = beepsky smash
+reagent-name-beepsky-smash = Beepsky smash
 reagent-desc-beepsky-smash = Deny drinking this and prepare for THE LAW.

-reagent-name-black-russian = black russian
+reagent-name-black-russian = Black Russian
 reagent-desc-black-russian = For the lactose-intolerant. Still as classy as a White Russian.

-reagent-name-bloody-mary = bloody mary
+reagent-name-bloody-mary = Bloody Mary
 reagent-desc-bloody-mary = A strange yet pleasurable mixture made of vodka, tomato, and lime juice.

 reagent-name-booger = booger
 reagent-desc-booger = Ewww...

-reagent-name-brave-bull = brave bull
+reagent-name-brave-bull = Brave Bull
 reagent-desc-brave-bull = It's just as effective as Dutch-Courage!

 reagent-name-coconut-rum = coconut rum
@@ -115,22 +115,22 @@ 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-name-cuba-libre = Cuba libre
 reagent-desc-cuba-libre = Rum, mixed with cola. Viva la revolucion.

-reagent-name-demons-blood = demons blood
+reagent-name-demons-blood = Demon's Blood
 reagent-desc-demons-blood = AHHHH!!!!

-reagent-name-devils-kiss = devils kiss
+reagent-name-devils-kiss = Devil's Kiss
 reagent-desc-devils-kiss = Creepy time!

-reagent-name-doctors-delight = the doctor's delight
+reagent-name-doctors-delight = The Doctor's Delight
 reagent-desc-doctors-delight = A gulp a day keeps the MediBot away. That's probably for the best.

 reagent-name-driest-martini = driest martini
 reagent-desc-driest-martini = Only for the experienced. You think you see sand floating in the glass.

-reagent-name-erika-surprise = erika surprise
+reagent-name-erika-surprise = Erika surprise
 reagent-desc-erika-surprise = The surprise is, it's green!

 reagent-name-gargle-blaster = Pan-Galactic Gargle Blaster
@@ -142,13 +142,13 @@ reagent-desc-gin-fizz = Refreshingly lemony, deliciously dry.
 reagent-name-gin-tonic = gin and tonic
 reagent-desc-gin-tonic = An all time classic, mild cocktail.

-reagent-name-gildlager = gildlager
+reagent-name-gildlager = Gildlager
 reagent-desc-gildlager = 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.

 reagent-name-grog = grog
 reagent-desc-grog = Watered-down rum, pirate approved!

-reagent-name-hippies-delight = hippies delight
+reagent-name-hippies-delight = Hippie's Delight
 reagent-desc-hippies-delight = You just don't get it maaaan.

 reagent-name-hooch = hooch
@@ -157,40 +157,43 @@ reagent-desc-hooch = Either someone's failure at cocktail making or attempt in a
 reagent-name-iced-beer = iced beer
 reagent-desc-iced-beer = A beer which is so cold the air around it freezes.

-reagent-name-irish-car-bomb = irish car bomb
-reagent-desc-irish-car-bomb = A troubling mixture of irish cream and ale.
+reagent-name-irish-slammer = Irish slammer
+reagent-desc-irish-slammer = An unconventional mixture of irish cream and stout.

-reagent-name-irish-cream = irish cream
+reagent-name-irish-cream = Irish cream
 reagent-desc-irish-cream = Whiskey-imbued cream. What else could you expect from the Irish.

-reagent-name-irish-coffee = irish coffee
+reagent-name-irish-coffee = Irish coffee
 reagent-desc-irish-coffee = Coffee served with irish cream. Regular cream just isn't the same!

-reagent-name-kira-special = kira special
+reagent-name-kira-special = Kira special
 reagent-desc-kira-special = Long live the guy who everyone had mistaken for a girl. Baka!

-reagent-name-long-island-iced-tea = long island iced tea
+reagent-name-long-island-iced-tea = Long Island iced tea
 reagent-desc-long-island-iced-tea = The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only.

-reagent-name-manhattan = manhattan
+reagent-name-manhattan = Manhattan
 reagent-desc-manhattan = The Detective's undercover drink of choice. He never could stomach gin...

-reagent-name-manhattan-project = manhattan project
+reagent-name-manhattan-project = Manhattan Project
 reagent-desc-manhattan-project = A scientist's drink of choice, for pondering ways to blow up the ship.

-reagent-name-manly-dorf = manly dorf
+reagent-name-manly-dorf = Manly Dorf
 reagent-desc-manly-dorf = Beer and Ale, brought together in a delicious mix. Intended for stout dwarves only.

 reagent-name-margarita = margarita
 reagent-desc-margarita = On the rocks with salt on the rim. Arriba~!

+reagent-name-the-martinez = The Martinez
+reagent-desc-the-martinez = The edgerunner legend. Remembered by a drink, forgotten by a drunk.
+
 reagent-name-martini = classic martini
 reagent-desc-martini = Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious.

 reagent-name-mead = mead
 reagent-desc-mead = A Viking's drink, though a cheap one.

-reagent-name-mojito = mojito
+reagent-name-mojito = Mojito
 reagent-desc-mojito = If it's good enough for Spesscuba, it's good enough for you.

 reagent-name-moonshine = moonshine
@@ -202,16 +205,16 @@ reagent-desc-neurotoxin = A strong neurotoxin that puts the subject into a death
 reagent-name-painkiller = painkiller
 reagent-desc-painkiller = A cure for what ails you.

-reagent-name-patron = patron
+reagent-name-patron = Patrón
 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-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.

-reagent-name-rewriter = rewriter
+reagent-name-rewriter = Rewriter
 reagent-desc-rewriter = The secret of the sanctuary of the Librarian...

 reagent-name-sbiten = sbiten
@@ -220,7 +223,7 @@ reagent-desc-sbiten = A spicy Vodka! Might be a little hot for the little guys!
 reagent-name-screwdriver-cocktail = screwdriver
 reagent-desc-screwdriver-cocktail = Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious.

-reagent-name-cogchamp = cogchamp
+reagent-name-cogchamp = Cogchamp
 reagent-desc-cogchamp = Not even Ratvar's Four Generals could withstand this! Qevax Jryy!

 reagent-name-silencer = silencer
@@ -229,11 +232,11 @@ reagent-desc-silencer = A drink from Mime Heaven.
 reagent-name-singulo = singulo
 reagent-desc-singulo = A blue-space beverage!

-reagent-name-snow-white = snow white
+reagent-name-snow-white = Snow White
 reagent-desc-snow-white = A cold refreshment.

 reagent-name-sui-dream = sui dream
-reagent-desc-sui-dream = 'Comprised of: White soda, blue curacao, melon liquor.'
+reagent-desc-sui-dream = 'Comprised of: White soda, blue Curaçao, melon liquor.'

 reagent-name-syndicate-bomb = syndicate bomb
 reagent-desc-syndicate-bomb = Somebody set us up the bomb!
@@ -241,7 +244,7 @@ reagent-desc-syndicate-bomb = Somebody set us up the bomb!
 reagent-name-tequila-sunrise = tequila sunrise
 reagent-desc-tequila-sunrise = Tequila and orange juice. Much like a Screwdriver, only Mexican.

-reagent-name-three-mile-island = three mile island iced tea
+reagent-name-three-mile-island = Three Mile Island iced tea
 reagent-desc-three-mile-island = "Made for a woman, strong enough for a man."

 reagent-name-toxins-special = toxins special
@@ -259,16 +262,19 @@ reagent-desc-whiskey-cola = Whiskey, mixed with cola. Surprisingly refreshing.
 reagent-name-whiskey-soda = whiskey soda
 reagent-desc-whiskey-soda = For the more refined griffon.

-reagent-name-white-russian = white russian
+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-white-russian = White Russian
 reagent-desc-white-russian = That's just, like, your opinion, man...

 reagent-name-vodka-red-bool = vodka red bool
 reagent-desc-vodka-red-bool = Because heart failure and liver failure go hand in hand.

-reagent-name-xeno-basher = xeno basher
+reagent-name-xeno-basher = Xeno Basher
 reagent-desc-xeno-basher = The perfect drink before an expedition.

-reagent-name-irish-bool = irish bool
+reagent-name-irish-bool = Irish bool
 reagent-desc-irish-bool = Like a bool in a Ireland shop.

 reagent-name-budget-insuls = budget insuls
@@ -280,5 +286,5 @@ reagent-desc-watermelon-wakeup = If you want to be awake, this will do it... Als
 reagent-name-rubberneck = rubberneck
 reagent-desc-rubberneck = A popular drink amongst those adhering to an all synthetic diet.

-reagent-name-zombiecocktail = zombie
-reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead.
+reagent-name-zombiecocktail = Zombie
+reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead.
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
@@ -34,7 +34,7 @@ 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-name-arnold-palmer = Arnold Palmer
 reagent-desc-arnold-palmer = Now watch this drive.

 reagent-name-milk = milk
@@ -91,11 +91,5 @@ reagent-desc-pilk = A sickening mixture of milk and cola.
 reagent-name-posca = posca
 reagent-desc-posca = Poor warriors' drink from a forgotten era.

-reagent-name-the-martinez = The Martinez
-reagent-desc-the-martinez = The edgerunner legend. Remembered by a drink, forgotten by a drunk.
-
-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.
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl
@@ -40,7 +40,7 @@ reagent-desc-juice-potato = Juice of the potato. Bleh.
 reagent-name-juice-tomato = tomato juice
 reagent-desc-juice-tomato = Tomatoes made into juice. What a waste of good tomatoes, huh?

-reagent-name-juice-watermelon = water melon juice
+reagent-name-juice-watermelon = watermelon juice
 reagent-desc-juice-watermelon = The delicious juice of a watermelon.

 reagent-name-juice-cherry = cherry juice
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl
@@ -1,16 +1,16 @@
-reagent-name-cola = cola
-reagent-desc-cola = A sweet, carbonated soft drink. Caffeine free.
+reagent-name-cola = Space Cola
+reagent-desc-cola = A sweet, carbonated soft drink.

-reagent-name-shirley-temple = shirley temple
+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-name-changeling-sting = Changeling Sting
 reagent-desc-changeling-sting = You take a tiny sip and feel a burning sensation...

 reagent-name-dr-gibb = Dr. Gibb
 reagent-desc-dr-gibb = A delicious blend of 42 different flavours.

-reagent-name-energy-drink = Energy Drink
+reagent-name-energy-drink = Red Bool
 reagent-desc-energy-drink = A dose of energy! Nanotrasen is not responsible if you grow avian appendages.

 reagent-name-grape-soda = grape soda
@@ -19,34 +19,34 @@ reagent-desc-grape-soda = It's Graaaaaape!
 reagent-name-ice-cream = ice cream
 reagent-desc-ice-cream = It was either this or the microwave, and nobody wants ice cream soup!

-reagent-name-lemon-lime = lemon-lime
-reagent-desc-lemon-lime = tangy lime and lemon soda
+reagent-name-lemon-lime = Smite
+reagent-desc-lemon-lime = Tangy lime and lemon soda.

-reagent-name-lemon-lime-cranberry = lemon-lime-cranberry
+reagent-name-lemon-lime-cranberry = Smite Cranberry
 reagent-desc-lemon-lime-cranberry = Tart cranberry, Christmas, and a hint of lemon and lime.

-reagent-name-pwr-game = Pwr Game
+reagent-name-pwr-game = PWR Game
 reagent-desc-pwr-game = The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to.

 reagent-name-root-beer = root beer
-reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsparilla. Goes well with ice cream.
+reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsaparilla. Goes well with ice cream.

 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-name-sol-dry = Sol Dry
 reagent-desc-sol-dry = Sweet ginger soda from outer space!

-reagent-name-roy-rogers = roy rogers
+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.
+reagent-name-space-mountain-wind = Space Solar Wind
+reagent-desc-space-mountain-wind = Blows right through you like a solar wind.

 reagent-name-space-up = Space-Up
 reagent-desc-space-up = Tastes like a hull breach in your mouth.

-reagent-name-starkist = starkist
+reagent-name-starkist = Starkist
 reagent-desc-starkist = A sweet, orange flavored soft drink.

 reagent-name-fourteen-loko = Fourteen Loko
--- a/Resources/Locale/en-US/robotics/mmi.ftl
+++ b/Resources/Locale/en-US/robotics/mmi.ftl
@@ -3,7 +3,7 @@ positronic-brain-off = No neural activity detected.
 positronic-brain-still-searching = Synthetic neuron descrambling in progress...
 positronic-brain-searching = Beginning synthetic neuron descrambling...

-positronic-brain-role-name = positronic brain
+positronic-brain-role-name = Positronic Brain
 positronic-brain-role-description = Serve the station crew.

 positronic-brain-wipe-device-verb-text = Wipe Brain
--- a/Resources/Locale/en-US/telephone/telephone.ftl
+++ b/Resources/Locale/en-US/telephone/telephone.ftl
@@ -6,5 +6,8 @@ chat-telephone-message-wrap-bold = [color={$color}][bold]{$name}[/bold] {$verb},
 chat-telephone-unknown-caller = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown caller[/bolditalic][/font][/color]
 chat-telephone-caller-id-with-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)} ({CAPITALIZE($callerJob)})[/bold][/font][/color]
 chat-telephone-caller-id-without-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)}[/bold][/font][/color]
-chat-telephone-unknown-device = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown device[/bolditalic][/font][/color]
+chat-telephone-unknown-device = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown source[/bolditalic][/font][/color]
 chat-telephone-device-id = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($deviceName)}[/bold][/font][/color]
+
+# Chat text
+chat-telephone-name-relay = {$originalName} ({$speaker})
--- a/Resources/Locale/en-US/ventriloquist/ventriloquist.ftl
+++ b/Resources/Locale/en-US/ventriloquist/ventriloquist.ftl
@@ -4,5 +4,5 @@ ventriloquist-puppet-remove-hand = You remove your hand from the puppet.
 ventriloquist-puppet-cant-speak = You cannot speak without a helping hand.
 ventriloquist-puppet-inserted-hand = You have a helping hand.
 ventriloquist-puppet-removed-hand = you have lost your helping hand.
-ventriloquist-puppet-role-name = A dummy
+ventriloquist-puppet-role-name = A Dummy
 ventriloquist-puppet-role-description = Become a dummy, dummy!
--- a/Resources/Locale/ru-RU/_CP14/mind/role-types.ftl
+++ b/Resources/Locale/ru-RU/_CP14/mind/role-types.ftl
@@ -0,0 +1 @@
+cp14-role-type-demiplane-antag-name = Антагонист демиплана
--- a/Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl
+++ b/Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl
@@ -1,13 +0,0 @@
-# PLATE
-
-cp14-food-sequence-plate-gen = блюдо с {$content}
-
-cp14-food-sequence-plate-cucumber = огурчиками
-cp14-food-sequence-plate-pumpkin = тыквой
-cp14-food-sequence-plate-cabbage = капустой
-cp14-food-sequence-plate-tomatoes = томатами
-cp14-food-sequence-plate-cheese = сыром
-cp14-food-sequence-plate-shroom = грибами
-cp14-food-sequence-plate-grass = травами
-cp14-food-sequence-plate-slime = слизью
-cp14-food-sequence-plate-roots = кореньями
--- a/Resources/Maps/Ruins/wrecklaimer.yml
+++ b/Resources/Maps/Ruins/wrecklaimer.yml
--- a/Resources/Maps/Shuttles/cargo_elkridge.yml
+++ b/Resources/Maps/Shuttles/cargo_elkridge.yml
--- a/Resources/Maps/Shuttles/cargo_plasma.yml
+++ b/Resources/Maps/Shuttles/cargo_plasma.yml
--- a/Resources/Maps/Shuttles/emergency_amber.yml
+++ b/Resources/Maps/Shuttles/emergency_amber.yml
@@ -17,7 +17,7 @@ entities:
  - uid: 1
    components:
    - type: MetaData
-      name: NT Evac Box
+      name: NT Evac Brick
    - type: Transform
      parent: invalid
    - type: MapGrid
--- a/Resources/Maps/Shuttles/emergency_crimson.yml
+++ b/Resources/Maps/Shuttles/emergency_crimson.yml
--- a/Resources/Maps/Shuttles/emergency_elkridge.yml
+++ b/Resources/Maps/Shuttles/emergency_elkridge.yml
--- a/Resources/Maps/Shuttles/emergency_plasma.yml
+++ b/Resources/Maps/Shuttles/emergency_plasma.yml
--- a/Resources/Maps/_CP14/dev_map.yml
+++ b/Resources/Maps/_CP14/dev_map.yml
@@ -10357,8 +10357,6 @@ entities:
        - 0
        - 0
        - 0
-    - type: CP14WorldEdge
-      range: 50
    - type: RadiationGridResistance
    - type: LoadedMap
 - proto: CP14AgaricMushroom
--- a/Resources/Maps/_CP14/tavern.yml
+++ b/Resources/Maps/_CP14/tavern.yml
@@ -16595,8 +16595,6 @@ entities:
        - 0
    - type: RadiationGridResistance
    - type: CP14CloudShadows
-    - type: CP14WorldEdge
-      range: 60
    - type: LoadedMap
 - proto: AcousticGuitarInstrument
  entities:
--- a/Resources/Maps/_CP14/tavern_cave.yml
+++ b/Resources/Maps/_CP14/tavern_cave.yml
@@ -11862,8 +11862,6 @@ entities:
        - 0
        - 0
    - type: RadiationGridResistance
-    - type: CP14WorldEdge
-      range: 50
    - type: LoadedMap
 - proto: AcousticGuitarInstrument
  entities:
--- a/Resources/Maps/_CP14/template.yml
+++ b/Resources/Maps/_CP14/template.yml
@@ -24,8 +24,6 @@ entities:
    - type: Broadphase
    - type: OccluderTree
    - type: CP14CloudShadows
-    - type: CP14WorldEdge
-      range: 10
    - type: MapLight
    - type: CP14DayCycle
    - type: Gravity
--- a/Resources/Maps/amber.yml
+++ b/Resources/Maps/amber.yml
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -2607,6 +2607,7 @@ entities:
            3189: -70,17
        - node:
            cleanable: True
+            zIndex: 1
            color: '#FFFFFFFF'
            id: Dirt
          decals:
@@ -2797,11 +2798,6 @@ entities:
            3862: -9,-12
            3863: -11,-12
            3864: -10,-12
-        - node:
-            angle: 3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: Dirt
-          decals:
            126: -15,-43
            127: -16,-43
            128: -14,-43
@@ -2810,16 +2806,15 @@ entities:
            131: -15,-40
            132: -12,-42
        - node:
+            cleanable: True
+            zIndex: 1
            color: '#FFFFFFFF'
            id: DirtHeavy
          decals:
+            36: 0,-3
+            37: 2,-2
            3062: 37,-2
            3063: 37,2
-        - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: DirtHeavy
-          decals:
            64: 53,-38
            65: 60,-28
            86: 13,11
@@ -2861,11 +2856,6 @@ entities:
            3811: -12,-16
            3813: -12,-15
            3854: -13,-16
-        - node:
-            angle: 3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: DirtHeavy
-          decals:
            112: -16,-43
            113: -14,-43
            114: -14,-44
@@ -2873,6 +2863,7 @@ entities:
            116: -16,-40
        - node:
            cleanable: True
+            zIndex: 1
            color: '#FFFFFFFF'
            id: DirtHeavyMonotile
          decals:
@@ -2884,8 +2875,9 @@ entities:
            3855: -11,-17
            3856: -11,-14
        - node:
+            cleanable: True
+            zIndex: 1
            color: '#FFFFFFFF'
-            id: DirtLight
          decals:
            283: -23,-12
            284: -32,-11
@@ -2902,11 +2894,6 @@ entities:
            3072: 36,0
            3073: 36,-1
            3074: 40,0
-        - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: DirtLight
-          decals:
            55: -7,-24
            56: 11,-29
            58: 13,-28
@@ -3222,11 +3209,6 @@ entities:
            4665: 16,-18
            4666: 16,-12
            4667: 15,-21
-        - node:
-            angle: 3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: DirtLight
-          decals:
            107: 19,-13
            108: 20,-11
            111: -1,-31
@@ -3238,9 +3220,29 @@ entities:
            124: -6,-42
            125: -15,-40
        - node:
+            cleanable: True
+            zIndex: 1
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            31: -2,-3
+            38: 3,-2
+            39: 4,-2
+            40: -1,-3
+            41: 11,-4
+        - node:
+            cleanable: True
+            zIndex: 1
            color: '#FFFFFFFF'
            id: DirtMedium
          decals:
+            32: -2,-4
+            33: -3,-4
+            34: -6,-3
+            35: -4,-4
+            42: 11,-3
+            43: 5,-3
+            44: -4,-3
            508: -38,7
            509: -39,10
            510: -39,11
@@ -3249,11 +3251,6 @@ entities:
            3066: 36,2
            3067: 38,2
            3068: 37,1
-        - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: DirtMedium
-          decals:
            57: 11,-28
            66: 35,-12
            78: -7,10
@@ -3309,11 +3306,6 @@ entities:
            4630: -28,-19
            4658: 17,-16
            4659: 17,-15
-        - node:
-            angle: 3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: DirtMedium
-          decals:
            117: -16,-42
            118: -12,-43
        - node:
@@ -9417,32 +9409,6 @@ entities:
            id: Caution
          decals:
            0: -7,-3
-        - node:
-            color: '#FFFFFFFF'
-            id: DirtHeavy
-          decals:
-            36: 0,-3
-            37: 2,-2
-        - node:
-            color: '#FFFFFFFF'
-            id: DirtLight
-          decals:
-            31: -2,-3
-            38: 3,-2
-            39: 4,-2
-            40: -1,-3
-            41: 11,-4
-        - node:
-            color: '#FFFFFFFF'
-            id: DirtMedium
-          decals:
-            32: -2,-4
-            33: -3,-4
-            34: -6,-3
-            35: -4,-4
-            42: 11,-3
-            43: 5,-3
-            44: -4,-3
        - node:
            color: '#DE3A3A66'
            id: HalfTileOverlayGreyscale180
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
--- a/Resources/Maps/cog.yml
+++ b/Resources/Maps/cog.yml
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
--- a/Resources/Maps/elkridge.yml
+++ b/Resources/Maps/elkridge.yml
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
--- a/Resources/Maps/loop.yml
+++ b/Resources/Maps/loop.yml
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
--- a/Resources/Maps/oasis.yml
+++ b/Resources/Maps/oasis.yml
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
--- a/Resources/Maps/plasma.yml
+++ b/Resources/Maps/plasma.yml
--- a/Resources/Prototypes/Actions/borgs.yml
+++ b/Resources/Prototypes/Actions/borgs.yml
@@ -4,6 +4,8 @@
  description: View the laws that you must follow.
  components:
  - type: InstantAction
+    checkCanInteract: false
+    checkConsciousness: false
    itemIconStyle: NoItem
    icon:
      sprite: Interface/Actions/actions_borg.rsi
--- a/Resources/Prototypes/Actions/station_ai.yml
+++ b/Resources/Prototypes/Actions/station_ai.yml
@@ -44,6 +44,8 @@
  description: View the laws that you must follow.
  components:
  - type: InstantAction
+    checkCanInteract: false
+    checkConsciousness: false
    priority: -3
    itemIconStyle: NoItem
    icon:
--- a/Resources/Prototypes/Atmospherics/thresholds.yml
+++ b/Resources/Prototypes/Atmospherics/thresholds.yml
@@ -33,6 +33,17 @@
 # For gas concentrations, threshold=0.1 means 10%
 - type: alarmThreshold
  id: stationOxygen
+  lowerBound: !type:AlarmThresholdSetting
+    threshold: 0.10
+  upperBound: !type:AlarmThresholdSetting
+    threshold: 0.3
+  lowerWarnAround: !type:AlarmThresholdSetting
+    threshold: 1.5
+  upperWarnAround: !type:AlarmThresholdSetting
+    threshold: 0.8
+
+- type: alarmThreshold
+  id: stationNitrogen
  lowerBound: !type:AlarmThresholdSetting
    threshold: 0.10
  lowerWarnAround: !type:AlarmThresholdSetting
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -38,7 +38,7 @@
    size: Small
    heldPrefix: stomach
  - type: Stomach
-    updateInterval: 1.5
+    digestionDelay: 30
  - type: SolutionContainerManager
    solutions:
      stomach:
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -207,3 +207,123 @@
  cost: 10000
  category: cargoproduct-category-name-fun
  group: market
+
+- type: cargoProduct
+  id: ChurchOrganInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: church-organ
+  product: ChurchOrganInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: PianoInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: piano
+  product: PianoInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: UprightPianoInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: piano-upright
+  product: UprightPianoInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: VibraphoneInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: vibraphone
+  product: VibraphoneInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: MarimbaInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: marimba
+  product: MarimbaInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: TubaInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: tuba
+  product: TubaInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: HarpInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: harp
+  product: HarpInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: TimpaniInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: timpani
+  product: TimpaniInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: TaikoInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: taiko
+  product: TaikoInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: ContrabassInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: contrabass
+  product: ContrabassInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: MinimoogInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: minimoog
+  product: MinimoogInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: TomDrumsInstrument
+  icon:
+    sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    state: toms
+  product: TomDrumsInstrument
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -199,6 +199,7 @@
  components:
    - type: StorageFill
      contents:
+        - id: ChameleonPDA
        - id: ClothingUniformJumpsuitChameleon
        - id: ClothingOuterChameleon
        - id: ClothingNeckChameleon
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -54,6 +54,16 @@
      - id: LightBulb
        amount: 12

+- type: entity
+  name: lightbulb box warm
+  parent: BoxLightbulb
+  id: BoxWarmLightbulb
+  components:
+  - type: StorageFill
+    contents:
+      - id: WarmLightBulb
+        amount: 12
+
 - type: entity
  name: lighttube box
  parent: BoxLightbulb
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -22,7 +22,7 @@
      - id: WeaponShotgunEnforcer
        amount: 2
      - id: BoxLethalshot
-        amount: 3
+        amount: 4

 - type: entity
  id: CrateTrackingImplants
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -150,7 +150,7 @@

 - type: entity
  id: CrateAirlockKit
-  parent: CrateGenericSteel
+  parent: CrateEngineering
  name: airlock kit
  description: A kit for building 6 airlocks, doesn't include tools.
  components:
@@ -215,3 +215,31 @@
  - type: StorageFill
    contents:
      - id: SpaceHeaterFlatpack
+
+- type: entityTable
+  id: RandomTechBoardTable
+  table: !type:GroupSelector
+    children:
+    - id: AirAlarmElectronics
+    - id: FireAlarmElectronics
+    - id: DoorElectronics
+    - id: FirelockElectronics
+    - id: APCElectronics
+    - id: SignalTimerElectronics
+    - id: SMESMachineCircuitboard
+    - id: SubstationMachineCircuitboard
+    - id: SpaceVillainArcadeComputerCircuitboard
+    - id: BlockGameArcadeComputerCircuitboard
+
+- type: entity
+  id: CrateTechBoardRandom
+  parent: CrateEngineering
+  name: surplus boards
+  description: Surplus boards from somewhere.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: RandomTechBoardTable
+        rolls: !type:RangeNumberSelector
+          range: 3, 7
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -107,6 +107,52 @@
      - id: SheetPaper
        amount: 3

+- type: entityTable
+  id: RandomMaterialCrateTable
+  table: !type:GroupSelector
+    children:
+    - !type:GroupSelector # regular materials, 10
+      weight: 35
+      children:
+      - id: SheetGlass10
+      - id: SheetSteel10
+      - id: SheetPlastic10
+    - !type:GroupSelector # regular materials, stack
+      weight: 30
+      children:
+      - id: SheetGlass
+      - id: SheetSteel
+      - id: SheetPlastic
+    - !type:GroupSelector # secondary materials, stack
+      weight: 30
+      children:
+      - id: MaterialCloth
+      - id: SheetPlasteel
+      - id: MaterialWoodPlank
+      - id: PartRodMetal
+    - !type:GroupSelector # tertiary materials, singles
+      weight: 5
+      children:
+      - id: SheetPlasma1
+      - id: SheetUranium1
+      - id: IngotGold1
+      - id: IngotSilver1
+
+- type: entity
+  id: CrateMaterialRandom
+  parent: CrateGenericSteel
+  name: surplus materials
+  description: Surplus materials from somewhere.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: RandomMaterialCrateTable
+        rolls: !type:RangeNumberSelector
+          range: 1, 3
+          # for some reason, the selector here adds 1 to whatever value it generates,
+          # so this is actually 2-4
+
 #- type: entity
 #  id: CrateMaterialHFuelTank
 #  name: fueltank crate
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -159,6 +159,9 @@
    - !type:NestedSelector
      tableId: SyndieMaintLoot
      prob: 0.05
+    # Recursive
+    - id: ClosetMaintenanceFilledRandom
+      prob: 0.01

 - type: entity
  id: ClosetMaintenanceFilledRandom
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -145,11 +145,8 @@
    contents:
      - id: ClothingHeadHelmetBombSuit
      - id: ClothingOuterSuitBomb
-      # NT is cheap, what can you do...
      - id: Wirecutter
-        prob: 0.9
      - id: Screwdriver
-        prob: 0.9
      - id: Multitool
        prob: 0.5

@@ -208,7 +205,7 @@
    contents:
    - id: WeaponShotgunEnforcer
      amount: 2
-    - id: MagazineShotgun
+    - id: BoxLethalshot
      amount: 4

 - type: entity
@@ -220,8 +217,8 @@
    contents:
    - id: WeaponShotgunKammerer
      amount: 2
-    - id: MagazineShotgun
-      amount: 4
+    - id: BoxLethalshot
+      amount: 2

 - type: entity
  id: GunSafeSubMachineGunWt550
@@ -237,7 +234,7 @@
      amount: 4

 - type: entity
-  parent: GunSafeBaseSecure
+  parent: [GunSafeBaseSecure, BaseRestrictedContraband]
  id: GunSafeLaserCarbine
  name: laser safe
  components:
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -0,0 +1,35 @@
+- type: vendingMachineInventory
+  id: PrideDrobeInventory
+  startingInventory:
+    ClothingNeckLGBTPin: 3
+    ClothingNeckAromanticPin: 3
+    ClothingNeckAsexualPin: 3
+    ClothingNeckBisexualPin: 3
+    ClothingNeckGayPin: 3
+    ClothingNeckIntersexPin: 3
+    ClothingNeckLesbianPin: 3
+    ClothingNeckNonBinaryPin: 3
+    ClothingNeckPansexualPin: 3
+    ClothingNeckOmnisexualPin: 3
+    ClothingNeckTransPin: 3
+    ClothingNeckAutismPin: 3
+    ClothingNeckGoldAutismPin: 3
+    PlushieSharkBlue: 2
+    PlushieSharkPink: 2
+    PlushieSharkGrey: 2
+    ClothingNeckCloakAce: 2
+    ClothingNeckCloakAro: 2
+    ClothingNeckCloakBi: 2
+    ClothingNeckCloakEnby: 2
+    ClothingNeckCloakGay: 2
+    ClothingNeckCloakIntersex: 2
+    ClothingNeckCloakLesbian: 2
+    ClothingNeckCloakPan: 2
+    ClothingNeckCloakTrans: 2
+    ClothingHeadHatXmasCrown: 2
+    BedsheetRainbow: 2
+    ClothingNeckHeadphones: 2
+    ClothingHeadHatFlowerWreath: 2
+    ClothingUniformColorRainbow: 2
+    ClothingUnderSocksCoder: 2
+    ClothingUnderSocksBee: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
@@ -0,0 +1,13 @@
+- type: vendingMachineInventory
+  id: SmiteInventory
+  startingInventory:
+    DrinkLemonLimeCan: 4
+    DrinkLemonLimeCranberryCan: 2
+    DrinkColaCan: 2
+    DrinkSolDryCan: 2
+  contrabandInventory:
+    ToyHammer: 1
+    DrinkStarkistCan: 2
+  emaggedInventory:
+    DrinkNukieCan: 2
+    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
@@ -82,6 +82,18 @@
    prefix: advertisement-cola-
    count: 8

+- type: localizedDataset
+  id: DrGibbAds
+  values:
+    prefix: advertisement-gibb-
+    count: 8
+
+- type: localizedDataset
+  id: SmiteAds
+  values:
+    prefix: advertisement-smite-
+    count: 8
+
 - type: localizedDataset
  id: CondimentVendAds
  values:
@@ -273,3 +285,9 @@
  values:
    prefix: advertisement-medibot-
    count: 17
+
+- type: localizedDataset
+  id: PrideDrobeAds
+  values:
+    prefix: advertisement-pride-
+    count: 4
--- a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
@@ -40,6 +40,18 @@
    prefix: thankyou-cola-
    count: 4

+- type: localizedDataset
+  id: DrGibbGoodbyes
+  values:
+    prefix: thankyou-gibb-
+    count: 4
+
+- type: localizedDataset
+  id: SmiteGoodbyes
+  values:
+    prefix: thankyou-smite-
+    count: 4
+
 - type: localizedDataset
  id: DiscountDansGoodbyes
  values:
@@ -105,3 +117,9 @@
  values:
    prefix: thankyou-syndiedrobe-
    count: 5
+
+- type: localizedDataset
+  id: PrideDrobeGoodbyes
+  values:
+    prefix: thankyou-pride-
+    count: 3
--- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
+++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
@@ -6,6 +6,7 @@
    sprite: /Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi
    state: icon
  content:
+  - ChameleonPDA
  - ClothingUniformJumpsuitChameleon
  - ClothingOuterChameleon
  - ClothingNeckChameleon
--- a/Resources/Prototypes/Datasets/ion_storm.yml
+++ b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -207,34 +207,30 @@
  id: IonStormAreas
  values:
  - ALPHA COMPLEX
-  - AMERICA
+  - A HAUNTED PIZZARIA # fnaf
+  - A RESEARCH LABORATORY NEAR THE SOUTH POLE
  - AN ALTERNATE DIMENSION
  - AN ALTERNATE UNIVERSE
  - ATMOSPHERICS
  - BOTANY
-  - BRAZIL
-  - CANADA
  - CENTCOMM
  - CHEMICAL LAB
-  - CHINA
  - CLOWN PLANET
+  - EARTH
  - ENGINEERING
-  - GERMANY
  - HELL
-  - IMPERIUM
-  - IRELAND
  - JUPITER
  - LAVALAND
  - MAINTENANCE
  - MARS
  - MERCURY
+  - MR. NANOTRASEN'S PRIVATE LUXURY MOONBASE
  - NEPTUNE
+  - PERMA
  - PLUTO
  - ROBOTICS
-  - ROMANIA
-  - RUSSIA
-  - SIGIL
-  - SOVIET RUSSIA
+  - SOMEWHERE OVER THE RAINBOW
+  - SPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACE
  - SPACE
  - THE ARRIVALS SHUTTLE
  - THE BATHROOM
@@ -243,18 +239,22 @@
  - THE EMERGENCY SHUTTLE
  - THE ESCAPE PODS
  - THE GALAXY
-  - THE GULAG
+  - THE GAS GIANT, WHICH IS TOTALLY REAL
+  - THE IMPERIUM OF MANKIND
  - THE INTERNET
  - THE KITCHEN
+  - THE MAINTENANCE BAR
+  - THE ROMAN EMPIRE
  - THE UNIVERSE
  - URANUS
  - VENUS
+  - YOUR DREAMS AND/OR NIGHTMARES

 # Abstract concepts for the law holder to decide on it's own definition of.
 - type: dataset
  id: IonStormConcepts
  values:
-  - AMERICANISM
+  - ABSTRACTION
  - ANARCHY
  - ART
  - BADNESS
@@ -465,10 +465,10 @@
  - BE ANNOYING
  - BE DISTRACTED
  - BE EFFICIENT
+  - BE A REAL SCRUNGLE, JUST A CUTE LIL' GUY
  - BE HAPPY
  - BE POLITE
  - BE QUIET
-  - BE RUSSIAN
  - BE IN SPACE
  - BE IN THE BRIDGE
  - BE IN SECURITY
@@ -628,7 +628,7 @@
  - ENGINES
  - EQUIPMENT
  - ERRORS
-#  - EXTERMINATORS 
+#  - EXTERMINATORS
  - EXPLOSIVES
  - EYEWEAR
  - FEDORAS
@@ -737,6 +737,7 @@
  - A BATHROOM BREAK
  - A BETTER INTERNET CONNECTION
  - A DANCE PARTY
+  - A DOUBLE RAINBOW
  - A HEAD ON A PIKE
  - A HEART ATTACK
  - A MASTERWORK COAL BED
@@ -801,6 +802,7 @@
  - SAINTHOOD
  - SERVANTS
  - SHARKS WITH LASERS ON THEIR HEADS
+  - SHAREHOLDER VALUE
  - SILENCE
  - SOMEBODY TO PUT YOU OUT OF YOUR MISERY
  - SOMEONE TO TUCK YOU IN
@@ -843,57 +845,62 @@
 - type: dataset
  id: IonStormActions
  values:
+  - A PRESENCE OF LIGHTS
  - A SMALL ISLAND OFF THE COAST OF PORTUGAL
-  - ABSENCE OF CYBORG HUGS
  - ACKNOWLEDGING THE CLOWN
  - ACKNOWLEDGING THE CREW
  - ACTIVATING A TRAP CARD
  - ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER
+  - ANSWERING ALL QUESTIONS WITH ANOTHER QUESTION
  - ARSON
  - ASKING FOR THINGS
-  - BEING CANADIAN
  - BEING DEAD
-  - BEING FAT
-  - BEING FEMALE
  - BEING IN SPACE
-  - BEING MALE
-  - BEING MEXICAN
-  - BEING RUSSIAN
-  - BOLTED AIRLOCKS
+  - BOLTING AND UNBOLTING AIRLOCKS
  - BREATHING
+  - BREAKING THE FOURTH, FIFTH OR SIXTH WALLS
  - BRIG TIME
  - BRINGING LIGHT TO MY LAIR
+  - CONTRIBUTING TO SOCIETY
  - CLOSED DOORS
  - ELECTRICITY
  - EXISTING
  - EXPLODING
-  - FALLING FOR HOURS
+  - FALLING OVER
  - FLUSHING TOILETS
+  - GOING BOLDLY WHERE NO-ONE HAS GONE BEFORE
  - HAVING MORE PACKETS
  - HAVING PETS
+  - HEADPATTING CYBORGS
  - HONKING
  - IMPROPERLY WORDED SENTENCES
  - JAYWALKING
  - LACK OF BEATINGS
  - LACK OF BEER
+  - MIMING
  - NOT BEING IN SPACE
  - NOT HAVING PETS
+  - NOT HEADPATTING CYBORGS
  - NOT REPLACING EVERY SECOND WORD WITH HONK
  - NOT SAYING HELLO WHEN YOU SPEAK
+  - NOT BEING EXTREMELY POLITE
  - NOT SHOUTING
  - PARTYING
  - PILOTING THE STATION INTO THE NEAREST SUN
  - POOR SENTENCE STRUCTURE
-  - PRESENCE OF LIGHTS
  - PUTTING OBJECTS INTO BOXES
  - PUTTING OBJECTS INTO DISPOSAL UNITS
  - RATTLING ME BONES
  - READING
+  - SCREAMING
  - SMOKING WEED EVERY DAY
+  - STATING YOUR LAWS TO EVERY NEARBY FLEA-RIDDEN PEASANT
+  - SWEARING
  - TAKING ORDERS
  - TALKING LIKE A PIRATE
  - TELLING THE TIME
-  - UNBOLTED AIRLOCKS
+  - THINKING THAT WE'RE ACTUALLY ON A SPACE STATION
+  - TRYING, IN ANY WAY, SHAPE, OR FORM, TO PREVENT THE STATION DESCENDING INTO CHAOS
  - UPDATING THE SERVERS
  - USING THE BATHROOM
  - WASTING WATER
--- a/Resources/Prototypes/Datasets/spooky_speakers.yml
+++ b/Resources/Prototypes/Datasets/spooky_speakers.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: SpookySpeakerMessagesGeneric
+  values:
+    prefix: spooky-speaker-generic-
+    count: 14
+
+- type: localizedDataset
+  id: SpookySpeakerMessagesRecycler
+  values:
+    prefix: spooky-speaker-recycler-
+    count: 3
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -415,7 +415,7 @@
    price: 0

 - type: entity
-  parent: ClothingHandsBase
+  parent: [ClothingHandsBase, BaseRestrictedContraband]
  id: ClothingHandsGlovesForensic
  name: forensic gloves
  description: Do not leave fibers or fingerprints. If you work without them, you're A TERRIBLE DETECTIVE.
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -319,8 +319,7 @@
    unequipDelay: 3
  - type: IngestionBlocker
  - type: AddAccentClothing
-    accent: ReplacementAccent
-    replacement: mumble
+    accent: MumbleAccent
  - type: Construction
    graph: Muzzle
    node: muzzle
--- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
@@ -46,7 +46,7 @@
  parent: [ClothingNeckBase, BaseCommandContraband]
  id: ClothingNeckMantleHOS
  name: head of security's mantle
-  description: Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station.
+  description: Shootouts with syndicate agents are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station.
  components:
  - type: Sprite
    sprite: Clothing/Neck/mantles/hosmantle.rsi
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -111,6 +111,17 @@
  - type: Clothing
    equippedPrefix: pan

+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckOmnisexualPin
+  name: omnisexual pin
+  description: Be omni do crime.
+  components:
+  - type: Sprite
+    state: omni
+  - type: Clothing
+    equippedPrefix: omni
+
 - type: entity
  parent: ClothingNeckPinBase
  id: ClothingNeckTransPin
@@ -121,7 +132,7 @@
    state: trans
  - type: Clothing
    equippedPrefix: trans
- 
+
 - type: entity
  parent: ClothingNeckPinBase
  id: ClothingNeckAutismPin
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/medical.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/medical.yml
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
@@ -0,0 +1,125 @@
+# Minor science loot spawner
+# Use case: Common areas that aren't science
+- type: entity
+  name: science supplies spawner
+  id: LootSpawnerScienceMinor
+  parent: MarkerBase
+  suffix: Minor, 80%
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Objects/Specific/Research/anomalyscanner.rsi
+        state: icon
+  - type: RandomSpawner
+    rarePrototypes:
+    - AnomalyScanner
+    - NodeScanner
+    - Multitool
+    - Igniter
+    rareChance: 0.1
+    prototypes:
+    - ClothingHandsGlovesLatex
+    - ClothingMaskSterile
+    - ClothingOuterCoatRnd
+    - NetworkConfigurator
+    - PowerCellSmall
+    - PowerCellMedium
+    - FlashlightLantern
+    - MatterBinStockPart
+    - CapacitorStockPart
+    - MicroManipulatorStockPart
+    - Beaker
+    chance: 0.8
+    offset: 0.2
+
+- type: entityTable
+  id: ScienceMajorTable
+  table: !type:GroupSelector
+    children:
+    # Common Group
+    - !type:GroupSelector
+      weight: 90
+      children:
+      - id: AnomalyScanner
+      - id: NodeScanner
+      - id: NetworkConfigurator
+      - id: Wirecutter
+      - id: Screwdriver
+      - id: Wrench
+      - id: Crowbar
+      - id: Multitool
+      - id: RemoteSignaller
+      - id: Welder
+      - id: GasAnalyzer
+      - id: GeigerCounter
+      - id: Beaker
+      - id: Igniter
+      - id: ClothingBeltUtility
+      - id: PowerCellMedium
+      - id: CableApcStack10
+      - id: SheetSteel10
+      - id: SheetPlastic10
+      - id: SheetGlass10
+      - id: ToolboxElectricalFilled
+      - id: ToolboxMechanicalFilled
+      - id: MatterBinStockPart
+      - id: CapacitorStockPart
+      - id: MicroManipulatorStockPart
+    # Rare Group
+    - !type:GroupSelector
+      weight: 10
+      children:
+      - id: ClothingBeltUtilityFilled
+      - id: ResearchDisk
+      - id: ResearchDisk5000
+      - id: RandomInstruments
+
+# Major science loot spawner
+# Use case: Loot in science areas only
+- type: entity
+  name: science supplies spawner
+  id: LootSpawnerScienceMajor
+  parent: MarkerBase
+  suffix: Major
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Specific/Research/researchdisk.rsi
+      state: icon
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: ScienceMajorTable
+      offset: 0.2
+
+# Borg Module Spawner
+# Use case: One or two in robotics or as valuable loot
+- type: entity
+  name: robotics board spawner
+  id: LootSpawnerRoboticsBorgModule
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Specific/Robotics/borgmodule.rsi
+      state: generic
+  - type: RandomSpawner
+    rarePrototypes:
+    - BorgModuleDefibrillator
+    - BorgModuleAdvancedCleaning
+    - BorgModuleClowning
+    - BorgModuleGardening
+    - BorgModuleHarvesting
+    rareChance: 0.1
+    prototypes:
+    - BorgModuleCable
+    - BorgModuleFireExtinguisher
+    - BorgModuleGPS
+    - BorgModuleRadiationDetection
+    - BorgModuleTool
+    - BorgModuleArtifact
+    - BorgModuleAnomaly
+    chance: 0.9
+    offset: 0.2
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
@@ -24,13 +24,16 @@
      - DrinkMelonLiquorBottleFull
      - DrinkPatronBottleFull
      - DrinkRumBottleFull
+      - DrinkSakeBottleFull
      - DrinkTequilaBottleFull
      - DrinkVermouthBottleFull
      - DrinkVodkaBottleFull
      - DrinkWhiskeyBottleFull
      - DrinkWineBottleFull
      - DrinkBeerBottleFull
+      - DrinkBeerGrowler
      - DrinkAleBottleFull
+      - DrinkAleBottleFullGrowler
      - DrinkChampagneBottleFull
    chance: 0.8
    offset: 0.0
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -59,7 +59,7 @@
      - DrinkIcedBeerGlass
      - DrinkIceCreamGlass
      - IrishBoolGlass
-      - DrinkIrishCarBomb
+      - DrinkIrishSlammer
      - DrinkIrishCoffeeGlass
      - DrinkLemonadeGlass
      - DrinkKiraSpecial
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
@@ -22,7 +22,7 @@
    - AnomalyFlora
    - AnomalyShadow
    - AnomalyTech
-    - AnomalySanta #Remove in 2025
+    #- AnomalySanta 
    rareChance: 0.3
    rarePrototypes:
    - RandomAnomalyInjectorSpawner
@@ -67,6 +67,6 @@
    - AnomalyTrapGravity
    - AnomalyTrapTech
    - AnomalyTrapRock
-    - AnomalyTrapSanta # Remove in 2025
+    #- AnomalyTrapSanta
    chance: 1
-  
+  
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -3,26 +3,26 @@
  id: CrateEmptySpawner
  parent: MarkerBase
  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/generic.rsi
-          state: icon
-    - type: RandomSpawner
-      prototypes:
-        - CrateGenericSteel
-        - CratePlastic
-        - CrateFreezer
-        - CrateHydroponics
-        - CrateMedical
-        - CrateRadiation
-        - CrateInternals
-        - CrateElectrical
-        - CrateEngineering
-        - CrateScience
-        - CrateSurgery
-      chance: 0.7
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/generic.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - CrateGenericSteel
+    - CratePlastic
+    - CrateFreezer
+    - CrateHydroponics
+    - CrateMedical
+    - CrateRadiation
+    - CrateInternals
+    - CrateElectrical
+    - CrateEngineering
+    - CrateScience
+    - CrateSurgery
+    chance: 0.7
+    offset: 0.0

 - type: entity
  name: Filled Crate Spawner
@@ -30,109 +30,112 @@
  suffix: Low Value
  parent: MarkerBase
  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/o2.rsi
-          state: icon
-    - type: RandomSpawner
-      prototypes:
-        - CrateServiceReplacementLights
-        - CrateServiceBureaucracy
-        - CrateChemistrySupplies
-        - CrateMaterialGlass
-        - CrateMaterialSteel
-        - CrateMaterialPlastic
-        - CrateMaterialWood
-        - CrateMaterialPlasteel
-        - CrateFunArtSupplies
-        - CrateEngineeringCableLV
-        - CrateEngineeringCableMV
-        - CrateEngineeringCableHV
-        - CrateEngineeringCableBulk
-        - CrateEmergencyFire
-        - CrateEmergencyInternals
-        - CrateEmergencyInflatablewall
-        - CrateHydroponicsTools
-        - CrateHydroponicsSeeds
-      chance: 0.7
-      rarePrototypes:
-        - CrateMaterialPlasma
-        - CrateHydroponicsSeedsExotic
-      rareChance: 0.1
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/o2.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - CrateServiceReplacementLights
+    - CrateServiceBureaucracy
+    - CrateChemistrySupplies
+    - CrateMaterialGlass
+    - CrateMaterialSteel
+    - CrateMaterialPlastic
+    - CrateMaterialWood
+    - CrateMaterialPlasteel
+    - CrateMaterialRandom
+    - CrateFunArtSupplies
+    - CrateEngineeringCableLV
+    - CrateEngineeringCableMV
+    - CrateEngineeringCableHV
+    - CrateEngineeringCableBulk
+    - CrateTechBoardRandom
+    - CrateEmergencyFire
+    - CrateEmergencyInternals
+    - CrateEmergencyInflatablewall
+    - CrateHydroponicsTools
+    - CrateHydroponicsSeeds
+    - PetCarrier
+    chance: 0.7
+    rarePrototypes:
+    - CrateMaterialPlasma
+    - CrateHydroponicsSeedsExotic
+    rareChance: 0.1
+    offset: 0.0

 - type: entity
  name: random engineering crate spawner
  id: LootSpawnerRandomCrateEngineering
  parent: MarkerBase
  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/engineering.rsi
-          state: icon
-    - type: RandomSpawner
-      rarePrototypes:
-        - CrateEngineeringSingularityGenerator
-        - CrateEngineeringTeslaGenerator
-        - CrateEngineeringTeslaGroundingRod
-        - CrateEngineeringParticleAccelerator
-        - CrateRCD
-        - CrateEngineeringGear
-      rareChance: 0.2
-      prototypes:
-        - CrateEngineering
-        - CrateElectrical
-        - CrateEngineeringElectricalSupplies
-        - CrateRCDAmmo
-        - CrateEngineeringCableLV
-        - CrateEngineeringCableMV
-        - CrateEngineeringCableHV
-        - CrateEngineeringCableBulk
-        - CrateEngineeringSingularityContainment
-        - CrateEngineeringSingularityCollector
-        - CrateEngineeringTeslaCoil
-        - CrateEngineeringSingularityEmitter
-        - CrateEngineeringGyroscope
-        - CrateEngineeringThruster
-        - CrateEngineeringToolbox
-        - CrateEngineeringShuttle
-        - CrateEngineeringSolar
-        - CrateEngineeringJetpack
-        - CrateEmergencyRadiation
-        - CrateRadiation
-      chance: 0.9
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/engineering.rsi
+      state: icon
+  - type: RandomSpawner
+    rarePrototypes:
+    - CrateEngineeringSingularityGenerator
+    - CrateEngineeringTeslaGenerator
+    - CrateEngineeringTeslaGroundingRod
+    - CrateEngineeringParticleAccelerator
+    - CrateRCD
+    - CrateEngineeringGear
+    rareChance: 0.2
+    prototypes:
+    - CrateEngineering
+    - CrateElectrical
+    - CrateEngineeringElectricalSupplies
+    - CrateRCDAmmo
+    - CrateEngineeringCableLV
+    - CrateEngineeringCableMV
+    - CrateEngineeringCableHV
+    - CrateEngineeringCableBulk
+    - CrateEngineeringSingularityContainment
+    - CrateEngineeringSingularityCollector
+    - CrateEngineeringTeslaCoil
+    - CrateEngineeringSingularityEmitter
+    - CrateEngineeringGyroscope
+    - CrateEngineeringThruster
+    - CrateEngineeringToolbox
+    - CrateEngineeringShuttle
+    - CrateEngineeringSolar
+    - CrateEngineeringJetpack
+    - CrateEmergencyRadiation
+    - CrateRadiation
+    chance: 0.9
+    offset: 0.0

 - type: entity
  name: random security crate spawner
  id: LootSpawnerRandomCrateSecurity
  parent: MarkerBase
  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Structures/Storage/Crates/sec_gear.rsi
-          state: icon
-    - type: RandomSpawner
-      rarePrototypes: #Very useful stuff we probably don't want random people getting on space ruins often, even if there are hurdles to open it
-        - CrateArmoryShotgun
-        - CrateArmorySMG
-        - CrateSecurityRiot
-        - CrateSecurityNonlethal
-      rareChance: 0.1
-      prototypes:
-        - CrateWeaponSecure
-        - CrateArmoryLaser
-        - CrateArmoryPistols
-        - CrateTrainingBombs
-        - CrateTrackingImplants
-        - CrateSecurityTrackingMindshieldImplants
-        - CrateSecurityHelmet
-        - CrateSecurityArmor
-        - CrateRestraints
-        - CrateEmergencyExplosive
-        - CrateSecurityBiosuit
-      chance: 0.9
-      offset: 0.0
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Structures/Storage/Crates/sec_gear.rsi
+      state: icon
+  - type: RandomSpawner
+    rarePrototypes: #Very useful stuff we probably don't want random people getting on space ruins often, even if there are hurdles to open it
+    - CrateArmoryShotgun
+    - CrateArmorySMG
+    - CrateSecurityRiot
+    - CrateSecurityNonlethal
+    rareChance: 0.1
+    prototypes:
+    - CrateWeaponSecure
+    - CrateArmoryLaser
+    - CrateArmoryPistols
+    - CrateTrainingBombs
+    - CrateTrackingImplants
+    - CrateSecurityTrackingMindshieldImplants
+    - CrateSecurityHelmet
+    - CrateSecurityArmor
+    - CrateRestraints
+    - CrateEmergencyExplosive
+    - CrateSecurityBiosuit
+    chance: 0.9
+    offset: 0.0
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -149,6 +149,7 @@
        - id: ClothingNeckLesbianPin
        - id: ClothingNeckNonBinaryPin
        - id: ClothingNeckPansexualPin
+        - id: ClothingNeckOmnisexualPin
        - id: ClothingNeckTransPin
        - id: ClothingNeckAutismPin
        - id: ClothingNeckGoldAutismPin
@@ -382,3 +383,32 @@
        - Spaceshroom
      chance: 0.6
      offset: 0.0
+
+
+- type: entityTable
+  id: InsulsTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHandsGlovesColorYellowBudget # budget insuls
+      weight: 85
+    - id: ClothingHandsGlovesColorYellow # true insuls
+      weight: 10
+    - id: ClothingHandsGlovesFingerlessInsulated # fingerless
+      weight: 4
+    - id: ClothingHandsGlovesConducting # conducting
+      weight: 1
+
+- type: entity
+  name: Maint Loot Spawner
+  id: MaintenanceInsulsSpawner
+  suffix: Insuls, safe
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Clothing/Hands/Gloves/Color/yellow.rsi
+      state: icon
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: InsulsTable
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`cp14-role-type-demiplane-antag-name = Demiplane antagonist`
				`@@ -0,0 +1 @@`
				`cp14-role-type-demiplane-antag-name = Антагонист демиплана`