From 7baf95f34749ffffb418b75c929bce2a488acf32 Mon Sep 17 00:00:00 2001 From: Bolper Date: Sat, 3 Aug 2024 17:14:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D1=82=D0=B0:=20fix:=20Resources\Textures\ADT\Markers\job?= =?UTF-8?q?.rsi\meta.json=20Resources\Prototypes\ADT\Entities\Markers\Spaw?= =?UTF-8?q?ners\jobs.yml=20Resources\Textures\ADT\Markers\jobs.rsi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Markers/Spawners/job.yml | 23 ------------- .../ADT/Entities/Markers/Spawners/jobs.yml | 14 +++++++- .../Interface/Misc/job_icons.rsi/meta.json | 10 ++---- .../Textures/ADT/Markers/job.rsi/green.png | Bin 309 -> 0 bytes .../Textures/ADT/Markers/job.rsi/iaa.png | Bin 1080 -> 0 bytes .../ADT/Markers/job.rsi/magistrat.png | Bin 919 -> 0 bytes .../Textures/ADT/Markers/job.rsi/meta.json | 29 ---------------- .../{job.rsi => jobs.rsi}/investigator.png | Bin .../Textures/ADT/Markers/jobs.rsi/meta.json | 31 +++++++++++------- .../{job.rsi => jobs.rsi}/pathologist.png | Bin .../Markers/{job.rsi => jobs.rsi}/urist.png | Bin 11 files changed, 35 insertions(+), 72 deletions(-) delete mode 100644 Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml delete mode 100644 Resources/Textures/ADT/Markers/job.rsi/green.png delete mode 100644 Resources/Textures/ADT/Markers/job.rsi/iaa.png delete mode 100644 Resources/Textures/ADT/Markers/job.rsi/magistrat.png delete mode 100644 Resources/Textures/ADT/Markers/job.rsi/meta.json rename Resources/Textures/ADT/Markers/{job.rsi => jobs.rsi}/investigator.png (100%) rename Resources/Textures/ADT/Markers/{job.rsi => jobs.rsi}/pathologist.png (100%) rename Resources/Textures/ADT/Markers/{job.rsi => jobs.rsi}/urist.png (100%) diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml deleted file mode 100644 index 2376de0f27d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml +++ /dev/null @@ -1,23 +0,0 @@ - -- type: entity - id: ADTSpawnPointJobBase - parent: MarkerBase - abstract: true - suffix: Job Spawn ADT - components: - - type: SpawnPoint - spawn_type: Job - - type: Sprite - sprite: ADT/Markers/job.rsi - -- type: entity - id: SpawnPointADTPathologist - parent: ADTSpawnPointJobBase - name: pathologist - components: - - type: SpawnPoint - job_id: ADTPathologist - - type: Sprite - layers: - - state: green - - state: pathologist \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml index ef6d511358b..10d99928089 100644 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml @@ -2,13 +2,25 @@ id: ADTSpawnPointJobBase parent: MarkerBase abstract: true - suffix: Job Spawn + suffix: Job Spawn ADT components: - type: SpawnPoint spawn_type: Job - type: Sprite sprite: ADT/Markers/jobs.rsi +- type: entity + id: SpawnPointADTPathologist + parent: ADTSpawnPointJobBase + name: pathologist + components: + - type: SpawnPoint + job_id: ADTPathologist + - type: Sprite + layers: + - state: green + - state: pathologist + - type: entity id: SpawnPointMagistrat parent: ADTSpawnPointJobBase diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json index b442515e295..a71d57c8075 100644 --- a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json @@ -1,9 +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 | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi . Blueshield made by Tamioki.", -======= - "copyright": "Sprite made by JustKeks(github) ", + "copyright": "ADTPathologist icon made by JustKeks(github) | Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi . Blueshield made by Tamioki.", "size": { "x": 8, @@ -12,11 +10,7 @@ "states": [ { "name": "Magistrat" - } - ] -} -======= - + }, { "name": "ADTPathologist" } diff --git a/Resources/Textures/ADT/Markers/job.rsi/green.png b/Resources/Textures/ADT/Markers/job.rsi/green.png deleted file mode 100644 index 0becfdb0c54a42a943da2d51056a0bc22c451f37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmV-50m}Y~P)h6Uc+1&8LKWkAox;{xRy4*DB2-C)TMDJVqc7zy8u)O;^v^-f|X$gP>woL%N zk1*Rih5*BBnCu;009zr-H82&xT3)jaOa$=O_6&qNlzPi+6ha+JBjq&$(H}|!70wHx z4yBp$>VY^#zagUL*RW`A+J>yTRr4l(ZkS*m)?E2>`tx`LmfB@-I0Zg>00000NkvXX Hu0mjfW+Qp! diff --git a/Resources/Textures/ADT/Markers/job.rsi/iaa.png b/Resources/Textures/ADT/Markers/job.rsi/iaa.png deleted file mode 100644 index f93b5d5034934904799b7de460efc5b6c7995570..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1080 zcmV-81jqY{P)ByqRTId+WSXp$ghoWnPS4NZrN68@-v95v05DLS;3~ zB9w5weiZ?4+*gYtno?UZf{3qa-=evH#6`&hx&{^ZeiE z<2~=Sf8*jtfbTfWM~?6lu|s>|0s!$4i3GYVCBsYI`mFF9uJzP0f-e64RwL(+{CBTpOhaKr>frp zzu#Yp)c-=@c4L~RF+M&{B9Q=pH$TmP$%%ms{k_4OdQB66@~#ZSARdobWU*Kbfa3?h z17P-K8}WD?!!WotTJ=yfS7zu9!$2tofUfHRD5Z#pU*_r5dwl)E4ucokxERX-jcO4$Gm!>Bm9`RWx`viEUlx|1LND4A<*CfWatXf!HY+Zmago0DCq5(orD z*L4Yp!?JImPr~7_=(;X}KtME26M(t7IoaCINHiL)TL(2G&}-iyK0iw^pWxDDL;yS< z4^WQE2QS@QNsTGLG#Qa#K0$nbmR|ct-A&dcAh{d>sn{a!R$tXzHk)O1`cJaiY?a*I z>LV3ftkQ3qKqj5$#A~DM*SkorFI72LN}=mIN~tOm$@L}n>s{oGzsRK1bqUlxv5xk5 z1YmwGYcq2U|8@gV)t*Wz+r`tP0`TPN59`{mx!`DzN5c1)ziz7=d45gbQ|WP~6q=@0 zMxdd#yB(IVWTx|MHj7~x73bz?6-^N^Yhd?mFk7@K0+w#YcLH~vK;0CqZrq_u<}NH% z?5%AG<(At^X2oX1MR?)-c>y>+GJ?glh{(B#iH2`P4KW=X8{5-hBoeXJnrp=N yKf{{BhB>XC#{d8T4rN$LW=%~1DgXcg2mk;800000(o>TF00008_H$&&y6DFwj=7R_KQh)4)dFlX5bG>r?)@ka8 zF0y>D0fQI0Z_lta7Y-sYKy`D5f%GViTAfCGmPW14Kzfww=1iFS!F2QT1+nrmNhA`o zu&^K}UVFt|TltvWynJETL)lU0>^ZUWF##lzNXXK)Z``$&kBK>ZE-*mg>9z7Px%cQ( zo{N3x`dYR!^(b(@P{*fvwNDDaeeBv}2T!x-RVP%gKtZai3c%3N5HD`L>H2@!_Z=%M zD*#MSPlvt}x)!%>TXbEQjfakuN+q%KF)5WwvhmOnUDw67ZD~RJm9Jx{s;XqOS=XLZ zzXU+}=q-;8kj-WZ0?`%V&&kHd#uy(TXLWTIl%wd^zUAa`2mALz$GFe{@Z_yDO`}lQ zDN-yJ0hm7WBLK&uUr{I&&@_$qZtV)7)p||SNT<`TztshRuWyXP+*z*NeHnmsI_*OE z>4NX8IFrdl05nZ=A?){mX6n=@Y@DjF7Jc6HoL_YWn5v&=->s8m_iG-1rBVSvThDsz zZgGF7j+Wq{ zdhcw<8XY?zTU!7;C@vE1J>c0hO_S6+moQD!%e@UdshJ7$bAvfb={rn_OHUSEO(vB zWFqY`y9Q{Ns;V+MISD-J!oYpapOp=V`# zyG~zU{|?Zd+rIPq>OgXMMEd*pdwh;#1JEkozMmW(5x)?=0BW@wwOTFoekc6_&AEx$ t!Y#N60000EWmrjOO-%qQ00008000000002eQ