Skip to content
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

Тик так часики #120

Merged
merged 2 commits into from
Dec 5, 2024
Merged
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
@@ -0,0 +1,4 @@
corvax-hidden-desc-WristwatchSyndi-syndicate = [color=#e31735]Эти неприметные наручные часы оснащены модулем портативного устройства слежения и скрытым слотом для ID карты. Идеальны для тайных операций и проникновений.[/color]
corvax-hidden-desc-WristwatchSyndi-research = [color=#D381C9]Необычно: эти часы имеют скрытый слот для ID карты и дополнительную кнопку, которая активирует незадокументированный режим отслеживания. Интересное технологическое решение для компактного устройства.[/color]
corvax-hidden-desc-WristwatchSyndi-detective = [color=#6E6E6E]На первый взгляд обычные часы, но что-то в них кажется необычным. Возможно, стоит обратить на них внимание?[/color]
corvax-hidden-desc-WristwatchSyndi-security = [color=#DE3A3A]Это не простые часы! Или, может быть, мне просто кажется? Наверное показалось...[/color]
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/_corvaxnext/store/uplink_catalog.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
uplink-syndi-wristwatch-name = Часы агента внедрения
uplink-syndi-wristwatch-desc = Стильные наручные часы, светящиеся в темноте. Имеют слот для скрытного хранения одной ID-карты, а так же встроенный портативный датчик слежения.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ent-WristwatchBlack = чёрные часы
.desc = Строгие чёрные часы с зелёным светящимся циферблатом и стрелками, идеальны для просмотра времени в условиях низкой освещённости.
ent-WristwatchPocket = карманные часы
.desc = Классические серебряные карманные часы на цепочке, придающие образу винтажный шарм.
ent-WristwatchLeather = золотые часы
.desc = Золотые часы с кожаным ремешком, оснащённые независимыми стрелками.
ent-WristwatchSyndi = чёрные часы
.desc = Стильные чёрные часы с красным светящимся циферблатом и стрелками, заметными в темноте.
.suffix = Синдикат
6 changes: 6 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
- TowelColorSilver
- TowelColorWhite
- TowelColorYellow
# Corvax-Next-Start
- WristwatchBlack
- WristwatchPocket
- WristwatchLeather
- Wristwatch
# Corvax-Next-End

- type: loadoutGroup
id: Glasses
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/_CorvaxNext/Catalog/uplink-catalog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: listing
id: UplinkWristwatchSyndi
name: uplink-syndi-wristwatch-name
description: uplink-syndi-wristwatch-desc
productEntity: WristwatchSyndi
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 3
cost:
Telecrystal: 5
categories:
- UplinkDeception
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
- type: entity
id: WristwatchBlack
parent: Wristwatch
name: black watch
description: A sleek black wristwatch with a green glow-in-the-dark dial and hands, perfect for seeing the time in low-light environments.
components:
- type: Sprite
sprite: _CorvaxNext/Objects/Devices/Watches/blackwatch.rsi
layers:
- state: blackwatch
- map: [ "enum.ClockVisualLayers.MinuteHand"]
shader: unshaded
- map: [ "enum.ClockVisualLayers.HourHand"]
shader: unshaded
- type: Item
sprite: _CorvaxNext/Objects/Devices/Watches/blackwatch.rsi
- type: Clothing
sprite: _CorvaxNext/Objects/Devices/Watches/blackwatch.rsi
- type: StaticPrice
price: 200

- type: entity
id: WristwatchPocket
parent: Wristwatch
name: pocket watch
description: A classic silver pocket watch attached to a chain, adding a touch of vintage style.
components:
- type: Sprite
sprite: _CorvaxNext/Objects/Devices/Watches/pocketwatch.rsi
layers:
- state: pocketwatch
- map: [ "enum.ClockVisualLayers.MinuteHand"]
- map: [ "enum.ClockVisualLayers.HourHand"]
- type: Item
sprite: _CorvaxNext/Objects/Devices/Watches/pocketwatch.rsi
- type: Clothing
sprite: _CorvaxNext/Objects/Devices/Watches/pocketwatch.rsi
- type: StaticPrice
price: 200

- type: entity
id: WristwatchLeather
parent: Wristwatch
name: leather watch
description: A gold watch with a leather strap, featuring independent hour and minute hands positioned in different corners of the face.
components:
- type: Sprite
sprite: _CorvaxNext/Objects/Devices/Watches/leatherwatch.rsi
layers:
- state: leatherwatch
- map: [ "enum.ClockVisualLayers.MinuteHand"]
- map: [ "enum.ClockVisualLayers.HourHand"]
- type: Item
sprite: _CorvaxNext/Objects/Devices/Watches/leatherwatch.rsi
- type: Clothing
sprite: _CorvaxNext/Objects/Devices/Watches/leatherwatch.rsi
- type: StaticPrice
price: 200

- type: entity
id: WristwatchSyndi
parent: [Wristwatch, PinpointerBase]
name: black watch
description: A stylish black wristwatch featuring a red glow-in-the-dark dial and hands that stand out in the dark.
components:
- type: Sprite
sprite: _CorvaxNext/Objects/Devices/Watches/syndiwatch.rsi
layers:
- state: syndiwatch
map: ["enum.PinpointerLayers.Base"]
visible: false
- state: syndiwatch_clock
- map: [ "enum.ClockVisualLayers.MinuteHand"]
shader: unshaded
- map: [ "enum.ClockVisualLayers.HourHand"]
shader: unshaded
- state: pinonnull
map: ["enum.PinpointerLayers.Screen"]
shader: unshaded
visible: false
- state: "id_overlay"
map: [ "enum.PdaVisualLayers.IdLight" ]
shader: "unshaded"
visible: false
- map: [ "enum.PdaVisualLayers.Base" ]
- state: "light_overlay"
map: [ "enum.PdaVisualLayers.Flashlight" ]
shader: "unshaded"
visible: false
- type: Icon
sprite: _CorvaxNext/Objects/Devices/Watches/syndiwatch.rsi
state: syndiwatch_clock
- type: Item
sprite: _CorvaxNext/Objects/Devices/Watches/syndiwatch.rsi
- type: Clothing
sprite: _CorvaxNext/Objects/Devices/Watches/syndiwatch.rsi
- type: Pinpointer
updateTargetName: true
canRetarget: true
- type: Pda
state: pda
paiSlot:
priority: -2
whitelist:
components:
penSlot:
priority: -1
whitelist:
tags:
idSlot:
name: access-id-card-component-default
ejectSound: /Audio/Machines/id_swipe.ogg
insertSound: /Audio/Machines/id_insert.ogg
whitelist:
components:
- IdCard
- Emag
- type: StaticPrice
price: 200
- type: GenericVisualizer
visuals:
enum.PinpointerVisuals.IsActive:
enum.PinpointerLayers.Screen:
True: { visible: True }
False: { visible: False }
enum.PinpointerVisuals.TargetDistance:
enum.PinpointerLayers.Screen:
Unknown: { state: pinonnull }
Reached: { state: pinondirect }
Close: { state: pinonclose }
Medium: { state: pinonmedium }
Far: { state: pinonfar }
- type: AnimationPlayer
- type: HiddenDescription
entries:
- label: corvax-hidden-desc-WristwatchSyndi-syndicate
whitelistMind:
mindRoles:
- TraitorRole
- NukeopsRole
- label: corvax-hidden-desc-WristwatchSyndi-research
jobRequired:
- ResearchAssistant
- ResearchDirector
- Scientist
- Borg
- label: corvax-hidden-desc-WristwatchSyndi-detective
jobRequired:
- Detective
- label: corvax-hidden-desc-WristwatchSyndi-security
jobRequired:
- HeadOfSecurity
- Warden
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Wristwatches
- type: loadout
id: Wristwatch
storage:
back:
- Wristwatch

- type: loadout
id: WristwatchLeather
storage:
back:
- WristwatchLeather

- type: loadout
id: WristwatchPocket
storage:
back:
- WristwatchPocket

- type: loadout
id: WristwatchBlack
storage:
back:
- WristwatchBlack
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/223bf37a7386249ecf1fe425ca8cef25821ca9d7/icons/obj/watches/wristwatch.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "blackwatch"
},
{
"name": "hours_1"
},
{
"name": "hours_2"
},
{
"name": "hours_3"
},
{
"name": "hours_4"
},
{
"name": "hours_5"
},
{
"name": "hours_6"
},
{
"name": "hours_7"
},
{
"name": "hours_8"
},
{
"name": "hours_9"
},
{
"name": "hours_10"
},
{
"name": "hours_11"
},
{
"name": "hours_0"
},
{
"name": "minutes_1"
},
{
"name": "minutes_2"
},
{
"name": "minutes_3"
},
{
"name": "minutes_4"
},
{
"name": "minutes_5"
},
{
"name": "minutes_6"
},
{
"name": "minutes_7"
},
{
"name": "minutes_8"
},
{
"name": "minutes_9"
},
{
"name": "minutes_10"
},
{
"name": "minutes_11"
},
{
"name": "minutes_0"
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "equipped-HAND",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading