From fe287de02119a8a79dd044b404ea3ab9959ad52f Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Wed, 7 Aug 2024 18:15:12 +0300 Subject: [PATCH] Janitor-Control --- .../ss220/clothing/Jumpsuit/jumpsuit.ftl | 2 ++ .../Prototypes/Loadouts/loadout_groups.yml | 1 + .../Clothing/Uniforms/Jumpsuit/jumpsuits.yml | 12 ++++++++ .../SS220/Loadouts/Jobs/Civilian/janitor.yml | 18 ++++++++++++ .../Jumpsuit/janitor_control.rsi/icon.png | Bin 0 -> 468 bytes .../Jumpsuit/janitor_control.rsi/inleft.png | Bin 0 -> 494 bytes .../Jumpsuit/janitor_control.rsi/inright.png | Bin 0 -> 507 bytes .../Jumpsuit/janitor_control.rsi/meta.json | 26 ++++++++++++++++++ .../Jumpsuit/janitor_control.rsi/normal.png | Bin 0 -> 1256 bytes 9 files changed, 59 insertions(+) create mode 100644 Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/janitor.yml create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/inleft.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/inright.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/normal.png diff --git a/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl b/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl index c60369d38596..7aa245a00deb 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl @@ -28,4 +28,6 @@ ent-ClothingUniformJumpsuitTrustedLawyer = костюм доверенного .desc = Шикарный костюм для тех, кто следит за безупречным исполнением законов компании. Говорят, что вы способны навязать свои требования даже самому Богу. ent-ClothingUniformJumpsuitWarehouseman = рабочий комбинезон заведующего складом .desc = Практичный, удобный, не стесняющий движения и главное стильный комбинезон. У вас с ним связаны плохие воспоминания о прошлом начальнике +ent-ClothingUniformJumpsuitJanitorBlue = синий костюм уборщика + .desc = Костюм таинственного уборщика. diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index c5569641cda6..b52ba6a92f05 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -374,6 +374,7 @@ loadouts: - JanitorJumpsuit - JanitorJumpskirt + - JanitorBlueJumpsuit #SS220-Janitor-Control - type: loadoutGroup id: JanitorGloves diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml index f338b4fede04..f12da468d482 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml @@ -154,6 +154,18 @@ - type: Clothing sprite: SS220/Clothing/Uniforms/Jumpsuit/bartender_nt.rsi + # Уборщик +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitJanitorBlue + name: blue janitor's suit + description: The costume of the mysterious cleaner. + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi + - type: Clothing + sprite: SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi + # Medical # Парамед diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/janitor.yml new file mode 100644 index 000000000000..dfd69983340d --- /dev/null +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/janitor.yml @@ -0,0 +1,18 @@ +# Janitor Time +- type: loadoutEffectGroup + id: JanitorControl + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobJanitor + time: 108000 # 30 hrs + +# Jumpsuit +- type: loadout + id: JanitorBlueJumpsuit + effects: + - !type:GroupLoadoutEffect + proto: JanitorControl + equipment: + jumpsuit: ClothingUniformJumpsuitJanitorBlue diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/icon.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1aa3f9135adca0f9bd32ad573b5f91e65237f3 GIT binary patch literal 468 zcmV;_0W1EAP)Px$j!8s8R9J=Wl(9;~P!xv0hz@OTy2O@*Ld7Cd#Dci#)E98i-Yw7<5;}G1;?%KA z2cb^IQA#PaOH0%xCT6@2nrju2T%ow+TN09!bN-z3p9?uTIXVA~p%dI_wPg|pTpXM9 z`+fDT=Xr8GjVY8WJdC=`Is$feg6pT3 z>fWhV@H|gC)hcCo56gD2Y=_lyrjs&T2O6!mbZbW{xn(=_hI5+DCcWVt%XR=*EoZp3 zBdsoE9sxiS21v2?Ji9g(?iFzfP~h6d!SGEg_j5dvJaw z0m^P&J&WQ<2?BUr%>h_U2AT6_9>HQVFbbv0uQ7#EMXR`$0C*oo6h}Y4i{fZ|9!NQS zx}}E6avpOZN{YoI>(^J#N(LwUCd;Rog{A=QlMp_QxaonkGg~_eQ-mp$^HVI_`C>*L zv__DU?)+jhFb>YI7Ext?1zm}GkZ0000< KMNUMnLSTXg1<2F@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/inleft.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/inleft.png new file mode 100644 index 0000000000000000000000000000000000000000..7dd4230cbb33896ac62ad4ef5ad8c8ce1ab47036 GIT binary patch literal 494 zcmVPx$s7XXYRCt{2+P`YTP!tC6&(cMVE}|q$3X;LO_y8`Qq>s=kTR?oDLZ{B19J_Sv z!IGX5vdTH)dKtV@=x-zly1OmGOi@ge)9ZA zD#UCuK5Mn4^RkFM19UNZ+iLncZ?V#OX|AP$fUonq-A!TDEU5YP-{l=6(#doFoAa!i zbY2><9Z+qw;ke$9mD1Nm9$3;y=sSr>q3jHmUJEw5fKp)5fKp)5t&SC9zpc= z_@zkBBN*8LO=2FwxEBo4^8?210O|Pw;~F46KVVz~0NMEg(fNQ&lb9bc?jZ=s&JP&7 k1El5$jNAbL=Lbm2C!7a413aCGZ2$lO07*qoM6N<$g4|x>e*gdg literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/inright.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/inright.png new file mode 100644 index 0000000000000000000000000000000000000000..6b8efa93ef5ca999e743fcbc0c1397a0428a073e GIT binary patch literal 507 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zw|crbhE&XX zd&@BUkb?x?3OC`KdWxT=R^pD$8|q z*UOYmXLXDNTVFU-8}McMa=*UH&T!!Vj~)AV9l85hx@Qt2gTZO>2)&#=c6X1}{lER` znQcE`&0717agrZm*u$3dZ|1pk=X_%6F9wF+sr&Z&vsQjS#`WRfp8$q3^S&2#4|bkA zUt6!AfA5H`!yTPzQx(>QR#qzd-@C!Z@!8z&PcQG{l!TodKC9bqO#Y-6=JsrV+|tkq z>hJG~2AHf~VY+s%S66nZ*?|qopWn@O4ZQlH`Dk;)c+~LC7bcNn4jg5J>%#kuSGNL7~B~Li5V%YVSCq;2D`-^MF3f@_)EibPbPjIWc q29%sIHIo%2s(iWUBhS2l^Yb4vYnm~$&RYSDO$JX_KbLh*2~7aKA>|VQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/meta.json b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/meta.json new file mode 100644 index 000000000000..6f3a326265e6 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.tx", + "copyright": "Sprited by Kerch91 (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/normal.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/janitor_control.rsi/normal.png new file mode 100644 index 0000000000000000000000000000000000000000..413bd53bdaf1602407dc74e6674ba43d1b9fae46 GIT binary patch literal 1256 zcmVP)Px(qDe$SRCt{2n>}kANf^ifI${oaS6f*2B0-QiA%Zv}I21PtDb%DgYOYdqmAb&; z58yA6a1h+2y2iaprRItwDdLzbf;fUu&>Ese&Kgd;Iw4$aisc!P)_U35w*)djFj~#7 z_CNc~%RckWV?ZL2NF)-8MDl%-5xKb5?6|YZ7!U6$I5|0CziqeM?wb!&WHlZC{`FGm zo?-L>Agk%DoG%mA4}5XC(Q@~S73A^-jEp{hds4yC(NX63_}G1R@)pHX6}DyKax}p3 z{4{nW>>nJuxqN|rw=I($`^(Q>JrArO=)zjF;JInf^wt99)4u>0eBYg_U5S9>*)68?BPd7AGv%1s-mLY zXt{xFyoUXQLzj9N>91mB^kG{jilr*{4-NzA-`R9QR@0Ho7hqc^W|J{S22d<*wRDifbg#;`5VSkBZ5qQ4REK3=cl_5F~(hZ$IZZ4aQXM`IfRdthp5YJDod91U12 z)S8`0y?|ODxS8lwMTKpdxBf_f=x zdw?IlbypoH$ts<&`a%Zy>GR(x?J6(^Q~Wb=vAw;G{|5i#7cJwJf1Y9(sv6?@r04$> z)fX~=S@{)?q5?&rFm<3RDx9eUM^VuO;AjqDycDcLa6axnhEuE{cfWuOcwQWR_AC>Z z7y!np&^?8R0Qm&V%AM(YMmc0N5*57S4;X(G%q1C!g75yfE?j&nF2vIrQLB zoGu{)5V?GTt-Q!nObc?rvYL*wSI;w9O&+-SL#`;Ts|%b)!GBmQ{tB9#@{?@yn)-QJvi zr$Ei%{cGV>p-@DKk|Y3c{jDl0+bQn$=4iLuiT8?jyX|&+^95}_NGjShg$%%NmGe-T ztX{8++%6QP;SYk^mdS#(B18_0Q_=$E3nYy{Cn0KRK2l7O7xP*qTwG3sWjP7d7-8a) zLIxo5Tpk!1H|1%D#g_#@vzpFjjfgcu=zW28Th(boL%_CF_FaU~QDK^F=xy*dpoh(B zIy)AP3=40LuB%8IIRbHOi021j`M&(w)ipFti?wpgxHjLx`Y^%%&Q>fr0zwA(xceBU zrUM#Sp1?)EfDC}Ul&1FSlh_jpvQ>D1yZ3ZtN>y9{a4eJMCYS(b7z^bHgmQ%`WtK=X zMKdfE4^MUA6C{?U@&zSSegKbcnV~W>qLS70rI{+CL^i