From 923bbfbac85d52bbeb01884cd0445f8a5cf8fff1 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:41:54 +1100 Subject: [PATCH] Janitorial Bomb Suit (#22244) * add * add cargo purchase * fix * it works * do not map --- .../catalog/fills/crates/service-crates.ftl | 3 ++ .../Catalog/Cargo/cargo_service.yml | 12 +++++++- .../Catalog/Fills/Crates/service.yml | 11 ++++++++ .../Catalog/Fills/Lockers/service.yml | 10 +++++++ .../Entities/Clothing/Head/helmets.yml | 16 +++++++++++ .../Entities/Clothing/OuterClothing/suits.yml | 22 +++++++++++++++ .../Structures/Storage/Closets/closets.yml | 14 ++++++++++ .../janitor_bombsuit.rsi/equipped-HELMET.png | Bin 0 -> 1805 bytes .../Helmets/janitor_bombsuit.rsi/icon.png | Bin 0 -> 1390 bytes .../janitor_bombsuit.rsi/inhand-left.png | Bin 0 -> 1662 bytes .../janitor_bombsuit.rsi/inhand-right.png | Bin 0 -> 1654 bytes .../Helmets/janitor_bombsuit.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 3260 bytes .../Suits/janitor_bombsuit.rsi/icon.png | Bin 0 -> 1844 bytes .../janitor_bombsuit.rsi/inhand-left.png | Bin 0 -> 1639 bytes .../janitor_bombsuit.rsi/inhand-right.png | Bin 0 -> 1596 bytes .../Suits/janitor_bombsuit.rsi/meta.json | 26 ++++++++++++++++++ .../Storage/closet.rsi/janitor_bomb.png | Bin 0 -> 1251 bytes .../Storage/closet.rsi/janitor_bomb_door.png | Bin 0 -> 1312 bytes .../Storage/closet.rsi/janitor_bomb_open.png | Bin 0 -> 1280 bytes .../Structures/Storage/closet.rsi/meta.json | 9 ++++++ 21 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_door.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_open.png diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl index 4eba21b79b..2bed24a4ef 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl @@ -33,3 +33,6 @@ ent-CrateJanitorBiosuit = Janitor bio suit crate ent-CrateServiceTheatre = Theatrical performances crate .desc = Contains a moth cloak, maid uniform, clown and mime attributes, and other performance charms. + +ent-CrateJanitorExplosive = Janitorial bomb suit crate + .desc = Supplies a bomb suit for cleaning up any explosive compounds, buy one today! diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index f010f1ef2f..ab9e1c3235 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -146,4 +146,14 @@ product: PetCarrier cost: 500 category: Service - group: market \ No newline at end of file + group: market + +- type: cargoProduct + id: JanitorExplosive + icon: + sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi + state: icon + product: CrateJanitorExplosive + cost: 1000 + category: Service + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 8c358923f2..df789208e7 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -242,3 +242,14 @@ prob: 0.1 - id: ShardGlassPlasma prob: 0.1 + +- type: entity + id: CrateJanitorExplosive + parent: ClosetJanitorBomb + components: + - type: StorageFill + contents: + - id: ClothingOuterSuitJanitorBomb + amount: 1 + - id: ClothingHeadHelmetJanitorBombSuit + amount: 1 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index e86c09de2a..512525dfb7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -124,3 +124,13 @@ prob: 0.5 - id: NettleSeeds prob: 0.7 + +- type: entity + id: ClosetJanitorBombFilled + parent: ClosetJanitorBomb + suffix: Filled + components: + - type: StorageFill + contents: + - id: ClothingHeadHelmetJanitorBombSuit + - id: ClothingOuterSuitJanitorBomb diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index a87f713ffa..48aa43fa55 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -111,6 +111,22 @@ Slash: 0.95 Piercing: 0.95 +#Janitorial Bombsuit Helmet +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHelmetJanitorBombSuit + name: janitorial bombsuit helmet + description: A heavy helmet designed to withstand explosions formed from reactions between chemicals. + suffix: DO NOT MAP + components: + - type: Sprite + sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi + - type: IngestionBlocker + - type: ExplosionResistance + damageCoefficient: 0.9 + #Cult Helmet - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 57d100fd9a..94f1d584eb 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -23,6 +23,28 @@ - Hardsuit - WhitelistChameleon +- type: entity + parent: ClothingOuterBaseLarge + id: ClothingOuterSuitJanitorBomb + name: janitorial bomb suit + description: A heavy helmet designed to withstand explosions formed from reactions between chemicals. + suffix: DO NOT MAP + components: + - type: Sprite + sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.15 + - type: GroupExamine + - type: Tag + tags: + - Hardsuit + - WhitelistChameleon + - type: entity parent: ClothingOuterBaseLarge id: ClothingOuterSuitFire diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml index c8136546ee..d734d61832 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml @@ -63,6 +63,20 @@ stateDoorOpen: bomb_open stateDoorClosed: bomb_door +# Janitorial bomb suit closet +- type: entity + id: ClosetJanitorBomb + name: janitorial bomb suit closet + parent: ClosetBase + description: It's a storage unit for janitorial explosion-protective suits. + suffix: DO NOT MAP + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: janitor_bomb + stateDoorOpen: janitor_bomb_open + stateDoorClosed: janitor_bomb_door + # Biohazard # Base level 3 bio hazard closet diff --git a/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..ba2968b9710793397848269775184689fe59bc87 GIT binary patch literal 1805 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjK8LB%&n3*T*V3KUXg?B|j-uuOhbq ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~% zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?xG?W zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$ z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA{@Xy2l%uT3XuZLsX&ahKQmXYNL{p zmyJF=C)sg{E@QC<<~s#X7srqa#<#OJ=1DmUw6S}vxxt|mm>}tssOi$A=Hc16@H_Vo zKgn4pD`V~}FY$bODN}Q@$CnPZi3P%30TW~dn)nR1IjeB|pZC4UZo=U?mWxho7P@oq z&bu?`%&V)9@=P>Q{IG!Y$BujQa&mr$A8we{_PW3#JGove>CY-rN!%WX`Q$wQ(QQtqirvhTrFkomqD^>*`d!*yv&+4l|FE?&g zaeGjsHFXoyr`M|^brLz#=3d@hzV5)SQk_@(tNxYgDR2E)wBnVp!M?E78#g<@x${8j z`P;8dTG7?pGJbxau4uYm`c00hkjX!xMaT8e#3WkHWn-{SS*b0}ux+QGf3o29^S44O z{w|MO5TPUG9a(0mA=G){;>C$e??+C4pk{lHt)cXFd0mYq^M*q{y3;wYHO^}3ZH!!g zWN!b*b+4G;w9TvOzuf-#e4Fa*YVWn`-{0RTnJ-swlyLjrpSpe4Zw_;{EBMvt)L&tX z3E%$Wd0qRLq;1W&=gBqwovkHuMJ31V@s^2(-AYW240Gqt-^}l5#vpM1`DZP$-Me>d zG4#4MFS@wmmHBMnRo7py`=Z5K{wH;FznTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Ug$@zIU`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{ zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?* zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McEq|2LZXBJ2O8_kEl?axAtV|mnmvCP5zF_`HqGC z2ZDcasHmAuaqH<+n|5nO>&~ak7dfQAH!EmKX4e)j_lPL_@oaW~J_Cd3DaNM_MGy8{ zFZg?m;r{p6`*vCMxqt4}66lpZ-neU>?cGab$ViZ!{A;8g%4}J-g`%rU=i?BGTzkf3>>^8fLMCh93NS z)wkn_`03((k4)Q6gkR2@t1xdV(~<8scW?Y!akuEz)u&ol7W_QFXV!Nc`$kTA#%rCo z6m@wIGn^`owYzfpP;38T^$VqY#e4bA?i2fvX7}ND<}9zDOB?dk6_?Exul5RV3|(F1 fVEI8^<_FuE-*wJ2*Dl)+D(gI5{an^LB{Ts5&R*V| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..dcf6038fd257ca63125b454b2bd65e982a373afd GIT binary patch literal 1662 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2Xr;5=l3&r`oHgtKWeGuqvF7X9es!w^mrL|J8%2jq>V33y0@oB`qk}>@!EfX|Hl1k zn=`LxncmDX+qdv+nz1BbyZN>6pt?ey z%#4%wS$g}e)WOEDRkq9m-*hus6XIrk`uu$!KiAPUar5+>)8ZxnC#b@8!CcYqc4a57`}0EdO%NDBxJn zy7|6OPd;kRc`mRlTR2VT(f`m(Rop8a&82wD?`j?XW-HaJ^tCnnL;iM#u!HyFo8|Uy z+*HVL?A45^o((J>c+i77;f^P3Zm_c)+`-(FX*Jg>Z?gs8WEX~t&!1vXT%J;!+gUWH z@A%`nd)>+($z0u=^q?r5KZ$>W-u{1_i&k7e>?j#{e8F8ysjZK1{|VQcy5#apiB*0E z*A)70+XymDDfrsC;d$n%1N$X5JnUZ2O^GCy-WfM3U)OVf_(%HSRJbih3(T7(bzp)9-Jpa7! zT6I0I)6y=<6VE?~3)@KW2o?6m^UjbIQfS<({DGU*>)wJL<_%v!WxuDZpUXO@geCyl CPgm^# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2a583183961ad3489f707c94f6e9cdb723ebc40a GIT binary patch literal 1654 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2X-@a zt^b>E-h5P2P)$gI5j*;^o@0s6)?T;6r&EmfNuGaM^6I(zfUoPqFlCrIt{0s-Y?(f+(Ep7A58NAVJ zr!jNciYj66&<5tVMf&1SN$t_L?`Q}(WW4+T@!{^AP;(!nF z3s!_|aAsBPI_i5N#5LuEP1|mkhDj0(N2Z^Cs(WL%{%mj2=)+dUm0#^X{`h6_`%HUM zbD?^-(E9t@9~N&4FLbw#*?ojz!`V;?sif)a-7nSr{vGGI`)(PZy7s>_os0=wU(emw zyT_Q+32xs`sO>(j?an>W9e?$XcCUUN#tZb<>hqc6w59hYrNec$@W z=C>k4W67saPc--r9$`?}6u18O>p7>N2244apl~zi+IjwV=a=7q_eSMUJLNwk^g`au)Nfa36xuN7fbAmjdmTD=SDS*$d{0+Dmvv4FO#pqzP*(r| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/meta.json new file mode 100644 index 0000000000..2b96cd082c --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1, edited by Ubaser", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..a22f3853fb73da60ea011c61afa122d7c7aa32f9 GIT binary patch literal 3260 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 QwLb@pv6T_)pnK&10gVlr@Bjb+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cfd02b300eae18864d521682fe20bd0ae14e55a5 GIT binary patch literal 1844 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=7^q+l2s5%z3BJp~z?_pA5>XQ2>tmIipR1RclAn~SSCLx) z)@4&+1!U%?mLw`v zE(HYzo1&C7s~{IQsCFRFRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdw zuOzWTH?LS3VhGF}m(=3qqRfJl%=|nBkhzIT`K2YcN=hJ$-~i&zlw`O)1*JtfU|Uj> z^;2_Fb5rw5iuDck4E3?;E6GelxG=968XUlY(Fe%@wHaX5=2=jZYyu1^*9xF}p#B3o zG#PAfaY>3kk^+4r0|N_P10!7{OMSTifX=r`NwzA8(5=(PRlMwuh98(*mdDb14l2#j%gD=FP=Erc=1)0qUz^8 z@4rgTwa))m{P5h~_j5kiK7YQi`Wd5&+ajh;E)}f_D;#7*ca*&mTfKH|sHLph@5N!ry8p#iqM?@zXZ4H76!(h%`Ok{muFLRJO83kA&EkWo8(? z$=Q3HC9q|=`SAn0|0)Z<{#td^(LjRbn1sasrw&hhWjxO}tW zwOq&49SJY)JpQN=y!>+O*U-e;4To7ex}AQ`pCRq=@|{#`N>!1JRQwm_wCaVcBz)8+ z8=apnK55U#p9~A;+FYrK6x&(EY>;Diz%yF#49h-mRkjo7&as{Oc5rgu0j(3C6Qku% z2KJX_^jjP`E_H`NpeIFdKD%E0{-yo{D+OoVF!7mVy1ehehadYFeEPP`>G9^eOR0ZPH8+b%zp?!7zH3cW ziL_o(ZNb#5+pNkwl)SGm5AvMe|LesrUOv92+i$~!OlF^*Fn_-OPho|X^|O=uLn~~m z+Fv){?^yEZq9vcrb>8A`k%p^Tt&0we8NA!jP+rBgkIk&%{Bz~qs_`8LMtv=FS@N3V0;{S5P5tkXh(#oBV)0zG~ zut_k;-27W1lB4{Hhs=A+bqrp`vPYhBJ~`BI!Sm*{`Rfu`*GQb%Rw7WUWYT}<>Cfn; z-8b26 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e7f4a2e9a25bf179e41f8568eb83a0580f8eba57 GIT binary patch literal 1639 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2X)?Adj`EpLa0@{QGh{3mYo zSQ|F^WXh%uwVSWWf88%$wIZatt!i`JyghTyGrV8+|H`hguGQCLLJZI8ud9p9&$edY z@O!7SqreJ_w!;fgB`&_Fa&Z0qc!!=Z8+^a2)xNMh$5=5>ee+Ep-@k5)7Z%-EVea|i z@Gf^P5iX!JR)sfh|JOC|-rKTh+oOrMk6d|MHdXJ^;cXXh|FD|R82Ef`n0M9Qds0QW zTi6$_Yu~%-$sgSYhwXOPQfvN&AMKI(_VrKlEG6APUpKA1cPu~E_<&l+_AjM;4^A(i zn|?hz=I^HmkN-S+HT~-r&juC`+$c_A!?#2E@BgX4kx0DEQr&-}rSd!DZXSc_r(1XU zZSy}Ie?M>DU+sHK_D_AoGqdDRl>8jq6(L$eHT+K=l;{^0pEGw8a-ZZ7p*Q{L{{21+ z{;;cD6gn_**56wf|8Hk8n%PrgC2RSO&-K%1>s=PziM83myIEFUU1eo+HOFi%`&#ZG zZie-H4<;<=R}Hk>n$Or{Rv$iT^JMu=it<9da*M8*z8wg-C-to`F@ c_0Ih+^P>+B+0>6n3xf)IPgg&ebxsLQ0RCcDGXMYp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d990be40863b5a5cc54ce84cb4e55432a6e4f3c8 GIT binary patch literal 1596 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2XZ(x}W&{X2FQ3>Y;M39C`0SOj@w1MC?N9Q!cl5qjF_?Ms z%{y!U?-Mt8voJFXFyKOs|NS03{de_bijkk)eDU)eJ$+*S-eIl}dwD-9ucw>6nK5#j z>*0q1Hpf@1Mb1l}ym7VtT))dXX3F1Ie|fLd{q)iH!*Ul}G^U@vSYq|Jm;LnAi#^YO z+1GvD?Df)p;r(LP5;y;Sb60-acU0PERmrMPat!9r%T46^m$ugJ*PoYsZg#?&&3E(k zUp$XkdY^g0<(Ct3Zx_83=VJXRQ+$sld2Y@9%}awcKgzUUdT(cY`spScSIcQLd46V@ zNG-a3_54P!UC+4+xV@JOZH-zhQGK~bzNP+a@fxFehU2@{O)7s*Gkjxdc5>F)XH9k6 z#rMnAF#ZsoHO2a_HruqKQ$OtwT2L_yIk)y&g?Zr`R zPwhW`GiRFC)UIzfyI$wl-1&NO?dN|6MM9k|!8&5K|Gn<-IKjYV^P7qBm`A6pSn2NA zuH%n4HAL* zqjbaedDVO8ZOmspuej2{K7DW8{Q1W?jP<;>-eP$6oNeEtD}EKax3(Y9JDNE^=wW!z m4USv}v$H2^MQ82#{*O86`|X5l5#9BmlH1eO&t;ucLK6T5H#5Wl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/meta.json new file mode 100644 index 0000000000..c216244ab0 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7, edited by Ubaser", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb.png b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb.png new file mode 100644 index 0000000000000000000000000000000000000000..a25fb4a6ed747a491c07928f08b9d47faf8f47e3 GIT binary patch literal 1251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Tl`MF6p`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{ zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?* zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McE_7L`%Y_xxlQGHUfdc;a! zg^t!lp*QCn5(V!ZdsgxM-Q15GmF8V#~=~3I^)db-$aW!g(-N#$8a| z*ica6sJ+u}Mib^+jXI}Q&KFHymV+i^a}d#`*C^!zxkN zMwj3F+~+v`4&I=?p_j#PJ@>p0K4-QGWz0IZ#hPh$+Xfx)MVh&{mHZSZGyc_AIh}OiH&2CmLY8A_=o035wXPW^ oi@w+t)WsJTvR+QkdbIbTd@Hx+MFlOrub=|P)78&qol`;+0DZ%j00000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_door.png b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_door.png new file mode 100644 index 0000000000000000000000000000000000000000..f90fd31254e7f4d7d6683e7ca88829fd38c54a70 GIT binary patch literal 1312 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Tl`MF6p`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{ zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?* zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McEdr-EDqyPh_0fs+b18C_<1Z!uaV`{DI< z{W)!JuC5DDJPht$Byd9U7UTQ-``s^ccekaUo@Ur!VB`?qtM6ArH|N{erwIrO9@OmDbKJsw z!8EAbzC`B3_w(_KY|frOefq<*v(k&MG>HV7vN&)Gu$26hYR*jJSY_29!F};+k5z&R yONU;UV<&sa6(QDrLQA>UWE@!BP_djZd@95G>u&iH97UiakHOQ`&t;ucLK6VGpRe%% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_open.png b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_open.png new file mode 100644 index 0000000000000000000000000000000000000000..2e0e6f716f2acff6ea518069365607f75371f2ea GIT binary patch literal 1280 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Tl`MF6p`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{ zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?* zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McE@N*V#X`4hdUW=rWhI;T1=lkdv@bPzB%5dY~9Di znb|x|J=@mD?+?0Lki^5%exRO>BPFF_%8up#WSd@>rhI7GoOzJJI^px?t2}%5?1?zL zy!1rRGo}KLj;^jG-nt17rt8NSoCbP0l+XkKoad() literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index 3f2a1ae244..80c3273c6c 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -106,6 +106,15 @@ { "name": "bomb_open" }, + { + "name": "janitor_bomb" + }, + { + "name": "janitor_bomb_door" + }, + { + "name": "janitor_bomb_open" + }, { "name": "cabinet" }, -- 2.52.0