Upstream sync #1666
Merged
Upstream sync #1666
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: whateverusername0 <whateveremail> Co-authored-by: Kevin Zheng <[email protected]>
Co-authored-by: whateverusername0 <whateveremail> Co-authored-by: Kevin Zheng <[email protected]>
* new structural type * riveted wall stronk * balance structural items
* Rename Miasma to Ammonia * Namespace changes * Map change????? why
* changed sprites * desaturated a bit
Updated carpet sprites
… (#22527) * everything * tweakeroo * maintspill * some balancing and tweaking * adds ice tags and gives it to ice crust * fix code because im smart im the smart guy yeah that's me * yeah * oops * do you wanna try that again * conserve matter * im rather smart
Many people have been running into issues cooling bodies to the current temperature. Make it a bit easier by raising the max temperature. This is the temperature that the body has to change to in order to metabolize the drug, so in practice cryo has to cool lower than this in order to actually get the body to this temperature.
* Removes old inhand visuals from e_sword.rsi and its meta.json * Adds new visuals with a longer blade for the e sword * Makes e sword use its new sprites and modifies other energy weapons prototypes to keep using their own inhands * Makes the toy sword use the old less scary e sword sprites (and gives it BaseItem parent because I thought I broke something when i couldnt pick it up) * Removes old desword sprites and modifies meta.json * Temporarily removes esword blade sprites * Adds back esword sprites after modifying them to flash instead of shimmer * Adds new desword inhand sprites and modifies meta.json and entity prototype to use them * Moves desword sprites back to its own folder from inhands_64x after a supposed prefix conflict * Removes blade inhands * Adds back blade inhands * Moves all inhand sprites to their own inhand folders related to the items. Removes inhands_64x folder
…nd objects tab (#22798) * Fix right clicks in AHelp window * Fix player tab right click * Fix objects tab right click
borg see job borg see crew
* renamed leg wrap to thigh wrap * gauze species rework pt. 1 attempt 73 I hate it here please god get me out * fixing lizard foot wraps part 80 * Attempt 80 to get lizard markings to work i fucking hate it here someone help me D: * attempt 82 im crying please work now * made gauze eye pads actually tape on * Handwraps added * fixed lizard foot wraps (again) 84. * attempt 83.5 * attempt 84 please work * added blindfold gauze * fixed boxerwrap_r :greenfrog: * fixed @UbaserB's eye scars * Revert "fixed @UbaserB's eye scars" This reverts commit eb364e1e61c03c2b8567fec8c1a5c6c78c9a333c. * Revert "Revert "fixed @UbaserB's eye scars"" This reverts commit ac1ee343ae2a8adb2569f88b81cc4afc6915f220.
rotated icon 45 degrees
* Cleanup forensic cleaning * move cleandelay to new component; buff syndiesoap * updated based on feedback * remove tag
cyberpen throw damage
* Adds top surgery scar markings to the character creator * Darkens scars and adds new short and long variants
* gambling * fix typos
…tions (#22831) DumpableComponent does not block the entity from being disposed via InteractOn a DisposalUnit
Fixed issue with dragging the nav map in the station map UI
* :party: * a little trolling
* Added a glossary to the guidebook to help new players understand slang. :cl: 2013HORSEMEATSCANDAL - add: What's a Greytide ? The new edition of your employee guidebook now has a glossary ! * added one more definition
* Fix entity storage localization * Fix HumanoidAppearanceComponent resolve * Fix null reference exceptions * Fix duplicate key error * Fix artifact error spam * actually maybe this is what its meant to do * Fix entities playing sounds on deletion
all the clothes (ft. emag)
* Add YAML gas reactions * Convert more reactions * Use enum names * Convert more names * Add migration for MiasmaCanister * Prevent reactants from going negative * Fix energy conservation, lift energy calculation * Fix comment * Comment * Add rate multiplier
* reach update * lights n shit
* barber! * 5% change to maintenance
Made the rigged boxing gloves have variant TC costs.O[Oi
* Use ECS prototype-reload events * better constructors * Maybe this fixes tests?
Update chapel.yml
# Conflicts: # Resources/Prototypes/Datasets/Names/regalrat.yml # Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 203db7d merging into c44c469 Resources/Textures/Clothing/Head/Hats/party_blue.rsi
Resources/Textures/Clothing/Head/Hats/party_green.rsi
Resources/Textures/Clothing/Head/Hats/party_red.rsi
Resources/Textures/Clothing/Head/Hats/party_yellow.rsi
Resources/Textures/Mobs/Customization/gauze.rsi
|
Morb0
pushed a commit
that referenced
this pull request
Dec 23, 2023
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
Медиа
Проверки
Изменения