Roxy de4c3b255d Merge branch 'master' of github.com:tgstation/tgstation into upstream-2026-06-23

2026-06-23 15:51:55 -04:00

..

weeds

Plant Analyzer UX Revamp (#92667)

2025-09-02 18:57:41 -07:00

aloe.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

ambrosia.dm

…

apple.dm

Being drunk makes you a worse surgeon unless you land in the Balmer Peak (also Balmer Peak tweak) (#94674)

2026-01-04 20:38:22 -07:00

banana.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

beans.dm

capitalizes butterbeans when planted (#96442)

2026-06-12 07:43:10 +02:00

berries.dm

Buffs mutagen hydroponics application, adds some plant traits to interact with it (#94783)

2026-01-22 17:09:15 +13:00

cannabis.dm

…

cereals.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

cherries.dm

[MDB IGNORE] [IDB IGNORE] Upstream Sync - 04/17/2026 (#5453)

2026-05-16 00:56:00 +02:00

chili.dm

…

citrus.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

cocoa_vanilla.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

corn.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

cotton.dm

Remove slavery joke from cotton seed description (#96386)

2026-06-08 09:02:59 -07:00

cucumber.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

eggplant.dm

…

flowers.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

garlic.dm

…

gatfruit.dm

…

grass_carpet.dm

"Conserved Genetics" - A trait to prevent cross-pollination instability change in plants with the gene. (#96402)

2026-06-11 11:32:53 -04:00

hedges.dm

…

herbs.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

korta_nut.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

kronkus.dm

…

melon.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

mushrooms.dm

moves abstract_type up to datum, spawners wont spawn them (#92909)

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

olive.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

onion.dm

Refactors effect_system (#94999)

2026-02-03 22:23:09 -05:00

peanut.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

peas.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

pineapple.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

plum.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

potato.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

pumpkin.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

rainbow_bunch.dm

…

random.dm

…

replicapod.dm

Merge remote-tracking branch 'tgstation/master' into upstream-feb12-2026

2026-02-12 23:50:09 -05:00

root.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

seedling.dm

…

sugarcane.dm

…

tea_coffee.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

tobacco.dm

…

tomato.dm

Axes grind & juice vars into procs (#94592)

2025-12-25 20:40:35 +01:00

towercap.dm

Unit test material checks are now performed on all crafting recipes by default. All stack recipes now transfer mats to the results (#92620)

2025-12-02 18:29:01 -05:00