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
..
2024-10-29 12:18:35 +03:00
2024-11-18 14:40:52 +03:00
2024-08-31 15:49:20 +10:00
2024-04-20 17:01:15 -04:00
2024-11-18 14:40:52 +03:00
2024-12-24 18:57:52 +13:00
2024-09-19 09:55:26 +10:00
2025-03-03 23:15:40 +03:00
2023-10-28 09:59:53 +11:00
2024-06-20 01:14:18 +10:00
2024-11-23 01:48:24 +03:00
2025-03-17 11:54:43 +03:00
2024-07-03 10:01:37 +10:00
2024-06-04 21:53:24 +10:00
2025-03-20 20:58:09 +01:00
2024-04-20 17:01:15 -04:00
2025-02-21 00:12:12 +11:00
2024-06-03 17:05:51 -04:00
2025-02-25 23:37:05 +03:00
2025-03-25 01:16:13 +01:00
2024-11-18 14:40:52 +03:00
2025-01-21 23:57:12 +03:00
2025-01-21 23:57:12 +03:00
2025-03-31 12:41:37 +03:00
2024-08-31 10:40:28 -04:00
2024-06-11 15:20:47 +03:00
2025-02-24 21:09:24 +01:00
2025-03-17 11:54:43 +03:00
2024-11-18 14:40:52 +03:00
2025-02-07 19:22:49 +01:00
2025-02-15 20:52:47 +01:00
2024-05-12 09:18:21 +10:00
2025-03-16 22:32:08 +01:00
2024-07-03 10:01:37 +10:00
2025-02-24 21:12:25 +01:00
2025-02-24 21:26:04 +01:00
2024-07-03 10:01:37 +10:00
2024-07-03 10:01:37 +10:00
2024-07-30 12:18:53 +10:00
2024-11-18 14:40:52 +03:00
2024-07-31 21:31:41 +10:00
2024-11-18 14:40:52 +03:00
2024-10-10 10:48:56 +02:00
2023-08-25 10:56:51 +10:00
2024-06-03 01:21:46 -04:00
2024-07-03 10:01:37 +10:00
2023-11-01 19:56:07 -07:00
2025-02-24 21:26:40 +01:00
2024-07-03 10:01:37 +10:00
2024-07-03 10:01:37 +10:00
2024-12-23 02:42:17 +13:00
2024-10-14 14:05:25 +11:00
2024-07-28 20:56:05 +03:00
2024-06-11 15:20:47 +03:00
2024-08-08 12:12:01 +10:00
2024-06-02 11:11:19 +10:00
2024-06-03 17:05:51 -04:00
2024-12-21 17:45:48 +11:00
2024-08-26 17:39:48 +10:00
2024-05-03 10:10:15 +10:00
2025-03-15 17:07:04 +11:00
2024-06-03 17:05:51 -04:00
2024-03-20 16:22:47 +01:00
2025-03-03 23:23:40 +03:00
2024-08-09 17:05:12 +10:00
2024-01-02 19:08:50 -08:00
2024-07-03 10:01:37 +10:00
2025-03-17 11:54:43 +03:00
2023-08-25 12:13:11 +10:00
2024-07-03 10:01:37 +10:00
2025-02-12 15:47:48 +03:00
2024-06-04 10:23:43 +10:00
2024-07-03 10:01:37 +10:00
2024-08-31 10:40:28 -04:00
2025-02-24 21:10:09 +01:00
2023-08-25 10:56:51 +10:00
2023-08-25 10:56:51 +10:00
2024-11-18 14:40:52 +03:00
2025-03-17 11:54:43 +03:00
2024-08-04 13:31:45 +10:00
2025-02-24 21:11:33 +01:00
2025-03-31 12:41:37 +03:00
2025-03-21 00:57:04 +11:00
2025-02-16 11:58:47 +03:00
2024-05-26 01:14:29 -04:00
2023-11-01 19:56:07 -07:00
2024-05-11 20:13:58 -07:00
2024-12-23 02:42:17 +13:00
2025-02-16 21:36:35 +11:00
2024-12-24 18:57:52 +13:00
2024-07-03 10:01:37 +10:00
2023-08-25 10:56:51 +10:00
2024-10-14 14:05:25 +11:00
2025-03-15 21:58:13 +01:00
2024-11-18 14:40:52 +03:00