Remuchi
d2d501dbc0
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
2024-04-13 11:29:33 +07:00
..
2024-04-10 09:57:42 +07:00
2024-04-13 11:29:33 +07:00
2024-04-13 11:29:33 +07:00
2024-04-01 17:36:31 +11:00
2024-03-19 14:30:56 +11:00
2024-03-26 15:52:23 +07:00
2024-03-19 21:09:00 +11:00
2024-04-01 19:29:13 +11:00
2024-03-26 15:52:23 +07:00
2024-03-30 10:36:17 +07:00
2024-04-13 11:29:33 +07:00
2024-03-19 23:27:02 -04:00
2024-03-30 11:33:13 +07:00
2024-03-30 11:40:01 +07:00
2024-03-27 21:23:18 +07:00
2024-03-27 21:23:18 +07:00
2024-04-13 11:29:33 +07:00
2024-03-28 00:13:47 +07:00
2024-04-13 11:29:33 +07:00
2024-04-13 11:29:33 +07:00
2024-03-19 23:27:02 -04:00
2024-03-30 10:36:17 +07:00
2024-04-13 11:29:33 +07:00
2024-04-13 11:29:33 +07:00
2024-03-26 15:52:23 +07:00
2024-04-13 11:29:33 +07:00
2024-03-26 15:52:23 +07:00
2024-03-29 16:28:16 +11:00
2024-04-01 17:27:39 +11:00
2024-04-13 11:29:33 +07:00
2024-03-30 10:36:17 +07:00
2024-04-13 11:29:33 +07:00
2024-04-13 11:29:33 +07:00
2024-03-28 16:53:18 +11:00
2024-03-27 21:50:24 +07:00
2024-03-30 11:40:01 +07:00
2024-03-27 21:23:18 +07:00
2024-03-22 18:08:40 +11:00
2024-03-24 16:33:45 +11:00
2024-03-27 19:42:57 +07:00
2024-03-30 11:40:01 +07:00
2024-04-01 17:27:39 +11:00
2024-03-29 16:28:16 +11:00
2024-04-13 11:29:33 +07:00
2024-03-19 21:09:00 +11:00
2024-04-13 11:29:33 +07:00
2024-03-29 16:28:16 +11:00
2024-03-30 10:36:17 +07:00
2024-04-01 17:27:39 +11:00
2024-03-26 15:52:23 +07:00
2024-03-29 21:25:42 -04:00
2024-04-13 11:29:33 +07:00
2024-03-30 10:36:17 +07:00
2024-03-19 23:27:02 -04:00
2024-04-13 11:29:33 +07:00
2024-03-25 17:37:25 +11:00
2024-04-01 17:31:36 +11:00
2024-03-30 10:36:17 +07:00
2024-03-30 10:36:17 +07:00
2024-03-20 22:54:07 +03:00
2024-03-28 15:05:04 +11:00
2024-03-30 10:36:17 +07:00
2024-03-24 16:33:45 +11:00
2024-03-30 10:36:17 +07:00
2024-03-26 15:52:23 +07:00
2024-04-01 17:27:39 +11:00
2024-03-26 15:52:23 +07:00
2024-03-26 15:52:23 +07:00
2024-03-26 15:52:23 +07:00
2024-04-13 11:29:33 +07:00
2024-03-30 15:17:53 +11:00
2024-04-13 11:29:33 +07:00
2024-03-26 15:52:23 +07:00
2024-03-18 07:30:27 +11:00
2024-03-19 23:27:02 -04:00
2024-03-29 16:28:16 +11:00
2024-03-30 14:11:44 -04:00
2024-04-01 17:27:39 +11:00
2024-03-28 16:53:18 +11:00
2024-04-13 11:29:33 +07:00
2024-03-30 10:36:17 +07:00
2024-04-01 14:00:10 -07:00
2024-03-24 03:34:56 +11:00
2024-03-30 10:36:17 +07:00
2024-03-25 17:37:25 +11:00
2024-03-28 16:53:18 +11:00
2024-03-30 15:17:53 +11:00
2024-03-26 15:52:23 +07:00
2024-03-29 17:41:09 +11:00
2024-03-31 17:34:17 +11:00
2024-03-30 11:40:01 +07:00
2024-03-19 23:27:02 -04:00
2024-03-26 15:52:23 +07:00
2024-03-30 10:36:17 +07:00
2024-03-27 19:42:57 +07:00
2024-04-13 11:29:33 +07:00
2024-04-01 14:00:10 -07:00
2024-03-29 16:28:16 +11:00
2024-03-30 10:36:17 +07:00
2024-03-26 11:52:27 +11:00
2024-04-13 11:29:33 +07:00
2024-03-22 18:08:40 +11:00
2024-03-30 10:36:17 +07:00
2024-03-30 10:36:17 +07:00
2024-04-01 15:50:00 +11:00
2024-04-13 11:29:33 +07:00
2024-03-31 16:44:02 -04:00
2024-04-13 11:29:33 +07:00
2024-03-29 16:28:16 +11:00
2024-03-30 10:36:17 +07:00
2024-03-28 17:28:45 +11:00
2024-04-04 17:26:21 +11:00
2024-03-30 10:36:17 +07:00
2024-04-13 11:29:33 +07:00
2024-03-19 21:09:00 +11:00
2024-03-30 11:40:01 +07:00
2024-03-19 23:27:02 -04:00
2024-03-21 03:08:17 +03:00
2024-03-30 10:36:17 +07:00
2024-04-13 11:29:33 +07:00
2024-03-26 15:52:23 +07:00
2024-03-19 21:09:00 +11:00
2024-04-01 17:06:13 +11:00
2024-04-13 11:29:33 +07:00
2024-03-26 15:52:23 +07:00
2024-03-28 15:05:04 +11:00
2024-03-22 18:08:40 +11:00
2024-03-30 10:36:17 +07:00
2024-03-17 18:31:09 +11:00
2024-03-19 21:09:00 +11:00
2024-03-30 10:36:17 +07:00
2024-03-24 16:33:45 +11:00
2024-03-31 14:21:18 +11:00
2024-03-28 15:05:04 +11:00
2024-03-19 23:27:02 -04:00
2024-04-01 17:06:13 +11:00
2024-03-30 10:36:17 +07:00
2024-03-30 10:36:17 +07:00
2024-04-13 11:29:33 +07:00
2024-04-04 17:28:09 +11:00
2024-03-26 15:52:23 +07:00
2024-03-30 10:36:17 +07:00
2024-03-30 10:36:17 +07:00
2024-03-26 15:52:23 +07:00