Upstream sync #1661
Merged
Upstream sync #1661
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
* add * locale * probably fix * fix stuffs * oversight * uh yea * i beg * tag * i pray to god this fixes it * update * fix * vestine * fix note * balancing * fix * toxin wipe
* add * fix * formatting..
* Adds coal * Fix stack splitting spawn * Convert size * Ahhh, it's a reagent tooo.... * ore.rsi * Adjust recipes, add reagent extraction * solution name * Adjust reagents to prevent reactions * Adjust reagents for standard of 10u --------- Co-authored-by: Jeff <[email protected]>
* Added the Super Bonk smite. It teleports the player from table to table in the game and bonk their head into them. Also smashes them into glass tables. * Stopped using a timer and now instead use Comp + System. Also added proper logging impact. * Fixed name inconsistency * Admin CL which I forgot * Made it funnier * Moved basically all logic to the system and added a light version that stops when you die * Hopefully made YAML Linter stop bullying me * Removed fun(Glass tables no longer get smashed when the target is bonked over them) General opinion seems that it would cause too much collateral damage. I kinda agree. * Adressed reviews
* boots * Boots rsi * Fix damage values and remove unnecessary item statement * Oops I still needed the Item statement for the sprite. * Added to warden locker and maints rare fluff loot pool * No longer in ward's locker * Update Resources/Prototypes/Entities/Clothing/Shoes/boots.yml Co-authored-by: faint <[email protected]> --------- Co-authored-by: Nemanja <[email protected]> Co-authored-by: faint <[email protected]>
…2352) Weapon Random Fixes
makes external & shuttle airlocks bump-openable
Make closet craftable
* Remove duplicate milks * Migration * Inventories * Guidebook --------- Co-authored-by: Jeff <[email protected]>
* Rebalance Fireaxe * Nerf it a bit
* Adds service light visuals and meta.json * Added the rest of the needed service light sprites * Adds service light and service light bulb entity prototypes * Changes entity descriptions * Removes sprites temporarily * Adds back the sprites and modifies rotation sprites
* Give security sunglasses the security HUD * Switch security to round-start sunglasses, add sec glasses research
…(#22776) * gogoogsf * deltanedas has been banned from the repo * double banned
* added suit * added suit * tweaked monkey suit
…693) * added * pen touch up * fixed conflict? * whatever i dont want credits
Fixes #14220 Because the entity they start following is moving, the physics system gives the follower opposing velocity to counteract, at the time the parent change happens. This happens *after* the follower system tries to clear the follower's velocity, so the follower gets some velocity that will still move them a bit off-center. Fix is easy enough, just reset velocity *after* reparenting, not before.
MinimumTemperatureDeltaToConsider sets the minimum temperature difference for a heat capacity calculation to be run. The problem is that when heating up large quantities of gas (e.g. with a heater), a small dT becomes an even smaller dT when running DivideInto(). This means that small changes in temperature are completely ignored.
* removed nocturine from the uplink catalog * fixed nocturine locale, added back to catalog for 6tc
* fix: Use manhattan distance for extension cable system * fix: Changed my mind
* Add coal distribution to progen * Add sprite --------- Co-authored-by: Jeff <[email protected]>
# Conflicts: # Content.Server/RoundEnd/RoundEndSystem.cs # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png # Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json # Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png # Tools/actions_changelogs_since_last_run.py
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 972d3f4 merging into 75c2e07 Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi
Resources/Textures/Interface/Alerts/human_alive.rsi
Resources/Textures/Structures/Furniture/potted_plants.rsi
Resources/Textures/Objects/Consumable/Food/ingredients.rsi
Resources/Textures/Clothing/Hands/Gloves/janitor.rsi
Resources/Textures/Clothing/Shoes/Boots/highheelboots.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_agent.rsi
Resources/Textures/Objects/Misc/bureaucracy.rsi
Resources/Textures/Objects/Misc/cc-clipboard.rsi
Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi
Resources/Textures/Structures/Storage/closet.rsi
Resources/Textures/Structures/Wallmounts/screen.rsi
Resources/Textures/Structures/Wallmounts/service_light.rsi
Resources/Textures/Structures/Walls/rock.rsi
|
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
Медиа
Проверки
Изменения