Ed 07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream ...

# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

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

..

_CP14

Reduces gauze (#928)

2025-02-22 17:28:32 +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

Swap price of EMAG and AD. (#35354)

2025-02-23 14:01:06 +01:00

Chemistry

…

Damage

Add Holy damage (#32755)

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

Datasets

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +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/master' into ed-23-02-2025-upstream

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

EntityLists/Tools

…

Flavors

Upstream sync (#786)

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

GameRules

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

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

GhostRoleRaffles

…

Guidebook

Add microwave recipes to the guidebook (#34105)

2025-02-23 16:24:44 +01: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

Add loadout names (#31303)

2025-02-11 18:30:24 +01:00

LootTables

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

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

Magic

Fix/Addition - Wizard Survivor Antag Status (#35226)

2025-02-23 12:24:36 -05:00

Maps

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

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

NPCs

Firebot Tweaks (#32629)

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

Objectives

Mind Role Entities (#31318)

2024-10-10 10:48:56 +02: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

Upstream sync (#846)

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

Recipes

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

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

Research

Add fultons as a T2 research (#34567)

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

Roles

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

2025-02-23 23:07:55 +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

High Heel Boots do the Clicky Clacky (#35083)

2025-02-13 23:35:59 +01: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

Wizard Staff of Animation (#34649)

2025-02-12 23:46:02 -05: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

Remove kessler and zombeteors gamemodes from the secret pool (#34051)

2025-01-07 01:18:56 +01: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

Upstream sync (#786)

2025-01-21 23:57:12 +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

Fix/Addition - Wizard Survivor Antag Status (#35226)

2025-02-23 12:24:36 -05: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