Upstream #97
Merged
Upstream #97
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
deleted bartender's incend
…es. (#27145) Disable comms console announce for long messages Disable the "announce" button on the communications console for messages above the cap. I did not touch broadcasting because I could not identify an easy way to check the maximum length for it.
* Wallmount substation once again obtainable * Fill mapped wallmount substations with components
- Fix some prediction stuff. - Fix some jank. - UseDelay. - Cap.
…5971) * png alignment and minor refactorization * Update migration.yml --------- Co-authored-by: metalgearsloth <[email protected]>
* adds non randomized rod velocity * Adds despawn suffix to despawn rod
Redundant getworldpos.
* blank filled slots * Update InventoryTemplatePrototype.cs
* Add evac shuttle test. * Fix typo in comment
* trap * without effect
* added ninja to Antagonists.xml * give the space ninja some love * by the way did you know there are now 25 fiber types? i demand this number get updated with every single PR
* Made more things blessable * Removed junk * Remove whatever that was * Make bowls blessable * New mixablesolution component, converted everything to work with it * Fix minor mishaps * Fix extra spaces in bottle yml * Fix last extra space, fix bottle havign the wrong solution name * Remvoe unneeded event(I think), fix alcohol bottles not being mixable * I missed cans
* Update shards.yml Changed glass shards damage depends on their type, each tier of glass gains 1 more damage, also changed attack rate to 1, because you cant fast swing with weapon that can hurt you * Oops Forgot about base shard * Update shards.yml Cleanup * Update shards.yml Changed damage on step (Attack damage + 1)
* Add medical gloves to loadouts * Realize I don't need to duplicate them * Re-add extra lines * I did it wrong... * Format it back to how it was this time for sure * For real this time * ... * Add sterile masks too * I can't spell officer apparently * Standardize order of where gloves are * Add Nurse Hat to doctors * Remove duplication of gloves and masks * Remove extra space * Name glove protos similiar to other ones * Remove latex gloves proto from medical (sci has it)
Fixes crates masks not allowing them to go under plastic flaps + crates no longer can go trough windoors.
* Windoors now contain proper electronics * weh
* vox oxygen toxicity and related stuff * Review --------- Co-authored-by: metalgearsloth <[email protected]>
* Update miscellaneous.yml * Update mobspawn.yml * Update miscellaneous.yml * Update miscellaneous.yml
… (#26178) * Printable Empty Magazines * Adjust values of ammo boxes, adjust material costs, add empty lethal/non-lethal mags, swap secfab shotgun shells with shotgun ammo boxes, add recipe for shotgun ammo boxes * Adds fully loaded pistol mags at secfab, removes printing respective cartridges at secfab * Adds fully loaded rifle mags at secfab, removes respective cartridges * Adds fully loaded light rifle mags at secfab, removes respective cartridges from secfab * Adds fully loaded speedloader to secfab, removes respective cartridges from secfab * small id mismatch fix * another wrong ID fix * capitalize Ls in speedloader * Add missing SpeedLoader recipe * Adds fully loaded shotgun drums to secfab, removes respective shells from secfab * add rifle ammo unlocks back in, forgot ammo unlocks affect other fabs as well * Moves tranquilizer shells to the non-lethal ammunition research * Account for the removal of rubbers, adds in craftable disablers * rubber rounds don't exist, remove empty non-lethal mags to just have empty mags * Add in WT550 mags * Convert latheRecipes to use LayeredTextureRect instead of TextureRect * Fix for issue, texture layering now works * Add in missing shell uranium box art * add shelluranium to meta.json * Fix yml issue * Get rid of unused single ammo printing unlocks --------- Co-authored-by: Plykiya <[email protected]>
* Update cane UI key * none of the pr passed ci yippee * weh
* Add a handy security radio I've always wanted to have a handy security radio in game and I thought it would be cool to have one in game. Demonstation can be found in here: https://youtu.be/VQOLiTQAmKc * Merged radio files and changed sprite location * Fixed RSI not having license and copyright * Added a chance to spawn in security closets All security closets will have 50% chance to spawn a handy security radio in it * Update radio id Co-authored-by: lzk <[email protected]> * Change id in locker spawn * Change id in locker spawn * Changed id to RadioHandheldSecurity as suggested * Add radio to vending machine instead of locker Removed radio from lockers and added it to security vending machine * Fixed radio not having a sprite --------- Co-authored-by: lzk <[email protected]>
…tion-14 into UpstreamLast
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.