This repository was archived by the owner on Apr 21, 2026. It is now read-only.
Changes2 - #69
Merged
Merged
Conversation
config for backups sake and new company
* Dockworkers Union Dock Upgrade * Shadekin propaganda and linter fixes * The changes were in fact... not staged... --------- Co-authored-by: ABush <69372251+aabush64@users.noreply.github.com>
* Update atmos_high_pressure.yml * PTK fix
* Interdyne Equipment - added gasmask - added cloth mask - added headset - added uniform * moved headset prototype * rename wrong case * added inhand sprites to meta * added interdyne director hardsuit * wip * fixed species id references * lots of more gear :3 --------- Co-authored-by: Xiv3n <gross@sinceideagames.com>
* fix broken ship shields * merge cryospace to a single mapentity * refactor dungeon atlas generation * fix shipyard map entity generation * fix various expedition issues * fix nuclear reactor inlet/outlet duplication
removing fails and relaxed
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
Bot
added
YML
C#
Sprites
S: Merge Conflict
FTL
S: Untriaged
and removed
size/XL
labels
|
RSI Diff Bot; head commit 6c56471 merging into b801309 Resources/Textures/_HL/Clothing/Neck/mantles/interdynemantle.rsi
Resources/Textures/Objects/Misc/bureaucracy.rsi
Resources/Textures/Objects/Misc/stamps.rsi
Resources/Textures/_HL/Clothing/Gloves/interdyne-surgical.rsi
Resources/Textures/_HL/Clothing/Head/Hardsuits/interdyne-crew.rsi
Resources/Textures/_HL/Clothing/Head/Hardsuits/interdyne-director.rsi
Resources/Textures/_HL/Clothing/Head/interdyneberet.rsi
Resources/Textures/_HL/Clothing/OuterClothing/Hardsuits/interdyne-crew.rsi
Resources/Textures/_HL/Clothing/OuterClothing/Hardsuits/interdyne-director.rsi
Resources/Textures/_HL/Clothing/OuterClothing/interdynebodyarmor.rsi
Resources/Textures/_HL/Structures/pucklight.rsi
Resources/Textures/_Mono/Structures/dark_steel_catwalk.rsi
Resources/Textures/_Mono/Structures/steel_catwalk.rsi
Resources/Textures/_Mono/Structures/white_steel_catwalk.rsi
|
* Interdyne Equipment - added gasmask - added cloth mask - added headset - added uniform * moved headset prototype * rename wrong case * added inhand sprites to meta --------- Co-authored-by: Xiv3n <gross@sinceideagames.com>
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 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.