iaada 48dcf8a474 Merge remote-tracking branch 'upstream/master' into up/drinks-yml ...

# Conflicts:
#	Resources/Locale/en-US/nutrition/components/drink-component.ftl
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml

2025-08-06 12:45:41 -05:00

..

Accents

Scurrets (#38218)

2025-06-20 16:39:08 -07:00

Access

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

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

Actions

JumpBoots Attempt №2 (#36862)

2025-07-07 21:19:28 +02:00

AlertLevels

…

Alerts

Xenoborgs part 4 (#36935)

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

Anomaly

…

AppearanceCustomization

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

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

Atmospherics

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

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

Body

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

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

Catalog

Merge remote-tracking branch 'upstream/master' into up/drinks-yml

2025-08-06 11:17:41 -05:00

Chemistry

Cryo and grinder cleanup (#34842)

2025-03-13 01:44:05 +03:00

Codewords

Split codewords into its own system (#37928)

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

Damage

Merge remote-tracking branch 'upstream/master' into up/drinks-yml

2025-08-06 12:45:41 -05:00

Datasets

Scurret naming fixes (#38776)

2025-07-07 00:30:44 +02:00

Decals

Exo Station - Upstream Playtest Version (#33144)

2025-06-15 12:10:22 -07:00

Device

Xenoborgs part 1 (#36830)

2025-04-23 19:38:10 -07:00

DeviceLinking

Trigger Refactor (#39034)

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

Entities

Merge remote-tracking branch 'upstream/master' into up/drinks-yml

2025-08-06 12:45:41 -05:00

EntityLists/Tools

…

Flavors

Berry Delight (#38881)

2025-08-02 14:35:09 -04:00

GameRules

Adds Wizard's Den (Replaces Wizard Shuttle) (#37701)

2025-07-30 21:08:05 -07:00

GhostRoleRaffles

…

Guidebook

Re-id 'Medical Doctor' guide entry to 'MedicalDoctor' (#39029)

2025-07-17 00:26:12 -07:00

Hydroponics

Display obvious plant mutations in examine text (#32650)

2025-04-29 00:45:10 -04:00

InventoryTemplates

Hats (and glasses) for pets - Part 1 - Ian and McGriff (#38634)

2025-07-13 12:11:00 -04:00

Loadouts

Add Offset Canes + Trinket Canes Group (#39272)

2025-08-04 19:39:40 -04:00

Magic

fix: fix non-access checking EntityTargetActions (#38731)

2025-07-22 21:34:39 +02:00

Maps

Exo - Minor balance changes and fixes (#38689)

2025-07-03 11:51:40 -07:00

NPCs

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

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

Nutrition

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

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

Objectives

Branded lighters addition (#35514)

2025-07-07 14:53:17 -04:00

Paintables

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

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

Palettes

Scurrets (#38218)

2025-06-20 16:39:08 -07:00

Parallaxes

Adds Wizard's Den (Replaces Wizard Shuttle) (#37701)

2025-07-30 21:08:05 -07:00

Polymorphs

fix: properly respect AllowRepeatedMorphs (#39411)

2025-08-06 02:02:52 +02:00

Procedural

Revert biome rework (#38724)

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

RCD

fix: return deconstruct to the top level option of radial menu (#36486)

2025-04-17 23:50:15 -05:00

Reagents

Retry of Advanced Chem Tweaks (#38811)

2025-07-29 14:52:42 -04:00

Recipes

Fun with cardboard! (#37363)

2025-08-06 12:58:07 -04:00

Research

Advanced Clowning Module (#35797)

2025-08-02 22:19:17 -04:00

Roles

Give admin bags explosion resistance (#38384)

2025-07-16 15:35:14 -07:00

Shaders

Fix displacement map rendering in UI (#38042)

2025-06-24 22:47:29 +02:00

Shuttles

add man-o-war shuttle (#32105)

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

SoundCollections

Xenoborgs part 4 (#36935)

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

Species

Raises max chest markings for all species (except Reptilian) to 2 (#37065)

2025-05-07 14:44:53 +02:00

Stacks

Marble tiles (#38007)

2025-07-17 19:44:28 -04:00

StatusIcon

Give cluwnes job icons (#37834)

2025-05-27 18:39:52 +02:00

Store

pAI Software Catalog (#36857)

2025-04-23 16:55:35 -07:00

StoryGen

…

Tiles

Marble tiles (#38007)

2025-07-17 19:44:28 -04:00

Traits

Monochromacy typo fix (#38686)

2025-07-01 20:49:15 +02:00

Voice

Xenoborgs part 4 (#36935)

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

Wires

Give APCs wirepanels (#38443)

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

World

…

XenoArch

XenoArch Rebalancing (#36604)

2025-04-16 00:38:26 +02:00

ai_factions.yml

Xenoborgs part 1 (#36830)

2025-04-23 19:38:10 -07:00

audio.yml

Fix space ambient music (#33594)

2024-11-27 16:32:39 +11:00

bar_signs.yml

ports two barsigns from frontier (#35296)

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

borg_types.yml

Cyborg Rebalance (#34186)

2025-04-24 19:29:16 -07:00

contraband_severities.yml

Magical contraband type (#35254)

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

edge_spreaders.yml

…

explosion.yml

Fix explosion visuals (#36644)

2025-04-17 20:12:13 +10:00

floor_trap.yml

…

fonts.yml

…

game_presets.yml

Wizard added in all at once! (#36408)

2025-04-10 19:06:47 -07:00

holidays.yml

…

hud.yml

…

item_size.yml

…

lobbyscreens.yml

…

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

Xenoborgs part 1 (#36830)

2025-04-23 19:38:10 -07:00

round_announcements.yml

…

secret_weights.yml

THE WIZARD (#35406)

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

silicon-laws.yml

Xenoborgs part 1 (#36830)

2025-04-23 19:38:10 -07:00

status_effects.yml

Crawling Part 1: The Knockdownening (#36881)

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

tags.yml

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

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

themes.yml

Ashen hud item status slot fix (#31411)

2025-04-22 14:40:58 -04:00

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

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

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