Skip to content
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

Upstream merge 68 fix #2290

Merged
merged 321 commits into from
Dec 2, 2024
Merged

Upstream merge 68 fix #2290

Changes from all commits
Commits
Show all changes
321 commits
Select commit Hold shift + click to select a range
3795837
Automatic changelog update
PJBot Nov 11, 2024
36aceb1
Database SnakeCaseNaming fixes
PJB3005 Oct 29, 2024
4f3db43
Integrate Modern HWID into content
PJB3005 Nov 12, 2024
806e1e4
Separate CCVars into separate files
Simyon264 Nov 12, 2024
a1966d8
improve BiomeDunGen (#33113)
TheShuEd Nov 12, 2024
70e3650
Make Droppers Respect Closed/Sealed Containers (#33011)
thetolbean Nov 12, 2024
8776c71
Automatic changelog update
PJBot Nov 12, 2024
8b15489
Allow editing angle of the fired projectile (#33254)
MilenVolf Nov 12, 2024
ef51700
Fix unban/editing role bans placed in groups. (#30659)
Titian3 Nov 12, 2024
cc3712b
Automatic changelog update
PJBot Nov 12, 2024
af3593a
Adds new sprites for shotgun shell boxes (#33176)
SpaceRox1244 Nov 12, 2024
e9f6a02
un-reverted fixes
cohanna Nov 13, 2024
21074bd
oops
cohanna Nov 13, 2024
bd2d0ee
Added the ability to microwave inert flesh anomaly cores to turn into…
august-sun Nov 13, 2024
52c1708
Automatic changelog update
PJBot Nov 13, 2024
99b4604
Cog fixes (#33285)
Spessmann Nov 13, 2024
8cf279e
Window sprite tweaks (#33282)
UbaserB Nov 13, 2024
c978eef
Automatic changelog update
PJBot Nov 13, 2024
6f7066e
Separate CCVars into separate files (#33268)
VasilisThePikachu Nov 13, 2024
51d2b51
tag:with toolshed command (#31751)
dffdff2423 Nov 13, 2024
9643598
Automatic changelog update
PJBot Nov 13, 2024
fa3a04a
Ethereal Jaunt Spell for Wizard & Jaunt ECS (#33201)
keronshb Nov 13, 2024
b91c977
Automatic changelog update
PJBot Nov 13, 2024
f2b7743
Half Revert #31978 (#33160)
keronshb Nov 14, 2024
5e54536
Hotfix 33160 (#33302)
keronshb Nov 14, 2024
755f322
Merge branch 'master' into ion-storm-refactor
ScarKy0 Nov 14, 2024
4f754b8
derelictn't (for now)
ScarKy0 Nov 14, 2024
e9c66cf
Merge branch 'ion-storm-refactor' of https://github.com/ScarKy0/space…
ScarKy0 Nov 14, 2024
75ec546
Update Label workflows to use new labels (#33310)
SlamBamActionman Nov 14, 2024
c862013
guh
ScarKy0 Nov 14, 2024
5dbea42
derelicn't for real
ScarKy0 Nov 14, 2024
0f30639
progress
ScarKy0 Nov 14, 2024
ace158d
Yippee!
ScarKy0 Nov 14, 2024
815e37e
Fix mime broken vow alert (#33303)
CheddaCheez Nov 14, 2024
669bc14
Automatic changelog update
PJBot Nov 14, 2024
1bebb33
Borg type switching. (#32586)
PJB3005 Nov 14, 2024
0437ec6
Automatic changelog update
PJBot Nov 14, 2024
53ce812
slash
ScarKy0 Nov 14, 2024
9a5c49b
epic empty commit
ScarKy0 Nov 14, 2024
3b93651
or was it
ScarKy0 Nov 14, 2024
2c9f227
Marathon Station: Added air alarms to CMO, Surgery, Security Checkpoi…
scrivoy Nov 14, 2024
d205d17
Meta Station: Add a fully functional TEG room (#32941)
scrivoy Nov 15, 2024
530a741
Rule amendment - Remove role abandonment aHelp requirement. (#33287)
Titian3 Nov 15, 2024
dfda557
Note expiry time is now relative instead of using timestamps (#33262)
beck-thompson Nov 15, 2024
606d44b
Automatic changelog update
PJBot Nov 15, 2024
f75be07
Merge hotfix #33287 from "stable" into "master"
SaphireLattice Nov 15, 2024
b4e0362
Update Core (#33325)
UbaserB Nov 15, 2024
465170f
Prevent Digiboard recycling (#33315)
thetolbean Nov 15, 2024
e3b6110
Automatic changelog update
PJBot Nov 15, 2024
97ce69f
Command external airlocks (#33333)
UbaserB Nov 15, 2024
cf96679
New ruin variant (#33332)
UbaserB Nov 15, 2024
4fc7a4c
Edited Snow White reaction to output proper amount of drink. (#33331)
RedBookcase Nov 15, 2024
3a6ae97
Automatic changelog update
PJBot Nov 15, 2024
089f190
Add succumb action 10 sec delay (#32985)
lzk228 Nov 15, 2024
6683dc9
Automatic changelog update
PJBot Nov 15, 2024
09d0565
Adds gorilla gauntlet storage sprite and updates hit sound (#33167)
SpaceRox1244 Nov 15, 2024
da4fa9b
Clumsy system refactor (#31147)
beck-thompson Nov 15, 2024
abdefbd
Automatic changelog update
PJBot Nov 15, 2024
7d82a7b
Merge branch 'space-wizards:master' into ion-storm-refactor
ScarKy0 Nov 15, 2024
3173a34
S: Awaiting Changes
ScarKy0 Nov 16, 2024
e7e1d96
Improve crayon UI to not be stuck in 1996 (#33101)
SaphireLattice Nov 16, 2024
4426bbe
Automatic changelog update
PJBot Nov 16, 2024
862c2ac
BRB sign in the Bureaucracy Crate (#33341)
southbridge-fur Nov 16, 2024
c4e8751
Automatic changelog update
PJBot Nov 16, 2024
1f5eb6a
Fix utensils not being thrown away (#33326)
SaphireLattice Nov 16, 2024
6bcfe6f
Automatic changelog update
PJBot Nov 16, 2024
11963e5
Fix server crash when the seed extractor is used on the dev map (#33312)
MossyGreySlope Nov 16, 2024
4f659b9
Solar assembly crate buff (#33019)
K-Dynamic Nov 16, 2024
7077b93
Automatic changelog update
PJBot Nov 16, 2024
2c82a2d
Add admin remarks button to lobby (#31761)
dffdff2423 Nov 16, 2024
47f94d1
Automatic changelog update
PJBot Nov 16, 2024
d9a5ffb
Cog christmas update (#33344)
Spessmann Nov 16, 2024
f5b63b8
Box Holiday Update (#33340)
southbridge-fur Nov 16, 2024
f071bf6
Marathon holiday update (#33335)
southbridge-fur Nov 16, 2024
bdab412
bagel christmas update (#33347)
Emisse Nov 16, 2024
a68c6cb
Temporarily make singularity a bit harder to loose as non-antag
SaphireLattice Nov 16, 2024
01d6df3
Fix Fluent string ID copypaste fail
SaphireLattice Nov 16, 2024
476f90d
Fix the component defaults
SaphireLattice Nov 16, 2024
5cd9243
Throwing Knife description tweak (#33349)
ThatGuyUSA Nov 17, 2024
0991b6b
Update Credits (#33360)
github-actions[bot] Nov 17, 2024
d9c677e
Adds paper label visuals to closets and lockers (#33318)
SpaceRox1244 Nov 17, 2024
96b9d1a
Automatic changelog update
PJBot Nov 17, 2024
f484118
Omega Update (Christmas Edition) (#33357)
spanky-spanky Nov 17, 2024
c7f8352
Packed Update (Christmas Edition) (#33356)
spanky-spanky Nov 17, 2024
22987fc
Wizard Summon Guns/Magic (#32692)
ActiveMammmoth Nov 17, 2024
e290588
Changes + Cleanup
ScarKy0 Nov 17, 2024
31d5a66
Chemical synthesis kit tweak (#33345)
ThatGuyUSA Nov 17, 2024
97be261
Reduced cost of coloured light fixtures
SpaceLizard24 Nov 17, 2024
824efd4
Dim light bulbs (#33383)
UbaserB Nov 18, 2024
b0fd9d5
Automatic changelog update
PJBot Nov 18, 2024
647db6a
Shift air alarm sprites to better reflect their direction (#33379)
SpaceManiac Nov 18, 2024
79ff990
Replace direct uses of GameTicker dictionary with `TryGetValue` (#33222)
ficcialfaint Nov 18, 2024
96d2fe4
Service Worker Job Icon Change (#33361)
spanky-spanky Nov 18, 2024
68eaf6f
Bump the failsafe timer down
SaphireLattice Nov 19, 2024
dffece4
Cog update (#33410)
Spessmann Nov 19, 2024
909235c
fix viewing nav slowing shuttle down (#32381)
Ilya246 Nov 19, 2024
10ee37a
Automatic changelog update
PJBot Nov 19, 2024
437a586
Welded secret doors no longer say they are welded shut. (#33365)
ScarKy0 Nov 19, 2024
0e2e6a0
Automatic changelog update
PJBot Nov 19, 2024
895648a
Increase softcap back to 80 (#33400)
nikthechampiongr Nov 19, 2024
a949cf3
Toggle clothing fix (#32826)
ArZarLordOfMango Nov 19, 2024
42ee90e
Automatic changelog update
PJBot Nov 19, 2024
c4e2eb9
.NET 9 forward compatibility changes (#33421)
PJB3005 Nov 20, 2024
7f5bae9
Fix security riot crate (#33415)
Plykiya Nov 20, 2024
2002de9
Localize planet dataset names (#33398)
MilenVolf Nov 20, 2024
efa28fc
Automatic changelog update
PJBot Nov 20, 2024
89392e2
Remove drag & drop dropping items from containers (#32706)
SlamBamActionman Nov 20, 2024
ed1ae96
Automatic changelog update
PJBot Nov 20, 2024
eebf06d
Automatically add "Approved" to maintainer PRs (#33337)
SaphireLattice Nov 20, 2024
fdf3df9
Crew monitoring crate updated to contain flatpacks, science access in…
Plykiya Nov 20, 2024
35e2c64
Automatic changelog update
PJBot Nov 20, 2024
6e53cd9
Add emag functionality
SlamBamActionman Nov 19, 2024
9c66645
Move some of the new singularity code into shared
SaphireLattice Nov 20, 2024
1fa1975
Fix toggle verbs (#32138)
beck-thompson Nov 20, 2024
e98383d
Construction menu grid view (#32577)
qwerltaz Nov 20, 2024
7e8e2c7
Automatic changelog update
PJBot Nov 20, 2024
0ec2336
Merge into master: Increase softcap back to 80 (#33400) (#33419)
metalgearsloth Nov 20, 2024
b177a1d
Coloured Light Cost Reduction (#33376)
metalgearsloth Nov 20, 2024
a13a4f7
Automatic changelog update
PJBot Nov 20, 2024
75acce0
Fix: Examine Damage now specifies no damage (#33064)
metalgearsloth Nov 20, 2024
1b3672e
Automatic changelog update
PJBot Nov 20, 2024
44db676
Actually make the emagging popup work properly
SaphireLattice Nov 20, 2024
b8b33b9
Move PlayerBeforeSpawnEvent and PlayerSpawnCompleteEvent to Shared
DrSmugleaf Nov 20, 2024
f5d0e95
Fix imports
DrSmugleaf Nov 20, 2024
8acbf87
Move PlayerBeforeSpawnEvent and PlayerSpawnCompleteEvent to Shared (#…
metalgearsloth Nov 20, 2024
a818c2a
Temporarily make singularity a bit harder to loose as non-antag (#33358)
metalgearsloth Nov 20, 2024
a7003ac
Automatic changelog update
PJBot Nov 20, 2024
59b0938
Capacitor Crafting Change (#31966)
metalgearsloth Nov 20, 2024
4f3ac3e
Automatic changelog update
PJBot Nov 20, 2024
a9be561
Merge branch 'master' into ion-storm-refactor
metalgearsloth Nov 20, 2024
98caf50
Ion storm refactor (#33311)
metalgearsloth Nov 20, 2024
f9533a6
Automatic changelog update
PJBot Nov 20, 2024
cb246f5
Set airlock unlit layers as invisible (#32484)
metalgearsloth Nov 20, 2024
693e5f1
Update salvage.yml
MissKay1994 Nov 20, 2024
f23b652
Update cargo_vending.yml
MissKay1994 Nov 20, 2024
e96e80b
Update salvage.yml
MissKay1994 Nov 20, 2024
c02a027
Update salvage.yml
MissKay1994 Nov 20, 2024
5c0a32b
Update to Robust v237.2.0
PJB3005 Nov 20, 2024
beeffdb
Update to Robust v237.2.0 (#33436)
metalgearsloth Nov 21, 2024
75a096b
Merge remote-tracking branch 'upstream/master' into 24-10-29-modern-hwid
PJB3005 Nov 21, 2024
0f0b141
Syndicate item fix ups (#33435)
ThatGuyUSA Nov 21, 2024
f5930bb
Coal presents and chrimmas tree options. Presents no longer itemify (…
IProduceWidgets Nov 21, 2024
11ee2f9
Automatic changelog update
PJBot Nov 21, 2024
4f703ae
Fix approval labeler (#33440)
VasilisThePikachu Nov 21, 2024
3758715
electrification hud
slarticodefast Nov 21, 2024
5a751a8
Fix admin ghosts not being able to see items in pockets or interact w…
DrSmugleaf Nov 22, 2024
38c70d6
Automatic changelog update
PJBot Nov 22, 2024
403528c
Gas pipe sensors (#33128)
chromiumboy Nov 22, 2024
a3edf04
Automatic changelog update
PJBot Nov 22, 2024
94ac0b1
Modern HWID integration (#33265)
VasilisThePikachu Nov 22, 2024
646d41d
Add telegram to the server info-links (#33459)
c4llv07e Nov 22, 2024
b4ec946
Fix sandbox error with new HWID code. (#33461)
PJB3005 Nov 22, 2024
09ca45a
Merge staging into master (#33462)
slarticodefast Nov 22, 2024
5a9a2d4
Merge branch 'master' into powerhud
slarticodefast Nov 22, 2024
08bfb43
cleanup
slarticodefast Nov 22, 2024
306277a
rename
slarticodefast Nov 22, 2024
de51690
another rename
slarticodefast Nov 22, 2024
a28adf4
baby proof the terminal (#33281)
IProduceWidgets Nov 22, 2024
6bc2054
Automatic changelog update
PJBot Nov 22, 2024
6169070
Fix salvage vendor inventory (#33437)
metalgearsloth Nov 23, 2024
d8ecf12
Automatic changelog update
PJBot Nov 23, 2024
5409815
Allow AI and observers to see electrified doors (#33466)
metalgearsloth Nov 23, 2024
7feafcb
Automatic changelog update
PJBot Nov 23, 2024
0a587c9
Disable submit admin note button on switch to note (#33456)
Winkarst-cpu Nov 23, 2024
1e93e12
Automatic changelog update
PJBot Nov 23, 2024
a42bacd
Fix startingGear storage (#33394)
MetalSage Nov 23, 2024
bdf4a46
Minor improvements & fixes to Shuttle Console UI (#31623)
eoineoineoin Nov 23, 2024
c3786a5
Fix door animations mispredicting if closing is interrupted (#33481)
metalgearsloth Nov 23, 2024
bde8585
Automatic changelog update
PJBot Nov 23, 2024
11dae2f
Don't show drag-drop outline if climbing (#33477)
metalgearsloth Nov 23, 2024
45af6a1
Automatic changelog update
PJBot Nov 23, 2024
855547a
Ensure wires can always be cut (#32447)
goet Nov 23, 2024
4cecf99
Automatic changelog update
PJBot Nov 23, 2024
fab9993
babyproof arrivals shuttle (#33284)
IProduceWidgets Nov 23, 2024
8522ffe
Automatic changelog update
PJBot Nov 23, 2024
11dbf50
Add delay to AutoOrient (#33479)
metalgearsloth Nov 23, 2024
e958c0c
Automatic changelog update
PJBot Nov 23, 2024
ef89d5c
Update Credits (#33503)
github-actions[bot] Nov 24, 2024
f706170
Draw muzzle flash below mobs (#33465)
Winkarst-cpu Nov 24, 2024
2229a6a
Automatic changelog update
PJBot Nov 24, 2024
aa80a88
Allow shuttles on planets to make FTL jump (#33507)
MilenVolf Nov 24, 2024
84df2b8
Automatic changelog update
PJBot Nov 24, 2024
e436a50
fix exped caves generation (#32890)
deltanedas Nov 24, 2024
91b9d4a
Automatic changelog update
PJBot Nov 24, 2024
cae49ae
various material & ore inhands (#33342)
muburu Nov 24, 2024
d642ee7
Delete HOS headset from warden's locker (#33234)
kosticia Nov 25, 2024
3c6c5ab
fix airlocks inconsistently auto-closing after unbolting (#33524)
slarticodefast Nov 25, 2024
ed2cd23
Automatic changelog update
PJBot Nov 25, 2024
86a3d16
baby proof the terminal (#33281)
IProduceWidgets Nov 22, 2024
9a898bb
babyproof arrivals shuttle (#33284)
IProduceWidgets Nov 23, 2024
f53e3ec
[BUGFIX] "Ghost" in the lobby lets you see the whole chat (#33529)
Schrodinger71 Nov 25, 2024
da9b2e6
Automatic changelog update
PJBot Nov 25, 2024
14103e7
Hotfix babyproof arrivals terminal and arrivals shuttle (#33538)
Errant-4 Nov 25, 2024
32f48d9
removed obsolete netmessage creator (#33542)
benev0 Nov 25, 2024
ea7f543
Fix RA0003 warning for ChatBox (#33531)
CrafterKolyan Nov 25, 2024
45cf4ec
Shark plushies now goes rawr on hit. (#33540)
Minemoder5000 Nov 25, 2024
ae576ab
Automatic changelog update
PJBot Nov 25, 2024
49724a9
Turn off PointLights on VendingMachines when broken or off. (#33513)
red15 Nov 25, 2024
b8466d8
Automatic changelog update
PJBot Nov 25, 2024
b8c8f7d
Adds more diona names (#33066)
Flareguy Nov 25, 2024
f0e9de8
"Borgimorph" Release 2024-11-22 (#33544)
VasilisThePikachu Nov 25, 2024
e9eca82
minor AI cleanup (#33555)
slarticodefast Nov 25, 2024
f27fa1e
Simplify separated screen top menu (#33047)
metalgearsloth Nov 26, 2024
a69fc39
Automatic changelog update
PJBot Nov 26, 2024
d5225d1
Ghost role drop-down alignment (#33397)
Intoxicating-Innocence Nov 26, 2024
470c869
Greytide Virus station event (#33547)
slarticodefast Nov 26, 2024
41d2cf1
Make shuttle airlocks not snapcardinals (#33557)
Winkarst-cpu Nov 26, 2024
dfc3562
Automatic changelog update
PJBot Nov 26, 2024
ab7221e
Added two N2 lockers to Reach (#33409)
dylanstrategie Nov 26, 2024
eb95403
Hotfix the randomly occurring DeleteAllThenGhost test failures (#33582)
Errant-4 Nov 26, 2024
c861c56
Fix space ambient music (#33594)
slarticodefast Nov 27, 2024
6187675
Automatic changelog update
PJBot Nov 27, 2024
8ea388b
Fix windoor and high security door not showing electrocution HUD (#33…
slarticodefast Nov 27, 2024
1b6c9e8
Automatic changelog update
PJBot Nov 27, 2024
1bc6562
Merge stable into master: Hotfix the randomly occurring DeleteAllThen…
VasilisThePikachu Nov 27, 2024
56fd7cb
Removes burnt tiles (#33422)
Flareguy Nov 28, 2024
9704ed7
Added Oppenhopper poster to the game. (#33588)
ScarKy0 Nov 28, 2024
ac65c5a
Fix version for electril_grill meta.json (#33611)
AlexUm418 Nov 28, 2024
de613e4
Fix gauze eyepatch flying pixel (#33564)
fqqf Nov 28, 2024
a206acc
Fix swapped uniform printer east/west sprites (#33442)
SpaceManiac Nov 28, 2024
f6813e3
Makes knives fly straight when thrown (#33615)
SpaceRox1244 Nov 28, 2024
a790955
Light verb is now predicted (#33622)
beck-thompson Nov 28, 2024
6463e7e
Automatic changelog update
PJBot Nov 28, 2024
4a21ed8
Update `Content.PatreonParser` to use `net8.0` `TargetFramework` (#33…
CrafterKolyan Nov 28, 2024
b53c8ea
Approval labeler fix electric boogaloo (#33633)
VasilisThePikachu Nov 28, 2024
93bdd81
Fix gender, maybe (#33631)
Alpha-Two Nov 29, 2024
360f698
Display GPS coordinates on their own line (#33625)
arimah Nov 29, 2024
2e34057
Automatic changelog update
PJBot Nov 29, 2024
422d1a9
Remove grasshopper from the panic bunker message (#33638)
VasilisThePikachu Nov 29, 2024
3ad227a
Add admin log for ghost warping (#33636)
DrSmugleaf Nov 29, 2024
bbdadd7
Automatic changelog update
PJBot Nov 29, 2024
87d6b0b
Rename nitrogen internals crate (#33545)
MossyGreySlope Nov 29, 2024
f99331a
Automatic changelog update
PJBot Nov 29, 2024
6c86d7b
Cleanup some Client atmos systems (#33634)
MilenVolf Nov 30, 2024
9236e9e
Fix for arrivals deleting nuke (#33659)
GansuLalan Nov 30, 2024
17a224c
Automatic changelog update
PJBot Nov 30, 2024
54a9dce
add locale to Shuttle Console Map tab (#33651)
SpyDev14 Nov 30, 2024
e9ef00f
Automatic changelog update
PJBot Nov 30, 2024
b45c9d5
fix PermanentBlindnessComponent to be not so permanent (#33292)
lunarcomets Nov 30, 2024
08db47c
Cog/Marathon: Airlock fixes (#33621)
Compilatron144 Nov 30, 2024
8679158
Automatic changelog update
PJBot Nov 30, 2024
021c983
Fix for handcuffing someone more than once (#33646)
Plykiya Nov 30, 2024
973f42b
Automatic changelog update
PJBot Nov 30, 2024
450bf81
Fix for inspecting entities in hand (#33642)
Plykiya Nov 30, 2024
3d98460
Automatic changelog update
PJBot Nov 30, 2024
fb76cd9
Fix for inspecting entities in the stripping window (#33644)
Plykiya Nov 30, 2024
766389a
Automatic changelog update
PJBot Nov 30, 2024
ab36b15
Fix borgs not getting names on roundstart (#33578)
Winkarst-cpu Nov 30, 2024
720fccf
Automatic changelog update
PJBot Nov 30, 2024
64f9a3e
Merge commit '720fccf3' into upstream-merge-68-fix
stalengd Dec 1, 2024
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

These merge commits were added into this branch cleanly.

There are no new changes to show.