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

..

_CP14

s (#1096)

2025-03-30 20:31:37 +03:00

Accents

fix (#896)

2025-02-14 11:51:10 +03:00

Access

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Actions

ConfirmableAction for DNA Scrambler implant (#35232)

2025-02-16 22:16:54 -08:00

AlertLevels

…

Alerts

double hp and mana alerts (#749)

2025-01-12 23:05:19 +03:00

Anomaly

…

Atmospherics

Add new freezer atmos devices and fix freezer fixgridatmos marker (#34991)

2025-02-12 18:32:18 +11:00

Body

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

Catalog

Add smuggler stashes (#19460)

2025-03-26 16:20:15 +01:00

Chemistry

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Damage

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Datasets

A Bunch of New Figurine Voicelines (#36039)

2025-03-25 21:14:34 +01:00

Decals

Leaf maze demiplane + crayon update (#901)

2025-02-15 17:49:05 +03:00

Device

…

DeviceLinking

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Entities

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

EntityLists/Tools

…

Flavors

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

GameRules

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

GhostRoleRaffles

…

Guidebook

THE WIZARD (#35406)

2025-02-25 22:34:07 -07:00

Hydroponics

Updates to Hydroponic sprites (#35004)

2025-03-27 10:11:02 -07:00

InventoryTemplates

Slots separate (#778)

2025-01-17 22:15:54 +03:00

Loadouts

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

LootTables

Remove Vector assets and renames Vector SMG magazines (#34603)

2025-02-05 13:39:26 +01:00

Magic

Staff of Animation Fixes (#35491)

2025-02-27 20:11:57 +01:00

Maps

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

NPCs

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Objectives

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Palettes

…

Parallaxes

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

Polymorphs

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Procedural

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

RCD

…

Reagents

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

Recipes

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

Research

Add fultons as a T2 research (#34567)

2025-02-11 16:29:13 -08:00

Roles

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

Shaders

Additive lighting (#685)

2025-01-12 13:33:06 +03:00

Shuttles

add man-o-war shuttle (#32105)

2024-12-20 14:36:23 +03:00

SoundCollections

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Species

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Stacks

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

StatusIcon

Zombies can see Initial Infected (#33665)

2024-12-16 14:53:13 +03:00

Store

…

StoryGen

…

Tiles

Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream

2025-02-23 23:07:55 +03:00

Traits

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

Voice

Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream

2025-02-23 23:07:55 +03:00

Wires

Holopads (#32711)

2024-12-17 20:18:15 +01:00

World

…

XenoArch

Upstream sync (#786)

2025-01-21 23:57:12 +03:00

ai_factions.yml

dragon ai faction fix (#35578)

2025-03-21 01:13:00 +01:00

audio.yml

Random content (#815)

2025-01-28 13:04:10 +03:00

bar_signs.yml

ports two barsigns from frontier (#35296)

2025-02-19 20:25:17 +01:00

borg_types.yml

some robotics inhands (#33676)

2025-03-19 21:43:00 -04:00

contraband_severities.yml

Magical contraband type (#35254)

2025-02-18 01:21:49 +01:00

edge_spreaders.yml

…

explosion.yml

…

floor_trap.yml

…

fonts.yml

…

game_presets.yml

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

holidays.yml

…

hud.yml

Some issues (#452)

2024-09-23 18:34:04 +03:00

item_size.yml

…

lobbyscreens.yml

New lobby art (#748)

2025-01-12 22:39:33 +03:00

name_identifier_groups.yml

…

ore.yml

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

radio_channels.yml

Other colour of the binary channel (#33841)

2024-12-14 17:03:18 +01:00

round_announcements.yml

…

secret_weights.yml

Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2

2025-03-03 23:23:40 +03:00

silicon-laws.yml

Rename Dungeon Master Laws to not run into copyright problems (#33678)

2024-12-16 14:52:03 +03:00

status_effects.yml

…

tags.yml

make admin interacts with storages silent (#35417)

2025-03-27 18:42:57 +01:00

themes.yml

Some issues (#452)

2024-09-23 18:34:04 +03:00

threats.yml

…

tool_qualities.yml

…

typing_indicator.yml

…

weather.yml

…

whitelists.yml

…

wizardsDenWhitelists.yml

[HOTFIX] Fix MRP whitelist auto denying people with any medium severity notes in 14 days (#34532)

2025-01-21 11:24:50 +01:00