shayoki f601a6ddaf Merge remote-tracking branch 'tgstation/master' into upstream-6-2-2026

2026-06-03 01:23:54 -05:00

..

vendor

Restocking a Vending machine no longer creates 0 credit holochips. (#96137)

2026-05-19 08:50:14 +02:00

assist.dm

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

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

autodrobe.dm

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

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

boozeomat.dm

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

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

cartridge.dm

feat: new floppy disk sprites; most disks are now under the /item/disk type; adds disk stacking, uqinue styling and wrapping (#94112)

2026-01-04 08:52:18 +13:00

cigarette.dm

…

clothesmate.dm

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

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

coffee.dm

…

cola.dm

…

custom.dm

Standerdizing currency symbols Part 2 (#94259)

2025-12-13 21:00:19 -05:00

cytopro.dm

…

donk.dm

…

drinnerware.dm

…

engineering.dm

…

engivend.dm

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

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

games.dm

…

hotdog.dm

…

liberation_toy.dm

Katanas now have their own respective sheaths, adds leather crafting recipes for katana sheaths (#94939)

2026-01-28 13:09:44 +02:00

liberation.dm

…

magivend.dm

…

mail.dm

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

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

medical_wall.dm

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

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

medical.dm

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

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

megaseed.dm

…

modularpc.dm

feat: new floppy disk sprites; most disks are now under the /item/disk type; adds disk stacking, uqinue styling and wrapping (#94112)

2026-01-04 08:52:18 +13:00

nutrimax.dm

…

plasmaresearch.dm

…

robotics.dm

…

runic_vendor.dm

…

security.dm

…

snack.dm

…

sovietsoda.dm

…

subtype.dm

…

sustenance.dm

Standerdizing currency symbols (Part 1?) (#94128)

2025-11-30 13:50:20 -06:00

syndichem.dm

…

toys.dm

Katanas now have their own respective sheaths, adds leather crafting recipes for katana sheaths (#94939)

2026-01-28 13:09:44 +02:00

wardrobes.dm

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

2026-06-03 01:23:54 -05:00

youtool.dm

Decreases multitool credit cost, increases quantity from vending machines. (#95076)

2026-02-08 14:15:01 +11:00