nevimer 1c0751265c Merge branch 'upstream-6-2-2026' ...

# Conflicts:
#	_maps/shuttles/zubbers/emergency_millionaire.dmm

2026-06-11 16:01:25 -04:00

..

actionspeed

…

admin

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

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

antagonists

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

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

art

Bane refactor (now uses damage multipliers) (#96003)

2026-05-16 11:41:29 +10:00

assembly

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

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

asset_cache

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

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

atmospherics

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

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

autowiki

Removes /proc/type2parent, replaces it with ::parent_type (#96155)

2026-05-20 17:49:32 +02:00

awaymissions

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

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

balloon_alert

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

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

basketball

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

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

bitrunning

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

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

buildmode

…

capture_the_flag

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

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

cards

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

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

cargo

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

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

chatter

…

client

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

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

clothing

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

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

deathmatch

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

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

debugging

…

detectivework

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

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

discord

…

economy

Fixes crab market crash (#96097)

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

emoji

…

emote_panel

Reorganizing the non-game UI (#95383)

2026-05-09 15:06:03 +03:00

error_handler

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

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

escape_menu

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

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

events

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

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

experisci

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

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

explorer_drone

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

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

fishing

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

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

flufftext

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

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

food_and_drinks

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

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

forensics

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

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

hallucination

fixes the "your mother" hallucination for plasmapeople (#96205)

2026-05-25 20:57:12 -04:00

holiday

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

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

holodeck

Add a "Prison Block" holodeck map (#96032)

2026-05-23 20:41:43 +02:00

hydroponics

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

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

instruments

pAIs can play music again (#96150)

2026-05-26 09:06:18 -04:00

interview

…

jobs

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

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

keybindings

…

language

…

library

Janitors have perfect aim throwing things into disposal units (#96188)

2026-05-27 23:51:09 -04:00

lighting

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

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

loadout

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

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

logging

fixes view round logs option being visible (though not accessible) to people with the R_DEBUG permission (#95960)

2026-05-19 12:50:05 +02:00

lootpanel

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

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

lost_crew

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

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

mafia

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

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

manufactorio

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

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

mapfluff

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

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

mapping

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

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

meteors

…

mining

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

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

mob

Merge branch 'upstream-6-2-2026'

2026-06-11 16:01:25 -04:00

mob_spawn

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

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

mod

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

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

modular_computers

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

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

movespeed

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

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

NTNet

…

pai

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

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

paperwork

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

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

photography

Camera blending now happens as you start the snap (#96122)

2026-05-26 09:07:10 -04:00

plumbing

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

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

point

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

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

power

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

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

procedural_mapping

Reworks lavaland tendrils into minibosses (#96186)

2026-06-02 21:00:15 +10:00

projectiles

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

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

reagents

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

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

recycling

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

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

religion

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

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

requests

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

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

research

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

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

reta

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

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

security_levels

…

shuttle

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

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

spatial_grid

…

spells

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

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

sprite_editing

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

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

station_goals

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

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

surgery

another code regression

2026-06-03 18:26:54 -04:00

tgchat

…

tgs

…

tgui

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

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

tgui_input

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

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

tgui_panel

Reorganizing the non-game UI (#95383)

2026-05-09 15:06:03 +03:00

tooltip

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

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

transport

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

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

tutorials

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

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

unit_tests

📷📸📷

2026-06-11 15:36:38 -04:00

uplink

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

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

vehicles

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

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

vending

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

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

visuals

…

wiremod

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

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

zombie

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

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