Upstream sync #194
Merged
Upstream sync #194
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
(cherry picked from commit 1b172861d15177d248063f93e307a08e40775cd1)
* Ship Vs. Ship Outfits * FUCK * prefix? GONE * ABCDEFJ PEE PEE PEEING (cherry picked from commit 35a2a1478b8f797546e6b9122f4cc9eba31e7b14)
* energy shield * description edits * shields protect * small correction * say no to asteroid bees * fix * BlockModifier * fix * tweak * tweak * ops * fix * Update RobustToolbox * Revert "Update RobustToolbox" This reverts commit 55be82fe537490367e0afaf86365b0e274e6597e. * formatting (cherry picked from commit 4ed11ca73b5f78043fdf5d0d13bf54965775fc2d)
(cherry picked from commit 3d98319069a786320d48969d0091e0ac2712c195)
* Update windoor.yml * comit (cherry picked from commit 3f946bb1e597260d6d1eca8a763546b43ce210cb)
(cherry picked from commit 78939b4c045364638fbd32bd875c2d8f39bd490f)
(cherry picked from commit aadcc48ddc88e6a5f8f44699fb3fb69da7b4eb89)
(cherry picked from commit 9c976d517ecdb70cf064862a177ca2dc0fc8a3b8)
* fix * left over comment (cherry picked from commit cacf26d74062f8760ad1797caf8903170cc8a9ad)
(cherry picked from commit 276f18102128145a82f035d1b8d97301b5b8acdd)
* Added Lead & Zinc, Nerfed Licoxide. * Updated physical descriptions. * Fixed my stupid dumb error. (cherry picked from commit d0a9cce71722d123e0ded0d211afc7311e96853d)
Co-authored-by: keronshb <[email protected]> (cherry picked from commit 9d844520be159ef18e84aec7b0e615c82adfe864)
Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 777c7dcd3324f81224dcfe2696d9ac0c40884b31)
- Add turret spawns. - Mark warding tower as anchored. (cherry picked from commit 982e8f386578d0f293a5abc8180efb83af76587f)
* Syndicate sponge for uplink * Fix yaml error * Made changes mentioned in review * Made changes according to reviews (cherry picked from commit ec58d2e716c5db7c73afcb08edc2babd49bda782)
* Syndicate sponge nerf * Fixed Indentation * Made it exclusive to zookeeper, chef and scientist (cherry picked from commit b070d98da0f3601ed71302f7d812bc5cb4d4a474)
Signed-off-by: c4llv07e <[email protected]> (cherry picked from commit 6e66866567239fc855c50e2f75fa034bda7b2162)
* [Clothing] Syndicate cool. * s1 * s2 * Update meta.json * new banner (cherry picked from commit 2cb700bfff936b06523dafcbfb7a99a6735490dc)
* [VM] SyndieDrobe * "Death to NT" * Animation update (cherry picked from commit bc79e9468214196ecd20c8c11aaaad27aff954f3)
(cherry picked from commit 8b1af362ee28fa5d9cd49f93b57f29c44781beaa)
* interrogator lamp Ultra-bright lamp for the bad cop * interrogator lamp update -Reduced energy consumption, improved base energy source for extra thorough interrogation -The Basic Rights of Sentient Beings have been respected by reducing the number of flash charges. Now they slowly regenerate over time. -The chief engineer fixed the charge indication, although there was a conscript on the shift. It may not work as intended (cherry picked from commit 1aab1ee21273f4cb7f2a5bd04c1288f40db647a1)
* Adds Advanced ointment and bruisepack recipes * Changes the sprites to the ones from /tg * Changed names and sprites, slight tweaks * Formatting * Solve Conflict * Formatting * Fix issues found in check * Fix Oopsie (cherry picked from commit b4c251472f58c81649cf2136642cd4217125e932)
* minibomb buff * redux (cherry picked from commit 979e283572260415251d8d76c9790de1c32c1caa)
* centcom pda and other ID changes * remove duplicate pda (cherry picked from commit 1f55391b42dbc4d35b697670793ae44f9d3c0d78)
…722) (cherry picked from commit 84bd21b4a72cb44e4a44715d55720d10435a8603)
* Disposable turret for uplink * Adjusted firerate and ammo capacity * Fix funny yaml mistake * adjust cargo value * Fix price for real this time * Made it buyable for scientist traitors (cherry picked from commit 579b0093fae8c10c658cc2c2ed6b4a9234341d0c)
* tweaked stats * change comment (cherry picked from commit 657d15751be0fdce8e1de4c3f6e97685e7b096f0)
* Food HUD Icons and Onion Goggles * Added meta.json to food_icons.rsi --------- Co-authored-by: Derby <Derby@ss14> (cherry picked from commit b3a1b97919cc41c0a6a64271971b4f4a87009389)
Co-authored-by: Jeff <[email protected]>
Co-authored-by: Jeff <[email protected]>
Adjusted armory contents to include suit storage units instead of having hardsuits/air tanks on racks, and mk58 safes instead of the weapon/magazines on racks. Also made sure janitors have trash bags in their offices.
Co-authored-by: Jeff <[email protected]>
* Add Basic Parts to Engi Techfab Adds Capacitors, Matter-bins, and Micro-Manipulators to engineering Techfab static recipes. * Deleting Stock Parts in dynamic recipes since the research for them doesn't exist. * Fixes I forgot * Fixes I forgot 2 * Update lathe.yml
(cherry picked from commit cc5d83fe212cb7a91887b72f8c382e491aa01254)
Cherrypick 2023-08-08
* Map Edits * HoS Shutters * Delete invalid * Deploy D.D.S.(Disposal Defense System) --------- Co-authored-by: Jeff <[email protected]>
Updated stations to have mass-media computers. Updated NTSV Tote to have a mass scanner and side blast doors.
…nto upstream-sync
github-actions
bot
added
Changes: C#
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.
No description provided.