Files
crystall-punk-14/Content.Client
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-03-17 11:54:43 +03:00
2024-05-02 12:40:07 +10:00
2024-07-26 10:30:49 -07:00
2023-09-28 20:48:50 +10:00
2024-07-01 02:20:57 +10:00
2025-02-06 13:57:14 +03:00
2025-03-15 09:24:23 -07: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
2025-03-17 11:54:43 +03:00
2024-08-25 22:05:39 +10:00
2025-02-06 13:57:14 +03:00
2024-08-04 13:31:45 +10:00
2025-03-17 11:54:43 +03:00
2025-02-14 16:46:25 +01:00
2023-09-11 19:18:06 +10: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
2025-03-22 13:22:01 +11:00
2024-09-24 19:02:51 +02:00
2024-08-31 10:40:28 -04:00
2025-02-06 13:57:14 +03:00
2025-03-17 11:54:43 +03:00
2025-02-27 18:57:28 +01:00
2025-02-12 00:35:54 +03:00
2025-02-06 13:57:14 +03:00
2025-03-17 11:54:43 +03:00
2024-02-16 16:52:31 -07:00
2025-02-12 23:46:02 -05:00
2024-06-09 15:18:54 -04:00
2024-08-18 21:39:00 -06:00
2023-10-24 10:23:56 -04:00
2024-09-07 00:05:53 +10:00
2024-07-21 17:17:59 +10:00
2025-02-02 02:38:02 +01:00
2025-03-19 12:52: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-03-17 11:54:43 +03: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-08-23 11:14:38 +02:00
2023-10-01 16:46:09 -04:00
2025-02-06 13:57:14 +03:00
2025-02-23 00:37:00 +11:00
2024-08-25 22:18:42 +10:00
2024-12-17 20:18:15 +01:00
2024-04-03 10:33:34 +03:00
2024-12-23 15:24:09 +01:00
2024-04-21 23:16:23 +10: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-23 18:23:00 +11:00
2025-02-06 13:57:14 +03:00
2024-12-04 21:13:22 +11:00
2025-01-21 23:57:12 +03:00