-
Notifications
You must be signed in to change notification settings - Fork 223
Korpus Novy Mir — "New World Corps" company PR #1649
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
SeaborneProto
wants to merge
14
commits into
HardLightSector:master
from
SeaborneProto:knm-company-addition
+37
−30
Closed
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
b421b9c
Update companies.yml to add Korpus Novy Mir
SeaborneProto 6c491d9
Update headset-component.ftl to add KNM/VSR
SeaborneProto f1eddb1
Update encryption_keys.yml to add VSR/Korpus Novy Mir key
SeaborneProto b9fe6d6
Update radio_channels.yml to add KNM channel
SeaborneProto 5468ca1
adds KNM/VSR key logo
SeaborneProto ec05e91
Update meta.json to include KNM key and attributions
SeaborneProto 829e5d1
Changes KNM channel to be more distinct from space!
SeaborneProto 6c256f3
Merge branch 'master' into knm-company-addition
SeaborneProto 757953a
Removing VSR key
SeaborneProto 3c7b289
Removing VSR radio channel
SeaborneProto e2248f3
Removed KNM key lable
SeaborneProto 4494755
Remove localization of the channel
SeaborneProto cc5d75d
Merge branch 'master' into knm-company-addition
SeaborneProto c2b8b7d
Merge branch 'master' into knm-company-addition
SeaborneProto File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba, crypt states modified by Flareguy for Space Station 14, nano/cartel/arca by Sera for Hardlight, Avali crypt modified by Nyxu for hardlight using a base sprite from Avali Triage github https://github.com/Avali-Triage-Team/Avali. Starbound label modified by SeaTheProto, colcomm_label changed by DakoDemon (Github)'s HardLight Recolor PR 94", | ||
| "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba, crypt states modified by Flareguy for Space Station 14, nano/cartel/arca by Sera for Hardlight, Avali crypt modified by Nyxu for hardlight using a base sprite from Avali Triage github https://github.com/Avali-Triage-Team/Avali. Starbound label modified by SeaTheProto, colcomm_label changed by DakoDemon (Github)'s HardLight Recolor PR 94", knm_label by DrDmitry on discord" | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
|
|
@@ -53,6 +53,7 @@ | |
| {"name": "crypt_avali"}, | ||
| {"name": "crypt_avaliblue"}, | ||
| {"name": "starbound_label"}, | ||
| {"name": "duskenclave_label"} | ||
| {"name": "duskenclave_label"}, | ||
| {"name": "knm_label"} | ||
|
Comment on lines
+56
to
+57
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Faction encryption keys are being phased out, no? |
||
| ] | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unrelated changes.