Skip to content

Upstream 2026-05-24-0205Z #55

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
blinkdog merged 207 commits into from
May 24, 2026
Merged

Upstream 2026-05-24-0205Z #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
207 commits
Select commit Hold shift + click to select a range
e810c21
Fixes cell explosion damage numbers (#6185)
Gristlebee Apr 19, 2026
6a5124e
Automatic changelog generation for PR #6185 [ci skip]
actions-user Apr 19, 2026
d435d24
Automatic changelog compile [ci skip]
actions-user Apr 20, 2026
df4052b
Suit storage fixes (#6015)
AnomalousPotato Apr 21, 2026
9d12ef2
Fixes Adminhelp sent to discordm essage (#6181)
generalthrax Apr 21, 2026
314d9ad
Adds .22 LR surplus ammo (#6167)
googobbug Apr 21, 2026
5108b81
Makosso-Warraning the TGUI crash screen (#6156)
Addust Apr 21, 2026
6324e8c
Automatic changelog generation for PR #6167 [ci skip]
actions-user Apr 21, 2026
0f0ef0e
Buffs Longarm Sharplites + Rush (plus nerfs the taipan) (#6161)
generalthrax Apr 21, 2026
0aa3454
Crying Sun Remap + Coherency (#6137)
DIB-DOG Apr 21, 2026
ab8edec
Automatic changelog generation for PR #6156 [ci skip]
actions-user Apr 21, 2026
63504d1
modernizes Vaq medkit selection (#6171)
PhoenixTheRedandEvil Apr 21, 2026
8a4cc61
Adds Separate Market for CLIP Civilian Vessels (#6160)
firebudgy Apr 21, 2026
f5342d8
Reworks Scarab dorms (#6188)
Sadhorizon Apr 21, 2026
8397780
Pouches fit in Vests (#6133)
firebudgy Apr 21, 2026
3c6f406
Underbarrel Safety sanity and obliterates the remains of underbarrel …
Gristlebee Apr 21, 2026
14c5b33
Automatic changelog generation for PR #6160 [ci skip]
actions-user Apr 21, 2026
b909526
Frontie Sarathi helmet no longer invisible (#6182)
generalthrax Apr 21, 2026
8428543
Adds more things to the food section of outpost cargo, removes gambli…
SkyClearingFowl Apr 21, 2026
4261263
Automatic changelog generation for PR #6141 [ci skip]
actions-user Apr 21, 2026
cd1acdc
Nimbus Replacement (#6065)
Erikafox Apr 21, 2026
627a899
Automatic changelog generation for PR #6106 [ci skip]
actions-user Apr 21, 2026
bc0fed9
Corporate Resort - replacement for Ancient Danger (#5927)
Addust Apr 21, 2026
9aafd71
Automatic changelog generation for PR #5927 [ci skip]
actions-user Apr 21, 2026
304e85c
Automatic changelog compile [ci skip]
actions-user Apr 22, 2026
d05984c
Fixes all warnings and fails from parser (#6195)
FalloutFalcon Apr 22, 2026
66fee04
Automatic changelog generation for PR #6195 [ci skip]
actions-user Apr 22, 2026
46d22b2
Ramzi Clique Unique Burst Shotgun: The Bockadam (#6118)
PhoenixTheRedandEvil Apr 22, 2026
fc57a40
Automatic changelog generation for PR #6118 [ci skip]
actions-user Apr 22, 2026
a95eb87
Automatic changelog compile [ci skip]
actions-user Apr 23, 2026
4c414a0
Consoles and missing pipes (#6199)
DIB-DOG Apr 23, 2026
27e380a
Improved Cybersun ERT outfits (#6198)
Erikafox Apr 23, 2026
10379a1
adds armless pincher glasses (#6173)
AnomalousPotato Apr 23, 2026
ed6103c
Automatic changelog generation for PR #6198 [ci skip]
actions-user Apr 23, 2026
fa09884
SRM The Keporining (#6179)
BaseballDuster Apr 23, 2026
60f61d8
bayonet resprite (#6178)
thearbiber Apr 23, 2026
f79d523
Automatic changelog generation for PR #6179 [ci skip]
actions-user Apr 23, 2026
04d624c
mining suit touchup (#6177)
thearbiber Apr 23, 2026
88c436a
Automatic changelog generation for PR #6173 [ci skip]
actions-user Apr 23, 2026
89a7138
PGFN Armor (#6149)
DIB-DOG Apr 23, 2026
17f8d1b
Removes unused and residual species files (#6190)
firebudgy Apr 23, 2026
b671981
Automatic changelog generation for PR #6178 [ci skip]
actions-user Apr 23, 2026
007d853
Cloak Cape (#6172)
Erikafox Apr 23, 2026
e37eee7
Automatic changelog generation for PR #6172 [ci skip]
actions-user Apr 23, 2026
2db2cb4
more typos (#6200)
AnomalousPotato Apr 23, 2026
7174ddb
Automatic changelog generation for PR #6190 [ci skip]
actions-user Apr 23, 2026
28722f0
pipe (#6197)
Erikafox Apr 23, 2026
8d79d59
Automatic changelog generation for PR #6197 [ci skip]
actions-user Apr 23, 2026
978361d
makes tomato soup non-alcoholic (#6201)
zimon9 Apr 23, 2026
bab6217
Automatic changelog generation for PR #6201 [ci skip]
actions-user Apr 23, 2026
95e3f81
Automatic changelog compile [ci skip]
actions-user Apr 24, 2026
5aa08e1
You can only take 1 High Priority Mission (#5773)
Erikafox Apr 24, 2026
dcb8f9e
Health Analyzer Surgery Scan (#5959)
Erikafox Apr 24, 2026
cdcd071
Automatic changelog generation for PR #5773 [ci skip]
actions-user Apr 24, 2026
947e87d
Enables release obj verb (#6126)
kaylexis Apr 24, 2026
7bd3c30
Automatic changelog generation for PR #5959 [ci skip]
actions-user Apr 24, 2026
101a99e
Removes Odysseus from cargo (#6204)
firebudgy Apr 25, 2026
4539976
Automatic changelog generation for PR #6204 [ci skip]
actions-user Apr 25, 2026
cb1969f
Automatic changelog compile [ci skip]
actions-user Apr 25, 2026
abedbcc
Give crystals a range limit. (#6211)
Breakingzap Apr 26, 2026
66a22c3
Adds Airlock Pneumatic Seals to Autolathe (#6214)
generalthrax Apr 26, 2026
9efe079
Automatic changelog generation for PR #6214 [ci skip]
actions-user Apr 26, 2026
47e28e3
Fixes certain surgeries appearing when they shouldn't, fixes boneless…
googobbug Apr 26, 2026
1051806
f90 buff and brimstone buff (#6189)
thearbiber Apr 26, 2026
43f0195
Adjusts Cargo MK III Hypospray Contents (#6215)
generalthrax Apr 26, 2026
c73188c
Automatic changelog generation for PR #6189 [ci skip]
actions-user Apr 26, 2026
e67fc80
Ammo Pouch can now only fit small items (#6218)
generalthrax Apr 26, 2026
8a104b6
Automatic changelog generation for PR #6218 [ci skip]
actions-user Apr 26, 2026
634aa40
Fix cargo export being sold bellow minimum price (#6186)
ritorizo Apr 26, 2026
f2c2622
Automatic changelog generation for PR #6215 [ci skip]
actions-user Apr 26, 2026
4be10e0
VI Capercaillie-class Patrol Vessel (#6064)
moffball19 Apr 26, 2026
fa5f03f
NS Quail-class Light Surveyor (#6100)
NovyNovatic Apr 26, 2026
e6ae6da
Add Sink to Corona (#6217)
generalthrax Apr 26, 2026
10d89c2
Automatic changelog generation for PR #6217 [ci skip]
actions-user Apr 26, 2026
1c52a57
Big hole (#6148)
PhoenixTheRedandEvil Apr 26, 2026
b3fdcc0
Automatic changelog generation for PR #6148 [ci skip]
actions-user Apr 26, 2026
edf7fa4
Automatic changelog compile [ci skip]
actions-user Apr 27, 2026
6c83c53
four hair sprites (#6205)
thearbiber Apr 28, 2026
1818991
Automatic changelog generation for PR #6205 [ci skip]
actions-user Apr 28, 2026
b273761
sports bag (#6210)
thearbiber Apr 28, 2026
cafa39c
Automatic changelog generation for PR #6210 [ci skip]
actions-user Apr 28, 2026
407cb29
Automatic changelog compile [ci skip]
actions-user Apr 29, 2026
179407f
Mining boot respirte+brown cowboy boot recolor (#6227)
thearbiber Apr 29, 2026
c98aded
adds sledge to cargo (#6226)
PhoenixTheRedandEvil Apr 29, 2026
0306357
Automatic changelog generation for PR #6226 [ci skip]
actions-user Apr 29, 2026
0772ecb
Makes it so the new PGFN helmets show the wearer's hair beneath (#6208)
DIB-DOG Apr 29, 2026
f31f66c
cabinet and guncase resprite (#6131)
thearbiber Apr 30, 2026
cb7a0e8
Headlamp (#6139)
Overteh Apr 30, 2026
9401786
Automatic changelog generation for PR #6139 [ci skip]
actions-user Apr 30, 2026
3395bab
Automatic changelog compile [ci skip]
actions-user Apr 30, 2026
8ebd74f
Firefly sofa fix + Chair buckle dir (#6056)
AnomalousPotato May 2, 2026
4d01ba8
Fixes Kunai areas & relocates external/dark (#6224)
goober3 May 2, 2026
418fcfe
Adds clipboards to the Shetland (#6225)
goober3 May 2, 2026
87f88ae
Gives Corona Sink (Real) (#6239)
generalthrax May 2, 2026
6bc5973
Adds the captain parade coat to the Ivory (#6236)
googobbug May 2, 2026
cf678d9
Automatic changelog generation for PR #6225 [ci skip]
actions-user May 2, 2026
480d7b2
Yebiri Expansion (#6157)
goober3 May 2, 2026
77c804b
Automatic changelog generation for PR #6236 [ci skip]
actions-user May 2, 2026
b92bdb1
Removes "NOTELEPORT" from centcom z-level (#6152)
firebudgy May 2, 2026
06f19ce
Automatic changelog generation for PR #6152 [ci skip]
actions-user May 2, 2026
9fbbaf1
Automatic changelog compile [ci skip]
actions-user May 3, 2026
c1194ad
Crying Sun pipework (#6241)
DIB-DOG May 3, 2026
499b762
Removes the Ranger & Loss Prevention (#6238)
generalthrax May 3, 2026
7a62121
Automatic changelog generation for PR #6238 [ci skip]
actions-user May 3, 2026
810f537
Automatic changelog compile [ci skip]
actions-user May 4, 2026
60d0cee
You can now pick your preview outfit from any outfit (#6037)
Erikafox May 4, 2026
b63981c
Two Lazy Food Quirks (#6070)
Erikafox May 4, 2026
3364669
Restores Cutting Board Food Multiplier (#6145)
Erikafox May 4, 2026
010b583
City Props, for urban enviroments (#6022)
rye-rice May 4, 2026
044c63b
Automatic changelog generation for PR #6145 [ci skip]
actions-user May 4, 2026
80180bd
Removes Moffic + Touches Up Vox Pidgin (#6146)
Erikafox May 4, 2026
081d346
Automatic changelog generation for PR #6022 [ci skip]
actions-user May 4, 2026
acbc500
HBG-7L into the market (#6155)
DIB-DOG May 4, 2026
be52fdc
Automatic changelog generation for PR #6155 [ci skip]
actions-user May 4, 2026
dc63312
Automatic changelog compile [ci skip]
actions-user May 5, 2026
1a567c8
CLIP Posters: Frontier Expansion! (#6170)
Imaginos16 May 6, 2026
10e0723
removes the ability for FBPs to cry. (#6053)
PhoenixTheRedandEvil May 6, 2026
6d3ef8b
Automatic changelog generation for PR #6053 [ci skip]
actions-user May 6, 2026
616b866
Makes sterilizine gel bottle desc more descriptive (#6176)
AnomalousPotato May 6, 2026
2ca042f
Automatic changelog generation for PR #6176 [ci skip]
actions-user May 6, 2026
22acc22
Fixes the Wideband interaction say key (#6196)
zimon9 May 6, 2026
d984a4b
Handheld reagent scanner readability improvement (#6235)
googobbug May 6, 2026
5d1a282
Automatic changelog generation for PR #6196 [ci skip]
actions-user May 6, 2026
95defaf
Fish Fingers Adjustment + Seaweed Sheet Cargo (#6219)
generalthrax May 6, 2026
953b516
Automatic changelog generation for PR #6235 [ci skip]
actions-user May 6, 2026
c7afb43
Adds Other Plates to Autolathe (#6216)
generalthrax May 6, 2026
ef84718
Automatic changelog generation for PR #6216 [ci skip]
actions-user May 6, 2026
d5e86eb
Automatic changelog compile [ci skip]
actions-user May 7, 2026
7d76962
digi pajamas (#6209)
thearbiber May 8, 2026
e9ac28d
Adds New Bags: Lizards Ecstatic For Tailbags (#6206)
kaylexis May 8, 2026
a5bb08f
Automatic changelog generation for PR #6209 [ci skip]
actions-user May 8, 2026
b8ed3cd
Automatic changelog generation for PR #6206 [ci skip]
actions-user May 8, 2026
5625cae
Automatic changelog compile [ci skip]
actions-user May 8, 2026
ae4261a
Adds the Silverfish-class Blockade Runner! (#6024)
Crystal1Blitz May 8, 2026
8239b0f
Automatic changelog generation for PR #6024 [ci skip]
actions-user May 8, 2026
616b0be
Automatic changelog compile [ci skip]
actions-user May 9, 2026
4a9beda
extremely simple Crying Sun piping fix (#6263)
DIB-DOG May 11, 2026
d3dc693
rhode QOL (#6248)
thearbiber May 11, 2026
9002602
Automatic changelog generation for PR #6263 [ci skip]
actions-user May 11, 2026
5bc1714
Removes Nanotrasen from the Crying Sun (#6254)
googobbug May 11, 2026
4f2a8c5
Automatic changelog generation for PR #6248 [ci skip]
actions-user May 11, 2026
74e0537
Routier-class Privateer (#6187)
thearbiber May 11, 2026
8ac3a88
Automatic changelog generation for PR #6187 [ci skip]
actions-user May 11, 2026
6c9158a
Automatic changelog compile [ci skip]
actions-user May 12, 2026
f9af069
Dynamite hole and biodome removal (#6244)
thearbiber May 12, 2026
6bff689
Automatic changelog generation for PR #6244 [ci skip]
actions-user May 12, 2026
322150b
Turf Adjustments (#6132)
Erikafox May 12, 2026
e21835b
Automatic changelog generation for PR #6132 [ci skip]
actions-user May 12, 2026
ef607ed
Updates chlorine and hydrogen chloride canister descriptions. (#6277)
googobbug May 12, 2026
6e79ad9
Removes R&D server board from autolathe (#6272)
googobbug May 12, 2026
278586b
Automatic changelog generation for PR #6272 [ci skip]
actions-user May 12, 2026
ea5296d
Removes "Frotiersmen" (#6278)
googobbug May 12, 2026
2a07872
Automatic changelog generation for PR #6278 [ci skip]
actions-user May 12, 2026
ae38943
Automatic changelog compile [ci skip]
actions-user May 13, 2026
ee363b3
Grocery Vending Machines (#6246)
PhoenixTheRedandEvil May 15, 2026
1e22caa
Automatic changelog generation for PR #6246 [ci skip]
actions-user May 15, 2026
eff9cfc
Axilai Orbital is real (#6247)
DIB-DOG May 15, 2026
03a5308
Automatic changelog generation for PR #6247 [ci skip]
actions-user May 15, 2026
590cad8
[MDB IGNORE] removes wood color var edits (#6249)
Erikafox May 15, 2026
fd64d58
Fancy Tables Colored In Editor (#6283)
Ical92 May 15, 2026
6ed827d
Automatic changelog generation for PR #6249 [ci skip]
actions-user May 15, 2026
0574ab3
Fix black market items with a preset stock (#6223)
ritorizo May 15, 2026
946846d
Automatic changelog compile [ci skip]
actions-user May 16, 2026
7926a30
fixes cm82 mags and cm5c in cargo (#6290)
firebudgy May 16, 2026
5eff478
Automatic changelog generation for PR #6290 [ci skip]
actions-user May 16, 2026
0d82f40
Automatic TGS DMAPI Update (#5766)
github-actions[bot] May 16, 2026
91317a8
Automatic changelog compile [ci skip]
actions-user May 17, 2026
6f94060
kill (#6292)
Erikafox May 18, 2026
f30609d
fingerless gloves+sunglasses resprite (#6280)
thearbiber May 18, 2026
ab8eca7
keporffer vests, pufferjacket touchup (#6268)
thearbiber May 18, 2026
2b0cd46
ecm6 sprite (#6245)
thearbiber May 18, 2026
0620778
Automatic changelog generation for PR #6280 [ci skip]
actions-user May 18, 2026
7766ebe
fatigue touchup+loadout add (#6270)
thearbiber May 18, 2026
cde3816
Automatic changelog generation for PR #6245 [ci skip]
actions-user May 18, 2026
bc1e389
Pubbytown Remap (#6243)
PhoenixTheRedandEvil May 18, 2026
a70a6d5
Automatic changelog generation for PR #6243 [ci skip]
actions-user May 18, 2026
4c0db1b
Automatic changelog generation for PR #6270 [ci skip]
actions-user May 18, 2026
dbcc783
Automatic changelog compile [ci skip]
actions-user May 18, 2026
53aaa20
welding goggles+leather satchel resprite (#6279)
thearbiber May 18, 2026
d36b044
Automatic changelog generation for PR #6279 [ci skip]
actions-user May 18, 2026
97564d6
Automatic changelog compile [ci skip]
actions-user May 19, 2026
45ed23b
Crying Sun pump settings fix (#6301)
DIB-DOG May 22, 2026
5537107
Scanners detect Husking (#6212)
Breakingzap May 22, 2026
93b3edc
New scarborough gun CSG-12 "Gaboon" (#6101)
EmptyLullaby May 22, 2026
dac404e
Automatic changelog generation for PR #6212 [ci skip]
actions-user May 22, 2026
4e4ad48
Adds pouring reagents down the sink (#6193)
googobbug May 22, 2026
290f3a1
Automatic changelog generation for PR #6193 [ci skip]
actions-user May 22, 2026
86396fd
reagent scanners will now indicate what an item grinds into and adds …
ritorizo May 22, 2026
2925f8c
Automatic changelog generation for PR #6101 [ci skip]
actions-user May 22, 2026
704f899
Automatic changelog compile [ci skip]
actions-user May 22, 2026
8a33f0e
The Etherbor Jezail Has Arrived (#6237)
DIB-DOG May 22, 2026
2444eb9
Ports stacking container qol (#6256)
ritorizo May 22, 2026
044ee2c
Drops Scatterlaser + Pulse slug wear down to 2 from 4 (#6253)
generalthrax May 22, 2026
ad97d1a
Automatic changelog generation for PR #6237 [ci skip]
actions-user May 22, 2026
ac9cb25
On transfer fix (#6299)
ritorizo May 22, 2026
cf61eed
Automatic changelog generation for PR #6299 [ci skip]
actions-user May 22, 2026
b167894
Purchase Turret Boards from Cargo (#6267)
generalthrax May 22, 2026
8440d3a
Automatic changelog generation for PR #6253 [ci skip]
actions-user May 22, 2026
04d6607
Adds placebo inhaler to loadout (#6232)
googobbug May 22, 2026
b9b3b01
Automatic changelog generation for PR #6232 [ci skip]
actions-user May 22, 2026
f46dbbc
removes spread reduction mod on suppressors (#6284)
zimon9 May 22, 2026
f559771
Automatic changelog generation for PR #6284 [ci skip]
actions-user May 22, 2026
ea0f041
Automatic changelog compile [ci skip]
actions-user May 23, 2026
25952c5
[MDB IGNORE] Notice Board Resprite & Minor Changes (#6287)
Ical92 May 23, 2026
6e1ea56
Automatic changelog generation for PR #6287 [ci skip]
actions-user May 23, 2026
abcc6e4
Merge remote-tracking branch 'upstream/master' into upstream-20260524…
blinkdog May 24, 2026
f620d8a
Remove /datum/language/moffic from languages_possible_lizard
blinkdog May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8,985 changes: 0 additions & 8,985 deletions _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
View file
Open in desktop

This file was deleted.

18,293 changes: 18,293 additions & 0 deletions _maps/RandomRuins/BeachRuins/beach_corpo_resort.dmm
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions _maps/RandomRuins/BeachRuins/beach_frontie_moat.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,9 +582,8 @@
/turf/open/floor/concrete/slab_1,
/area/ruin/beach/village/armory)
"jH" = (
/obj/effect/turf_decal/siding/wood{
dir = 4;
color = "#543C30"
/obj/effect/turf_decal/siding/wood/walnut{
dir = 4
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ruin/beach/village/kitchen)
Expand Down Expand Up @@ -2794,9 +2793,8 @@
/obj/effect/turf_decal/techfloor{
dir = 1
},
/obj/effect/turf_decal/siding/wood{
dir = 4;
color = "#543C30"
/obj/effect/turf_decal/siding/wood/walnut{
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/tech/techmaint,
Expand Down
Loading
Loading