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

# Conflicts: # Resources/Changelog/Changelog.yml # Resources/Credits/GitHub.txt # Resources/Prototypes/Entities/Mobs/Player/silicon.yml
2024-11-06 16:53:24 +03:00
parent ae27cf7e08 24e6b9f42c
commit 955145a9a5
207 changed files with 2180 additions and 1314 deletions
--- a/Resources/Audio/Machines/ame_fuelinjection.ogg
+++ b/Resources/Audio/Machines/ame_fuelinjection.ogg
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -181,3 +181,8 @@
  license: "CC0-1.0"
  copyright: "by ScarKy0"
  source: "https://github.com/space-wizards/space-station-14/pull/32012"
+
+- files: ["ame_fuelinjection.ogg"]
+  license: "CC0-1.0"
+  copyright: "by AftrLite (Github). Uses audio from hypospray.ogg and hiss.ogg (Found in Resources/Audio/Items)"
+  source: "https://github.com/space-wizards/space-station-14/pull/33097"
--- a/Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg
+++ b/Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -567,5 +567,28 @@ Entries:
  id: 70
  time: '2024-10-16T22:24:31.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/32844
+- author: BramvanZijp
+  changes:
+  - message: CC, ERT, Admin, and Deathsquad PDA's now have all departmental programs
+      pre-installed.
+    type: Tweak
+  id: 71
+  time: '2024-10-31T14:53:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32601
+- author: metalgearsloth
+  changes:
+  - message: Added on-call functionality for discord relay to get notified on unanswered
+      ahelps.
+    type: Add
+  id: 72
+  time: '2024-11-02T09:29:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30443
+- author: nikthechampiongr
+  changes:
+  - message: It is now possible to edit the AI's laws through its core and eye.
+    type: Fix
+  id: 73
+  time: '2024-11-02T13:21:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32461
 Name: Admin
 Order: 1
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,364 +1,4 @@
 Entries:
- author: Errant
-  changes:
-  - message: Medical Mask sprite now works on vox.
-    type: Fix
-  id: 7052
-  time: '2024-08-07T03:41:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30702
- author: Lyroth001
-  changes:
-  - message: Dragons are immune to flashes
-    type: Tweak
-  id: 7053
-  time: '2024-08-07T07:42:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30658
- author: ShadowCommander
-  changes:
-  - message: Rollerbeds can now be dragged to the player to fold and pick them up.
-    type: Add
-  id: 7054
-  time: '2024-08-07T09:19:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30002
- author: Errant
-  changes:
-  - message: Survivors arriving via the Unknown Shuttle event, ERT and CBURN agents,
-      and Death Squad members are now equipped with the appropriate species-specific
-      survival gear.
-    type: Fix
-  - message: Unknown Shuttle event can once again spawn vox characters.
-    type: Tweak
-  id: 7055
-  time: '2024-08-07T09:26:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29746
- author: IProduceWidgets
-  changes:
-  - message: butter is slippery
-    type: Tweak
-  id: 7056
-  time: '2024-08-07T21:47:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29772
- author: Mervill
-  changes:
-  - message: Gas Miners now have detailed examine text
-    type: Tweak
-  id: 7057
-  time: '2024-08-08T02:14:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30480
- author: BackeTako
-  changes:
-  - message: "!, \u203D and multiple punctuations now work for Spanish."
-    type: Tweak
-  id: 7058
-  time: '2024-08-08T03:08:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30551
- author: strO0pwafel
-  changes:
-  - message: Fixed inconsistent naming of CentComm.
-    type: Fix
-  id: 7059
-  time: '2024-08-08T10:04:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29217
- author: Plykiya
-  changes:
-  - message: Buffed the range of EMP implants from a radius of 1.75 tiles to 2.75
-      tiles.
-    type: Tweak
-  - message: Buffed the range of EMP grenades from a radius of 4 tiles to 5.5 tiles.
-    type: Tweak
-  id: 7060
-  time: '2024-08-08T10:04:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30660
- author: Plykiya
-  changes:
-  - message: You can drop food or drinks from your hands to interrupt eating it, again.
-    type: Fix
-  - message: Barber scissors are now interrupted if the item is dropped or if the
-      user changes hands.
-    type: Tweak
-  id: 7061
-  time: '2024-08-08T11:39:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30361
- author: TheShuEd
-  changes:
-  - message: Add "thieving beacon" to Thief antag - a device that counts objects within
-      a radius of itself as stolen.
-    type: Add
-  - message: Return thief structures stealing objectives.
-    type: Add
-  - message: Animal theft objectives can no longer appear if the animals are not on
-      the station.
-    type: Fix
-  id: 7062
-  time: '2024-08-08T13:17:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29997
- author: lzk228
-  changes:
-  - message: RD labcoat added in RD's dresser.
-    type: Add
-  id: 7063
-  time: '2024-08-08T22:50:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30671
- author: SlamBamActionman
-  changes:
-  - message: Animal DNA now shows up as "unknown DNA" in the Forensic Scanner.
-    type: Tweak
-  - message: Forensic Scanner can now scan fluid containers for DNA in reagents.
-    type: Tweak
-  - message: Fluids keep their DNA data when moved.
-    type: Fix
-  - message: Fluids now stain containers they're in with DNA. Make sure to scrub your
-      blood bucket after use!
-    type: Add
-  - message: Vomit now includes DNA!
-    type: Add
-  id: 7064
-  time: '2024-08-08T23:27:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26699
- author: themias
-  changes:
-  - message: Butter can be sliced, cookie and toast recipes now use butter slices.
-    type: Tweak
-  - message: Chefvend butter reduced from 4 to 3.
-    type: Tweak
-  id: 7065
-  time: '2024-08-08T23:32:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30789
- author: EmoGarbage404
-  changes:
-  - message: You should have significantly less friction when moving in space.
-    type: Tweak
-  id: 7066
-  time: '2024-08-09T04:52:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29383
- author: Plykiya
-  changes:
-  - message: Hardsuits and EVA suits now count as protection for unscrewing lightbulbs.
-    type: Add
-  - message: More gloves were given the ability to unscrew light bulbs.
-    type: Add
-  - message: Behonkers no longer hurt you when melee attacking them or interacting
-      with them.
-    type: Remove
-  id: 7067
-  time: '2024-08-09T05:32:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30244
- author: Ian321
-  changes:
-  - message: The warden is now an important job.
-    type: Tweak
-  id: 7068
-  time: '2024-08-09T05:45:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30745
- author: slarticodefast
-  changes:
-  - message: Added tooltips to the agent ID job icons
-    type: Add
-  id: 7069
-  time: '2024-08-09T06:14:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28575
- author: stalengd
-  changes:
-  - message: Head bandana no longer blocks food eating.
-    type: Fix
-  id: 7070
-  time: '2024-08-09T06:17:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28910
- author: Ubaser
-  changes:
-  - message: Oxygen and nitrogen canisters now have new sprites when worn.
-    type: Add
-  id: 7071
-  time: '2024-08-09T10:32:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30809
- author: Plykiya
-  changes:
-  - message: Buckling someone now triggers a short do-after.
-    type: Tweak
-  id: 7072
-  time: '2024-08-09T15:43:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29621
- author: Ubaser
-  changes:
-  - message: Normal crowbars cannot be placed in pockets, but can now fit in belts.
-    type: Tweak
-  - message: Depending on where you obtained the crowbars, they will now have different
-      colours.
-    type: Tweak
-  id: 7073
-  time: '2024-08-09T19:29:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28988
- author: lzk228
-  changes:
-  - message: Hotplate works again.
-    type: Fix
-  id: 7074
-  time: '2024-08-10T01:10:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30830
- author: EmoGarbage404
-  changes:
-  - message: Maintenance closets have more variety in what they can contain.
-    type: Tweak
-  id: 7075
-  time: '2024-08-10T02:12:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30579
- author: Ko4erga
-  changes:
-  - message: Changed chemistry airlock color.
-    type: Tweak
-  id: 7076
-  time: '2024-08-10T03:23:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30666
- author: Blackern5000
-  changes:
-  - message: Bent pipes now deal 8 thrown damage instead of 3.
-    type: Tweak
-  id: 7077
-  time: '2024-08-10T03:30:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30634
- author: shampunj
-  changes:
-  - message: Rat king can now wideswing
-    type: Tweak
-  id: 7078
-  time: '2024-08-10T12:47:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30808
- author: BackeTako
-  changes:
-  - message: Added a suitskirt for the psychologist
-    type: Add
-  id: 7079
-  time: '2024-08-10T12:51:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30709
- author: Unkn0wnGh0st333
-  changes:
-  - message: ERT Chaplain starting gear was fixed and will no longer give the ERT
-      Engineer gear
-    type: Fix
-  id: 7080
-  time: '2024-08-10T12:55:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30855
- author: Ubaser
-  changes:
-  - message: Light tube structures now have new sprites.
-    type: Tweak
-  id: 7081
-  time: '2024-08-10T15:00:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29091
- author: lzk228
-  changes:
-  - message: Standartized some clothing recipes.
-    type: Tweak
-  id: 7082
-  time: '2024-08-10T18:16:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29315
- author: TheShuEd
-  changes:
-  - message: You cat cut burger bun into two halfs, and make custom burgers now!
-    type: Add
-  id: 7083
-  time: '2024-08-10T19:31:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30755
- author: thetolbean
-  changes:
-  - message: Updated Core's boxing ring beacon label to be correct
-    type: Tweak
-  id: 7084
-  time: '2024-08-10T19:50:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30800
- author: Flareguy
-  changes:
-  - message: Added vox sprites for most of the remaining common mask items.
-    type: Add
-  id: 7085
-  time: '2024-08-10T21:06:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30838
- author: Scribbles0, Plykiya, nikthechampiongr
-  changes:
-  - message: You can now execute incapacitated/cuffed entities or yourself with certain
-      sharp weapons. Executions require a do-after, deal 9x the damage of a normal
-      attack, and ignore damage resistances.
-    type: Add
-  id: 7086
-  time: '2024-08-11T03:05:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30104
- author: Plykiya
-  changes:
-  - message: Cooking shelves have been renamed to Kitchen shelves, you can now put
-      more drinks and cutlery in them.
-    type: Tweak
-  id: 7087
-  time: '2024-08-11T06:21:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30858
- author: BombasterDS
-  changes:
-  - message: You can now change the suit's sensors on incapacitated people without
-      taking it off
-    type: Tweak
-  id: 7088
-  time: '2024-08-11T09:04:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29668
- author: lzk228
-  changes:
-  - message: RCD UI can be activated only in hand.
-    type: Tweak
-  id: 7089
-  time: '2024-08-11T09:15:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30861
- author: TokenStyle
-  changes:
-  - message: Pax reagent now refresh pacified.
-    type: Tweak
-  - message: Pax reagent pacified duration has been changed from 2 seconds to 4 seconds.
-    type: Tweak
-  id: 7090
-  time: '2024-08-11T09:19:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30778
- author: osjarw
-  changes:
-  - message: You can once again pull and buckle pets.
-    type: Fix
-  id: 7091
-  time: '2024-08-11T09:22:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30066
- author: slarticodefast
-  changes:
-  - message: The sentient plant mutation can no longer be propagated to other trays
-      via seeds or swabs. It has also been made more rare.
-    type: Tweak
-  id: 7092
-  time: '2024-08-11T09:23:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29133
- author: Moomoobeef
-  changes:
-  - message: Added The Throngler (Plushie) to the grand lottery!!
-    type: Add
-  id: 7093
-  time: '2024-08-11T10:26:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29978
- author: Plykiya
-  changes:
-  - message: Energy sword weapons are now execution-capable.
-    type: Add
-  id: 7094
-  time: '2024-08-11T22:12:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30909
- author: Blackern5000
-  changes:
-  - message: Added diamond-tipped mining drills, a science printed item found under
-      T2 industrial.
-    type: Add
-  - message: Standard mining drills now attack faster and break rocks in two hits.
-    type: Tweak
-  - message: Moved ore bags of holding to T2 industrial tech.
-    type: Tweak
-  - message: Grappling guns are now researched with Salvage Equipment.
-    type: Tweak
-  - message: Diamonds are now worth 2,000 spesos each.
-    type: Tweak
-  id: 7095
-  time: '2024-08-12T01:49:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30814
 - author: mirrorcult
  changes:
  - message: With space law being overhauled, you can now examine items to see their
