Dev #301
Merged
Dev #301
Conversation
This file contains hidden or 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
…-wizards#36255) Co-authored-by: pa.pecherskij <[email protected]>
* use dragon rift sprite colours * Entity<T>
[pull] upstream from space-wizards:master
…6263) Convert AgentIDCard message to use a selector
* NPC Warnings cleanup * Reverting unnecessary changes * Reverting unnecessary changes, missed * Using entity GetGrid override instead
[pull] upstream from space-wizards:master
…pace-wizards#36268) * Make burning to ash use identity * CAPITALIZE(THE())
* Use identity for magic mirror popups * THE() * Use correct pronouns in blocked-by-hat message
Expensive for what it is just really annoying in debug to not have it. Worst case I just make it debug only and we don't add it for release.
…#36258) Changed the name and description of the knight helmet. Co-authored-by: Flesh <N/A>
* nap time in medbay * suggested changes * fake test fail
* Click through faded sprites * Count the mouse position for which sprites to fade
[pull] upstream from space-wizards:master
…ace-wizards#33721) * Carpet curtain/table recipes now respect stacks * remove unused colour carpet tags * Remove the tags outright
[pull] upstream from space-wizards:master
* stop ghosts from being logged * thanks rider for the random import * add new tag PreventAccessLogging * once again removing random auto imports * inverted if for code readability * switch to ProtoId<> usage
* init * slight value tweaks * few more
Update Displacement Map Visualizer.lua
[pull] upstream from space-wizards:master
* remove evil * fix non-localizeddataset uses --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* behold! * minor name change 👍 * Remove fields 👍 * Changes it to parent off DeathRattleImplant * Adds implants round start and fixes hypothetical bug * Update Resources/Prototypes/Entities/Mobs/Player/humanoid.yml As per slarticodefast's suggestion Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>
[pull] upstream from space-wizards:master
…rds#36323) Alter the description of the chemical synthesis kit to no longer include any false hopes of toxins
Co-authored-by: PJBot <[email protected]>
[pull] upstream from space-wizards:master
* Minor salvage melee tweaks. * Minor salvage melee tweaks. --------- Co-authored-by: RedBookcase <[email protected]>
[pull] upstream from space-wizards:master
…wizards#36347) * Modify .cs and admin pda * enhance comment
* init * review
[pull] upstream from space-wizards:master
Upstream
github-actions
bot
added
Changes: Sprites
Changes: UI
size/M
Changes: Map
S: Untriaged
labels
|
RSI Diff Bot; head commit 55633d5 merging into 30087b7 Resources/Textures/Objects/Weapons/Melee/crusher.rsi
Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.