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

Jump to bottom

upstream merge 2/11 #2090

Merged
merged 94 commits into from
Nov 7, 2024
Merged

upstream merge 2/11 #2090

merged 94 commits into from
Nov 7, 2024

Conversation

deltanedas
Copy link
Member

@deltanedas deltanedas commented Nov 2, 2024 •
edited
Loading

Notable additions

  • on call webhook is now supported
  • loneop is in midround antag events table instead of unknown shuttles, shouldnt change much
  • unrevivability warning my beloved
  • encryption key/station map/brig timer resprites real
  • all expeds work now
  • making cables in an autolathe isnt unbearably slow

Notable exclusions

  • reverted the sec belt change (removing flashbangs) as it was stealth merged, you can still put sec radios in it though

Changelog
🆑

  • add: Merged this week's changes from upstream.

chromiumboy and others added 30 commits November 2, 2024 16:02
@chromiumboy
Fix multiplying colors of differing nullabilities (#32991)
89aa64f
revert the temporary hack
761ecbc
@chromiumboy
Make atmos alert computer colors private variables (#32992)
6bd07cd
@slarticodefast
Add flash reaction effect (#32377)
2ebdc07 
add flash reaction effect
@PJBot
Automatic changelog update
afdaa00
@BramvanZijp
Fix loneop spawnrate by reverting it to not use the shuttle event sys…
a9913fc 
…tem. (#32942)

Fix loneop spawnrate by reverting it to not use the custom shuttle event system.
@PJBot
Automatic changelog update
c31000a
@Ilya246
add atmosia to devmap (#32460)
426df37 
change
@Moomoobeef
bowls now make drinking sounds (#32819)
e849ce8
@PJBot
Automatic changelog update
d49b71a
@SaphireLattice
Add health analyzer unrevivability warning (#32636)
9048bc6 
* Add health analyzer unrevivability warning

* Remove errornous comment
@PJBot
Automatic changelog update
0b0e221
@Moomoobeef
Removed the name "Hujsak" (#32998)
c16df96 
removed hujsak
@slarticodefast
fix pie throwing sound not playing (#33017)
6b5711c
@PJBot
Automatic changelog update
6f421f6
@FluffMe
Fix TestSuicideByHeldItem and TestSuicideByHeldItemSpreadDamage (#33030)
738ce8b
@pheenty
make ai speak robotically (#33025)
42a55c1
@PJBot
Automatic changelog update
a56e9ad
@august-sun
Extends the minimum round time for meteor swarm events (#32876)
5640ec1 
* adjusted minimum timers in meteorswarms.yml

* Updated timer minimum from 20 to 15 minutes

* Reduced minimum timer to 10 minutes as a result of other meteor changes

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
@PJBot
Automatic changelog update
75df992
@lzk228
add StartDelay bool to actions (#33026)
39f5ea9 
* add StartDelay bool to actions

* forgot summary
@Moomoobeef
Updated an incorrect sprite in the smite menu (#33043)
cd3ed90 
changed the synth sprite used in the icon for the instrumentify smite out for the more accurate supersynth sprite
@deltanedas
fix lava expeds (#33042)
03bf602 
Co-authored-by: deltanedas <@deltanedas:kde.org>
@PJBot
Automatic changelog update
d775554
@metalgearsloth
Fix separated game screen bumping (#33046)
a47e73d 
I don't really understand why RecordedSplitContainer exists but removing it looks identical and fixes the panel bumping occasionally.
@PJBot
Automatic changelog update
30a24d5
@thetolbean
Fix: Make Plushie Damage Unexaminable (#33061)
f5bcaa3 
Set hidden to true
@MilonPL
fix chameleon projector bot whitelist (#33055)
455c099 
fix
@Flareguy
Various Vaugely Connected Sprite Updates™: Encryption Keys, Station M…
0018646 
…ap, Brig Timer (#32786)

* various resprites (encryption keys + signal screens + station map)

* brig timer update

* fixes n shit
@Blackern5000
Give proto-kinetic crushers, glaives, and daggers better inhands. Upd…
c14b5ab 
…ate the crusher and glaive icons. (#32212)

* inhands

* better inhands

* indent
joshepvodka and others added 3 commits November 2, 2024 16:34
@deltanedas deltanedas requested review from a team and IamVelcroboy as code owners November 2, 2024 16:46
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: Map Changes: UI Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Documentation Changes any xml or md files Changes: Sprite Changes any png or json in an rsi Changes: Audio Changes any audio files and removed S: Needs Review labels Nov 2, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 2, 2024 •
edited
Loading

RSI Diff Bot; head commit 94b7cbb merging into 2a1ee7a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi

State Old New Status
muffin-berry Modified
muffin-cherry Modified
muffin-banana Added
muffin-chocolate Added

Resources/Textures/Objects/Devices/encryption_keys.rsi

State Old New Status
crypt_blue Modified
crypt_gold Modified
crypt_gray Modified
crypt_orange Modified
crypt_red Modified
crypt_rusted Modified
crypt_silver Modified

Resources/Textures/Objects/Devices/tablets.rsi

State Old New Status
generic Modified
tablet Modified
tabletsol Modified

Resources/Textures/Objects/Weapons/Melee/crusher.rsi

State Old New Status
icon Modified
inhand-left Removed
inhand-right Removed
wielded-inhand-left Removed
wielded-inhand-right Removed

Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi

State Old New Status
icon Modified
inhand-left Removed
inhand-right Removed
wielded-inhand-left Removed
wielded-inhand-right Removed

Resources/Textures/Structures/Machines/station_map.rsi

State Old New Status
station_map0 Modified
station_map_broken Modified
station_map_frame0 Modified
station_map_frame1 Modified
station_map_frame2 Modified

Resources/Textures/Structures/Wallmounts/signalscreen.rsi

State Old New Status
signalscreen Modified

Resources/Textures/Interface/Actions/actions_ai.rsi

State Old New Status
job_view Removed

Resources/Textures/Objects/Consumable/Food/plates.rsi

State Old New Status
muffin-tin Added

Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi

State Old New Status
mopbucket_carpplush Added

Resources/Textures/Objects/Specific/Medical/defibsmall.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added
ready Added
screen Added

Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added
ready Added
screen Added

Resources/Textures/Objects/Specific/Medical/medipen.rsi

State Old New Status
dexpen Added
dexpen_empty Added
punctpen Added
punctpen_empty Added
pyrapen Added
pyrapen_empty Added

Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi

State Old New Status
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi

State Old New Status
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after 94b7cbb

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Nov 6, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 6, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@MilonPL
Copy link
Member

MilonPL commented Nov 6, 2024

real

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Nov 6, 2024
@deltanedas deltanedas merged commit 2620eb4 into DeltaV-Station:master Nov 7, 2024
13 checks passed
@deltanedas deltanedas deleted the upstream-ops branch November 7, 2024 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IamVelcroboy IamVelcroboy IamVelcroboy left review comments

Assignees
No one assigned
Labels
Changes: Audio Changes any audio files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: UI Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.