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

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

..

AI_modules

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

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

circuitboards

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

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

devices

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

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

food

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

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

granters

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

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

grenades

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

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

implants

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

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

kirby_plants

…

rcd

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

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

robot

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

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

stacks

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

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

storage

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

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

tanks

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

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

tcg

…

tools

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

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

weaponry

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

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

apc_frame.dm

…

bear_armor.dm

…

binoculars.dm

…

blueprints.dm

…

body_egg.dm

…

botpad_remote.dm

…

busts_and_figurines.dm

…

cardboard_cutouts.dm

…

cards_ids.dm

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

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

charter.dm

…

choice_beacon.dm

…

chromosome.dm

…

cigarettes.dm

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

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

climbingrope.dm

…

clown_items.dm

Omega Soap changes (#95595)

2026-04-19 19:10:31 -07:00

cosmetics.dm

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

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

courtroom.dm

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

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

crab17.dm

Fixes crab market crash (#96097)

2026-05-17 11:26:48 +02:00

crayons.dm

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

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

credit_holochip.dm

…

debug_items.dm

…

dehy_carp.dm

…

dice.dm

…

dna_injector.dm

Streamlines Life() a little (#96215)

2026-05-29 22:48:16 -06:00

dna_probe.dm

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

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

door_seal.dm

…

drug_items.dm

…

dyespray.dm

…

eightball.dm

…

emags.dm

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

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

etherealdiscoball.dm

…

flatpacks.dm

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

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

floppy_disk.dm

feat: 🅱️ig Manipulatin' Time 2: Electric Boogaloo (#95907)

2026-05-21 13:28:37 +02:00

forensicsspoofer.dm

…

frog_statue.dm

…

gift.dm

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

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

gun_maintenance.dm

…

hand_items.dm

…

handcuffs.dm

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

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

holosign_creator.dm

…

hot_potato.dm

…

hourglass.dm

…

inspector.dm

n-spect scammer (#96039)

2026-05-13 17:56:46 -05:00

latexballoon.dm

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

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

lighter.dm

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

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

machine_wand.dm

…

mail.dm

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

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

maintenance_loot.dm

…

manuals.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

pet_carrier.dm

…

piggy_bank.dm

…

pillow.dm

…

pinpointer.dm

…

pitchfork.dm

…

plushes.dm

…

puzzle_pieces.dm

…

religion.dm

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

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

rollertable_dock.dm

…

scrolls.dm

…

secret_documents.dm

…

sharpener.dm

Fixes transforming items getting their force incorrectly modified when metalgenned multiple times (#95739)

2026-04-19 22:58:37 +01:00

shooting_range.dm

…

shrapnel.dm

…

signs.dm

…

skateboards.dm

…

skub.dm

…

stickers.dm

…

syndie_spraycan.dm

…

tail_pin.dm

…

taster.dm

…

teleportation.dm

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

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

tourniquet.dm

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

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

toy_mechs.dm

…

toys.dm

Removes Station-time (more time changes) (#95744)

2026-04-25 14:13:31 -06:00

trash.dm

…

v8_engine.dm

…

vending_items.dm

…

virgin_mary.dm

…

wall_mounted.dm

Quality of life for the Hearth (#5421)

2026-04-17 01:17:00 +02:00

wiki_manuals.dm

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

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

wind_turbine.dm

…