upstream merge 04/01/2024 #14
Merged
Conversation
This file contains 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
* Initial commit * Minor update (cherry picked from commit 6c465153abfafda2f5582d1853038c5d0bc3a567)
(cherry picked from commit 4155440a1ba236e7d1044cbf38b947b198100fe0)
Co-authored-by: PJBot <[email protected]> (cherry picked from commit 3f84b04e4ce1ff35657f56a421ff91d05145149c)
* Added support so that smile can use hats Changed Prototypes/Entities/Mobs/NPCs/pets.yml Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi Added smile_displacement.rsi/meta.json Added smile_displacement.rsi/head.png * Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1 Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/ Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi * Minor fixes: removing comments and change naming Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi * Removed smile_inventory_template.yml and used head_inventory_template.yml instead (cherry picked from commit 5d0d37161dddcdf4f3c65d3a267e257273a82b7a)
(cherry picked from commit 9f9553b5261995d7f44fc29f1d3fa30c5bc35cd9)
* add guaranteed cotton pizza to pizza crates * saner parenting * Use clearer suffix on cotton pizza box (cherry picked from commit bfb256f0bacbef19c957ff0426e8f1aa4bf2a88a)
(cherry picked from commit 4bb68c4bacd9ecf34dcf813a5f7fd116cf5ea9e2)
(cherry picked from commit 2c41ed0939b6cd1ed7b04a239105b5f71db9219f)
…ds for moffs (#33508) * A looooooooot of new cotton foods for the moffs * address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs) * alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png * update requested sprites * change requested sprites * address part of sloth's review, awaiting response * address second half of review, fix magical food nutriment mitosis bug (cherry picked from commit e07609b3b3109604b664ec62d6712334ec2fbc97)
(cherry picked from commit a7ca552dfcf193c8b8d706f7567eb12fcc33b69c)
* Remove filters from joint crafting * err * hmmm * guhhh * yyyy * whitespace --------- Co-authored-by: Velcroboy <[email protected]> (cherry picked from commit d6a9fe1c84ba803740b7526c210002de351520e7)
(cherry picked from commit da8bb996b174ac9b781b61c73a1ed206b93a4233)
Update hand_teleporter.yml (cherry picked from commit 072b973f3b6f3eccaeb19a5c36bcda134f822a45)
Co-authored-by: Velcroboy <[email protected]> (cherry picked from commit c2ffc25970a1f15ce81be1bce2e71f28572a7848)
added id for captain Co-authored-by: dylanhunter <[email protected]> (cherry picked from commit 608b433da4905c41928c77b150f75048b236ea25)
* Step 01: Remade arrivals * Nearly finished, also added new beacons and a holopad * Wrapped up all changes, also added a beacon for the docking arm (cherry picked from commit 4acfec8e36d5ae975486499a815678ffc2884b50)
* dechrismassified * removed camera from shower (cherry picked from commit 3fb7ee4068219ca7847f80ff17aae828b4bf8ca1)
* dechristmassified * further dechristmassified (cherry picked from commit def73da9f39e154c6293a0443e9a7917c64bb4b8)
* many changes * contentingregrationtests * serialized invalid removed * blank * "Changes and fixes as suggested" * blank * blank * added desk bells * engi rework rework rework * added gate to content integration * tweaks * aaa * bbb * added holopads * ccc * Update default.yml * hotfix * aaa * bbb * many many tweaks and fixes * aaa * decals and maints * aaa * bbb * ccc --------- Co-authored-by: Emisse <[email protected]> (cherry picked from commit a1c8ac3301ee69b633a43e0026f698942fa1fca7)
renamed cryopod.yml to cryogenic_sleep_unit.yml (cherry picked from commit ff08fb3160532ce52fcf39f42c2b1c9c28fd00bd)
removed christmas merry (cherry picked from commit b31a183324debdcaa7495cafd8369af0379ba103)
(cherry picked from commit 494cb1822b76f479f312263454946506f0e461b3)
* add sprite pulato * update * add pulato hair * add pulato hair * add pulato hair * update meta "pulato" (cherry picked from commit 94422e299b2f694a67eab9efc7fd165b614d602a)
(cherry picked from commit b51f75003560c9dabcf4a6627028c542e732720a)
* Initial commit * Update * Comment correction * Minor margin increase (cherry picked from commit c1c4b1c9a478aac5b9f516d27d8381f7ba8a62f3)
…114) Initial commit (cherry picked from commit 8545c3a70e16112fcc40d94deb5c57305f5b288d)
(cherry picked from commit dc90fab0063d324c69706dbe3eb9deade1549cf9)
* fix * fix2 (cherry picked from commit 9158d76fc1bf85533eb4fd04b068a76311f25adc)
(cherry picked from commit b69212b49ab23b7dbb759bfb2163b94fbcec6a48)
(cherry picked from commit bdea33d866cf9b4a8b57330c8d977cf1dbd59780)
added pricegun sound Co-authored-by: dylanhunter <[email protected]> (cherry picked from commit 39ee8538015dc84aab976e0e8f6276844f71ae42)
(cherry picked from commit 65a463e6660b0064eb5b556856d15bec73e1f595)
* Update tables.yml * Remove Extra base: state_ * Update tables.yml (cherry picked from commit ecdcc9f6b3f85c08c732c8d1767c1dbc758f1610)
(cherry picked from commit 34960c53cbca9b43980e7c686de8e55f00069940)
* V1 commit * Remove PDA name and unnecessary pda state * Adds PDA to Chameleon backpack & thief toolbox * Change to use AppearanceDataInit * Add basic PDA state to ensure there's always a sprite before AppearanceData can be applied * Revert PDA name (this will be changed to another way later) * Update PDA name updating to new system * Fix yaml, and fix Agent ID chameleon * Updated based on review (cherry picked from commit 21351df03ab01e6e9c600ba78382950be223570c)
(cherry picked from commit c98a4b96076229ff85ae49029b1a638f98464f28)
* Add some ion storm actions to replace removed ones * Remove other country references, replace * Some more tuning of the storm values, removing real-world countries * boldy basics (cherry picked from commit edaf0a3820b12c8d197690ed6a53047511d67c4f)
(cherry picked from commit a13076bdc3ac4df3ea8d1d0f7989931eb5535cea)
* Modified science spawners a bit since I realized including maints loot was undesireable * Linked Medical doors to buttons, redesigned the floor of the dining area a bit, placed more science spawners * Somehow I overlooked that I was importing the maints loot table instead of the sci loot table * Gave sci an EOD closet * named the evac shuttle (cherry picked from commit a033abbfbea89a355c419f94dcd2611bf3a2ad4e)
add (cherry picked from commit 55ad6a74eeb2008569c373cfb1ab2ddda67f8d50)
* named apcs, doors, air alarms, cameras, fire alarms, substations, SMESs * updated PostMapInitTest.cs to include Cell * added psychologist spawn * fixed scanner console link, fixed disposals conveyors, and more * added janitor service lights, maints firelocks, and more * added more fun maint rooms * improved head offices, kitchen, psych. added maints between science and arrivals * fixed spawners placed over solid objects * added unique evac shuttle, the Cilium * evac shuttle is now orientated correctly * added unique cargo shuttle * updated kitchen area * renamed Cell Station to Elkridge Depot, removed most main hall airlocks for smoother travel * general last-minute touch-ups around the bridge and sec * changed station name in PostMapInitTest.cs (cherry picked from commit 03b34f06cca32c66949c5cea525bd8b63e6d67f2)
* named apcs, doors, air alarms, cameras, fire alarms, substations, SMESs * updated PostMapInitTest.cs to include Cell * added psychologist spawn * fixed scanner console link, fixed disposals conveyors, and more * added janitor service lights, maints firelocks, and more * added more fun maint rooms * improved head offices, kitchen, psych. added maints between science and arrivals * fixed spawners placed over solid objects * added unique evac shuttle, the Cilium * evac shuttle is now orientated correctly * added unique cargo shuttle * updated kitchen area * renamed Cell Station to Elkridge Depot, removed most main hall airlocks for smoother travel * general last-minute touch-ups around the bridge and sec * changed station name in PostMapInitTest.cs * added Elkridge to default map pool * added myself to map_attribution.yml credits (cherry picked from commit 53a9e0997ead36b9f2fad1f5905a95741a10a88c)
(cherry picked from commit 983cfa8f480a12104fb1bd1d109f860c7d3a66b8)
github-actions
bot
added
S: Needs Review
size/M
|
RSI Diff Bot; head commit 202b5e6 merging into e05948d Resources/Textures/Effects/fire_greyscale.rsi
Resources/Textures/Structures/Piping/disposal.rsi
Resources/Textures/Mobs/Customization/human_hair.rsi
Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi
Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi
Resources/Textures/Objects/Consumable/Food/ingredients.rsi
Resources/Textures/Objects/Misc/module.rsi
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 upstream up to commit
983cfa8f480a12104fb1bd1d109f860c7d3a66b8on 04/01/2024