]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Freelance Radio Channel and Encryption Key (#20904)
authorLordEclipse <106132477+LordEclipse@users.noreply.github.com>
Mon, 6 Nov 2023 03:38:00 +0000 (22:38 -0500)
committerGitHub <noreply@github.com>
Mon, 6 Nov 2023 03:38:00 +0000 (20:38 -0700)
* Freelance Radio Channel

* Freelance Radio Channel

Resources/Locale/en-US/headset/headset-component.ftl
Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
Resources/Prototypes/radio_channels.yml
Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS.png [new file with mode: 0644]
Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/equipped-EARS.png [new file with mode: 0644]
Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png [new file with mode: 0644]
Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json [new file with mode: 0644]

index 70b83c1e663ce7a459687d96016743e469f65c26..5bacf512ea9e21b7f4455a7eee7b00af56d8aba3 100644 (file)
@@ -14,6 +14,7 @@ chat-radio-security = Security
 chat-radio-service = Service
 chat-radio-supply = Supply
 chat-radio-syndicate = Syndicate
+chat-radio-freelance = Freelance
 
 # not headset but whatever
 chat-radio-handheld = Handheld
index 858ec6f0db6001daadde8b5b35903de6e742bf89..a2e18d99aa28c8aafe8bae4383627e5e763e1608 100644 (file)
   - type: Clothing
     sprite: Clothing/Ears/Headsets/service.rsi
 
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetFreelance
+  name: freelancer headset
+  description: This is used by a roaming group of freelancers
+  components:
+    - type: ContainerFill
+      containers:
+        key_slots:
+          - EncryptionKeyFreelance
+    - type: Sprite
+      sprite: Clothing/Ears/Headsets/freelance.rsi
+    - type: Clothing
+      sprite: Clothing/Ears/Headsets/freelance.rsi
index bff46beda2f9ad0c3c97a8889e64b16663e41015..7981fc2b9e9cdf6c27eb38e47fbbdd22f9b75921 100644 (file)
     sprite: Clothing/Ears/Headsets/syndicate.rsi
   - type: Clothing
     sprite: Clothing/Ears/Headsets/syndicate.rsi
+
+- type: entity
+  parent: ClothingHeadsetAlt
+  id: ClothingHeadsetAltFreelancer
+  name: freelancer's over-ear headset
+  components:
+    - type: Headset
+    - type: EncryptionKeyHolder
+      keySlots: 5
+    - type: ContainerFill
+      containers:
+        key_slots:
+          - EncryptionKeyFreelance
+    - type: Sprite
+      sprite: Clothing/Ears/Headsets/freelance.rsi
+    - type: Clothing
+      sprite: Clothing/Ears/Headsets/freelance.rsi
index edee1dbb2cdd74fea983cb03ab6b94e0c3702b13..df9954eb1543d5b2abc3c89b31a714c7b002a890 100644 (file)
     layers:
     - state: crypt_silver
     - state: rd_label
+
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyFreelance
+  name: freelancer encryption key
+  description: An encryption key used by freelancers, who may or may not have an affiliation. It looks like its worn out.
+  components:
+    - type: EncryptionKey
+      channels:
+        - Freelance
+      defaultChannel: Freelance
+    - type: Sprite
+      layers:
+        - state: crypt_rusted
+        - state: pirate_label
+
index 232fd41772ccf1d87e2ac0e02fb858721d5959b7..48cc0872a1a83314e436e2ebf784d87ee77cc036 100644 (file)
   color: "#2ed2fd"
   # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms
   longRange: true
+
+- type: radioChannel
+  id: Freelance
+  name: chat-radio-freelance
+  keycode: 'f'
+  frequency: 1984
+  color: "#f6ce64"
+  # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms
+  longRange: true
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS.png
new file mode 100644 (file)
index 0000000..3393125
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/equipped-EARS.png
new file mode 100644 (file)
index 0000000..30188f5
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png
new file mode 100644 (file)
index 0000000..0ff3f2c
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png
new file mode 100644 (file)
index 0000000..d3be4bc
Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
new file mode 100644 (file)
index 0000000..5567eaa
--- /dev/null
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_alt"
+    },
+    {
+      "name": "equipped-EARS",
+      "directions": 4
+    },
+    {
+      "name": "alt-equipped-EARS",
+      "directions": 4
+    }
+  ]
+}