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 7/9 #1762

Merged
merged 133 commits into from
Sep 9, 2024
Merged

upstream merge 7/9 #1762

merged 133 commits into from
Sep 9, 2024

Conversation

deltanedas
Copy link
Member

@deltanedas deltanedas commented Sep 7, 2024 •
edited
Loading

Notable additions

  • uplink discounts are real, deltav and nyano listings updated for it
  • atmos alerts computer is now functional
  • ai is less buggy
  • ghost role rule updates, deltav ones still used where they override things like spiders and slimes

Notable exclusions

  • removed instant death snail from the event
  • mysta keeps the binary key until ai is rolled out
  • vendors no longer have grappling gun, justice helm or red neck gaiters

Changelog
🆑

  • add: Merged upstream changes from last week.

Winkarst-cpu and others added 30 commits September 7, 2024 13:14
@Winkarst-cpu
Remove always false checks (#31708)
74f8ce0
@Winkarst-cpu
Remove calls to FormattedMessage obsolete methods (#31706)
64fbd1d 
* Remove FormattedMessage obsolete methods

* Oops
@Ilya246
remove misinformation from tip 26 (#31705)
f1530eb 
tip 26
@PJBot
Automatic changelog update
5953ede
@Errant-4
Replace obsolete code in AnomalySystem.Generator.cs (#31718)
db1ba0c 
* replace obsolete

* weh
@godisdeadLOL
Added cursor indicator for space dragon fire breath ability (#31725)
61cc9a6 
space dragon breath cursor indicator

Co-authored-by: YourUsername <[email protected]>
@PJBot
Automatic changelog update
c5e4707
@lzk228
small yml cleanup (#31720)
7420d48
@Boaz1111
Updates descriptions of station specific jobs. (#31713)
3c36fa3 
done
@Mervill
Remove unused IoC dependency references. (#31704)
78eb844 
Remove unused IoC dependencies
@lzk228 @slarticodefast
cleanup filing cabinets yml (#31211)
924ef34 
* partmedia ahh kommit

* ahh

* everything should be fine now

* f

* now should be good

* Update Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml

Co-authored-by: slarticodefast <[email protected]>

* fix suffix

---------

Co-authored-by: slarticodefast <[email protected]>
@DrSmugleaf
Move IgnitionEvent to shared (#30985)
72fc223
@lzk228
Cleanup railings yml (#31618)
7d7d1a7 
* Cleanup railings

* fix line

* real fix
@EmoGarbage404
Roundstart Grappling Gun (#31737)
b223df5 
Roundstart grappling hook
@PJBot
Automatic changelog update
3fcf4d2
@godisdeadLOL
Added in-hand sprite for Smile the Slime (#31731)
da4e005 
added smile the slime in-hand texture

Co-authored-by: YourUsername <[email protected]>
@EmoGarbage404
Lite Magnet Rebalancing (#31726)
52f4002 
magnet rebalancing ish
unnerf fishops
a933a32
@Errant-4
Devmap crew monitor fix (#31677)
50354e6
@PJBot
Automatic changelog update
2af1b3e
@poeMota @KonChenY1
Add ERT time stats (#31629)
727c614 
* add jobs for ghost roles

* add job to ToggleableGhostRole

* typo

---------

Co-authored-by: Mota <[email protected]>
@PJBot
Automatic changelog update
8c349c4
@Mervill
Fix CS0642 - Possible mistaken empty statement (#31740)
61e373e
@Moomoobeef
Throw the book at em! The space law book now does 1 blunt projectile …
58efbc0 
…damage (#31387)

* you can now throw the space law book for 1 blunt damage

* made book damage a feature of all books
@Cojoke-dot @PJB3005
Replace instances of SolutionContainerSystem with SharedSolutionConta…
d98555b 
…inerSystem (#30084)

* Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem

* guap

* More fixes

* Wait you can do that?

---------

Co-authored-by: Pieter-Jan Briers <[email protected]>
@themias
Add Donk Co. microwave board to Combat Bakery Kit (#31239)
aeb2f75 
* Add special microwave board to Combat Bakery Kit

* use event instead of trycomp

* make the board sus

* add instructions note

* embarrassing typo

* Add functionality to Donk Co. microwave instead

* update note
@PJBot
Automatic changelog update
c81f1bc
@godisdeadLOL
Actions bar dynamic resizing (#31759)
2bd20ac 
* action bar dynamic resizing

* action bar dynamic resizing for separated style

* decreased indent for separated style

---------

Co-authored-by: YourUsername <[email protected]>
@PJBot
Automatic changelog update
574406d
@Mervill
Fix warnings related to non-exhaustive pattern matching. (#31763)
1ce9276 
old man shakes fist at modern syntax
Ian321 and others added 8 commits September 7, 2024 14:10
@Ian321
guide on agrichem and botanicals guidebook update (#31896)
3b6ec3b
@PJBot
Automatic changelog update
2a1cc5c
@PJBot
Automatic changelog update
3d1f572
@Emisse
Lost evac pod thing tiny fan (#31915)
6f658b7 
* disaster evacpod tinyfan

* real
:trollface:
1dee6a8
untroll
aae7d86
@TsjipTsjip @Chief-Engineer
Ghostrole rule updates (#29249)
1e312b9 
* First batch of ghostrole rule updates

* Second pass

* Re-word free agent

* Apply review comments

Co-authored-by: Chief-Engineer <[email protected]>

* You heard it here first folks

God rules are weird to write.

Co-authored-by: Chief-Engineer <[email protected]>

* Honkbot -> Free Agent

Co-authored-by: Chief-Engineer <[email protected]>

* Mimebot -> Free Agent

Co-authored-by: Chief-Engineer <[email protected]>

* Jonkbot -> Free Agent

Co-authored-by: Chief-Engineer <[email protected]>

* Softer blue

---------

Co-authored-by: Chief-Engineer <[email protected]>
:trollface:
33a272b
@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 and removed S: Needs Review labels Sep 7, 2024
deltanedas added 2 commits September 7, 2024 22:35
TadJohnson00
TadJohnson00 requested changes Sep 8, 2024
View reviewed changes
Copy link
Contributor

@TadJohnson00 TadJohnson00 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Taking a brief peep through the commits, apparently these were the only lines that raised issues.

Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml Outdated Show resolved Hide resolved
@IamVelcroboy
Copy link
Member

Really curious about the action bar change in mapping after you load a few maps....will there be any screen left?

(Side note: I should just PR the load acts files so everyone can ignore that anyway)

@deltanedas deltanedas enabled auto-merge (squash) September 8, 2024 10:56
TadJohnson00
TadJohnson00 approved these changes Sep 9, 2024
View reviewed changes
Copy link
Contributor

@TadJohnson00 TadJohnson00 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requested changes done, direction stamp of approval given.

@deltanedas deltanedas merged commit c93551d into DeltaV-Station:master Sep 9, 2024
12 checks passed
@deltanedas deltanedas deleted the upstream-ops branch September 9, 2024 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TadJohnson00 TadJohnson00 TadJohnson00 approved these changes

@IamVelcroboy IamVelcroboy Awaiting requested review from IamVelcroboy

@Colin-Tel Colin-Tel Awaiting requested review from Colin-Tel

Assignees
No one assigned
Labels
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.