From fbbed4b59c24f615fe15c0b730c0ab3807054923 Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk Date: Sun, 15 Dec 2024 14:03:20 +0300 Subject: [PATCH 1/4] pda --- .../entities/objects/devices/pda.ftl | 2 ++ .../objects/misc/identification_cards.ftl | 2 ++ .../Entities/Objects/Devices/pda.yml | 17 +++++++++++++++++ .../Objects/Misc/identification_cards.yml | 11 +++++++++++ .../_CorvaxNext/Roles/Jobs/Medical/surgeon.yml | 1 + Resources/Textures/Markers/jobs.rsi/meta.json | 2 +- .../Textures/Markers/jobs.rsi/surgeon.png | Bin 0 -> 1475 bytes .../Textures/Objects/Devices/pda.rsi/meta.json | 3 +++ .../Objects/Devices/pda.rsi/pda-surgeon.png | Bin 0 -> 503 bytes .../Objects/Misc/id_cards.rsi/idsurgeon.png | Bin 0 -> 212 bytes .../Objects/Misc/id_cards.rsi/meta.json | 5 ++++- 11 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/_CorvaxNext/prototypes/entities/objects/devices/pda.ftl create mode 100644 Resources/Locale/ru-RU/_CorvaxNext/prototypes/entities/objects/misc/identification_cards.ftl create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Devices/pda.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Entities/Objects/Misc/identification_cards.yml create mode 100644 Resources/Textures/Markers/jobs.rsi/surgeon.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-surgeon.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idsurgeon.png 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/_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..5bdf4c36343 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 diff --git a/Resources/Textures/Markers/jobs.rsi/surgeon.png b/Resources/Textures/Markers/jobs.rsi/surgeon.png new file mode 100644 index 0000000000000000000000000000000000000000..7f8becb4870b88344f9e0f4b0018f1f76b68c68e GIT binary patch literal 1475 zcmV;!1w8tRP)Px)eMv+?R9J<@mU~RoR}{xTw}1uI8MKU6(#DCDI5Zn$nkW^=Vl*+%_=p)Xi<;mI zXUyhnE=Jv4X6DrC98u#Vd&Gz_PBx8mVnsx7(}?((I*JNHCJ%psIPh0WDR+P1uW3um zXfm^t{Ql^<=YG%ke0%RX7yf4xhYlSgCnqPYP4f?53+n&=y*I-qpbK}ylr5(KWZ>83 za%*cZj)0cjY9319*VL%U0sUjcCK0XzGBYDR=t5>jI&IHX>3P-~7GPvJ!OrSR92OG| zwe>yLj208l>Pr5uc|c;qSpI6f`ri^rOc)D5^~GXN?q9`t>kRru#nRzcx$O9f>5F#& z@Z?sx1VmqP!}$v&fKq&k@zxm>T--~CTczOQUdCHzpcG#M;GMM}ioRA4VJI+d{Sq-} zT9!0#e3$yhMrKaT1z_gHT=wK|z?6_co!iaT^S_5t6GWC@ztO{KG^F|cZcr)!}x%YnSbdeYh zY5cr7PfT0C1l8HX?WQIG+MAmJxZTu*>TIENV4M&_Cq16dkT^XQ7&2sVkK_Xf#Cv_M zZBHbCj7t#5@=J*Y_GE8@qn~@Zn`{@yhS5QwAGMGB)K%}(K1 zNRy$G^dR8zbowbWW!C|$=Ak(19{a_G>WGfI$7E)tW3(KgU3GHPelQqrXaWHy8fxn$ z;O%}TW#vJWYl>)b4Yl<&m7K?H8i(869x_45Mx+xF0J8D$5um#bcPa`-iz#Tl(PE-g zQE*mQ0?>H)2+GYXva2h2<(l>A1FExy*qAs}XN!y=iVnAmebqA5;i-%sl^S#oKzGHX zN2PN6k2^d#d5l3Xbrbb?I^}b`-~|@E9e^G4Mls0HpQQ_DQE0d0a5zYsoJGp&b!;iiCwb+Xkd=E01oVL(r}a#|i{!~! z=+kVZU#cQeJx9`r6cW{Q{Q2N9Pg@?r?%kX?x`$s2ucJ@1kvutzGxe@salHh5e>5l+ zLOTP#R#kWbS4An7S6*fAyhR-O;Q({zEn-DZCPKz|<5qtB39gD#stPao?e{qYB5)q` zdJXSx{Y(JTRZ$8cYOC+cE0;@XYi(uQ@fva$fD}$xu>ydpQ^wL??-Jh?mddJb2*L9) z9?E(ppc4@q38JE+DXOuPHs&;2x9z0RZUgE71>1VbWVuiH?cEaqp5a2B;7+ zN1(&^Z|IVq?n(B%Cro&IE;(-~6x!{aKYQA{$7;2bG$I9KVj|`-8Ge(nH~B*<(4bTZ zqajUdXF+wg$S$`>jLh92+s#8U0_Hd?({~h!<&!4KThZ~jfRVWy0J!tZS>L@OlLu8G zP>Emw+FbBFYbCF|w#S_4ZEv3x@C6FBrnOuEeA;tONwM}K>eItCtY^9Jpb6!FcqT)S9&{mrVr!uCypeR+8R@`EYE02el!4H)AWQ(9UI z)?olruh)xxd3h{dzWiUY`>KGPIeRuXn+>zs+?@=#fB(KWx!G*SX0tJK_H61NJ(AA$ d&~E@=`v(dDlm>LqWDfuU002ovPDHLkV1j;2xa$A_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0af3dbfc224d30a8c4fae325fc74982c59aa2f9d GIT binary patch literal 503 zcmVPx$u}MThR9J=WmA`AkP!PwzEmbP1(w5R80bNRl4sH=03x(p~B(9mdiCa5Jx{8BN z{s+z4NmFojl0xXxp@Vd2Q(lH35iG%OcF?@~1I@GQ)O_HPaCh(S_+G*RK0ZE-Bom3@ zHuCOnBk3yaFvJWcN%RcT_0FI2FAb0+aagO}Ll6W2fb#k_KQd*%G~buT=L?1P8z6)rnMxsJ7 zB^;1-5Ghy_`$b-Qft$#N35zw;j>UPsZDn4xxM9{brDn$SZHpULD42Au|CRqt-g(l& zFVdQ&MBb@ E0357O%K!iX literal 0 HcmV?d00001 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 From a6f34ccce771f158b3d249ed84e24b43fd9212f2 Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk Date: Sun, 15 Dec 2024 14:04:42 +0300 Subject: [PATCH 2/4] spawnpoint --- Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml index e23d3c9de75..ce5e20e6b4a 100644 --- a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml @@ -18,4 +18,4 @@ - type: Sprite layers: - state: green - - state: virologist + - state: surgeon From 7de1aa80aeb7728ed13787e2ac22ebf48eb7f63c Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk Date: Sun, 15 Dec 2024 14:07:35 +0300 Subject: [PATCH 3/4] meta fix --- Resources/Textures/Markers/jobs.rsi/meta.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index 5bdf4c36343..17bff5a9e55 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -190,6 +190,9 @@ { "name": "seniorofficer" }, + { + "name": "surgeon" + }, { "name": "technicalassistant" }, From d743874b031759f557c6226f998eadf26429f473 Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk Date: Sun, 15 Dec 2024 14:19:05 +0300 Subject: [PATCH 4/4] fix --- .../Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml index ce5e20e6b4a..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: surgeon + - state: surgeon # Corvax-Next-surgeon