-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
Upstream 20 Sep #80
Upstream 20 Sep #80
Conversation
* make tesla brighter * radius to 10
* Added a ClothingShoesBootsMagBase, to allow the other versions of the magboots to have their own contraband settings * Changed Science Boots to not be contraband * Made ClothingShoesBootsMagBase abstract * Removed Engineering Contraband from base magboots. Now only the CE's Advanced Magboots are contraband (Grand Theft Contraband). Blood Reds are Syndie Contraband.
* Remove unused VVs params and usings from entityUid, MorgueComponent into Entity<MorgueComponent> ent * remove unnecesary VVs cuz datafields add em
* Recompress some lobby images to be under a 1mb * oops
* Remove midround zombies * super rare, like, 1/651 chance every few minutes. * weight to 1 --------- Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
teleporting while pulling crash fix Co-authored-by: YourUsername <you@example.com>
* marathon update * ce spawn
* Atmospheric alerts computer * Moved components, restricted access to them * Minor tweaks * The screen will now turn off when the computer is not powered * Bug fix * Adjusted label * Updated to latest master version
Initial commit
we got more laws
* Basically every electronic device can now be used by the AI. * Removed stuff that didnt make sense * oops * Removed access from mailing and disposal units. * Added AI wires to a couple machines. * cool epic stuff
* feat: #26107 uplink discounts for traitors and nukies * refactor: #26107 extracted discount label from price of StoreListingControl * refactor: minor renaming * refactor: parametrized adding discounts to uplink store * fix: #26107 prevent exception on empty discountOptions * feat: uplink now have 'Discounted' category which contains all discounted items on this session. * after merge fixups * rename discount categories according to common sense * refactor: DiscountOptions is now optional (nullable) on ListingData * add nullability check ignore for already checked listingData.DiscountOptions * fix after merge store menu ui * remove unused using * final fix after merge conflicts * [refactor]: #26107 fix variables naming in UplinkSystem * fix: #26107 fix after merge * refactor: #26107 now supports discountDownUntil on ListingItem, instead of % of discount * feat: #26107 support multiple currency discount in store on side of discount message label * refactor: #26107 extracted discounts initialization to separate system. StoreDiscountData are spread as array and not list now * refactor: #26107 move more code from storesystem to StoreDiscountComponent * refactor: #26107 separated StoreSystem and StoreDiscountSystem using events * fix: #26107 placed not-nullable variable initialization in ListingData for tests * refactor: #26107 minor renaming, xml-docs * fix: #26107 changed most of discounts to be down to half price for balance purposes * ids used in with discounts are now ProtoIds, dicountCategories are now prototypes, code with weights simplified * decoupled storesystem and store discount system * xml-docs * refactor: #26107 xml-doc for StoreDiscountSystem * is now a thing (tmp) * fix: compilation errors + StoreDiscountData.DiscountCategoryId * refactor: rename ListingDataWithCostModifiers, fix all cost related code, enpittyfy performance, uglify uplink_catalog * refactor: removed unused code, more StoreDiscountSystem docs, simplify code * refactor: moved discount category logic to respective system, now creating ListingData c-tor clones all mutable fields as expected * refactor: rename back (its not prototype) * refactor: move ListingItemsInitializingEvent to file with handling logic * refactor: comments for StoreBuyFinishedEvent handling, more logging * refactor: moved StoreInitializedEvent, xml-doc * refactor: simplify StoreDiscountSystem code (reduce nesting) + xml-doc * refactor: restore old listing data cost field name * refactor: fix linter in uplink_catalog.yml * refactor: xml-doc for ListingDataWithCostModifiers * refactor: limit usage of ListingData in favour of ListingDataWithCostModifiers * refactor: purged linq, removed custom datafield names, minor cleanup * refactor: removed double-allocation on getting available listings * refactor: StoreSystem.OnBuyRequest now uses component.FullListingsCatalog as reference point (as it was in original code) * fix: minor discount categories on uplink items changes following design overview * refactor: StoreBuyListingMessage now uses protoId and not whole object * refactor: store refund and discount integration test, RefreshAllListings now translates previous cost modifiers to refreshed list, if state previous to refresh had any listing items --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
* Updated sprites for AI HUD * Epic test fail * Merged AGhost actions and AI actions together again. * Seperate comms and bugfix. Fixed broadcast.
* Updated sprites for AI HUD * Epic test fail * Merged AGhost actions and AI actions together again.
* Add a kit for botanists to do some limited chemistry to the NutriMax. Intended to help new botanists learn in-game about chemistry. * remove exclamation marks from names * naming fix * Rejected trademark application for 'Farmers Helper'. --------- Co-authored-by: PraxisMapper <praxismapper@gmail.com>
* clean up robotics lathe recipes * add result --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* clean up security lathe recipes * add result --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
Rather than doing goofy hacks we just use what sprites are near the mouse.
For realsies :)
* Reapply "FTL + AI fixes (#31952)" (#31968) This reverts commit c46a4ab. * Update
Co-authored-by: lapatison <lapatisonsocial@gmail.com> Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lapatison <lapatisonsocial@gmail.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
# Conflicts: # .github/workflows/publish-publish.yml # Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl # Resources/Locale/en-US/ss14-ru/prototypes/gamerules/unknown_shuttles.ftl # Resources/Locale/ru-RU/job/job-names.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/misc.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml # Resources/Prototypes/GameRules/unknown_shuttles.yml # Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
|
Описание PR
Медиа
Проверки
Изменения