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

# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs

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

..

_CP14

Alchemy integration test (#967)

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

Accents

fix (#896)

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

Access

[ADMIN] Adds missing accesses to universal access config (#35229)

2025-02-16 22:51:03 +01: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

Upstream sync (#786)

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

Catalog

THE WIZARD (#35406)

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

Chemistry

…

Damage

Add Holy damage (#32755)

2024-12-16 16:33:32 +01:00

Datasets

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

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

Decals

Leaf maze demiplane + crayon update (#901)

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

Device

…

DeviceLinking

Change the syndicate charge to start a timer on signal (#32423)

2024-10-04 11:34:48 +02:00

Entities

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

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

EntityLists/Tools

…

Flavors

Upstream sync (#786)

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

GameRules

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

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

GhostRoleRaffles

…

Guidebook

THE WIZARD (#35406)

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

Hydroponics

Separates frost oil into coldsauce and frost oil (#34458)

2025-02-01 09:20:01 -06:00

InventoryTemplates

Slots separate (#778)

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

Loadouts

Engineers can now choose to wear no head piece (#35508)

2025-02-25 20:21:45 -05: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-2025-03-03-upstream-stable-2

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

NPCs

Firebot Tweaks (#32629)

2024-10-13 15:55:51 +11:00

Objectives

Wizard ID (#35530)

2025-02-26 15:06:18 +01:00

Palettes

…

Parallaxes

Upstream sync (#846)

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

Polymorphs

Flora clean up (#33839)

2024-12-16 20:20:36 +01:00

Procedural

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

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

RCD

fix rcd blacklist (#32102)

2024-09-14 11:53:14 +10:00

Reagents

Change Phalanximine to be more complex, increase Arithrazine damage (#32209)

2025-03-02 13:47:11 +01:00

Recipes

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

2025-03-03 23:23:40 +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-2025-03-03-upstream-stable-2

2025-03-03 23:23:40 +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

THE WIZARD (#35406)

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

Species

Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream

2024-12-11 14:49:02 +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

Upstream sync (#846)

2025-02-06 13:57:14 +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

Staff of Animation Fixes (#35491)

2025-02-27 20:11:57 +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

Borg type switching. (#32586)

2024-11-14 11:08:35 -06: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-2025-03-03-upstream-stable-2

2025-03-03 23:23:40 +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

…

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

Hivelord mob (#31322)

2024-09-11 09:52:27 -04:00

tags.yml

Lizard Plushie Slippers (#35381)

2025-02-25 18:18:42 -08: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