@@ -3959,3 +3599,348 @@
  id: 7551
  time: '2024-10-24T03:41:03.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/32965
+- author: slarticodefast
+  changes:
+  - message: Mix 1u aluminium, 1u potassium and 1u sulfur for a flash reaction effect.
+      The radius scales with the reagent amount.
+    type: Add
+  id: 7552
+  time: '2024-10-25T22:47:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32377
+- author: BramvanZijp
+  changes:
+  - message: Fixed the Lone Nuclear Operative mid-round antagonist being extremely
+      rare.
+    type: Fix
+  id: 7553
+  time: '2024-10-26T02:16:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32942
+- author: Moomoobeef
+  changes:
+  - message: Bowls no longer make an eating sound when drinking from them.
+    type: Fix
+  id: 7554
+  time: '2024-10-26T04:00:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32819
+- author: SaphireLattice
+  changes:
+  - message: Added a warning about unrevivability in the health analyzer UI.
+    type: Add
+  id: 7555
+  time: '2024-10-26T17:22:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32636
+- author: slarticodefast
+  changes:
+  - message: Fixed pie throwing sound not playing.
+    type: Fix
+  id: 7556
+  time: '2024-10-27T04:25:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33017
+- author: stalengd
+  changes:
+  - message: Fixed playtime labels not being able to correctly display time greater
+      than 24 hours
+    type: Fix
+  id: 7557
+  time: '2024-10-28T18:00:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32974
+- author: august-sun
+  changes:
+  - message: Extended the minimum round time for meteor swarm events.
+    type: Tweak
+  id: 7558
+  time: '2024-10-28T21:25:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32876
+- author: deltanedas
+  changes:
+  - message: Fixed lava planet expeditions not working.
+    type: Fix
+  id: 7559
+  time: '2024-10-29T05:00:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33042
+- author: metalgearsloth
+  changes:
+  - message: Fix separated game screen bumping slightly.
+    type: Fix
+  id: 7560
+  time: '2024-10-29T05:07:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33046
+- author: Blackern5000
+  changes:
+  - message: Proto-kitentic crushers, glaives, and daggers now have more accurate
+      inhand sprites.
+    type: Tweak
+  id: 7561
+  time: '2024-10-30T07:38:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32212
+- author: Blackern5000
+  changes:
+  - message: Security belts now contain a holobarrier projector and a handheld security
+      radio by default rather than tear gas and a flashbang.
+    type: Tweak
+  id: 7562
+  time: '2024-10-30T07:40:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32291
+- author: Blackern5000
+  changes:
+  - message: Added three bottle boxes to the nanomed plus inventory for doctors to
+      carry small amounts of chemicals on their person
+    type: Add
+  id: 7563
+  time: '2024-10-30T07:41:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33018
+- author: Blackern5000
+  changes:
+  - message: Added the interdyne defibrillator, a black-and-red defibrillator that
+      can be used as a melee weapon.
+    type: Add
+  - message: The syndicate medical bundle now contains an interdyne defibrillator,
+      a collection of various instant injectors, tourniquets, and several combat kits.
+      The price has been raised to 24 tc.
+    type: Tweak
+  id: 7564
+  time: '2024-10-30T09:15:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32720
+- author: Boaz1111
+  changes:
+  - message: Pill bottles can now only store pills.
+    type: Tweak
+  id: 7565
+  time: '2024-10-31T10:56:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33074
+- author: Jarmer123
+  changes:
+  - message: You can now find a spare bible in the PietyVend
+    type: Add
+  id: 7566
+  time: '2024-10-31T13:26:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32363
+- author: justinbrick
+  changes:
+  - message: Added a pop-up notification when extra items are dropped while unequipping
+      something.
+    type: Tweak
+  id: 7567
+  time: '2024-10-31T14:12:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33078
+- author: BramvanZijp
+  changes:
+  - message: The maximum amount of programs that can be installed on a PDA has been
+      increased from 5 to 8
+    type: Tweak
+  - message: The Detective and Head of Security now get the logprobe program pre-installed
+      on their PDA.
+    type: Tweak
+  id: 7568
+  time: '2024-10-31T14:53:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32601
+- author: Psychpsyo
+  changes:
+  - message: Carp plushies can now be placed in mop buckets, along with other rehydratable
+      things like monkey cubes.
+    type: Add
+  id: 7569
+  time: '2024-10-31T18:46:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33079
+- author: Bhijn and Myr
+  changes:
+  - message: Tail thumping has been downmixed to mono to fix the sound lacking any
+      sort of positioning. They're now capable of having a presence in the actual
+      soundspace, in turn meaning lizards are no longer occupying your headset at
+      all times of day.
+    type: Fix
+  id: 7570
+  time: '2024-10-31T21:30:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33092
+- author: reesque
+  changes:
+  - message: pie not dropping tin on thrown
+    type: Fix
+  id: 7571
+  time: '2024-11-01T01:43:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33013
+- author: SlamBamActionman
+  changes:
+  - message: Votekicks can now be initiated during the pregame lobby.
+    type: Fix
+  id: 7572
+  time: '2024-11-01T01:52:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32528
+- author: PopGamer46
+  changes:
+  - message: Fixed bolt lights of recently unpowered bolted doors
+    type: Fix
+  id: 7573
+  time: '2024-11-01T02:04:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33063
+- author: RumiTiger
+  changes:
+  - message: A chocolate and banana muffin has been added to the game. The berry and
+      cherry muffins have also been resprited!
+    type: Add
+  - message: Now you can make a regular, chocolate, banana, and berry muffin!
+    type: Tweak
+  - message: Muffin tins have been added to the game. They are needed for making muffins!
+    type: Add
+  id: 7574
+  time: '2024-11-01T02:06:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29318
+- author: ScarKy0
+  changes:
+  - message: AI can no longer toggle seeing jobs off.
+    type: Tweak
+  - message: Borgs can no longer see mindshield status.
+    type: Fix
+  id: 7575
+  time: '2024-11-01T02:32:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33069
+- author: Minemoder5000
+  changes:
+  - message: The cargo shuttle's cargo pallets can no longer sell or buy.
+    type: Fix
+  id: 7576
+  time: '2024-11-01T06:22:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33022
+- author: aspiringLich
+  changes:
+  - message: Fixed the logic triggering popups when inserting items into machines.
+    type: Fix
+  id: 7577
+  time: '2024-11-02T01:33:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28856
+- author: K-Dynamic
+  changes:
+  - message: Pills are explosion resistant.
+    type: Tweak
+  id: 7578
+  time: '2024-11-02T09:51:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32458
+- author: K-Dynamic
+  changes:
+  - message: Handcrafted gauze now takes 3 seconds instead of 10 seconds of crafting
+    type: Tweak
+  - message: Medical techfab gauze recipe now takes 1 cloth instead of 2
+    type: Tweak
+  id: 7579
+  time: '2024-11-02T09:53:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32744
+- author: Ubaser
+  changes:
+  - message: Service workers can now be antagonists.
+    type: Fix
+  id: 7580
+  time: '2024-11-02T10:07:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31359
+- author: AftrLite
+  changes:
+  - message: The AME now has a new sound effect for fuel injection!
+    type: Add
+  id: 7581
+  time: '2024-11-02T13:19:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33097
+- author: deltanedas
+  changes:
+  - message: Printing cables in an autolathe is now 20 times faster.
+    type: Tweak
+  id: 7582
+  time: '2024-11-02T13:24:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31521
+- author: Centronias
+  changes:
+  - message: Fixed a bug where attempting to speak into a handheld radio and an intercom
+      simultaneously would lead to only one device transmitting the message.
+    type: Fix
+  id: 7583
+  time: '2024-11-02T15:04:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32737
+- author: joshepvodka
+  changes:
+  - message: Headphones are now selectable in loadouts.
+    type: Add
+  id: 7584
+  time: '2024-11-02T15:12:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33067
+- author: Plykiya
+  changes:
+  - message: Wielding weapons no longer displays your character's real identity when
+      your identity is hidden.
+    type: Fix
+  id: 7585
+  time: '2024-11-03T11:25:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33134
+- author: MilenVolf
+  changes:
+  - message: Ghost roles menu is now collapsible! This makes it much easier to find
+      a specific role that you want.
+    type: Tweak
+  id: 7586
+  time: '2024-11-04T00:49:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32717
+- author: Tr1bute
+  changes:
+  - message: A popup now appears when attempting to harvest mutated plants that require
+      sharp tools.
+    type: Add
+  id: 7587
+  time: '2024-11-04T00:56:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33136
+- author: Boolean-Buckeye
+  changes:
+  - message: Emergency lights can be constructed and deconstructed
+    type: Add
+  id: 7588
+  time: '2024-11-04T03:24:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32945
+- author: thetolbean
+  changes:
+  - message: The web coat and boots can now be broken down into silk.
+    type: Fix
+  id: 7589
+  time: '2024-11-04T03:33:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33121
+- author: Kickguy223
+  changes:
+  - message: Ion Storms now notify a Borg that their laws have changed via a sound
+      cue.
+    type: Add
+  id: 7590
+  time: '2024-11-04T11:23:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32887
+- author: DrSmugleaf
+  changes:
+  - message: Fixed not being able to see vote counts for non-votekick votes.
+    type: Fix
+  id: 7591
+  time: '2024-11-05T00:12:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33170
+- author: kirus59
+  changes:
+  - message: Fixed display of icons when using hunger or thirst huds
+    type: Fix
+  - message: Fixed errors spam when using beer goggles
+    type: Fix
+  id: 7592
+  time: '2024-11-05T16:58:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32832
+- author: Errant
+  changes:
+  - message: Syndicate Reinforcements no longer list their (hidden and unused) codewords
+      on the Round End window.
+    type: Fix
+  id: 7593
+  time: '2024-11-05T18:18:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33181
+- author: Baptr0b0t
+  changes:
+  - message: Fixed Intelicard can see through walls.
+    type: Fix
+  id: 7594
+  time: '2024-11-06T03:28:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33177
+- author: slarticodefast
+  changes:
+  - message: Removed the wanted list cartridge from the captain's PDA.
+    type: Remove
+  id: 7595
+  time: '2024-11-06T13:20:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33084
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
--- a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
+++ b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
@@ -31,3 +31,4 @@ plant-holder-component-heat-improper-warning = The [color=orange]improper temper
 plant-holder-component-pressure-improper-warning = The [color=lightblue]improper environment pressure alert[/color] is blinking.
 plant-holder-component-gas-missing-warning = The [color=cyan]improper gas environment alert[/color] is blinking.
 plant-holder-component-early-sample-message = The plant hasn't grown enough to take a sample yet.
