Upstream merged 12 #225
Merged
Upstream merged 12 #225
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
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Portal repalette * Portal traversal verb + anchoring * map restriction * optional max distance checks if we decide to have them later * lower pointlight energy slightly hopefully makes it less garish
* add test for salvage map loading * ouagh
Co-authored-by: Jeff <[email protected]>
* Fix bug with undeletable label on jugs * Fix label text for jugs * Documented LabelComponent * Revert "Fix label text for jugs" This reverts commit 38b7cc7. * make jugs labels names lowercase * Fix documentation of LabelComponent
* Adds directional switches * Revert unintended line deletion * Consistent recipes --------- Co-authored-by: Jeff <[email protected]>
* Added all the basics I think I needed for the basic cigs to show up in vendors and game. Need to implement the randomizer to grab varied chems from a list. * Forgot a png * Smokes work just need sprite work and random * First pass on random cigs * Cigarettes are named now just randomization left * Finished on my end. * Whoops * Nutrient is not availiable for smokes I guess? * Testing fixes * Dunno found this on the filledbookshelf might work here? * I dont know what Im doing wrong but I think this might work. * Trying with orgroups in the pack YAML * It seems to not like the food chems. Commented them out. * THC is also a no go. Also increased storage size of pack to total pool. Given the low prob should still should never hit max volume. * I have a sneaky suspicion its the size of the container and pool of fill items. * Messed with the size of the cigarrettes so they all have a chance to fit and the size of box stays consistent. * Apparently non whole number size is a no go. * Cartons were to small and added maxamount on cigarettes. * Amount: 0 caused odd errors. removed and changed maxamount to 2. * Reworked randomization system to try and use weightedRandom instead of prob in storageFill * Wrong weightedRandom * Rework of a rework. Good on my end. Simplified the randomization to bare minimum. * Added gas station dick pill vibe to all the names.
* barratry update * Update barratry.yml
Co-authored-by: TsjipTsjip <[email protected]>
* make sinks loog good * meta
* bagel update * bagel
Fingerless insulated gloves are a joke variant of insulated gloves that neither insulates you, nor prevents you from transferring fingerprints. The name and description make this adequately clear.
* more loot * a
* Change manifesto to manifest
* Lower material price for tier 2 parts
github-actions
bot
added
Changes: Localization
|
RSI Diff Bot; head commit 149ee1f merging into 5ba513a Resources/Textures/Effects/portal.rsi
Resources/Textures/Structures/Furniture/sink.rsi
Resources/Textures/Structures/Machines/parts.rsi
Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
Resources/Textures/Objects/Specific/Kitchen/food_carts.rsi
|
* replace sprites * change copyright * Update Resources/Textures/Structures/Machines/parts.rsi/meta.json Co-authored-by: lzk <[email protected]> --------- Co-authored-by: lzk <[email protected]>
* Update chemistry.yml * Adding Syringe Support for Chemical Analysis Goggles * Update cigarette.yml
…on-14 into upstream-merged-12
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
Мерж апстрима, хуйня всякая по сути
Медиа
Проверки
Изменения
🆑