diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl index fca2433ab01..d306f23a592 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl @@ -9,3 +9,6 @@ ent-ADTRoboticistPDA = КПК робототехника ent-ADTBlueshieldOfficerPDA = КПК офицера синего щита .desc = Покажи им, какой он стильный, как он прочен, ведь в нём вся сила NT. + +ent-ADTGhostPDA = КПК призрака + .desc = Скажи станции Бу! diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml index f5af95083cc..aac10cbe387 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml @@ -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 @@ -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. @@ -26,7 +61,7 @@ state: pda-roboticist - type: entity - parent: MedicalPDA + parent: ADTBaseMedicalPDA id: ADTPathologistPDA name: pathologist's PDA description: It breezes chill. @@ -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 @@ -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 diff --git a/Resources/Prototypes/ADT/InventoryTemplates/ghost_inventory_template.yml b/Resources/Prototypes/ADT/InventoryTemplates/ghost_inventory_template.yml new file mode 100644 index 00000000000..68b48ab3a35 --- /dev/null +++ b/Resources/Prototypes/ADT/InventoryTemplates/ghost_inventory_template.yml @@ -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 diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/ADT/Roles/Jobs/Fun/misc_startinggear.yml new file mode 100644 index 00000000000..8097f8c346d --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/Fun/misc_startinggear.yml @@ -0,0 +1,5 @@ +# Ghost +- type: startingGear + id: MobGhostGear + equipment: + id: ADTGhostPDA diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index b0c7f8accc6..3d636b5bd61 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseMob + parent: [BaseMob, InventoryBase] #ADT Tweak id: MobObserver name: observer description: Boo! @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 8053536038c..b81565643a6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -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 diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json index 044e62ff7a1..e1cca8562e8 100644 --- a/Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Devices/pda.rsi/meta.json @@ -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 @@ -28,6 +28,9 @@ { "name": "light_overlay" }, + { + "name": "pda" + }, { "name": "pda-blueshield", "delays": [ @@ -50,6 +53,18 @@ ] ] }, + { + "name": "pda-ghost" + }, + { + "name": "pda-lawyer" + }, + { + "name": "pda-roboticist" + }, + { + "name": "pda-pathologist" + }, { "name": "equipped-IDCARD", "directions": 4 diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-ghost.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-ghost.png new file mode 100644 index 00000000000..f0d879b3505 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-ghost.png differ diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-lawyer.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-lawyer.png new file mode 100644 index 00000000000..d18a4d29110 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-lawyer.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-pathologist.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-pathologist.png similarity index 100% rename from Resources/Textures/Objects/Devices/pda.rsi/pda-pathologist.png rename to Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-pathologist.png diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-roboticist.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-roboticist.png similarity index 100% rename from Resources/Textures/Objects/Devices/pda.rsi/pda-roboticist.png rename to Resources/Textures/ADT/Objects/Devices/pda.rsi/pda-roboticist.png diff --git a/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda.png b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda.png new file mode 100644 index 00000000000..8473ddaab11 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Devices/pda.rsi/pda.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 7db1ebf7418..6b133f359f1 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -61,9 +61,6 @@ { "name": "pda-clown" }, - { - "name": "pda-pathologist" - }, { "name": "pda-cmo" }, @@ -91,9 +88,6 @@ { "name": "pda-janitor" }, - { - "name": "pda-lawyer" - }, { "name": "pda-library", "delays": [ @@ -105,6 +99,9 @@ ] ] }, + { + "name": "pda-lawyer" + }, { "name": "pda-medical" }, @@ -144,9 +141,6 @@ { "name": "pda-rd" }, - { - "name": "pda-roboticist" - }, { "name": "pda-science" },