+plant-holder-component-ligneous-cant-harvest-message = The plant is too tough to harvest with your bare hands.
--- a/Resources/Locale/en-US/ghost/ghost-gui.ftl
+++ b/Resources/Locale/en-US/ghost/ghost-gui.ftl
@@ -14,6 +14,7 @@ ghost-target-window-current-button = Warp: {$name}
 ghost-target-window-warp-to-most-followed = Warp to Most Followed

 ghost-roles-window-title = Ghost Roles
+ghost-roles-window-available-button = Available ({$rolesCount})
 ghost-roles-window-join-raffle-button = Join raffle
 ghost-roles-window-raffle-in-progress-button =
    Join raffle ({$time} left, { $players ->
--- a/Resources/Locale/en-US/inventory/components/inventory-component.ftl
+++ b/Resources/Locale/en-US/inventory/components/inventory-component.ftl
@@ -2,3 +2,9 @@ inventory-component-can-equip-cannot = You can't equip this!
 inventory-component-can-equip-does-not-fit = This doesn't fit!

 inventory-component-can-unequip-cannot = You can't unequip this!
+
+inventory-component-dropped-from-unequip =
+    You dropped {$items ->
+    [1] an item!
+    *[other] some items!
+}
--- a/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
+++ b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
@@ -1,5 +1,6 @@
 # mop bucket
-mop-bucket-slot-component-slot-name-shark = Shark
+mop-bucket-slot-component-slot-name-item = Item
+mop-bucket-slot-component-eject-verb = Take out
 # janitorial trolley
 janitorial-trolley-slot-component-slot-name-plunger = Plunger
 janitorial-trolley-slot-component-slot-name-sign = Sign
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -216,8 +216,8 @@ uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes tox
 uplink-knives-kit-name = Throwing Knives Kit
 uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.

-uplink-meds-bundle-name = Medical Bundle
-uplink-meds-bundle-desc = All you need to get your comrades back in the fight: mainly a combat medkit, a defibrillator and three combat medipens.
+uplink-meds-bundle-name = Interdyne Medical Bundle
+uplink-meds-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon.

 uplink-ammo-bundle-name = Ammo Bundle
 uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW.
--- a/Resources/Locale/en-US/voting/ui/vote-call-menu.ftl
+++ b/Resources/Locale/en-US/voting/ui/vote-call-menu.ftl
@@ -25,8 +25,8 @@ ui-vote-type-not-available = This vote type has been disabled

 # Vote option only available for specific users.
 ui-vote-trusted-users-notice =
-  This vote option is only available to whitelisted players.
-  In addition, you must have been a ghost for { $timeReq } minutes.
+  This vote option is only available to players who have enough playtime or are whitelisted.
+  In addition, you must have been a ghost for { $timeReq } seconds.

 # Warning to not abuse a specific vote option.
 ui-vote-abuse-warning =
--- a/Resources/Locale/en-US/window/window-component.ftl
+++ b/Resources/Locale/en-US/window/window-component.ftl
@@ -2,13 +2,14 @@

 # Shown when examining the window. Each entry represents the window's health condition
 comp-window-damaged-1 = It looks fully intact.
-comp-window-damaged-2 = It has a few scratches
+comp-window-damaged-2 = It has a few scratches.
 comp-window-damaged-3 = It has a few small cracks.
-comp-window-damaged-4 = It has several big cracks running along its surface.
-comp-window-damaged-5 = It has deep cracks across multiple layers.
-comp-window-damaged-6 = It's extremely cracked and on the verge of shattering.
+comp-window-damaged-4 = [color=yellow]It has several big cracks running along its surface.[/color]
+comp-window-damaged-5 = [color=orange]It has deep cracks across multiple layers.[/color]
+comp-window-damaged-6 = [color=red]It's extremely cracked and on the verge of shattering.[/color]

 ### Interaction Messages

 # Shown when knocking on a window
 comp-window-knock = *knock knock*
+
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -6576,7 +6576,7 @@ entities:
  - uid: 2031
    components:
    - type: Transform
-      pos: 3.6114278,-10.732791
+      pos: 4.0109396,-12.223828
      parent: 104
  - uid: 2095
    components:
@@ -10993,6 +10993,13 @@ entities:
    - type: Transform
      pos: 11.5,-6.5
      parent: 104
+- proto: HandLabeler
+  entities:
+  - uid: 1826
+    components:
+    - type: Transform
+      pos: 3.4542694,-10.616036
+      parent: 104
 - proto: KitchenKnife
  entities:
  - uid: 1061
--- a/Resources/Prototypes/Actions/station_ai.yml
+++ b/Resources/Prototypes/Actions/station_ai.yml
@@ -5,35 +5,20 @@
  description: Sends your eye back to the core.
  components:
  - type: InstantAction
-    priority: -10
+    priority: -9
    itemIconStyle: BigAction
    icon:
      sprite: Interface/Actions/actions_ai.rsi
      state: ai_core
    event: !type:JumpToCoreEvent

- type: entity
-  id: ActionShowJobIcons
-  name: Show job icons
-  description: Shows job icons for crew members.
-  components:
-  - type: InstantAction
-    priority: -5
-    itemIconStyle: BigAction
-    icon:
-      sprite: Interface/Actions/actions_ai.rsi
-      state: job_view
-    event: !type:ActionComponentChangeEvent
-      components:
-      - type: ShowJobIcons
-
 - type: entity
  id: ActionSurvCameraLights
  name: Toggle camera lights
  description: Enable surveillance camera lights near wherever you're viewing.
  components:
  - type: InstantAction
-    priority: -6
+    priority: -5
    itemIconStyle: BigAction
    icon:
      sprite: Interface/Actions/actions_ai.rsi
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -302,13 +302,19 @@
  components:
  - type: StorageFill
    contents:
+      - id: DefibrillatorSyndicate
      - id: MedkitCombatFilled
-      - id: Defibrillator
+        amount: 4
+      - id: Tourniquet
+        amount: 4
      - id: CombatMedipen
-        amount: 3
-      - id: ClothingHandsGlovesNitrile
-      - id: SyringeTranexamicAcid
-      - id: SyringeHyronalin
+        amount: 4
+      - id: PunctAutoInjector
+        amount: 4
+      - id: PyraAutoInjector
+        amount: 4
+      - id: AirlossAutoInjector
+        amount: 4

 - type: entity
  parent: ClothingBackpackDuffelSyndicateBundle
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -46,10 +46,10 @@
  table: !type:AllSelector
    children:
    - id: Stunbaton
-    - id: GrenadeFlashBang
-    - id: TearGasGrenade
    - id: Handcuffs
    - id: Handcuffs
+    - id: HoloprojectorSecurity
+    - id: RadioHandheldSecurity

 - type: entity
  id: ClothingBeltSecurityFilled
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -20,6 +20,7 @@
    BoxCandle: 2
    BoxCandleSmall: 2
    Urn: 5
+    Bible: 1
  emaggedInventory:
    ClothingOuterArmorCult: 1
    ClothingHeadHelmetCult: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -11,6 +11,7 @@
    FoodPlate: 10
    FoodPlateSmall: 10
    FoodPlateTin: 5
+    FoodPlateMuffinTin: 5
    FoodKebabSkewer: 5
    DrinkGlass: 5
    Beaker: 5
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -7,6 +7,7 @@
    Bloodpack: 5
    EpinephrineChemistryBottle: 3
    Syringe: 5
+    BoxBottle: 3
    ClothingEyesHudMedical: 2
    ClothingEyesEyepatchHudMedical: 2

--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -699,9 +699,9 @@
  productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled
  discountCategory: rareDiscounts
  discountDownTo:
-    Telecrystal: 12
+    Telecrystal: 16
  cost:
-    Telecrystal: 20
+    Telecrystal: 24
  categories:
  - UplinkChemicals
  conditions:
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -487,7 +487,6 @@
        - CartridgeAmmo
        - DoorRemote
        - Whistle
-        - HolosignProjector
        - BalloonPopper
  - type: ItemMapper
    mapLayers:
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -13,11 +13,7 @@
  categories: [ HideSpawnMenu ]
  components:
  - type: ShowHealthBars
-    damageContainers:
-    - Biological
  - type: ShowHealthIcons
-    damageContainers:
-    - Biological

 - type: entity
  parent: ClothingEyesBase
@@ -223,8 +219,6 @@
    sprite: Clothing/Eyes/Hud/syndagent.rsi
  - type: ShowSyndicateIcons
  - type: ShowHealthBars
-    damageContainers:
-    - Biological

 - type: entity
  parent: [ClothingEyesGlassesSunglasses, ShowSecurityIcons]
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -853,6 +853,10 @@
  - type: Construction
    graph: WebObjects
    node: coat
+  - type: Butcherable
+    spawned:
+    - id: MaterialWebSilk1
+      amount: 5
  - type: FlavorProfile
    flavors:
      - cobwebs
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -187,6 +187,10 @@
        reagents:
        - ReagentId: Fiber
          Quantity: 10
+  - type: Butcherable
+    spawned:
+    - id: MaterialWebSilk1
+      amount: 2
  - type: Construction
    graph: WebObjects
    node: boots
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
@@ -46,6 +46,8 @@
      - FoodBakedMuffinBerry
      - FoodBakedMuffinCherry
      - FoodBakedMuffinBluecherry
+      - FoodBakedMuffinChocolate
+      - FoodBakedMuffinBanana
      - FoodBakedBunHoney
      - FoodBakedBunHotX
      - FoodBakedBunMeat
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -285,7 +285,6 @@
  - type: AccessReader
    access: [["Command"], ["Research"]]
  - type: ShowJobIcons
-  - type: ShowMindShieldIcons

 - type: entity
  id: BaseBorgChassisSyndicate
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -391,8 +391,6 @@
    - type: Construction
      node: syndicatemedical
    - type: ShowHealthBars
-      damageContainers:
-      - Biological
    - type: InteractionPopup
      interactSuccessString: petting-success-syndicate-cyborg
      interactFailureString: petting-failure-syndicate-cyborg
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -127,7 +127,7 @@
    icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
    iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png
    keywords: [ "AI", "console", "interface" ]
-    priority: -7
+    priority: -6
    event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key }

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

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

 - type: entity
  id: AiHeldIntellicard
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -19,44 +19,84 @@
  - type: Item
    size: Tiny

-# Muffins/Buns
+# Muffins

 - type: entity
  name: muffin
-  parent: FoodBakedBase
+  parent: FoodInjectableBase
  id: FoodBakedMuffin
  description: A delicious and spongy little cake.
  components:
+  - type: Food
+    trash: 
+    - FoodPlateMuffinTin
  - type: Sprite
+    sprite: Objects/Consumable/Food/Baked/misc.rsi
    state: muffin
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+  - type: FlavorProfile
+    flavors:
+      - sweet
+  - type: Item
+    size: Tiny

 - type: entity
  name: berry muffin
-  parent: FoodBakedBase
+  parent: FoodBakedMuffin
  id: FoodBakedMuffinBerry
  description: A delicious and spongy little cake, with berries.
  components:
  - type: Sprite
    state: muffin-berry
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: JuiceBerry
+          Quantity: 2
  - type: Tag
    tags:
    - Fruit

 - type: entity
  name: cherry muffin
-  parent: FoodBakedBase
+  parent: FoodBakedMuffin
  id: FoodBakedMuffinCherry
  description: A sweet muffin with cherry bits.
  components:
  - type: Sprite
    state: muffin-cherry
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: JuiceCherry
+          Quantity: 2
  - type: Tag
    tags:
    - Fruit

 - type: entity
  name: bluecherry muffin
-  parent: FoodBakedBase
+  parent: FoodBakedMuffin
  id: FoodBakedMuffinBluecherry
  description: Blue cherries inside a delicious muffin.
  components:
@@ -66,6 +106,51 @@
    tags:
    - Fruit

+- type: entity
+  name: chocolate muffin
+  parent: FoodBakedMuffin
+  id: FoodBakedMuffinChocolate
+  description: A delicious and spongy chocolate muffin.
+  components:
+  - type: Sprite
+    state: muffin-chocolate
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: CocoaPowder
+          Quantity: 2
+
+- type: entity
+  name: banana muffin
+  parent: FoodBakedMuffin
+  id: FoodBakedMuffinBanana
+  description: A delicious and spongy banana muffin.
+  components:
+  - type: Sprite
+    state: muffin-banana
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: JuiceBanana
+          Quantity: 2
+  - type: Tag
+    tags:
+    - Fruit
+
+# Buns
+
 - type: entity
  name: honey bun #TODO honey
  parent: FoodBakedBase
@@ -685,4 +770,4 @@
  - type: DamageOtherOnHit
    damage:
      types:
-        Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones
+        Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -178,3 +178,27 @@
    materialComposition:
      Steel: 60
  - type: SpaceGarbage
+
+# Muffin Tin
+
+- type: entity
+  name: muffin tin
+  parent: BaseItem
+  id: FoodPlateMuffinTin
+  description: A cheap foil tin for muffins.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/plates.rsi
+    state: muffin-tin
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    storedOffset: 0,-3
+  - type: Tag
+    tags:
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 30
+  - type: SpaceGarbage
--- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
@@ -12,6 +12,7 @@
      components:
      - Anchorable
      - Item
+      tags: 
      - Bot # for funny bot moments
    blacklist:
      components:
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -121,6 +121,7 @@
    - type: Tag
      tags:
        - HolofanProjector
+        - SecBeltEquip
    - type: StaticPrice
      price: 50

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

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

 - type: entity
  parent: BaseSecurityPDA
@@ -732,6 +739,16 @@
    borderColor: "#00842e"
  - type: Icon
    state: pda-centcom
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
+      - WantedListCartridge
+      - LogProbeCartridge
+      - AstroNavCartridge

 - type: entity
  parent: CentcomPDA
@@ -754,6 +771,8 @@
      - NewsReaderCartridge
      - LogProbeCartridge
      - WantedListCartridge
+      - MedTekCartridge
+      - AstroNavCartridge

 - type: entity
  parent: CentcomPDA
@@ -845,14 +864,6 @@
    uiKey: enum.PdaUiKey.Key
    preinstalled:
      - NotekeeperCartridge
-    cartridgeSlot:
-      priority: -1
-      name: Cartridge
-      ejectSound: /Audio/Machines/id_swipe.ogg
-      insertSound: /Audio/Machines/id_insert.ogg
-      whitelist:
-        components:
-          - Cartridge

 - type: entity
  parent: BaseSecurityPDA
@@ -870,6 +881,16 @@
    accentVColor: "#447987"
  - type: Icon
    state: pda-ert
+  - type: CartridgeLoader
+    uiKey: enum.PdaUiKey.Key
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
+      - MedTekCartridge
+      - WantedListCartridge
+      - LogProbeCartridge
+      - AstroNavCartridge

 - type: entity
  parent: ERTLeaderPDA
@@ -910,14 +931,6 @@
  components:
  - type: Pda
    id: ERTMedicIDCard
-  - type: CartridgeLoader
-    uiKey: enum.PdaUiKey.Key
-    preinstalled:
-      - CrewManifestCartridge
-      - NotekeeperCartridge
-      - NewsReaderCartridge
-      - MedTekCartridge
-      - WantedListCartridge

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

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

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

 - type: entity
  parent: PlushieCarp
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
@@ -20,8 +20,6 @@
        density: 15
        mask:
          - MachineMask
-  - type: CargoPallet
-    palletType: All
  - type: StaticPrice
    price: 100
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -71,3 +71,69 @@
  id: DefibrillatorOneHandedUnpowered
  parent: BaseDefibrillator
  suffix: One-Handed, Unpowered
+
+- type: entity
+  id: DefibrillatorCompact # This should be a research item at some point
+  parent: [ BaseDefibrillator, PowerCellSlotMediumItem ]
+  name: compact defibrillator
+  description: Now in fun size!
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/defibsmall.rsi
+    layers:
+      - state: icon
+      - state: screen
+        map: [ "enum.ToggleVisuals.Layer" ]
+        visible: false
+        shader: unshaded
+      - state: ready
+        map: ["enum.PowerDeviceVisualLayers.Powered"]
+        shader: unshaded
+  - type: Item
+    size: Normal
+  - type: ToggleCellDraw
+  - type: PowerCellDraw
+    useRate: 100
+  - type: Defibrillator
+    zapHeal:
+      types:
+        Asphyxiation: -40
+    doAfterDuration: 6
+  - type: DoAfter
+  - type: UseDelay
+
+- type: entity
+  id: DefibrillatorSyndicate
+  parent: DefibrillatorCompact
+  name: interdyne defibrillator
+  description: Doubles as a self-defense weapon against war-crime inclined tiders.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/defibsyndi.rsi
+    layers:
+      - state: icon
+      - state: screen
+        map: [ "enum.ToggleVisuals.Layer" ]
+        visible: false
+        shader: unshaded
+      - state: ready
+        map: ["enum.PowerDeviceVisualLayers.Powered"]
+        shader: unshaded
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 8
+  - type: ItemToggleMeleeWeapon
+    activatedSoundOnHit:
+      path: /Audio/Items/Defib/defib_zap.ogg
+      params:
+        variation: 0.250
+    activatedSoundOnHitNoDamage:
+      path: /Audio/Items/Defib/defib_zap.ogg
+      params:
+        variation: 0.250
+        volume: -10
+    activatedDamage:
+      types:
+        Blunt: 8
+        Shock: 16
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -271,7 +271,6 @@
    transferAmount: 20
    onlyAffectsMobs: false
    injectOnly: true
-
  - type: SolutionContainerManager
    solutions:
      pen:
@@ -284,6 +283,102 @@
  - type: Tag
    tags: []

+- type: entity
+  name: puncturase auto-injector
+  parent: ChemicalMedipen
+  id: PunctAutoInjector
+  description: A rapid dose of puncturase and tranexamic acid, intended for combat applications.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: punctpen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: punctpen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 15
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 15
+        reagents:
+        - ReagentId: Puncturase
+          Quantity: 10
+        - ReagentId: TranexamicAcid
+          Quantity: 5
+  - type: Tag
+    tags: []
+
+- type: entity
+  name: pyrazine auto-injector
+  parent: ChemicalMedipen
+  id: PyraAutoInjector
+  description: A rapid dose of pyrazine and dermaline, intended for combat applications.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: pyrapen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: pyrapen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 20
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 20
+        reagents:
+        - ReagentId: Pyrazine
+          Quantity: 10
+        - ReagentId: Dermaline
+          Quantity: 10
+  - type: Tag
+    tags: []
+
+- type: entity
+  name: airloss auto-injector
+  parent: ChemicalMedipen
+  id: AirlossAutoInjector
+  description: A rapid dose of saline and dexalin plus, intended to get someone up quickly.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: dexpen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: dexpen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 40
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 40
+        reagents:
+        - ReagentId: Saline
+          Quantity: 20
+        - ReagentId: DexalinPlus
+          Quantity: 20
+  - type: Tag
+    tags: []
+
 - type: entity
  name: space medipen
  parent: ChemicalMedipen
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
@@ -5,60 +5,65 @@
  description: A strange alien device.
  abstract: true
  components:
-    - type: Sprite
-      drawdepth: SmallObjects
-      sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
-      noRot: true
-      layers:
-      - state: ano30
-        map: [ "enum.ArtifactsVisualLayers.Base" ]
-      - state: ano30_on
-        map: [ "enum.ArtifactsVisualLayers.Effect" ]
-        visible: false
-    - type: Damageable
-    - type: Physics
-      bodyType: Dynamic
-    - type: Transform
-      noRot: true
-    - type: UserInterface #needs to be here for certain effects
-      interfaces:
-        enum.StorageUiKey.Key:
-          type: StorageBoundUserInterface
-        enum.TransferAmountUiKey.Key:
-          type: TransferAmountBoundUserInterface
-        enum.InstrumentUiKey.Key:
-          type: InstrumentBoundUserInterface
-        enum.IntercomUiKey.Key:
-          type: IntercomBoundUserInterface
-    - type: Reactive
-      groups:
-        Acidic: [Touch]
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape:
-            !type:PhysShapeCircle
-            radius: 0.45
-          density: 75
-          layer: # doesn't collide with artifact storage
-          - Opaque
-          mask:
-          - MachineMask
-    - type: InteractionOutline
-    - type: Artifact
-    - type: RandomArtifactSprite
-      maxSprite: 36
-    - type: RandomSprite
-      available:
-      - enum.ArtifactsVisualLayers.Effect:
-          ano01_on: Rainbow
-    - type: Appearance
-    - type: Actions
-    - type: GuideHelp
-      guides:
-      - Xenoarchaeology
-    - type: StealTarget
-      stealGroup: XenoArtifact
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
+    noRot: true
+    layers:
+    - state: ano30
+      map: [ "enum.ArtifactsVisualLayers.Base" ]
+    - state: ano30_on
+      map: [ "enum.ArtifactsVisualLayers.Effect" ]
+      visible: false
+  - type: Damageable
+  - type: Physics
+    bodyType: Dynamic
+  - type: Transform
+    noRot: true
+  - type: UserInterface #needs to be here for certain effects
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+      enum.TransferAmountUiKey.Key:
+        type: TransferAmountBoundUserInterface
+      enum.InstrumentUiKey.Key:
+        type: InstrumentBoundUserInterface
+      enum.IntercomUiKey.Key:
+        type: IntercomBoundUserInterface
+  - type: Reactive
+    groups:
+      Acidic: [Touch]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        density: 75
+        layer: # doesn't collide with artifact storage
+        - Opaque
+        mask:
+        - MachineMask
+  - type: InteractionOutline
+  - type: Artifact
+  - type: RandomArtifactSprite
+    maxSprite: 36
+  - type: RandomSprite
+    available:
+    - enum.ArtifactsVisualLayers.Effect:
+        ano01_on: Rainbow
+  - type: Appearance
+  - type: Actions
+  - type: GuideHelp
+    guides:
+    - Xenoarchaeology
+  - type: StealTarget
+    stealGroup: XenoArtifact
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container # needed for the EffectStorage artifactEffect
+        ents: [ ]
+      revolver-ammo: !type:Container # needed for the EffectBigIron artifactEffect

 - type: entity
  parent: BaseXenoArtifact
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -543,12 +543,8 @@
    solutions:
      food:
        maxVol: 20
-  - type: SolutionSpiker
-    sourceSolution: food
-  - type: Extractable
-    grindableSolutionName: food
-  - type: StaticPrice
-    price: 0
+  - type: ExplosionResistance
+    damageCoefficient: 0.025 # survives conventional explosives but not minibombs and nukes
  - type: Damageable
    damageContainer: Inorganic
  - type: Destructible
@@ -561,6 +557,12 @@
        solution: food
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: SolutionSpiker
+    sourceSolution: food
+  - type: Extractable
+    grindableSolutionName: food
+  - type: StaticPrice
+    price: 0
  - type: Tag
    tags:
    - Pill
@@ -588,4 +590,7 @@
    areaInsertRadius: 1
    storageInsertSound: /Audio/Effects/pill_insert.ogg
    storageRemoveSound: /Audio/Effects/pill_remove.ogg
+    whitelist: 
+      tags:
+      - Pill
  - type: Dumpable
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: WeaponWaterGunBase
  abstract: true
  parent: BaseItem
@@ -71,7 +71,7 @@
  id: WeaponWaterBlaster
  parent: WeaponWaterGunBase
  name: water blaster
-  description: With this bad boy, you'll be the cooleste kid at the summer barbecue.
+  description: With this bad boy, you'll be the coolest kid at the summer barbecue.
  components:
  - type: Gun
    cameraRecoilScalar: 0 #no recoil
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -103,6 +103,9 @@
        Slash: 10
  - type: Item
    sprite: Objects/Weapons/Melee/combat_knife.rsi
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/combat_knife.rsi
  - type: DisarmMalus
    malus: 0.225

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
@@ -7,13 +7,12 @@
  These bad actors are more often than not employed or backed by the [color=#ff0000]Syndicate[/color], a rival organization to Nanotrasen that wants nothing more than to see it burn.

  ## Various Antagonists
-  Antagonist roles come with their own special sets of abilities, tools and risks to the station.
-
  Antagonists can take many forms, like:
  - [textlink="Nuclear operatives" link="Nuclear Operatives"], with the goal of infiltrating and destroying the station.
  - [textlink="Traitors" link="Traitors"] amongst the crew who must assassinate, steal and decieve.
-  - [textlink="Space Ninjas" link="SpaceNinja"], masters of espionage and sabotage with special gear.
  - [textlink="Revolutionaries" link="Revolutionaries"] who are intent on taking control of the station from the inside.
  - [textlink="Zombies" link="Zombies"] that crave the flesh of every crew member and creature on board.
-  - [textlink="Several non-humanoid creatures" link="MinorAntagonists"] that usually just try to kill anything that moves.
+  - [textlink="Space Ninjas" link="SpaceNinja"], masters of espionage and sabotage with special gear.
+  - [textlink="Thieves" link="Thieves"] driven by kleptomania, determined to get their fix using their special gloves.
+  - [textlink="Various non-humanoid creatures" link="MinorAntagonists"] that generally attack anything that moves.
 </Document>
--- a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
@@ -9,12 +9,12 @@
    <GuideEntityEmbed Entity="MobRevenant"/>
  </Box>

-  Revenants are ethereal beings made of ectoplasm that haunt the crew and steal [color=cyan]life essence[/color] from them.
+  Revenants are ethereal beings made of ectoplasm that haunt the crew and steal [color=#8f63e6]life essence[/color] from them.
  - Your essence is your very own [bold]life force[/bold]. Taking damage reduces your essence.
  - Essence is also spent to use [bold]abilities[/bold].
-  - To gain essence you first [bold]inspect[/bold] various souls for their worth. More worthy souls grant more essence. Then you must [bold]siphon[/bold] it either when the victim is crit, dead or asleep.
+  - To gain essence you first [bold]inspect[/bold] various souls for their worth. More worthy souls grant more essence. Then you must [bold]siphon[/bold] it either when the victim is crit, dead or asleep. All of this is done with [color=yellow][bold][keybind="Use"][/bold][/color].
  - [bold]Stolen essence[/bold] is used to purchase new abilities to incapacitate the crew easier.
-  - You are [bold]vulnerable[/bold] to attacks when you siphon a soul or use an ability. You can tell when you are vulnerable when you have a [italic]"Corporeal"[/italic] status effect.
+  - You are [bold]vulnerable[/bold] to attacks when you siphon a soul or use an ability. You can tell when you are vulnerable when you have a [color=#8f63e6][italic]Corporeal[/italic][/color] status effect.

  # Rat King

@@ -26,12 +26,12 @@
    <GuideEntityEmbed Entity="MobRatServant" Caption=""/>
  </Box>

-  Rat Kings are abnormally large rodents capable of [color=cyan]raising huge rat armies[/color] by eating equally huge amounts of food.
-  - You have several abilities that come at the cost of your [bold]hunger[/bold].
-  - One ability is summoning [color=cyan]Rat Servants[/color] who you can [bold]command[/bold] to stay in place, follow you, attack a target of your choice or attack indiscriminately.
-  - You can conjure a cloud of [color=#77b58e]ammonia[/color], which is mildly poisonous to humans but heals rats.
-  - You can also [italic]"Rummage"[/italic] through any disposal unit by using the context menu. Use this to find [bold]scraps of food[/bold] to grow your army.
-  - Besides your abilities, you are [bold]stronger[/bold] than most other animals. You and your servants are capable of speech and you're both small enough to fit under airlocks and tables.
+  Rat kings are abnormally large rodents capable of [color=yellow]raising huge rat armies[/color] by eating equally huge amounts of food.
+  - You have several abilities that come at the cost of your [bold]hunger.[/bold]
+  - One such ability is [color=yellow][italic]Raise Army[/italic][/color], which summons a [bold]Rat Servant[/bold]. You can [bold]command[/bold] your servants to stay in place, follow you, attack a target of your choice or attack indiscriminately.
+  - You can conjure a cloud of [color=#77b58e]ammonia[/color] using [color=purple][italic]Rat King's Domain[/italic][/color]. This purple gas is mildly poisonous to humans but heals rats.
+  - [color=#9daa98][italic]Rummage[/italic][/color] through a disposal unit by using the context menu. Use this to find [bold]scraps of food[/bold] to grow your army.
+  - Besides your abilities, [bold]you are stronger than most other animals.[/bold] You and your servants are capable of speech and you're both small enough to fit under airlocks and tables.
  - [bold]Your underlings are still very fragile![/bold] Beware of spacings, explosions and the buisness end of a melee weapon.

  # Space Dragon
@@ -44,11 +44,11 @@
    <GuideEntityEmbed Entity="MobCarp" Caption=""/>
  </Box>

-  Space Dragons is are giant extradimensional fish that [color=cyan]create rifts and eat crew.[/color]
-  - Dragons have powerful jaws to [bold]devour[/bold] infrastructure such as doors, windows, and walls.
-  - Your [color=orange]dragon's breath[/color] is a flaming projectile which travels a straight flight path, exploding multiple times and igniting things along the way. Be careful, your carps are not immune to this!
-  - You have the ability to summon [bold]carp rifts[/bold] that periodically spawn [bold]space carp[/bold]. There can be 3 rifts active at any given time.
-  - Rifts charge up energy over a period of 5 minutes and are [bold]vulnerable[/bold] during this time.  After 5 minutes, it becomes invulnerable and will continue summoning carp as long as the dragon lives.
+  Space dragons are giant extradimensional fish that can [color=red]eat crew[/color] and create [color=#4b7fcc]carp rifts.[/color]
+  - Dragons have powerful jaws that allow them to [color=red][italic]Devour[/italic][/color] infrastructure such as doors, windows, and walls.
+  - They can also heal themselves by using [color=red][italic]Devour[/italic][/color] on crew members that have gone unconscious or have died.
+  - Your [color=orange][italic]Dragon's Breath[/italic][/color] is a [bold]flaming projectile[/bold] which travels a straight flight path, exploding multiple times and igniting things along the way. Try not to hit your carps with this!
+  - You have the ability to [color=#4b7fcc][italic]Summon a Carp Rift[/italic][/color]. Rifts periodically spawn [bold]space carp[/bold] and charge up energy over a period of 5 minutes, [bold]which is when it's vulnerable.[/bold] After 5 minutes, it becomes invulnerable and will continue summoning carp as long as the dragon lives.
  - You'll suffer a [bold]temporary debilitating feedback effect[/bold] if one of your rifts are destroyed before it's done charging.
  - If a period of five minutes passes since your spawn or since the last time a rift was charging, [bold]you'll disappear.[/bold]
  - Dragons who have the maximum of 3 fully charged rifts will [bold]never disappear[/bold], but they are still mortal.
@@ -61,6 +61,6 @@
  </Box>

  Slimes and spiders have no remarkable features, but will [color=cyan]infest the station[/color] from time to time regardless. Both will give chase and attack anything they see.
-  - Slimes may deal extra [bold]cellular or posion damage[/bold], based upon their color. Water hurts them just as it would hurt a slime person.
-  - Spiders can lay [bold]webs[/bold], which non-spiders have a hard time moving through. They can easily be destroyed with a blade.
+  - Slimes may [bold]deal extra cellular or poison damage[/bold], based upon their color. Water hurts them just as it would hurt a slime person.
+  - Spiders have a venomous bite and can [bold]create webs[/bold] that are hard to move though. Webs are easily destroyed with a blade. They can also pry open airlocks.
 </Document>
--- a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear
@@ -1,6 +1,6 @@
 <Document>
  # Nuclear Operatives
-  
+
  <Box>
    [color=#999999][italic]"OPERATIVES STANDBY. YOUR OBJECTIVES ARE SIMPLE.[/italic][/color]
  </Box>
@@ -38,13 +38,13 @@
  </Box>

  ## Preparation
-  Each member in your squad has been given an [color=cyan]uplink[/color] to purchase everything you will need for the mission, similar to [textlink="Traitors." link="Traitors"]
+  Each member in your squad has been given an [color=cyan]uplink[/color] to purchase everything you will need for the mission, similar to [textlink="traitors." link="Traitors"]

  <Box>
    <GuideEntityEmbed Entity="BaseUplinkRadio40TC" Caption="your uplink"/>
  </Box>

-  You can purchase the same kinds of gear Traitors can, but you have higher quality gear available to you and more telecrystals to spend.
+  You can purchase the same kinds of gear traitors can, but you have higher quality gear available to you and more telecrystals to spend.
  <Box>
    <GuideEntityEmbed Entity="WeaponLightMachineGunL6" Caption="Weaponry"/>
    <GuideEntityEmbed Entity="MagazineLightRifleBox" State="icon" Caption="Ammo"/>
@@ -71,8 +71,8 @@
  ## Getting to the Station
  You've got the plan, you've got the gear. Now, execute.

-  Grab a [bold]jetpack[/bold] from your armory and go with your other operatives to the [color=cyan]Syndicate Shuttle[/color].
-  Among other things you may need, you'll find an [bold]IFF Console[/bold] on the shuttle. It allows you to hide from other ships and mass scanners when [italic]"Show IFF"[/italic] and [italic]"Show Vessel"[/italic] are toggled off.
+  Grab a [bold]jetpack[/bold] from your armory and go with your other operatives to your [color=cyan]shuttle[/color].
+  Among other things you may need, you'll find an [bold]IFF Computer[/bold] on the shuttle. It allows you to hide from other ships and mass scanners when [italic]Show IFF[/italic] and [italic]Show Vessel[/italic] are toggled off.

  When everyone is ready, FTL to the station and fly to it with a jetpack. Don't forget the code, your pinpointers and the nuke if you're taking it.

@@ -82,12 +82,12 @@
  </Box>

  ## The Nuke & Arming Procedure
-  You have a paper with the [color=cyan]nuclear authentication codes[/color] on your shuttle. [bold]Check to see if the nuke ID matches the one on your shuttle.[/bold] If it doesn't, you'll have to use explosive in the station's vault.
+  You have a paper with the [color=cyan]nuclear authentication codes[/color] on your shuttle. [bold]Check to see if the nuke ID matches the one on your shuttle.[/bold] If it doesn't, you'll be arming the station's nuke instead.

  - Obtain the [bold]nuclear authentication disk[/bold] and insert it into the nuke.
  - Type in the [bold]nuclear authentication code[/bold] and press "[bold]E[/bold]" on the keypad to Enter.
-  - To begin [bold]self-destruct process[/bold], press "[color=red]ARM[/color]". After 300 seconds, the nuke will explode.
-  - [bold]Defend the nuke[/bold], even if it's at the cost of your lives! The mission requirements do not include your return. 
+  - [bold]To begin the self-destruct sequence, press [color=#EB2D3A]ARM[/color][/bold]. After 300 seconds, the nuke will explode.
+  - [bold]Defend the nuke[/bold], even if it's at the cost of your lives! The mission requirements do not include your return.
  - It takes 30 seconds for someone to [bold]disarm[/bold] the nuke. Re-arming it is possible, but the chance of mission success drops if you let it happen.
  - Should the nuke be re-armed, the timer will start from where it left off.

--- a/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
@@ -1,6 +1,6 @@
 <Document>
  # Revolutionaries
-  
+
  <Box>
    [color=#999999][italic]"Viva la revolución!!"[/italic][/color]
  </Box>
@@ -13,20 +13,20 @@
  ## Objectives
  You must cuff, kill, or exile all of the [textlink="Command staff" link="Command"] on station in no particular order.

-  Your objective is not to destroy the station, but [italic]take it over[/italic], so try to minimize damage where possible.
+  Your objective is [bold]not to destroy the station[/bold], but [italic]to take it over[/italic], so try to minimize damage where possible.

  [bold]The revolution will fail[/bold] if all of the [bold][color=#5e9cff]Head Revolutionaries[/color][/bold] die, and all [color=red]Revolutionaries[/color] will de-convert if this happens.

  ## Headrevs & Conversion
  [bold][color=#5e9cff]Head Revolutionaries[/color][/bold] are chosen at the start of the shift and begin with a [color=cyan]flash[/color] and a pair of [color=cyan]sunglasses[/color].
-  
+
  <Box>
    <GuideEntityEmbed Entity="Flash"/>
    <GuideEntityEmbed Entity="ClothingEyesGlassesSunglasses"/>
  </Box>
-  
+
  You can convert crew members to your side by taking any [bold]flash[/bold] and attacking someone with it using [color=#ff0000]harm mode[/color].
-  However, you can't convert your target if they're wearing [color=cyan]flash protection[/color] such as [bold]sunglasses[/bold] or a [bold]welding mask[/bold].
+  However, [bold]you can't convert your target if they're wearing [color=cyan]flash protection[/color][/bold] such as sunglasses or a welding mask.

  <Box>
    <GuideEntityEmbed Entity="ClothingEyesGlassesSunglasses"/>
@@ -34,10 +34,10 @@
    <GuideEntityEmbed Entity="ClothingHeadHatWelding"/>
  </Box>

-  Another hurdle in your way are pesky [color=cyan]mindshield implanters[/color]. These will:
+  Another obstacle in your way are those pesky [color=cyan]mindshield implanters[/color]. These will:
  - Prevent the implanted person from being converted into a [color=red]Revolutionary[/color]
  - De-convert Revolutionaries, and will make them no longer loyal to your cause
-  - Visibly be destroyed upon being implanted into a [bold][color=#5e9cff]Head Revolutionary[/color][/bold], giving away your cover
+  - [bold]Visibly be destroyed upon being implanted into a [color=#5e9cff]Head Revolutionary[/color][/bold], giving you away
  - NOT protect against flash disorientation

  Assume all of [color=#cb0000]Security[/color] and [color=#1b67a5]Command[/color] are implanted with mindshields already.
@@ -47,7 +47,7 @@
  </Box>

  ## Revolutionary
-  A [bold][color=red]Revolutionary[/color][/bold] is a crew member that has been converted by a [bold][color=#5e9cff]Head Revolutionary[/color][/bold].
+  A [color=red]Revolutionary[/color] is a crew member that has been converted by a [bold][color=#5e9cff]Head Revolutionary[/color][/bold].

  [bold][color=red]Revolutionaries[/color] can't convert people themselves,[/bold] but they're more than capable of doing dirty work and carrying out orders.
 </Document>
--- a/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
@@ -7,7 +7,7 @@

  You are an elite mercenary that [color=#66FF00]The Spider Clan[/color] has sent to wreak all kinds of havoc on the station. You are equipped to keep it silent-but-deadly.

-  Whether you decide to mercilessly pick off the station's crew one by one or stay out of trouble, your discipline has taught you that [italic]your objectives must be at least attempted[/italic]. For honor!
+  Whether you get bloody or stay out of trouble, your discipline has taught you that [italic]your objectives must be at least attempted[/italic]. For honor!

  ## Standard Equipment
  You begin implanted with a [color=cyan]death acidifier[/color], so if you are captured or KIA all your precious equipment is kept out of enemy hands.
@@ -19,7 +19,7 @@
    <GuideEntityEmbed Entity="PinpointerStation"/>
  </Box>
  
-  ## Ninja Suit & Boots
+  ## Your Suit
  
  <Box>
    <GuideEntityEmbed Entity="ClothingEyesVisorNinja" Caption="your visor"/>
@@ -27,12 +27,12 @@
    <GuideEntityEmbed Entity="ClothingShoesSpaceNinja" Caption="your boots"/>
  </Box>

-  Your single most important item is [color=#66FF00]your suit[/color], without it none of your abilities would work.
+  Your single most important item is [color=cyan]your suit[/color], without it none of your abilities would work.
  Your suit requires power to function, which is supplied by its [bold]internal battery[/bold]. It can be replaced, and [italic]high capacity batteries[/italic] mean a [italic]highly effective ninja[/italic].

-  [bold]You can recharge your internal battery directly[/bold] by using [color=#66FF00]your gloves[/color]. You can see the current charge by examining the suit or checking the nifty battery alert on your screen.
+  [bold]You can recharge your internal battery directly[/bold] by using [color=cyan]your gloves[/color]. You can see the current charge by examining the suit or checking the nifty battery alert on your screen.

-  Your outfit also includes [color=#66FF00]special boots[/color] that keep you agile, upright and grounded without using energy. You've also got flash protection thanks to your [color=#66FF00]visor[/color].
+  Your outfit also includes [color=cyan]special boots[/color] that keep you agile, upright and grounded without using energy. You've also got flash protection thanks to your [color=cyan]visor[/color].

  ## Ninja Gloves

@@ -58,9 +58,9 @@

  [bold]You have sworn yourself to the sword and refuse to use firearms.[/bold] Luckily, you've got a pretty cool sword.

-  Your [color=#66FF00]energy katana[/color] hurts plenty and can be [bold]recalled at will[/bold] at the cost of suit power. The farther away it is from you, the more energy required to recall it.
+  Your [color=cyan]energy katana[/color] hurts plenty and can be [bold]recalled at will[/bold] at the cost of suit power. The farther away it is from you, the more energy required to recall it.

-  While in hand you may also [color=#66FF00]teleport[/color] to anywhere that you can see, [bold]including through windows[/bold]. The charges required to do this regenerate slowly, so keep a charge or two spare in case you need a quick getaway.
+  While in hand you may also [color=cyan]teleport[/color] to anywhere that you can see, [bold]including through windows[/bold]. The charges required to do this regenerate slowly, so keep a charge or two spare in case you need a quick getaway.

  ## Spider Clan Charge
  
@@ -68,9 +68,9 @@
    <GuideEntityEmbed Entity="SpiderCharge"/>
  </Box>
  
-  [color=#66FF00]A modified C-4 explosive[/color], which can be found in your pocket. Creates a large explosion but [bold]must be armed in your target area[/bold] as it is one of your [color=#66FF00]objectives[/color].
+  This is a [color=cyan]modified C-4 explosive[/color] which can be found in your pocket. Creates a large explosion but [bold]must be armed in your target area[/bold] as it is one of your objectives.

-  It can't be activated manually, so simply plant it on a wall or a particularly ugly piece of furniture. Can't be unstuck once planted.
+  It can't be activated manually, so simply plant it on a wall or some furniture that does not spark joy. Choose wisely, it can't be unstuck once planted.

  ## Objectives

--- a/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
@@ -11,7 +11,7 @@
  Thieves are petty yet crafty [color=green]criminals[/color] who can't keep their hands to themselves. You were forcefully given a [bold]pacifism implant[/bold] after your last arrest, but you won't let that stop you from trying to add to your collection.

  ## Art of the Steal
-  Unlike other antagonists, [italic]staying out of trouble is almost a requirement for you[/italic] because of your implant.
+  Unlike other antagonists, [bold]staying out of trouble is almost a requirement for you[/bold] because of your implant.
  You can only run if [color=#cb0000]Security[/color] picks a fight with you, and because you work alone you don't have any friends to pull you out of danger.

  But against all odds, you'll sucessfully swipe what you want using determination, sleight of hand, a few tools and your [color=cyan]thieving gloves.[/color]
@@ -39,6 +39,9 @@
  Your [color=cyan]toolbox[/color] contains... well, whatever you remembered to pack. [bold]You can select two pre-made kits[/bold] to help you complete grander heists.
  Approve your choices in a safe place, as the toolbox will dissolve and the gear will drop at your feet.

+  <Box>
+    <GuideEntityEmbed Entity="ToolboxThief"/>
+  </Box>
  <Box>
    <GuideEntityEmbed Entity="StorageImplanter" Caption="Anatomy"/>
    <GuideEntityEmbed Entity="C4" Caption="Breacher"/>
--- a/Resources/Textures/Interface/Actions/actions_ai.rsi/job_view.png
+++ b/Resources/Textures/Interface/Actions/actions_ai.rsi/job_view.png
--- a/Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json
@@ -28,9 +28,6 @@
 		{
 			"name": "mass_scanner"
 		},
-		{
-			"name": "job_view"
-		},
 		{
 			"name": "comms_console"
 		},
--- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
@@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955. Muffin-chocolate, muffin-banana and muffin-cherry sprites modified from the original muffin sprite by RumiTiger",
    "size": {
        "x": 32,
        "y": 32
@@ -162,7 +162,12 @@
        },
        {
            "name": "croissant"
+        },
+        {
+           "name": "muffin-chocolate"
+        },
+        {
+           "name": "muffin-banana"
        }
    ]
 }
-
--- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-banana.png
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-banana.png
--- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-berry.png
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-berry.png
--- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png
--- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-chocolate.png
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-chocolate.png
--- a/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json
@@ -1,7 +1,7 @@
 {
  "version": 1,
  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Muffin-tin sprite modified from the original tin sprite by RumiTiger",
  "size": {
    "x": 32,
    "y": 32
@@ -33,6 +33,9 @@
    },
    {
      "name": "tray-trash"
+    },
+    {
+        "name": "muffin-tin"
    }
  ]
 }
--- a/Resources/Textures/Objects/Consumable/Food/plates.rsi/muffin-tin.png
+++ b/Resources/Textures/Objects/Consumable/Food/plates.rsi/muffin-tin.png
--- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png
+++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png
--- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png
+++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png
--- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png
+++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png
--- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png
+++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png
--- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png
+++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png
--- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png
+++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png
--- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png
+++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png
--- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json
@@ -1,7 +1,7 @@
 {
  "version": 1,
  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba",
+  "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba, crypt states modified by Flareguy for Space Station 14",
  "size": {
    "x": 32,
    "y": 32
--- a/Resources/Textures/Objects/Devices/tablets.rsi/generic.png
+++ b/Resources/Textures/Objects/Devices/tablets.rsi/generic.png
--- a/Resources/Textures/Objects/Devices/tablets.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/tablets.rsi/meta.json
@@ -1 +1,26 @@
-{"version":1,"license":"CC-BY-SA-3.0","copyright":"https://github.com/Baystation12/Baystation12/tree/17e84546562b97d775cb26790a08e6d87e7f8077","size":{"x":32,"y":32},"states":[{"name":"tablet"},{"name":"tabletsol"},{"name":"generic","delays":[[0.3,0.3]]}]}
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Baystation12 at https://github.com/Baystation12/Baystation12/tree/17e84546562b97d775cb26790a08e6d87e7f8077 and heavily modified by Flareguy for Space Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "tablet"
+        },
+        {
+            "name": "tabletsol"
+        },
+        {
+            "name": "generic",
+        "delays": [
+            [
+            0.3,
+            0.3
+            ]
+        ]
+        }
+    ]
+}
--- a/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png
+++ b/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png
--- a/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png
+++ b/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png
--- a/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json
@@ -39,15 +39,6 @@
    {
      "name": "grey-inhand-right",
      "directions": 4
-    },
-    {
-      "name": "mopbucket_shark_blue"
-    },
-    {
-      "name": "mopbucket_shark_pink"
-    },
-    {
-      "name": "mopbucket_shark_grey"
    }
  ]
 }
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
@@ -1,7 +1,7 @@
 {
  "version": 1,
  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, mopbucket_shark_* by Psychpsyo, mopbucket_carpplush adapted by Psychpsyo from tgstation carpplush at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
  "size": {
    "x": 32,
    "y": 32
@@ -25,6 +25,18 @@
    {
      "name": "mopbucket_water-3"
    },
+    {
+      "name": "mopbucket_shark_blue"
+    },
+    {
+      "name": "mopbucket_shark_pink"
+    },
+    {
+      "name": "mopbucket_shark_grey"
+    },
+    {
+      "name": "mopbucket_carpplush"
+    },
    {
      "name": "inhand-left",
      "directions": 4
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_carpplush.png
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_carpplush.png
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_blue.png
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_blue.png
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_grey.png
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_grey.png
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_pink.png
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_pink.png
--- a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png
+++ b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png
--- a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png
+++ b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png
--- a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png
+++ b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png
--- a/Show More
+++ b/Show More