Upstream0708 #201
Merged
Upstream0708 #201
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
* wrong magazine * a single typo * removed GunSystem solution * magazine misfit warnings
* Syndie borg can now wield DEsword * Made child of EnergySwordDouble for borgs * Made ESword borg module use this new borg DESword * Removed name property of CyborgDESword so that it now inherits from DESword and added a suffix to differentiate the two in spawn menu
* Lowercase some prototypes names * huh * return altar * apply * meta map
* split logic into own system * add support for different size displacement maps * some clothes may not use displacement maps * displacement maps spport hand sprites * Update DisplacementMapSystem.cs * rename things * fuck stencilmask * fix bugs * no masks * Update jumpsuits.yml * fix species specific sprites * Update ClothingSystem.cs * shoes + ears displacement, some bugfix * Update DisplacementMapSystem.cs
add check for hands
* Check if grinder is powered before doing work * Use existing extention method.
* Added all the parts to implement spicy rock pizza * Added sprites for pizza * Fixed coma formatting in meta.json for pizzas * Fix formatting and rebalance reagent quantities in pizza.yml * Flipped Uranium and Radium values to be the correct ratio * Updated meta.json file to have credit for sprite
split traits into disabilities and quirks
* Get needhand from yml * MovementThreshold modifiable + inheritdoc
replace tiny fans fix #29482
fans external airlocks one escape pod more airlocks in arrivals
replace tiny fans in fridge
replace tiny fans with directional connect missed external airlocks
* Update Box replace missed tiny fans with directional * add two more security hardsuits
* Update Atlas connect missed atmos devices (part of #29025) replace fans in fridge * remove invalid
* perma escape crate fills and spawner * also include maints closets because thats easy. * oopsie daisys * green glowsticks * mindshield * base folder * mob traps. * I skill issued a ctrl+F and wrote garabge into yml * re work syndicate gift crate, remove ability to get syndicate guns randomly. * Do mob traps differently to hopefully appease tests. * mindshield probability decrease. * lower mob chance since I forgor there are crabs in the walls * Suffixes * mob chance was definitely too low. * still too low * still a bit low * that feels right. * too many mk's * increase hatchet chance since you need a cutting impliment to logs. * alphabetize
* Update borg_chassis.yml * Update borg_chassis.yml * fix * Removing unnecessary components and adapting changes (#28391) for the syndicate --------- Co-authored-by: Ed <[email protected]>
* prevent borgs from using locks * e * bru * a * blacklist borgs and robotics console * frogro * add IsAllowed to EntityWhitelistSystem * use IsAllowed * move thing to new LockingWhitelistSystem ** review * use renamed CheckBoth in locking whitelist * remove unused stuff and add more to doc * Use target entity instead to remove self check * Rename to _whitelistSystem * Add deny lock toggle popup * Prevent duplicate checks and popups * Fix wrong entity in popup when toggling another borg * Make new event * Update comment to user for new event --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: ShadowCommander <[email protected]>
Co-authored-by: NotSoDamn <[email protected]> Co-authored-by: lzk <[email protected]>
…tion-14 into upstream0708
github-actions
bot
added
Changes: UI
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.
Описание PR
Admin.yml
Лист чейнжлогов, смотреть подробнее..
Changelog.yml
Лист чейнжлогов, смотреть подробнее..
Проверки
Изменения
🆑 Шрёдька