AlexisandMaia 0b070c1cfa Upstream fixes 2 ...

Linters (Again...)

This SHOULD be the last one needed.

Lewd part overlays now actually show up proper

penis not gone, tits not gone

KiloStation Automapper Stuff - Done by R0bwo

Revert "KiloStation Automapper Stuff - Done by R0bwo"

This reverts commit 14a5f4442d.

Misery

Put me out of my misery

2026-08-14 19:43:08 +02:00

..

antags

Adds a new antag, the Blood Worm (#93787)

2026-01-14 23:30:35 -06:00

aquarium

…

art

…

clothing

Makes crusher trophies craftable, reworks icewing/magmawing/blaster tube trophies (#96670)

2026-07-07 07:58:38 +10:00

devices

Ghosts can see more info on health scan (#96792)

2026-07-17 00:07:13 +02:00

doors

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

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

drinks

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

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

fluff

Upstream fixes 2

2026-08-14 19:43:08 +02:00

food

Yet Another Bacon Resprite (#96804)

2026-07-07 09:09:02 +02:00

holiday

…

machines

Merge commit '6b52b564a50e4f3091470529c683587e5de15d49' into upstream-sync-7-22-2026

2026-07-22 13:39:09 -04:00

medical

Merge commit '6b52b564a50e4f3091470529c683587e5de15d49' into upstream-sync-7-22-2026

2026-07-22 13:39:09 -04:00

mining_zones

Reworks bileworms into artillery-like enemies (#96159)

2026-05-23 14:43:48 +01:00

pipes_n_cables

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

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

science

Removes DNA infuser sprite from gizmo icon pool (#96566)

2026-06-19 08:18:23 +02:00

service

Implementing materials checks for techweb designs. (#96257)

2026-07-06 00:13:02 -07:00

smooth_structures

Resprites boulder platforms and adds smoothing to them (#93588)

2025-10-25 02:17:59 +02:00

storage

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

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

toys

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

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

tram

First new gateway in a year. (#93894)

2025-12-03 01:04:49 +00:00

weapons

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

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

aicards.dmi

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

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

anomaly.dmi

…

banner.dmi

Banners resprite (#94997)

2026-01-26 18:35:57 -05:00

bed.dmi

…

bedsheets.dmi

…

candle.dmi

…

canisters.dmi

…

card_old.dmi

…

card.dmi

…

chairs_wide.dmi

…

chairs.dmi

change shutter and high security syndicate door sprites (#95840)

2026-04-25 08:16:00 -04:00

chronos.dmi

…

cigarettes.dmi

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

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

cosmetic.dmi

…

debris.dmi

…

digital_clock.dmi

…

economy.dmi

…

exploration.dmi

…

fence.dmi

…

fishing.dmi

Adds a fish trait extractor/injector to the marine utility node (and a bluespace fishing reel) (#94042)

2025-12-18 01:02:25 +00:00

flipped_tables.dmi

…

fulton.dmi

…

guillotine.dmi

…

handrail.dmi

…

items_cyborg.dmi

Turns janitor borgs into walking crew operated vacuum cleaners. (#96724)

2026-07-12 10:50:41 -06:00

lighting_overlay.dmi

…

lighting.dmi

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

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

mafia.dmi

…

maintenance_loot.dmi

…

mechremoval.dmi

…

meteor.dmi

…

mining.dmi

Makes crusher trophies craftable, reworks icewing/magmawing/blaster tube trophies (#96670)

2026-07-07 07:58:38 +10:00

ore.dmi

Diamonds and Bluespace Crystals ore vent rebalance. (#96135)

2026-05-29 23:13:26 +02:00

pet_carrier.dmi

…

poster_wanted.dmi

…

poster.dmi

Ripping a certain poster off the wall may occasionally reveal another poster (#96969)

2026-07-15 12:02:13 +02:00

railings.dmi

…

scrolls.dmi

…

signboards.dmi

Adds signboards (#95824)

2026-05-06 01:47:27 -04:00

signs.dmi

Adds the monastery monitor (#94160)

2025-11-29 11:33:33 -07:00

small_stairs.dmi

…

stack_objects.dmi

Reworks bileworms into artillery-like enemies (#96159)

2026-05-23 14:43:48 +01:00

stairs.dmi

Fix inverted south stair icons (#94518)

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

structures_spawners.dmi

[MDB IGNORE] Offstation piping & cabling lookover (#94445)

2025-12-17 00:21:22 +00:00

structures.dmi

Fixes missing spare safe emag sprite (#94183)

2025-11-28 21:43:01 -07:00

supplypods_32x32.dmi

…

supplypods.dmi

…

tapes.dmi

…

tiles.dmi

…

tools.dmi

feat: A Plastic World (plastic floral decorations) (#96350)

2026-06-07 23:36:43 -06:00

track.dmi

…

trader_signs.dmi

…

tripwire.dmi

Adds very large tripwires that trip mechs (#96895)

2026-07-16 22:07:35 +01:00

vending_restock.dmi

…

wallmounts.dmi

Adds the Jaws of Recovery, a specialized form of Jaws of Life for paramedics with heavier limitations. (#93021)

2025-10-10 16:44:57 -04:00

watercloset.dmi

Omega Soap changes (#95595)

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

wind_turbine.dmi

…