]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Observation Kit (#23384)
authorERROR404 <100093430+ERORR404V1@users.noreply.github.com>
Thu, 4 Jan 2024 12:36:44 +0000 (17:36 +0500)
committerGitHub <noreply@github.com>
Thu, 4 Jan 2024 12:36:44 +0000 (05:36 -0700)
Observation Kit

Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png [new file with mode: 0644]
Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png [new file with mode: 0644]

index 184fa11a2031e2b2ef6babd6219967b1434d8cd8..ac97c0d1a3a10f294c6486119dec26376fd2d03c 100644 (file)
@@ -171,6 +171,9 @@ uplink-micro-bomb-implanter-name = Micro Bomb Implanter
 uplink-micro-bomb-implanter-desc = Explode on death or manual activation with this implant. Destroys the body with all equipment.
 
 # Bundles
+uplink-observation-kit-name = Observation Kit
+uplink-observation-kit-desc = Includes syndicate crew monitor, high power cell and security hud disguised as sunglasses.
+
 uplink-emp-kit-name = Electrical Disruptor Kit
 uplink-emp-kit-desc = The ultimate reversal on energy-based weaponry: Disables disablers, stuns stunbatons, discharges laser guns! Contains 3 EMP grenades and an EMP implanter. Note: Does not disrupt actual firearms.
 
index 0f1bd0f46520afdee698415f4b068e9d34c86fed..afabf400201bfd0dda2822391b400d9671301fa2 100644 (file)
         amount: 2
       - id: BaseChemistryEmptyVial
       - id: SyringeStimulants
+
+- type: entity
+  id: Observationskit
+  parent: BoxCardboard
+  name: Observations kit
+  suffix: Filled
+  components:
+    - type: StorageFill
+      contents:
+        - id: SyndiCrewMonitorEmpty
+          amount: 1
+        - id: PowerCellHigh
+          amount: 1
+        - id: ClothingEyesGlassesHiddenSecurity
+          amount: 1
+
index 2381ee8e706f2dda5d0d8f5aac74e80724af3345..5c1bc63de1cfbcaf329616a7174170dfd5dfa33c 100644 (file)
 
 # Bundles
 
+- type: listing
+  id: Observationkit
+  name: uplink-observation-kit-name
+  description: uplink-observation-kit-desc
+  icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: tracks }
+  productEntity: Observationskit
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkBundles
+
 - type: listing
   id: UplinkEmpKit
   name: uplink-emp-kit-name
index 18dc207a9e39f39cf0752c6ba1d3120457b39b15..121f2d8f57a2abbb8632053f66348e8d78fe2d0e 100644 (file)
   - type: ShowSyndicateIcons
   - type: ShowSecurityIcons
 
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesHiddenSecurity
+  name: sun glasses
+  description: A pair of black sunglasses.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/secglasses.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/secglasses.rsi
+  - type: ShowSecurityIcons
\ No newline at end of file
index ce29f10a5b44f4a1e9156ea321eb5838d0dcef7c..e704382e489fdcaa38d9cfd0c6836afebffbfc89 100644 (file)
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default 
+
+- type: entity
+  id: SyndiCrewMonitor
+  name: Syndicate crew monitor
+  description: The syndicated version of crew monitor, intercepts information from the server.
+  parent: HandheldCrewMonitor
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/syndihandheldcrewmonitor.rsi
+    state: syndiscanner
+  - type: Item
+    sprite: Objects/Specific/Medical/syndihandheldcrewmonitor.rsi
+  - type: PowerCellDraw
+    useRate: 40
+
+- type: entity
+  id: SyndiCrewMonitorEmpty
+  parent: SyndiCrewMonitor
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default 
   
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json
new file mode 100644 (file)
index 0000000..8a4d587
--- /dev/null
@@ -0,0 +1,21 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/ab4abf318f293a701754656dd4e9261eb70f8824#diff-9ab5c8a5e47ab7cfaeadd859a23e32b05de1fe839e99ea767fd7e340b6385d67,this sprite made(resprite) by Fazansen(https://github.com/Fazansen)",
+    "states": [
+        {
+            "name": "syndiscanner",
+            "directions": 1,
+            "delays": [
+                [
+                    0.4,
+                    0.4
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png
new file mode 100644 (file)
index 0000000..9fa8cba
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png differ
index 3931b4f6107345275f84a8544397e9d3fd9ab613..858fc7c4e54c120a2f87bba72b5422a081e1abc5 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43, vials drawn by Ubaser.",
+  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43, vials drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen).",
   "size": {
     "x": 32,
     "y": 32
@@ -81,6 +81,9 @@
     },
     {
       "name": "vials"
+    },
+    {
+      "name": "tracks"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png b/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png
new file mode 100644 (file)
index 0000000..debd093
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png differ