Ed
9d6e023bd0
Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2
# Conflicts:
# Content.Client/Administration/AdminNameOverlay.cs
# Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Cloning/CloningSystem.cs
# Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
# Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
# Content.Server/Roles/ParadoxCloneRoleComponent.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/CCVar/CCVars.Interface.cs
# Content.Shared/Cloning/CloningEvents.cs
# Content.Shared/Cloning/CloningSettingsPrototype.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Light/Components/SunShadowCycleComponent.cs
# Content.Shared/Storage/StorageComponent.cs
# Resources/Changelog/Admin.yml
# Resources/Changelog/Changelog.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/en-US/paradox-clone/role.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/loop.yml
# Resources/Prototypes/Chemistry/mixing_types.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Effects/puddle.yml
# Resources/Prototypes/Entities/Mobs/Player/clone.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Objectives/paradoxClone.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi/equipped-EYES-arachnid.png
2025-03-31 12:41:37 +03:00
..
2025-03-29 16:50:14 +03:00
2025-01-21 23:57:12 +03:00
2025-02-12 23:46:02 -05:00
2025-03-26 21:40:13 +01:00
2025-03-17 11:54:43 +03:00
2025-03-22 12:41:16 +01:00
2024-07-21 14:48:13 +10:00
2024-05-02 12:40:07 +10:00
2024-09-18 00:19:34 +02:00
2024-07-26 10:30:49 -07:00
2023-09-28 20:48:50 +10:00
2025-02-23 23:07:55 +03:00
2025-02-23 23:07:55 +03:00
2024-07-01 02:20:57 +10:00
2023-09-11 09:42:41 +10:00
2024-07-21 14:48:13 +10:00
2023-08-05 14:25:47 +10:00
2024-02-02 00:33:57 +11:00
2023-09-11 09:42:41 +10:00
2025-02-12 21:51:28 -08:00
2024-02-13 16:48:39 -05:00
2024-04-17 14:48:35 -07:00
2025-02-06 13:57:14 +03:00
2025-03-15 09:24:23 -07:00
2025-03-24 00:46:34 +01:00
2024-02-13 16:48:39 -05:00
2024-06-01 15:00:31 -04:00
2025-02-25 17:00:12 +01:00
2025-03-17 11:54:43 +03:00
2025-02-06 13:57:14 +03:00
2024-07-13 16:09:19 +10:00
2024-07-21 14:48:13 +10:00
2025-03-31 12:41:37 +03:00
2024-02-13 16:48:39 -05:00
2025-03-17 11:54:43 +03:00
2024-12-20 10:17:13 -06:00
2024-09-01 23:22:50 +02:00
2024-07-21 14:48:13 +10:00
2025-03-03 23:23:40 +03:00
2024-08-25 22:05:39 +10:00
2025-02-23 23:07:55 +03:00
2024-09-01 13:00:53 +02:00
2025-02-06 13:57:14 +03:00
2025-03-16 19:43:37 -04:00
2023-09-28 16:20:29 -07:00
2024-02-13 16:48:39 -05:00
2023-08-22 18:14:33 -07:00
2024-06-27 16:58:51 +02:00
2024-08-04 13:31:45 +10:00
2025-03-17 11:54:43 +03:00
2024-02-11 14:19:45 +11:00
2024-06-20 01:13:40 +10:00
2025-02-14 16:46:25 +01:00
2024-07-23 12:04:09 +03:00
2025-02-23 23:14:56 +11:00
2025-02-11 20:59:50 +11:00
2025-02-11 13:54:35 +11:00
2023-09-11 19:18:06 +10:00
2024-08-03 03:12:08 +10:00
2024-06-01 18:41:06 -07:00
2024-02-13 16:48:39 -05:00
2024-11-08 12:15:41 +01:00
2024-11-22 23:39:05 +01:00
2024-09-27 17:12:10 +10:00
2025-02-12 00:35:54 +03:00
2024-11-25 22:39:10 +11:00
2025-03-22 13:22:01 +11:00
2024-12-16 13:08:07 +01:00
2024-04-29 18:43:15 +10:00
2024-07-21 14:48:13 +10:00
2024-09-19 09:58:10 +10:00
2024-05-19 02:23:44 +02:00
2024-08-06 21:02:01 +10:00
2024-08-09 09:27:27 +10:00
2023-10-28 09:59:53 +11:00
2025-02-25 00:21:33 +01:00
2025-02-23 23:14:56 +11:00
2024-07-21 14:48:13 +10:00
2025-03-03 23:23:40 +03:00
2024-09-24 19:02:51 +02:00
2024-08-31 10:40:28 -04:00
2025-03-31 12:41:37 +03:00
2025-03-20 00:06:55 -07:00
2025-02-16 13:10:39 +03:00
2023-12-24 23:52:43 -07:00
2025-02-06 13:57:14 +03:00
2024-02-28 00:51:20 +11:00
2025-03-31 12:41:37 +03:00
2025-03-17 11:54:43 +03:00
2025-02-27 18:57:28 +01:00
2024-11-22 16:38:41 +01:00
2025-03-27 17:20:20 +03:00
2025-02-13 01:41:30 -05:00
2024-05-24 15:03:03 +10:00
2025-02-11 14:16:20 +11:00
2025-02-23 23:57:57 +11:00
2025-02-12 00:35:54 +03:00
2025-02-08 16:56:08 -05:00
2024-08-04 15:38:53 +10:00
2024-07-04 18:02:43 +10:00
2024-07-21 14:48:13 +10:00
2023-08-22 18:14:33 -07:00
2025-02-06 16:14:55 +01:00
2025-02-06 13:57:14 +03:00
2025-03-20 17:38:59 +01:00
2024-08-20 23:31:09 +02:00
2025-03-17 11:54:43 +03:00
2023-08-22 18:14:33 -07:00
2025-02-23 23:07:55 +03:00
2024-02-16 16:52:31 -07:00
2024-09-01 23:22:50 +02:00
2025-02-12 23:46:02 -05:00
2024-07-21 14:48:13 +10:00
2024-07-14 13:05:39 +10:00
2024-11-06 16:52:08 +03:00
2025-02-11 21:06:43 +11:00
2024-06-09 15:18:54 -04:00
2023-08-22 18:14:33 -07:00
2025-02-13 01:41:30 -05:00
2024-08-18 21:39:00 -06:00
2025-02-23 23:57:57 +11:00
2025-02-23 18:47:13 +01:00
2023-08-22 18:14:33 -07:00
2024-09-01 13:00:53 +02:00
2023-10-24 10:23:56 -04:00
2024-09-07 00:05:53 +10:00
2024-07-02 23:04:15 +10:00
2025-02-24 17:46:04 -05:00
2024-08-06 21:02:01 +10:00
2024-07-11 15:55:56 +10:00
2024-08-06 21:02:01 +10:00
2024-08-06 21:02:01 +10:00
2025-02-13 01:41:30 -05:00
2024-07-21 17:17:59 +10:00
2024-09-08 02:22:27 -04:00
2023-09-16 16:18:10 +10:00
2025-03-31 12:41:37 +03:00
2025-02-02 02:38:02 +01:00
2025-02-12 23:46:02 -05:00
2025-03-19 12:52:37 +03:00
2025-03-26 17:13:02 +01:00
2025-03-31 12:41:37 +03:00
2025-02-06 13:57:14 +03:00
2025-02-20 11:10:54 +01:00
2024-11-08 18:28:24 -06:00
2025-02-11 20:59:50 +11:00
2024-10-14 14:30:31 +11:00
2024-02-11 23:45:09 -07:00
2023-09-28 16:20:29 -07:00
2024-11-08 12:15:41 +01:00
2025-03-26 12:45:29 +01:00
2025-03-17 11:54:43 +03:00
2023-11-07 18:25:43 -07:00
2023-09-30 14:35:32 +10:00
2025-02-06 13:57:14 +03:00
2024-08-25 22:18:42 +10:00
2023-09-22 15:01:05 -05:00
2025-02-06 13:57:14 +03:00
2024-03-21 20:19:52 -04:00
2024-09-13 23:58:02 +10:00
2024-07-21 14:48:13 +10:00
2023-10-29 15:29:30 +11:00
2024-05-23 22:43:04 -04:00
2024-06-03 12:12:21 -04:00
2024-09-01 13:00:53 +02:00
2024-08-23 11:14:38 +02:00
2024-07-01 23:30:53 -04:00
2024-09-01 13:00:53 +02:00
2025-02-23 23:57:57 +11:00
2024-12-07 19:13:56 +01:00
2024-12-23 20:23:03 +01:00
2023-10-01 16:46:09 -04:00
2025-02-23 23:57:57 +11:00
2025-02-06 13:57:14 +03:00
2024-11-20 09:32:50 +06:00
2023-08-22 18:14:33 -07:00
2024-07-21 14:48:13 +10:00
2025-02-23 00:37:00 +11:00
2024-06-03 12:12:21 -04:00
2024-07-13 20:59:33 +10:00
2024-05-03 11:24:21 +10:00
2024-08-25 22:18:42 +10:00
2025-02-06 14:45:13 +01:00
2024-08-06 21:02:01 +10:00
2024-08-09 09:36:15 +10:00
2025-02-20 20:29:44 +01:00
2025-02-13 01:41:30 -05:00
2024-07-21 14:48:13 +10:00
2023-08-08 12:19:31 -08:00
2024-12-22 15:48:30 +03:00
2025-03-21 00:57:04 +11:00
2025-02-13 01:41:30 -05:00
2024-08-06 21:02:01 +10:00
2024-12-17 20:18:15 +01:00
2024-04-03 10:33:34 +03:00
2024-07-21 14:48:13 +10:00
2024-07-08 19:03:53 +10:00
2024-12-23 15:24:09 +01:00
2025-02-25 09:00:37 -08:00
2024-04-21 23:16:23 +10:00
2024-09-18 11:43:30 +10:00
2025-02-23 23:14:56 +11:00
2025-03-31 12:41:37 +03:00
2025-03-17 11:54:43 +03:00
2025-03-22 13:22:01 +11:00
2025-02-08 17:17:55 +11:00
2024-09-26 18:55:59 +02:00
2025-02-11 20:59:50 +11:00
2023-11-20 17:20:24 -08:00
2025-02-23 23:07:55 +03:00
2025-02-23 18:23:00 +11:00
2025-02-06 13:57:14 +03:00
2024-12-04 21:13:22 +11:00
2024-09-01 13:00:53 +02:00
2024-06-03 12:12:21 -04:00
2024-08-22 13:19:29 -04:00
2025-01-21 23:57:12 +03:00