From 76c11e32e21ff26a612fc90b6e58c0a9b361e998 Mon Sep 17 00:00:00 2001 From: Adrian16199 Date: Tue, 30 Jan 2024 16:06:51 +0100 Subject: [PATCH] Bit of a clean up. --- Resources/Prototypes/Access/cargo.yml | 2 +- .../DeltaV/Catalog/Fills/Boxes/pda.yml | 1 - .../Roles/Jobs/Cargo/mail_carrier.yml | 3 ++- .../Roles/Jobs/Cargo/quartermaster.yml | 6 +++--- .../Prototypes/Roles/Jobs/departments.yml | 9 ++++----- .../Misc/job_icons.rsi/nyanoMailCarrier.png | Bin 4915 -> 1184 bytes .../Misc/job_icons.rsi/QuarterMaster.png | Bin 5275 -> 1147 bytes 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Access/cargo.yml b/Resources/Prototypes/Access/cargo.yml index b071917034..dfcfcd10f7 100644 --- a/Resources/Prototypes/Access/cargo.yml +++ b/Resources/Prototypes/Access/cargo.yml @@ -14,7 +14,7 @@ id: Cargo tags: - Quartermaster - - Salvage # Parkstation now in engineering but we just keep it here. + - Salvage - Cargo - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - Orders # Delta V - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml index a123a99151..879c614b36 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml @@ -59,7 +59,6 @@ - id: EngineerPDA amount: 3 - id: AtmosPDA - - id: SeniorEngineerPDA - id: SalvagePDA # Parkstation - Salvage in engineering amount: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml index e48d44ccff..d75b01c431 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml @@ -10,7 +10,8 @@ - Cargo - Maintenance - Mail - + - Service + - type: startingGear id: MailCarrierGear equipment: diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index ef3f8da95b..73f4087493 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -22,8 +22,8 @@ # weight: 10 # Parkstation - No longer command. startingGear: QuartermasterGear icon: "JobIconQuarterMaster" - supervisors: job-supervisors-captain - canBeAntag: false + supervisors: job-supervisors-css + #canBeAntag: false access: - Cargo #- Salvage # Parkstation - Salvage is now engineering @@ -48,7 +48,7 @@ back: ClothingBackpackQuartermasterFilled shoes: ClothingShoesColorBrown id: QuartermasterPDA - ears: ClothingHeadsetService #ClothingHeadsetQM + ears: ClothingHeadsetQM belt: BoxFolderClipboard pocket1: AppraisalTool innerClothingSkirt: ClothingUniformJumpskirtQM diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 7f7197b5bd..c2cfd99b18 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -3,10 +3,10 @@ description: department-Cargo-description color: "#A46106" roles: - - CargoTechnician - - Quartermaster - - SalvageSpecialist # Going to need to change that - - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml + #- CargoTechnician + #- Quartermaster + #- SalvageSpecialist # Going to need to change that + #- MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - type: department id: Civilian @@ -23,7 +23,6 @@ - Clown #- HeadOfPersonnel # Parkstation - Replaced by ChiefServiceSupervisor as service command. - MailCarrier # Parkstation - civilian job - - CargoTechnician # Parkstation - civilian job - ChiefServiceSupervisor # Parkstation-CSS - Quartermaster # Parkstation - the cargo man. - Janitor diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png index 1b0acdd24122a7e5153c13c0a007ea6020cdf373..48e9214ae2d5fa7794a01c8060ea06378312e321 100644 GIT binary patch delta 1160 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 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png index 2e2e6fdcd627bd758115e1828f652dbb26b0d365..c90568a350ba6491a9ec953cbfa0f6b011e23935 100644 GIT binary patch delta 1127 zcmV-t1ep7qDfaB^>EX>4U6ba`-PAZ2)IW&i+q+O?NqmaHfY zh5u(2vjma=f#o2|IkSUV{#?+us%)#L^z}$97$aQr1+1p!pT8UZg+rVr^1)KfF*+PR z`z!^GgSE&91MZAQv}>c!<$v=Wwv=K8(C5;>XA@51gSqA5XDsZBDH% z>+Fh;h*YF)Qh#4l87(+Y2&InKB8uS*Xxk_mC1Hvc#AeW(P%3d|L9`otp1E-2Wz>}` zBzjrIP>WR2VM}U~r2+u=z^msbrdekK3(*Q{3bX85c#NCJc$E`Io*ACP=!^&1L!mR{ zow9e-T2EbOm-bjem-L*5j83j!;RPVvwwQ(y-%;o(Z-3kqSOvi_!kjR{;->F<3|;hY~gV7-EbT`yN$H&0DZ& zX34UZq<_h$kYciwQcfjHR%~G*$83~S&bbr}TF`aD+XWt_Ofu=@r!d9IrZnZLRHRS! zHPl$GrkZP+W!4$Xe~z=!oaQ{2g%_mK;+L?*#g??>r8MMP)8<=fu~|zkx3W{)sJ>F; z1G%56@kXr^^TW>`)L=II>Vo@r5;`*w6VD)SoqqrlS~@eA*n8>ZIy09Aiy{c9ap-Vn z?!-XQFD#+)&hA0(M{X4SC2sPL9CdWRL5@1Qjof!`C)DOLz9>2X^;Oto>a<~FgHw@& zKkUbAtxG7QIaSj-xx?ern*Ph-q}B!VALGmk(^}1R=679>B>Eja$0xN-e$7mWt>UUIItJ*jEIJr&%c9c^dL!$6lyBR}rMJInq@R#p(MaD#-qT3e z((b)Rx|VkD@zRaea4L&#tcFurbYnG~%73D}i}Waq?k>`!Ec&Cp<4G2Myhz`C7{9)Y zbnV0ZzNTv*=J&r7=y&v#bz}Qfk2d_!!oTJ8FFlptgNya)wgacDsreK(W4KNb&CIJ6P8YvHk(MA9O002ovPDHLkV1lwS9+Ut8 literal 5275 zcmeHKc~leU77v1oD2f%zrZPsWQcW@mA&``%vItQl$Pyx=b}}=8fovp0h$s&PQNgW> zA}-)kaREVF6$NEe6l#^WE+7Kpf`S!6t5talye|O}&+9qwc+Ts8CNs&*{qFsJ_x|qv z?tGK#Ki|jH#Kwd|p_uZ0y#m0$vF^Iq^- zSFQa{yNBO1J#1tI38MB%Ys7bIALY%qteZht&%D;4EJdD~2`qDTLpLv(Els@T#l?QX}+fJIks2tMq&7y+cMe2sC^Fz(@*(0pHO;S598E@HQ zZoKm5#$9KPA`V2ZnsT{dQl3hDFTVaHBgA>(@YFIa#Xlr$^H0_U9L+oC6J8FaBwpT2lDVbMiJ5)Y;GdHYwT)vXD3a?Wio3nwgxOm0ozv7p*GiM4lKXni^5n`su%#oV~>lRL_9zY*MR3f?`>K@)sx zmGCc{a?@ffY~ho=d%l~@-kQaGvik-7Oxu=UmUOqdbSB$1s7KpKl@)8us43>E8xcRO zb6ahNrg8ZJ(q{TTzrcC+57&D;P{ZHxE=+0_aGKg5amrF?^3=jGXpeZ^jM7zK%>BA( z&ds!8$4Xb*MCBGmCvV*;E9m+%RC?s$=p!*t3(s~e-#c;nA6=O2_kSzPDr^|FSa_uK z>U2kur?bbiTk{+5j#{6Jn@udYu}VHZJbda;r&yV`yYIPpgg6`cI#nNWu`*09{P9f9 zwAgiA4~v8pCzI$_K~DzP=0-_%<7CCJqPz!Nr+wuRIl<-3}(&l}yE zB15*SuMoEk2&e4@+x!#mr_?~^D2?Dh!DqFbeg#E-?^?~IV z)}Z@%4t_Zo=Qe7@L`0R!A~i0%qv+6K+Qk`F*^P6ovTmP?HzqT_m7L;j?|E2zE%f5f zf>vs<#HRkFvi#s0m)lo73s>h#5_TxmNLS9a!2NTpGBaK#)sl~6a@S@5@+6)lM|OtF z6NI)UQ%@%sN2NWcZS?DM&E4dd-u%F~Gv@rM+ii|T-OE;}ZHt7KuG{PKi3JPJTocfnlR#KMN3Y?ZwDsv zqod8kMvm^8DVz|tJ0?bHVN_vf<}+=Yx265_(gVLyFOA&vI{J?5n%5nMt7fMhk<>Zw zjm+4bR#hpL2e&WtW+XkEl(;Z;M;x^zb7gpZQ{c3li?@a^d)>V-e$E{%(QisNT8xZU znE5F}d9CsH;Te3B=iKL+vn;3ltEIU8Putf07l!;g%67*Mm*`BMRRlCg744N2)-OM2`+lO2&mL=FVXkHjSb2khL zZCEO!IP5u4*AUub+}1pdUeK`f-0-jtO0r)u=DV@w&{yUrd88YJ`68hjj9MGNhsuy4igb8Vn|mi6^ujg{gWvLf&qBBx}OEW2SbY}8B99NkjWT> zE!3p927vTC^tTr3An+7r1mJ2#j0(lQHMpFdJQxB)2kezGDycpk3}xU_Tn1FtU{>Zw zQ~K}){sR^|3c?AQQf~#w{z#J~Bp=B7$T!`HKAgdh0P_LdkF?*%u2%+H0s+rUfyU_E z<9oSMb@THu1xjE%{iTG-;&NH2geI1-oM~(v0at94LqnYr2S*146|->1K~Q|TnndI% zu7d*LbOPY8S(p>b#!(uFiQ_aj3x;Wk1L{n}V2MPGGr4Rg${GaWry@XABGSQL>7XzG zCFXKDTnxr&Y)1))#+JZNG=$5BX)H09DG^J+1Z=S$3PX9b6)G75(n-jWaGar(hwBG) zg!5+k^IfSdI{ZQ6FGWZRFaT?SkYkEi^@pJ#LWT#Dh>lMthr@Dma$vGxXQm^Q%lV)r z#8qlgi#k*$On2yuN0%5L2nSG$=qeQe=q*4rJWmylkP20hLLqgf>YRdfmIK2Au%Ix6 zM7$6Z2cR&E#e=!v2x7rJmLrb^(_lv)JV;-G5t3#9OIx>mAeX+R`x0s}|1!O(Z%qZ_ z(S3J)w^BmCm>@{MEO-do7lInm;F#V|fYmpIMj-NV9Q2R=f_*P1{-zkj2p4x2JEAnM z1OaJeJHs?FlZAoWKvA5D!Z3^5N8SLsS|K505fwfw9PkLZ0tKq)3Yy-ZD*KPUiH*Q@ zc>t8rU@kZYD5Em^gJtMC#`|bp82`nGi(X++ivf0hGSIp}Cu9t?!hXJhum9wyKM()p z6cF@zl279IGhLtQ`XmNEN%?bieWvS^82BXR&(-yRqs!#O%M>mLJD^zbs&v797azQ4 z4HM7x@uKwVzI#g!r31+brSC#Dg+iaKI}Nls?iwH*PVxob!yk<>F|ao8SW%?~B5TrH zM0zS@x;;5Xzfr_7D3%~2Al*hWWaVf}pp?Y-niXVq9evl^>;8kt|3#T1EzRF3;&o SA>RUcL*aYR_bTxCF6loStOMl$