diff --git a/Resources/Locale/ru-RU/_CorvaxNext/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/_CorvaxNext/prototypes/entities/objects/devices/pda.ftl new file mode 100644 index 00000000000..cc737ac199f --- /dev/null +++ b/Resources/Locale/ru-RU/_CorvaxNext/prototypes/entities/objects/devices/pda.ftl @@ -0,0 +1,2 @@ +ent-SurgeonPDA = КПК хирурга + .desc = { ent-MedicalPDA.desc } diff --git a/Resources/Locale/ru-RU/_CorvaxNext/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/_CorvaxNext/prototypes/entities/objects/misc/identification_cards.ftl new file mode 100644 index 00000000000..c3c06ff0b60 --- /dev/null +++ b/Resources/Locale/ru-RU/_CorvaxNext/prototypes/entities/objects/misc/identification_cards.ftl @@ -0,0 +1,2 @@ +ent-SurgeonIDCard = ID карта хирурга + .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml index e23d3c9de75..3ab8d884d28 100644 --- a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml @@ -15,7 +15,11 @@ parent: SpawnPointJobBase name: surgeon components: + # Corvax-Next-surgeon-start + - type: SpawnPoint + job_id: Surgeon + # Corvax-Next-surgeon-end - type: Sprite layers: - state: green - - state: virologist + - state: surgeon # Corvax-Next-surgeon diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/pda.yml new file mode 100644 index 00000000000..746e830d9d0 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/pda.yml @@ -0,0 +1,17 @@ +- type: entity + parent: BaseMedicalPDA + id: SurgeonPDA + name: surgeon PDA + description: Shiny and sterile. + components: + - type: Pda + id: SurgeonIDCard + state: pda-surgeon + - type: PdaBorderColor + borderColor: "#d7d7d0" + accentVColor: "#5db8be" + - type: Icon + state: pda-surgeon + - type: GuideHelp + guides: + - Medical Doctor diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Misc/identification_cards.yml new file mode 100644 index 00000000000..11e41eeb6db --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Misc/identification_cards.yml @@ -0,0 +1,11 @@ +- type: entity + parent: IDCardStandard + id: SurgeonIDCard + name: surgeon ID card + components: + - type: Sprite + layers: + - state: default + - state: idsurgeon + - type: PresetIdCard + job: Surgeon diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml index 2ee1c056a0c..a9c561a0d66 100644 --- a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml +++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Medical/surgeon.yml @@ -22,5 +22,6 @@ ears: ClothingHeadsetMedical belt: ClothingBeltSurgicalBoardFilled shoes: ClothingShoesColorWhite + id: SurgeonPDA mask: ClothingMaskSterile gloves: ClothingHandsGlovesNitrile diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index bca3be1df84..17bff5a9e55 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github), surgeon by Ko4erga", "size": { "x": 32, "y": 32 @@ -190,6 +190,9 @@ { "name": "seniorofficer" }, + { + "name": "surgeon" + }, { "name": "technicalassistant" }, diff --git a/Resources/Textures/Markers/jobs.rsi/surgeon.png b/Resources/Textures/Markers/jobs.rsi/surgeon.png new file mode 100644 index 00000000000..7f8becb4870 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/surgeon.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index f77f8c0e711..ba292e8165b 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -226,6 +226,9 @@ { "name": "pda-seniorofficer" }, + { + "name": "pda-surgeon" + }, { "name": "equipped-IDCARD", "directions": 4 diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-surgeon.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-surgeon.png new file mode 100644 index 00000000000..0af3dbfc224 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-surgeon.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idsurgeon.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idsurgeon.png new file mode 100644 index 00000000000..56bdc33dc53 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idsurgeon.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index ae53780e67f..f79fb2f7dbe 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -227,11 +227,14 @@ "name": "idseniorphysician" }, { - "name": "idseniorofficer" + "name": "idseniorofficer" }, { "name": "idpilot" }, + { + "name": "idsurgeon" + }, { "name": "gold-inhand-left", "directions": 4