Ed d6a8c169b2 Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/IdentityManagement/IdentitySystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs

2025-09-29 14:00:54 +03:00

..

_CP14

Hotfix (#1811)

2025-09-28 23:53:15 +03:00

Accents

Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync

2025-09-15 13:50:49 +03:00

Access

Sentry turrets - Part 6: Sentry turret control panels (#35235)

2025-05-26 16:00:50 +03:00

Actions

DoAfter support for Actions (#38253)

2025-09-08 12:55:13 +03:00

AlertLevels

…

Alerts

Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync

2025-09-08 13:12:50 +03:00

Anomaly

…

AppearanceCustomization

Revert "Kobold/monkey AI holograms (#38888)"

2025-07-20 17:13:59 +02:00

Atmospherics

Atmospherics Delta-Pressure YAML refactor (#40174)

2025-09-07 00:56:37 -07:00

Body

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

2025-09-29 14:00:54 +03:00

Catalog

Added diagnostic huds to the engi-vend (#40461)

2025-09-23 23:19:38 -05:00

Chat

The station AI can be destroyed (#39588)

2025-09-15 16:18:32 +02:00

Chemistry

…

Codewords

Split codewords into its own system (#37928)

2025-06-05 19:19:41 -04:00

Damage

Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync

2025-09-15 13:50:49 +03:00

Datasets

+1 Spam mail (#40310)

2025-09-13 09:15:10 +02:00

Decals

Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync

2025-09-08 13:12:50 +03:00

Device

…

DeviceLinking

Trigger Refactor (#39034)

2025-08-03 21:20:37 +02:00

Entities

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

2025-09-29 14:00:54 +03:00

EntityLists/Tools

…

Flavors

Expand soap making, but better (#39303)

2025-08-15 23:59:58 -07:00

GameRules

Adjusted minimumPlayers for Wizard midround events. (#38424)

2025-09-05 18:23:06 +02:00

GhostRoleRaffles

…

Guidebook

Atmos dP Guidebook Entry (#40194)

2025-09-07 17:10:39 +02:00

Hydroponics

Bloonion mutation (#33375)

2025-08-06 18:51:30 -07:00

InventoryTemplates

Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync

2025-09-15 13:50:49 +03:00

Loadouts

Vulpkanin Species (#37539)

2025-09-05 12:43:17 +02:00

Magic

prevent repeat TriggerOnCollide triggers (#40428)

2025-09-21 17:23:37 +02:00

Maps

Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync

2025-09-08 13:12:50 +03:00

NPCs

Debody Food and Drink Systems, Combine Food and Drink into One System. (#39031)

2025-08-06 12:53:38 -04:00

Nutrition

Fix Ingestion Localization Pop-ups (#39437)

2025-08-07 14:32:25 +02:00

Objectives

Fixing a syntax error (#40473)

2025-09-20 22:02:17 +02:00

Paintables

Make more objects spray paintable (Reviving #31328) (#37341)

2025-07-10 20:36:57 -04:00

Palettes

Revert "Upstream sync (#1509)" (#1510)

2025-07-08 11:59:51 +03:00

Parallaxes

Major Relic Update (#39215)

2025-08-28 11:40:36 -06:00

Polymorphs

Vulpkanin Admin Smite (#40360)

2025-09-21 23:22:25 -07:00

Procedural

Revert biome rework (#38724)

2025-07-03 20:48:04 +02:00

RCD

…

Reagents

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

2025-09-29 14:00:54 +03:00

Recipes

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

2025-09-29 14:00:54 +03:00

Research

Dark/Light Grass & Desert Astrotiles (#37867)

2025-09-14 18:30:12 -07:00

Roles

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

2025-09-29 14:00:54 +03:00

Shaders

Revert "Add heat distortion shader for hot gases" (#40352)

2025-09-14 20:48:24 +02:00

Shuttles

…

SoundCollections

Vulpkanin Species (#37539)

2025-09-05 12:43:17 +02:00

Species

adapt codebase

2025-09-15 14:49:58 +03:00

Stacks

Dark/Light Grass & Desert Astrotiles (#37867)

2025-09-14 18:30:12 -07:00

StatusIcon

Use an alias in job icons yml (#40415)

2025-09-17 12:29:08 +02:00

Store

…

StoryGen

…

Tiles

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

2025-09-29 14:00:54 +03:00

Traits

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

2025-09-29 14:00:54 +03:00

Voice

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

2025-09-29 14:00:54 +03:00

Wires

Give APCs wirepanels (#38443)

2025-06-19 17:06:11 +02:00

World

…

XenoArch

Delete DrinkComponent, migrate prototypes to EdibleComponent (#40308)

2025-09-12 15:26:56 -07:00

ai_factions.yml

…

audio.yml

…

bar_signs.yml

…

borg_types.yml

Inflatable Module (#35100)

2025-08-23 15:15:28 -07:00

chameleon.yml

Syndicate locks are now selectable (#39532)

2025-08-26 16:18:10 +02:00

contraband_severities.yml

Added "highly illegal" contraband to guidebook (#38176)

2025-08-18 17:51:33 +02:00

edge_spreaders.yml

…

explosion.yml

…

floor_trap.yml

prevent repeat TriggerOnCollide triggers (#40428)

2025-09-21 17:23:37 +02:00

fonts.yml

…

game_presets.yml

Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync

2025-09-15 13:50:49 +03:00

holidays.yml

…

hud.yml

…

item_size.yml

…

lobbyscreens.yml

lobby screens update

2025-06-16 12:02:59 +03:00

name_identifier_groups.yml

Xenoborgs part 4 (#36935)

2025-08-04 15:18:55 +02:00

ore.yml

New sprites for Coal and Gold ore crabs, new Bananium ore crab and Bananium rock anomaly. (#37787)

2025-05-29 18:16:20 -07:00

radio_channels.yml

…

round_announcements.yml

Blood moon (#1270)

2025-05-15 17:32:26 +03:00

secret_weights.yml

…

silicon-laws.yml

Remove drone lawset from ion storms (#40374)

2025-09-17 10:00:22 -07:00

status_effects.yml

Crawling Part 1: The Knockdownening (#36881)

2025-07-20 01:54:42 +02:00

tags.yml

The station AI can be destroyed (#39588)

2025-09-15 16:18:32 +02:00

themes.yml

…

threats.yml

…

tool_qualities.yml

Janitor Tool: Wire Brush (#38667)

2025-07-03 19:02:35 -07:00

typing_indicator.yml

Add Fancy Speech Bubbles for Diona and Gingerbread (#37742)

2025-05-26 13:51:09 +02:00

weather.yml

…

whitelists.yml

…

wizardsDenWhitelists.yml

…