Skip to content

Upstream 2026-06-04 #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bruh-24 merged 48 commits into from
Jun 5, 2026
Merged

Upstream 2026-06-04 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
69eaccd
Cybernetic cat ears can no longer be restyled with flesh reshapers (#…
Fghj240 Jun 2, 2026
910e423
bileworm spewlets spit bile instead of manifesting bullets (#96260)
Hatterhat Jun 2, 2026
5c43b14
Automatic changelog for PR #96263 [ci skip]
tgstation-ci[bot] Jun 2, 2026
7488af2
Automatic changelog for PR #96260 [ci skip]
tgstation-ci[bot] Jun 2, 2026
0f6acc5
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jun 2, 2026
7a9bd2c
Fix biome linter issue (#96312)
TealSeer Jun 3, 2026
dbd5c4e
Add security misspelling checks to CI (#96304)
timothymtorres Jun 3, 2026
bf91756
Automatic changelog for PR #96304 [ci skip]
tgstation-ci[bot] Jun 3, 2026
5b6aa51
Makes so blob_act() can't destroy indestructible items. (#96303)
StrangeWeirdKitten Jun 3, 2026
c083f4b
Automatic changelog for PR #96303 [ci skip]
tgstation-ci[bot] Jun 3, 2026
a85852a
grep & ticked file is enforced across the whole codebase (#96283)
JohnFulpWillard Jun 3, 2026
494d2ac
The Alt Jester Suit is Now Grayscaled and Buyable (#96306)
MacaroniCritter Jun 3, 2026
c9b00dc
Automatic changelog for PR #96306 [ci skip]
tgstation-ci[bot] Jun 3, 2026
bdd3117
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jun 3, 2026
f5fc272
Random recipe logging (and other stuff) (#96148)
levels0 Jun 3, 2026
e4b27b7
Automatic changelog for PR #96148 [ci skip]
tgstation-ci[bot] Jun 3, 2026
86f2b37
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jun 3, 2026
3463fdd
Makes stumps not see through (#96311)
FalloutFalcon Jun 3, 2026
f4aa5df
Automatic changelog for PR #96311 [ci skip]
tgstation-ci[bot] Jun 3, 2026
413b881
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jun 3, 2026
74a161a
Exclude changelog from grep (#96329)
JohnFulpWillard Jun 3, 2026
ddb4b35
Implements "forbidden" areas into atmospherics_sanity unit test (#96141)
tontyGH Jun 3, 2026
56395da
Stasis body bag density fix, body bag grammar tweaks (#96193)
Hatterhat Jun 3, 2026
4d68bfe
Automatic changelog for PR #96193 [ci skip]
tgstation-ci[bot] Jun 3, 2026
cebef6b
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jun 3, 2026
ebc9106
Drake swoop no longer misleadingly claims you fall into lava if it fa…
SmArtKar Jun 3, 2026
cfb8259
Automatic changelog for PR #96324 [ci skip]
tgstation-ci[bot] Jun 3, 2026
8d8a56c
Material spears do not erroneously drop force_unwielded (#96321)
lelandkemble Jun 3, 2026
ba2ef14
Fixes brimdust overlay on wide mobs (#96325)
SmArtKar Jun 3, 2026
74f3180
Automatic changelog for PR #96321 [ci skip]
tgstation-ci[bot] Jun 3, 2026
f5adad0
Automatic changelog for PR #96325 [ci skip]
tgstation-ci[bot] Jun 3, 2026
b5df33f
Changes apprentice to use mid-round wizard pref (#96315)
Wisemonster Jun 3, 2026
02bee76
Automatic changelog for PR #96315 [ci skip]
tgstation-ci[bot] Jun 3, 2026
5e627a7
Speeedy disabling (#96274)
oguzzzok123 Jun 3, 2026
53ce41b
Fix infiniti paper printing from NT Shop app (#96259)
Frfor17 Jun 3, 2026
e1935a8
Automatic changelog for PR #96259 [ci skip]
tgstation-ci[bot] Jun 3, 2026
9437863
Smartfridges become unsealed when broken, & can't be walked through b…
lelandkemble Jun 3, 2026
a7b3cb5
Automatic changelog for PR #96223 [ci skip]
tgstation-ci[bot] Jun 3, 2026
1f6d52d
fixes two heretic bugs (#96212)
Arturlang Jun 3, 2026
2a12c87
Automatic changelog for PR #96212 [ci skip]
tgstation-ci[bot] Jun 3, 2026
6ff148a
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jun 4, 2026
b7d5b2e
Fix for toxins paper discounts not appearing in UI (#96222)
QuiteLiterallyAnything Jun 4, 2026
f4615cc
Automatic changelog for PR #96222 [ci skip]
tgstation-ci[bot] Jun 4, 2026
a630272
Automatic changelog compile [ci skip]
tgstation-ci[bot] Jun 4, 2026
3d99334
Fixes nightmare blade harddeleting (#96279)
SmArtKar Jun 4, 2026
5d5bff2
merge upstream/master w conflicts
tgstation-ci[bot] Jun 4, 2026
14646fd
fix
Glamyrio Jun 4, 2026
9959ed1
deta melta
Glamyrio Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/_basemap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
//#define ABSOLUTE_MINIMUM //uncomment this to load a smaller centcomm and smaller runtime station, only works together with LOWMEMORYMODE
//#define ABSOLUTE_MINIMUM //uncomment this to load a smaller centcom and smaller runtime station, only works together with LOWMEMORYMODE

#ifdef ABSOLUTE_MINIMUM
#define LOWMEMORYMODE
Expand Down
Loading
Loading