Merge remote-tracking branch 'upstream/master' into upstream

# Conflicts:
#	Content.Client/Access/AccessOverlay.cs
#	Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
#	Content.Client/Access/UI/IdCardConsoleWindow.xaml
#	Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
#	Content.Client/Chemistry/UI/InjectorStatusControl.cs
#	Content.Client/StatusIcon/StatusIconOverlay.cs
#	Content.Client/Stylesheets/StyleNano.cs
#	Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
#	Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
#	Content.Server/Access/Systems/IdCardConsoleSystem.cs
#	Content.Server/Administration/Commands/AGhost.cs
#	Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
#	Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Server/Resist/EscapeInventorySystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Shared/Access/Components/IdCardConsoleComponent.cs
#	Content.Shared/Anomaly/SharedAnomalySystem.cs
#	Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/RCD/Systems/RCDSystem.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Content.Shared/StatusIcon/StatusIconPrototype.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Resources/Audio/Machines/attributions.yml
#	Resources/Locale/en-US/rcd/components/rcd-component.ftl
#	Resources/Maps/reach.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
#	Resources/Prototypes/DeviceLinking/sink_ports.yml
#	Resources/Prototypes/Entities/Clothing/Back/duffel.yml
#	Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
#	Resources/Prototypes/Entities/Clothing/Neck/misc.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
#	Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
#	Resources/Prototypes/Entities/Objects/Magic/books.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
#	Resources/Prototypes/Entities/Objects/Misc/tiles.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
#	Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
#	Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
#	Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
#	Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
#	Resources/Prototypes/Entities/Structures/Walls/grille.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
#	Resources/Prototypes/Recipes/Crafting/improvised.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/StatusEffects/health.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/lobbyscreens.yml
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING-body-slim.png
#	Resources/Textures/Decals/bricktile.rsi/white_box.png
#	Resources/Textures/Objects/Misc/books.rsi/meta.json
#	Resources/migration.yml

Resources/Textures/Objects/Misc/books.rsi/meta.json

@@ -1,71 +1,74 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77",
+  "copyright": "Base sprite taken at: https://github.com/tgstation/tgstation/commit/37fb6bc6dd20005775dde8d886f48f7722606b77 , splitted on layers by TheShuEd (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "book0"
+      "name": "book_icon"
     },
     {
-      "name": "book1"
+      "name": "cover_base"
     },
     {
-      "name": "book2"
+      "name": "cover_old"
     },
     {
-      "name": "book3"
+      "name": "cover_strong"
     },
     {
-      "name": "book4"
+      "name": "decor_wingette"
     },
     {
-      "name": "book5"
+      "name": "decor_wingette_flat"
     },
     {
-      "name": "book6"
+      "name": "decor_wingette_circle"
     },
     {
-      "name": "book7"
+      "name": "decor_bottom"
     },
     {
-      "name": "book8"
+      "name": "decor_diagonal"
     },
     {
-      "name": "book_infections"
+      "name": "decor_middle"
     },
     {
-      "name": "book_cooking"
+      "name": "decor_spine"
     },
     {
-      "name": "book_engineering"
+      "name": "decor_vertical_middle"
     },
     {
-      "name": "book_engineering2"
+      "name": "detail_bookmark"
     },
     {
-      "name": "book_hacking"
+      "name": "detail_rivets"
     },
     {
-      "name": "book_detective"
+      "name": "icon_apple"
     },
     {
-      "name": "book_nuclear"
+      "name": "icon_atmos"
     },
     {
-      "name": "book_particle_accelerator"
+      "name": "icon_aurora"
     },
     {
-      "name": "book_cloning"
+      "name": "icon_banana"
     },
     {
-      "name": "book_hydroponics_pod_people"
+      "name": "icon_bar"
     },
     {
-      "name": "book_borg",
+      "name": "icon_biohazard"
+    },
+    {
+      "name": "icon_borg",
       "delays": [
         [
           6,
@@ -74,19 +77,61 @@
       ]
     },
     {
-      "name": "book_chemistry"
+      "name": "icon_briefcase"
     },
     {
-      "name": "book_bar"
+      "name": "icon_bucket"
     },
     {
-      "name": "book_space_law"
+      "name": "icon_cabbage"
     },
     {
-      "name": "book_demonomicon",
+      "name": "icon_chemical"
+    },
+    {
+      "name": "icon_corner"
+    },
+    {
+      "name": "icon_diamond"
+    },
+    {
+      "name": "icon_dna"
+    },
+    {
+      "name": "icon_eye"
+    },
+    {
+      "name": "icon_fish"
+    },
+    {
+      "name": "icon_glow"
+    },
+    {
+      "name": "icon_hacking"
+    },
+    {
+      "name": "icon_ian"
+    },
+    {
+      "name": "icon_law"
+    },
+    {
+      "name": "icon_letter_N"
+    },
+    {
+      "name": "icon_letter_P"
+    },
+    {
+      "name": "icon_lightning"
+    },
+    {
+      "name": "icon_magic"
+    },
+    {
+      "name": "icon_magic_fireball",
       "delays": [
         [
-          0.5,
+          0.1,
           0.1,
           0.1,
           0.1
@@ -94,13 +139,32 @@
       ]
     },
     {
-      "name": "book_origami"
+      "name": "icon_magic_forcewall",
+      "delays": [
+        [
+          0.3,
+          0.3
+        ]
+      ]
     },
     {
-      "name": "book_boneworking"
+      "name": "icon_magic_knock",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
-      "name": "book_fish"
+      "name": "icon_magnifier"
+    },
+    {
+      "name": "icon_medical"
     },
     {
       "name": "summon_book"
@@ -109,10 +173,87 @@
       "name": "book_science"
     },
     {
-      "name": "book_medical"
+      "name": "icon_medical_cross"
     },
     {
-      "name": "book_security"
+      "name": "icon_mount"
+    },
+    {
+      "name": "icon_nuclear"
+    },
+    {
+      "name": "icon_origami"
+    },
+    {
+      "name": "icon_pentagramm"
+    },
+    {
+      "name": "icon_planet"
+    },
+    {
+      "name": "icon_possum"
+    },
+    {
+      "name": "icon_question"
+    },
+    {
+      "name": "icon_scmmd"
+    },
+    {
+      "name": "icon_skull"
+    },
+    {
+      "name": "icon_stars"
+    },
+    {
+      "name": "icon_stars2"
+    },
+    {
+      "name": "icon_stunbaton"
+    },
+    {
+      "name": "icon_temple"
+    },
+    {
+      "name": "icon_text"
+    },
+    {
+      "name": "icon_text2"
+    },
+    {
+      "name": "icon_text3"
+    },
+    {
+      "name": "icon_time"
+    },
+    {
+      "name": "icon_tree"
+    },
+    {
+      "name": "icon_wrench"
+    },
+    {
+      "name": "overlay_blood"
+    },
+    {
+      "name": "overlay_dirt"
+    },
+    {
+      "name": "overlay_null"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "paper_blood",
+      "delays": [
+        [
+          5,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     }
   ]
 }