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.

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 sync #2317

Merged
merged 102 commits into from
Jun 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
9b5219a
Fix double label on chem jugs (#29137)
Tayrtahn Jun 17, 2024
e04492e
Automatic changelog update
PJBot Jun 17, 2024
0cf56b9
Fix DresserFilled storagefill rarely causing an error (#29135)
Tayrtahn Jun 17, 2024
82c4db6
Fix female reptilians not having gasp sounds (#29143)
Dutch-VanDerLinde Jun 18, 2024
a1e66cf
clean up weather systems (#28792)
TheShuEd Jun 18, 2024
e5ef2a3
Implement vital chef's hat functionality (#25950)
Tayrtahn Jun 18, 2024
af7e599
Automatic changelog update
PJBot Jun 18, 2024
bd0631c
Add cvar to disable round end pvs overrides (#29151)
DrSmugleaf Jun 18, 2024
47653f3
Update submodule to 226.1.0 (#29159)
metalgearsloth Jun 18, 2024
65821c9
Fix conveyor mispredicts (#28157)
metalgearsloth Jun 18, 2024
92159ed
Automatic changelog update
PJBot Jun 18, 2024
b0b76a1
Replace StationRandomTransform (#29149)
metalgearsloth Jun 18, 2024
e49a0eb
Add warning cones to engivend (#29085)
lzk228 Jun 18, 2024
cffa356
Automatic changelog update
PJBot Jun 18, 2024
d60829f
arachnid inventory layout fix (#29165)
Errant-4 Jun 18, 2024
db30b5e
Automatic changelog update
PJBot Jun 18, 2024
ee2c115
Turn interaction related attempt events into structs (#29168)
ElectroJr Jun 18, 2024
801d405
Add the most anticipated gun in the game. Foam Force. (#29103)
IProduceWidgets Jun 18, 2024
3358aef
Automatic changelog update
PJBot Jun 18, 2024
dabf3d1
Fix material storage going BRRT (#29167)
metalgearsloth Jun 18, 2024
0b98ce8
Automatic changelog update
PJBot Jun 18, 2024
707f1f4
Fix air alarms (#29172)
osjarw Jun 19, 2024
baa6836
Automatic changelog update
PJBot Jun 19, 2024
9b2f9ce
Hidden loadout groups (#29170)
Errant-4 Jun 19, 2024
8113664
Upgrade rsi-diff's changed files action | Make it only return rsi and…
VasilisThePikachu Jun 19, 2024
0910983
unhardcode thief MaxSelectedSets (#29175)
deltanedas Jun 19, 2024
c8de4ec
PullingController cooldown change (#29177)
Sarahon Jun 19, 2024
f9ddccb
Decrease meteor frequency (#29194)
EmoGarbage404 Jun 19, 2024
bb62151
Automatic changelog update
PJBot Jun 19, 2024
4cf60f8
Security Resprite (#29082)
Flareguy Jun 19, 2024
1149641
Automatic changelog update
PJBot Jun 19, 2024
198f028
Make Hamlet a valid chef's hat pilot (#29191)
Tayrtahn Jun 19, 2024
69afba6
Fix Underwing wings (#29092)
UbaserB Jun 19, 2024
bde0f43
Add some happier medibot messages! (#29147)
beck-thompson Jun 19, 2024
3901cda
Automatic changelog update
PJBot Jun 19, 2024
f7db648
shorten short raffle (#28685)
HolySSSS Jun 19, 2024
8d52c1a
Automatic changelog update
PJBot Jun 19, 2024
9cd08b8
Fix some lathe recipe textures showing up blank (#28683)
Plykiya Jun 19, 2024
6c81000
Grammar fix to medibot! (#29197)
beck-thompson Jun 19, 2024
c966db4
Restore default panic bunker and tweak baby jail (#29198)
Chief-Engineer Jun 19, 2024
fc40cd7
Fixed cartridges installing more than once (#29187)
Truoizys Jun 19, 2024
37120c1
Automatic changelog update
PJBot Jun 19, 2024
2b88527
Musician's skirt (#29203)
lzk228 Jun 19, 2024
28ce298
Automatic changelog update
PJBot Jun 19, 2024
7c01ac9
hos cap resprite (#29208)
Flareguy Jun 19, 2024
8a4ce13
Automatic changelog update
PJBot Jun 19, 2024
20544b0
Rejig device link sink & source startup & shutdown (#29035)
ElectroJr Jun 19, 2024
024521b
Add prediction for Tech Disks, cleanup (#29061)
Tayrtahn Jun 19, 2024
e33f034
Code cleanup: radio jammer (#29052)
Tayrtahn Jun 19, 2024
fa3c89a
Partial buckling refactor (#29031)
ElectroJr Jun 19, 2024
39ccab6
Fix documentation typo (#29209)
TsjipTsjip Jun 19, 2024
9499546
Emergency toolbox fill rework (#29202)
Flareguy Jun 19, 2024
912091e
Add wet floor sign & warning cone to autolathe (#29205)
lzk228 Jun 19, 2024
674409d
Automatic changelog update
PJBot Jun 19, 2024
9759747
Tools batch files (#29179)
VasilisThePikachu Jun 19, 2024
67cc089
Fix terrible portable scrubber unlit layers (#29232)
PJB3005 Jun 19, 2024
2b92ec7
Prevent fly-by fixture from powering containment field generator (#29…
arimah Jun 19, 2024
a8ad09e
Automatic changelog update
PJBot Jun 19, 2024
872e927
Hide moth antenna and lizard frills with hardsuit helmets, fix lizard…
Dutch-VanDerLinde Jun 20, 2024
625fef0
Automatic changelog update
PJBot Jun 20, 2024
40bcf66
Fix and enable TestEmptyLoadout (#29228)
Tayrtahn Jun 20, 2024
d438925
Fix entities getting stuck red (#28981)
metalgearsloth Jun 20, 2024
f2c0991
Automatic changelog update
PJBot Jun 20, 2024
c1948d8
Update submodule to 226.2.0 (#29247)
metalgearsloth Jun 20, 2024
4bf6d9e
add a type specifier where one was forgor (#29250)
IProduceWidgets Jun 20, 2024
ad89444
Make winter coat hood hide certain markings (#29238)
Dutch-VanDerLinde Jun 20, 2024
8c9fcd4
Fix ERT becoming sleeper agents and add sleeper agent preferences (#2…
Dutch-VanDerLinde Jun 20, 2024
4ccdc90
Automatic changelog update
PJBot Jun 20, 2024
9bf4a28
fixed Syndicate smokes pack being half-filled (#28371)
neutrino-laser Jun 20, 2024
9fbcec1
Automatic changelog update
PJBot Jun 20, 2024
4fe5235
Buff cube boxes (#29251)
lzk228 Jun 20, 2024
0ac1b31
Automatic changelog update
PJBot Jun 20, 2024
a74ca54
moves explosive tech to T1 (#29227)
Boaz1111 Jun 20, 2024
514e760
Automatic changelog update
PJBot Jun 20, 2024
68c414e
made cup ramen eatable with anything with the fork component (#27826)
Redfire1331 Jun 20, 2024
7994175
Automatic changelog update
PJBot Jun 20, 2024
d15eafe
Survival Box Loadouts, Nitrogen Emergency tanks (#29131)
Errant-4 Jun 20, 2024
cf374ac
You can now pry multiple tiles at once (#29231)
PJB3005 Jun 20, 2024
c91789a
Automatic changelog update
PJBot Jun 20, 2024
50146d4
Fix prying speed & log (#29210)
MilenVolf Jun 20, 2024
0a3b221
Automatic changelog update
PJBot Jun 20, 2024
b90c6ac
golden plunger (#29043)
Ghagliiarghii Jun 20, 2024
c336445
Rate limit ahelps (#29219)
PJB3005 Jun 20, 2024
a3ffe22
return empty string for invalid identity (#29274)
deltanedas Jun 20, 2024
831d962
Make Loadout MinLimit not count failed attempts (#29264)
Tayrtahn Jun 21, 2024
0b34592
Add logging to SharedStorageSystem prototype indexing failure (#29273)
Tayrtahn Jun 21, 2024
afc8002
Fix null exceptions in SurveillanceCameraMonitorSystem (#29275)
Tayrtahn Jun 21, 2024
9cd2705
Make stasis bed power toggleable (#29268)
MilenVolf Jun 21, 2024
f94d663
Automatic changelog update
PJBot Jun 21, 2024
880fef5
Replace BlockSolutionAccessComponent with an attempt event (#26988)
Tayrtahn Jun 21, 2024
d62dddc
fix initial infected icons and add a briefing to the character menu (…
slarticodefast Jun 21, 2024
7ef1002
Automatic changelog update
PJBot Jun 21, 2024
711aced
feat: update cyborg parts naming for them to be ordered consistently,…
diraven Jun 21, 2024
949a837
Ghostrole rule updates (#29249)
TsjipTsjip Jun 21, 2024
3843999
Automatic changelog update
PJBot Jun 21, 2024
70a40b6
Fix some buckle interactions (#29293)
ElectroJr Jun 21, 2024
6b13f5f
Automatic changelog update
PJBot Jun 21, 2024
76a65c8
Implement BlacklistedRange exempt flag (#29258)
nikthechampiongr Jun 21, 2024
730a4d2
Automatic changelog update
PJBot Jun 21, 2024
bffaecf
Merge remote-tracking branch 'refs/remotes/upstream/master' into upst…
Morb0 Jun 21, 2024
fc70ff1
Update locale
Morb0 Jun 21, 2024
c3221e3
Fix locale
Morb0 Jun 21, 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
Prev Previous commit
Next Next commit
Automatic changelog update
PJBot committed Jun 20, 2024

Verified

This commit was signed with the committer’s verified signature.
raydouglass Ray Douglass
commit 9fbcec1c7453954bfab14e095ac8ed02c12e8425
14 changes: 7 additions & 7 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
Entries:
- author: Sk1tch
changes:
- message: Added chat window opacity slider to options.
type: Add
id: 6288
time: '2024-04-01T20:48:02.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/24990
- author: TheShuEd
changes:
- message: added procedurally generating books to library.
@@ -3846,3 +3839,10 @@
id: 6787
time: '2024-06-20T11:12:58.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/27817
- author: neutrino-laser
changes:
- message: Syndicate smokes pack now has 10 cigarettes as intended.
type: Fix
id: 6788
time: '2024-06-20T11:16:06.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/28371