Merge attempt 1. #142
Closed
Merge attempt 1. #142
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
… which also uses IonStormSystem. Added StartIonStormedComponent. Changed stuff related to the Derelict Cyborg. Derelict Cyborg now spawns with a randomized lawset.
Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
…ture Cyborgs and AI's, including those in subsequent rounds.
…h i didn't want to.
…screen. It still appears in the Player Manifest.
…relict Cyborg right now) not showing up as 'antag' in the admin player overlay.
Hopefully without explosions yay
First commit Co-authored-by: metalgearsloth <[email protected]>
* button * implement populate grid view * tweak min width * Make grid button toggle visible * tweak min window size * fix missing recipe button when mirroring item * make grid buttons toggleable * align button texture vertically * selected grid item has plain color background * tweak window width so all buttons look good * rename select method, defer colouring * get icon better * whoops * simpler button toggle * spritesys frame0, move spritesys * delete old sprite system refs
Doesn't really affect anything due to appearance bulldozing this but this aligns with their actual normal states so.
|
Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow our git usage documentation You can move your current work from the master branch to another branch by doing |
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit cb246f5 merging into 5913f56 Resources/Textures/Interface/Misc/job_icons.rsi
Resources/Textures/Objects/Misc/id_cards.rsi
Resources/Textures/Structures/Wallmounts/air_monitors.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.
About the PR
Why / Balance
Technical details
Media
Requirements
Breaking changes
Changelog