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

Кпк призраку (#276) #281

Merged
merged 9 commits into from
Aug 18, 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
Expand Up @@ -9,3 +9,6 @@ ent-ADTRoboticistPDA = КПК робототехника

ent-ADTBlueshieldOfficerPDA = КПК офицера синего щита
.desc = Покажи им, какой он стильный, как он прочен, ведь в нём вся сила NT.

ent-ADTGhostPDA = КПК призрака
.desc = Скажи станции Бу!
61 changes: 53 additions & 8 deletions Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,40 @@
- type: entity
parent: BasePDA
id: ADTBasePDA
suffix: ADT
abstract: true
components:
- type: Sprite
sprite: ADT/Objects/Devices/pda.rsi
layers:
- map: [ "enum.PdaVisualLayers.Base" ]
- state: "light_overlay"
map: [ "enum.PdaVisualLayers.Flashlight" ]
shader: "unshaded"
visible: false
- state: "id_overlay"
map: [ "enum.PdaVisualLayers.IdLight" ]
shader: "unshaded"
visible: false
- type: Icon
sprite: ADT/Objects/Devices/pda.rsi

- type: entity
parent: ADTBasePDA
id: ADTBaseMedicalPDA
abstract: true
components:
- type: ItemToggle
toggleLight: false
onUse: false
- type: HealthAnalyzer
scanDelay: 1
scanningEndSound:
path: "/Audio/Items/Medical/healthscanner.ogg"
#Если добаляете группу одинаковых кпк делайте им базу!

- type: entity
parent: ADTBasePDA
id: MagistratPDA
name: magistrat PDA
description: magistrat PDA
Expand All @@ -11,7 +46,7 @@
state: pda-lawyer

- type: entity
parent: BasePDA
parent: ADTBasePDA
id: ADTRoboticistPDA
name: roboticist PDA
description: It's covered with an unknown gooey substance.
Expand All @@ -26,7 +61,7 @@
state: pda-roboticist

- type: entity
parent: MedicalPDA
parent: ADTBaseMedicalPDA
id: ADTPathologistPDA
name: pathologist's PDA
description: It breezes chill.
Expand All @@ -41,13 +76,11 @@
state: pda-pathologist

- type: entity
parent: BasePDA
parent: ADTBaseMedicalPDA
id: ADTBlueshieldOfficerPDA
name: BlueShield PDA
description: Smells like protection.
components:
- type: Sprite
sprite: ADT/Objects/Devices/pda.rsi
- type: Pda
id: ADTBlueShieldOfficerIDCard
state: pda-blueshield
Expand All @@ -56,7 +89,19 @@
accentHColor: "#2851a4"
accentVColor: "#e1e1e1"
- type: Icon
sprite: ADT/Objects/Devices/pda.rsi
state: pda-blueshield
- type: HealthAnalyzer
scanDelay: 1.2

- type: entity
parent: ADTBasePDA
id: ADTGhostPDA
name: ghost PDA
description: Boo!
components:
- type: Pda
state: pda-ghost
- type: PdaBorderColor
borderColor: "#d7d7d0"
accentHColor: "#333333"
- type: Icon
state: pda-ghost
- type: Unremoveable
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: inventoryTemplate
id: ghost
slots:
- name: id
slotTexture: id
fullTextureName: template_small
slotFlags: IDCARD
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 2,2
strippingWindowPos: 2,3
displayName: ID
5 changes: 5 additions & 0 deletions Resources/Prototypes/ADT/Roles/Jobs/Fun/misc_startinggear.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Ghost
- type: startingGear
id: MobGhostGear
equipment:
id: ADTGhostPDA
8 changes: 7 additions & 1 deletion Resources/Prototypes/Entities/Mobs/Player/observer.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: entity
parent: BaseMob
parent: [BaseMob, InventoryBase] #ADT Tweak
id: MobObserver
name: observer
description: Boo!
Expand Down Expand Up @@ -53,6 +53,12 @@
- Universal
understands:
- Universal
- type: Hands #ADT Tweak
showInHands: false #ADT Tweak
- type: Inventory #ADT Tweak
templateId: ghost #ADT Tweak
- type: Loadout #ADT Tweak
prototypes: [ MobGhostGear ] #ADT Tweak

- type: entity
id: ActionGhostBoo
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -954,17 +954,17 @@
- type: Pda
id: CluwneIDCard
state: pda-cluwne
- type: PdaBorderColor
borderColor: "#1c8f4d"
- type: Icon
state: pda-cluwne
penSlot:
penSlot: #ADT Tweak
startingItem: CrayonGreen
ejectSound: /Audio/Items/bikehorn.ogg
priority: -1
whitelist:
tags:
- Write
- type: PdaBorderColor
borderColor: "#1c8f4d"
- type: Icon
state: pda-cluwne
- type: Unremoveable

- type: entity
Expand Down
17 changes: 16 additions & 1 deletion Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Blueshield made by Tamioki.",
"copyright": "Sprites exclusively for AdventureTime! Blueshield made by Tamioki. Ghost by illumination6753 (Discord).",
"size": {
"x": 32,
"y": 32
Expand All @@ -28,6 +28,9 @@
{
"name": "light_overlay"
},
{
"name": "pda"
},
{
"name": "pda-blueshield",
"delays": [
Expand All @@ -50,6 +53,18 @@
]
]
},
{
"name": "pda-ghost"
},
{
"name": "pda-lawyer"
},
{
"name": "pda-roboticist"
},
{
"name": "pda-pathologist"
},
{
"name": "equipped-IDCARD",
"directions": 4
Expand Down
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.
12 changes: 3 additions & 9 deletions Resources/Textures/Objects/Devices/pda.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@
{
"name": "pda-clown"
},
{
"name": "pda-pathologist"
},
{
"name": "pda-cmo"
},
Expand Down Expand Up @@ -91,9 +88,6 @@
{
"name": "pda-janitor"
},
{
"name": "pda-lawyer"
},
{
"name": "pda-library",
"delays": [
Expand All @@ -105,6 +99,9 @@
]
]
},
{
"name": "pda-lawyer"
},
{
"name": "pda-medical"
},
Expand Down Expand Up @@ -144,9 +141,6 @@
{
"name": "pda-rd"
},
{
"name": "pda-roboticist"
},
{
"name": "pda-science"
},
Expand Down
Loading