Merged
Conversation
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> (cherry picked from commit 2214857809c7eaae5ea0d703875efd6330696a41)
…es. (#29224) * New solar sprites, new solar panel upgrades, and some solar panel fixes. This adds and changes a few things for solar panels! * New sprites for all solar panels and all related states. * Move from xform.WorldRotation to _xformSystem.SetWorldRotation within the solar code. * Few random fixes that Rider suggested as warnings. * Solar Tracker Electronics was using what looks like to be the airlock controller electronics, so that's now updated to something a bit more realistic. It also uses the engineering circuit sprite instead of the generic * New Solar Panels! Adds Plasma and Uranium Glass solar panels. These can be constructed by adding the respective glass to the panel. Plasma is a slight increase of power and health, and uranium is double the power and health of glass. Thus giving engineers something to update if they want to use solar panels and possibly giving small outposts a way to make a bit more power without a large and complex power setup. * Add in solar sprites that were not in the meta file. * Updated sprites based on feedback. * Fix the rotation of the solar panel sprites. (cherry picked from commit 2a632b21b0e9954f3aed9cd5eec78ccd349c4aef)
(cherry picked from commit f0652d8e9a188d04c2e30554b1ced08f3bf18506)
added hos flask to locker spawn (cherry picked from commit 6240b9d774156d6d86590363db016174bf4763ba)
(cherry picked from commit 7d0b1357cdbfa315ffeb74948aad8286dfc5a4e1)
Update fland.yml (cherry picked from commit e464736ae60b3ca766e877f232e3cebd58504a2b)
fix mv cable crate typo (cherry picked from commit 06a2dca6954067a1aeacf9964bb219c982680bba)
(cherry picked from commit 5b6ef128dd22943ed2bca26a85dad278dc9413cb)
* add a chem dispenser to the nukie planet * begone test fail (cherry picked from commit c1456e050836b96edcb74f42aee72bb5bfcb7165)
… (#32655) * adds description to pneumatic valve and build menu description * Change one atmosphere to kPa (cherry picked from commit 3e346019fff12dc6fc024197907065e1466ffad1)
(cherry picked from commit f9c74f362279748105bd2c55163962b3d3e5f5ff)
(cherry picked from commit bbad14797392bc436560425041b779c937df2017)
FixMatchBox Now you can't put anything but matches in a box of matches. Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com> (cherry picked from commit 88456a4a8c95af3574f2e873dcfe73e32840da44)
(cherry picked from commit 5388414da748dfbd468f795c842b9f083c04e239)
* 27-12-2024-light-hi-viz * 28-12-2024-meta-fix (cherry picked from commit 276ec745fea9ab3c840cd2cc51556ac73602442d)
(cherry picked from commit fd25dac720b6e7e98336e63a1cc4fa7fb831aa53)
(cherry picked from commit 1b9d84a16e9d02865ff2f0eda4966f6fee7d3545)
* added pain-numbness component and system * added numb as a trait that pulls the pain numbness component * removed new event as mob threshold event as already being fired * checked for MobThresholdsComponent first before running VerifyThresholds * refacted force say to using LocalizedDatasetPrototype and added numb messages * added severity check alert * added comment for BeforeForceSayEvent * removed space formatting * changed Cancelled to CancelUpdate, fixed spacing and added two more damage-force-say-numb * changed prefix damage-force-say-numb to 5 (whoops) (cherry picked from commit 012c8355594823bc327fc42693a43a7c00f0caf9)
(cherry picked from commit 66d979462c9bc7530d687c41f404dfc03bee0f47)
(cherry picked from commit 79f8ea0572d86fe64bc22234c6c1b20a96d9ca79)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit 5733b47f060096f393d23706038c3ee4866a7e65)
(cherry picked from commit cf40804fb840fde5898848d77df87933bc7bdeb4)
Revert "Fix match box (#34632)" This reverts commit 88456a4a8c95af3574f2e873dcfe73e32840da44. (cherry picked from commit 25fba3036ad42282d2dc114a07ac3fb3b03130d5)
(cherry picked from commit d1b288402800357e51a96a78ccb2fae433349d34)
(cherry picked from commit b1f83fb70733893c4acca9583ce9b19d27416eac)
…ng belts (#33048) Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com> (cherry picked from commit be5b20e41625d7a846e796709565a6b91398ae19)
(cherry picked from commit 24486da85b58daf254fca35ccfab66cbb72e684d)
Significantly updates the Engineering guidebook (more explicitly the Atmos section) to have a lot more relevant and useful information. Right now engineering has been getting update after update with no real change to the relevant guidebook entry. This has lead to a lot of out of date information and bad practices being prevalent in the guidebook, something that pains me to read. (cherry picked from commit 98c606d76007865e93ebd438d0cf9219d14a4631)
(cherry picked from commit 0b78e17c30d080f54336e8cfed846c01bed09dfc)
fixed the freezer pipe in cryo room (cherry picked from commit cab98717ed9f1e3cc8631e1f12433d48d524c477)
(cherry picked from commit bf6fd4d581de27b8b293411c409aa7ed2c332b78)
(cherry picked from commit 50ba607bf54a5222f640ec0bf8025fdc8c5fc4eb)
(cherry picked from commit 5e3d744233843a649b2173b769ea757218d831d1)
* allow paper labels on seeds * added the components required by PaperLabel to the SeedBase * localize insert/eject for PaperLabel * visualize the paper label on seeds * new paper layer for seeds * eject the seed label on use * different looking paper label * forgot to turn on a layer (cherry picked from commit 36b59c69f4849400e6d2b8e6027aec9f7a445834)
(cherry picked from commit 1077d2dfb26cfe526b2864a6a5498b27aa90d66e)
(cherry picked from commit ab6a340d7c5765284c827a4515d3ad7178e9c940)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> (cherry picked from commit 01cbe31872cc6882819b309b19d06ad967589f1d)
* Make ReactionResults an array We're making the dictionaries fixed-size anyway. Alternatively could use a frozendictionary but not sure on the perf difference. Worst case whoever adds another reactionresult makes a minor adjustment * apply conventions --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit ba1fd6c5f3decb64d231c3e3b9689187a4152a7a)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit 9963416c1d015b98eea40d137559c6bd78e6be84)
Fixed rotation shuttle consoles when anchored (cherry picked from commit f37b851810529d1737c75c6392949dd493465d46)
(cherry picked from commit 7be66599335fc931e9b5ef999f2f5c2887a7609d)
* went to the long bacon store. * obtainable :3 (cherry picked from commit 3b621a0245eec8584943243c7bce10ff00e07671)
(cherry picked from commit 082b1f89799756bdeff2c3faad25c43433b8617e)
github-actions
bot
added
S: Needs Review
size/L
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
merges master
notable exclusions: