Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -133,34 +133,34 @@
# - state: crypt_black
# - state: viper_label

# - type: entity
# parent: [EncryptionKey, RecyclableItemDeviceTiny]
# id: EncryptionKeyInterdyne
# name: Interdyne Pharmaceuticals Encryption Key
# description: An encyption key used Viper Cell operatives to communicate securely.
# components:
# - type: EncryptionKey
# channels:
# - InterdynePharma
# defaultChannel: InterdynePharma
# - type: Sprite
# layers:
# - state: crypt-interdyne

# - type: entity
# parent: [EncryptionKey, RecyclableItemDeviceTiny]
# id: EncryptionKeyDominosRobotics
# name: Dominos Robotics Encryption Key
# description: An encyption key used by members of Dominos Robotics to communicate securely.
# components:
# - type: EncryptionKey
# channels:
# - DominosRobotics
# defaultChannel: DominosRobotics
# - type: Sprite
# layers:
# - state: crypt_purple
# - state: dominosrobotics_label
- type: entity
parent: [EncryptionKey, RecyclableItemDeviceTiny]
id: EncryptionKeyInterdyne
name: Interdyne Pharmaceuticals Encryption Key
description: An encyption key used Viper Cell operatives to communicate securely.
components:
- type: EncryptionKey
channels:
- InterdynePharma
defaultChannel: InterdynePharma
- type: Sprite
layers:
- state: crypt-interdyne
- type: entity
parent: [EncryptionKey, RecyclableItemDeviceTiny]
id: EncryptionKeyDominosRobotics
name: Dominos Robotics Encryption Key
description: An encyption key used by members of Dominos Robotics to communicate securely.
components:
- type: EncryptionKey
channels:
- DominosRobotics
defaultChannel: DominosRobotics
- type: Sprite
layers:
- state: crypt_purple
- state: dominosrobotics_label
Comment on lines +136 to +163
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated changes.


# - type: entity
# parent: [EncryptionKey, RecyclableItemDeviceTiny]
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/_Mono/companies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@
name: Suburbia
color: "#FFEA00"

- type: company
id: VSR
form: Protagonist
name: Korpus Novy Mir — "New World Corps"
color: "#595959"

- type: company
id: SBS
form: Protagonist
Expand Down
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
Expand Down Expand Up @@ -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
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Faction encryption keys are being phased out, no?

]
}
Loading