From abbb724849309178bf9372b6ef59407d0f813f52 Mon Sep 17 00:00:00 2001 From: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Date: Thu, 4 Jan 2024 17:36:44 +0500 Subject: [PATCH] Observation Kit (#23384) Observation Kit --- .../Locale/en-US/store/uplink-catalog.ftl | 3 +++ .../Catalog/Fills/Boxes/syndicate.yml | 16 ++++++++++++ .../Prototypes/Catalog/uplink_catalog.yml | 11 ++++++++ .../Prototypes/Entities/Clothing/Eyes/hud.yml | 11 ++++++++ .../Medical/handheld_crew_monitor.yml | 24 ++++++++++++++++++ .../syndihandheldcrewmonitor.rsi/meta.json | 21 +++++++++++++++ .../syndiscanner.png | Bin 0 -> 670 bytes .../Objects/Storage/boxicons.rsi/meta.json | 5 +++- .../Objects/Storage/boxicons.rsi/tracks.png | Bin 0 -> 458 bytes 9 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png create mode 100644 Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 184fa11a20..ac97c0d1a3 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -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. diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml index 0f1bd0f465..afabf40020 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml @@ -31,3 +31,19 @@ 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 + diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 2381ee8e70..5c1bc63de1 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -665,6 +665,17 @@ # 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 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 18dc207a9e..121f2d8f57 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -162,3 +162,14 @@ - 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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml index ce29f10a5b..e704382e48 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml @@ -65,4 +65,28 @@ 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 index 0000000000..8a4d587e3a --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json @@ -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 index 0000000000000000000000000000000000000000..9fa8cba94f5f94f10dbfc15d28a08d59a4f672b9 GIT binary patch literal 670 zcmV;P0%84$P)?M3kL)YWP=@!6pdIPi@L0C+c-+lT=RpDquRiQpiC3*VRk1bW?UZp8aC7>L(; zJs!J~t2C$V!oO&@W61YTCvKZItO)4!`;p()Y$dwIoTw-jfcFtwB&PuXPGUbvY>0{< z^`lX{AFD+W8NdV}Xk*`}tYdpbpHrv;kO0D`tV6rtTM0-010uIHu z-v#6f+?A+3A=d!83n2Rt(ou)$Ct8Cvd}JT*K51KMV*+rvX~{#*hOE{*f;z@=2!eku zd}9JIi698JK7jPIx%%OP|70l~_*T0Bg3&)f)P9!1CiznFbn=t_vv1tE0_bx%?LL6) z_JO)QBfnYWr(TF)vUDSZy&enBz8fJr7-ex8LPT-m8xcSg;kc6{-zNIl_$G7oHl6{` zfM?)OG4KtQbypdkT{7PQ000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$ Ef(H5|Y5)KL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json index 3931b4f610..858fc7c4e5 100644 --- a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json @@ -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 index 0000000000000000000000000000000000000000..debd093265f49e126a75a3a85aad443ab5a2ff4d GIT binary patch literal 458 zcmV;*0X6=KP)YHJzzjqk5@5Jk|+m&3;|ir!^6dJ_Y?l|0Hg+_7Ul@5IRIpEN>Ua>bX5ey z(zX>?&4tO$nKuoqJT^h1Lja^%Utgc$_=-~uX4yInr>0&(F%K-Z;tB&VFE5HXAr4su z5yf>Pzb;Phz$}W2M`?sU%q@}xOnj*I2WvF+r)71-aQoiRupeyu#7MR=Ma!uVgcU9 z0>}_hg9MhRVPye6!$FoKtEWnX1ldAaIsEkk$dRM~qM`uVP-HePi-=K!OYf-oXb6nF z5C8zO7;&wu?o&7b000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f^hVx A761SM literal 0 HcmV?d00001 -- 2.51.2