From eae6502f0e41b704c3998026e2d6e57412741708 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Feb 2024 14:12:11 +0100 Subject: [PATCH 01/17] Added chemical resistant apron --- .../Entities/Clothing/OuterClothing/misc.yml | 17 ++++++++++++ .../chemapron.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 973 bytes .../OuterClothing/Misc/chemapron.rsi/icon.png | Bin 0 -> 654 bytes .../Misc/chemapron.rsi/inhand-left.png | Bin 0 -> 738 bytes .../Misc/chemapron.rsi/inhand-right.png | Bin 0 -> 732 bytes .../Misc/chemapron.rsi/meta.json | 26 ++++++++++++++++++ 6 files changed, 43 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml new file mode 100644 index 00000000000..a102e79d8ea --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml @@ -0,0 +1,17 @@ +- type: entity #Delta-V realistic PPE apron for chemistry + parent: ClothingOuterStorageBase + id: ClothingOuterApronChemist + name: chemical resistand apron + suffix: Chemistry + description: Made out of thick rubber, the color of this apron still leaves you perplexed. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.25 + - type: TemperatureProtection + coefficient: 1 \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..90925f333afe205f42466843b73d85eb2ed46a30 GIT binary patch literal 973 zcmV;;12X)HP)g_{?7I>sm%{BB?82>lU6>RIMm1(-7P$swVFV4=R~h zLij}3tI2@Ex27Jq_|4?B#a||Ckbqs%M5C1Jhs?7&6~|zXMfDjAtJl- zaRvbLLR>r6GotOOx19kTkKfRQGSrVj`D;&IZzI2lhNZ)>UcZ*h<#VPW07NAocJz1L zo@AGE1waMF+8%=>74{_MQ~^a%RPO5H<-hdz#7wH&2|!Yr2TFzj0)d>Y8&<$%r!G+9 ztN>S#=X3GrLj?EZH5m3OUix+RU-_?AFJ+$R*?gXx@eq%9fWzU-*`IN8qsE|w0l|{* z>$7_U=nIf~KLMmZL$UK?1;i$tx_?%H?+oG0 zpqvsNV~bp3AZCcenO+qj+u=wG35{_~4l(q31j%9OM0x?xL1kvNEmk{ZtU)J5>%wH_ veP^TY*Y+PVLVN?*eA7k(BtQZraBl=I;%ubTO*Pp300000NkvXXu0mjfaf!Y> literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1f63c7c1217bbfb70a2f7923720a1278654d0e72 GIT binary patch literal 654 zcmV;90&)F`P)g_{?7I>sm%{BB?82>lU6>RIMm1(-7P$swVFV4=R~h zLij}3tI2@Ex27Jq_|4?B#a||Ck~y6g>KD-e z|An%`RwTNFG1XNvaz&81EU1#bU|;;W92n=!OaW8C6fgz;O@X$3#1!W(Je8}lvks2% zX#&&qPV(HslgSFC35?^*HO>9!H6R9_V<)Dlu5Ym@{I{emFH5Q1ex8Htx+m3>QXqt| z8V*3n$oax-heHwA(T`3s0;T}109H-bPQEzAz;le+Sq!MEYxLeb`5yqoaID}k^mISE oKuF-JEoZo{H{TR61rAf-1AWLlTv{v^bN~PV07*qoM6N<$f+x5xsQ>@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a517f238f13507b99c959b8cdc1561ca0456bc56 GIT binary patch literal 738 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aR zNUMMJ(nY$mB?5&f0*)>e4HR%+nK1p;g|H2;CN1&QR>}1UTC#&nkB^o8;?ea7>ldtk zuu6fWOX1OrH`kR^=b5yMWxhW>`*%Un`KQm=J}fth++OvJac|1(mnlvWXV-EbEdL?! zY^F=V6y0Ra%`;rD|ENqceXRKI+pDpF0+LP-RA5(GPm@buW8L`jmyfPGZ%18?qllua%@G|jnKrfmD)B^ ztKQxF|Ne4N`m(+67P4IU{mNo~vO|IVit94Zzh5bQmG1C>b%);8KdJ9B-_5RCyVSM6 z@dRH%<>gCDm>*<`OVpXU1m}1##_eClBron@!OnA!`S0s{>t?+#{Kt~A{b%>PhQrDU zbG}aOwg2}bgLCyc-wt2|a29w(7Bet#3xP1>rMq>1fYBl4>Eakt!T9#pL9QkTfrf{= zyVP%-o#$Bfe>und>eJCpwvHPQ9S~DFWntpIUqN-vS1;WI^2$% zSJ`p?@t-^E_rG5wbfWv+uGKefZvFXwi{bvd^{bLSc7H$1?(A)VE&;~cc&+J@7!YOYo(y7dUQG8hdnbHmmEs&nU_7k$oO~lsrkS6 z?Vow}aoh|RK^%?%J8Z2(RKrx)2w$DeOAUR4yw^?LdR#U6`7sf0gYYY}iW$~i{A5gTe~DWM4f Du0=&Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b7fb7b9893fe0a38d25c732df62c23298ad71124 GIT binary patch literal 732 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aR zNUMMJ(nY$mB?5&f0*)>e4HR%+nK1p;g|H2;CN1&QR>}1UTC#&nkB^o8;?ea7>ldtk zuu6fWOX1OrH`kR^=b5yMWxhW>`*%Un`KQm=J}fth++OvJac|1(mnlvWXV-EbEdL?! zY^F=V6y0Ra%`;rD|ENqceXRKI+pDpF0+LP-RA5(GPm@buW8L`jmyfPGZ%18?qllua%@G|jnKrfmD)B^ ztKQxF|Ne4N`m(+67P4IU{mNo~vO|IVit94Zzh5bQmG1C>b%);8KdJ9B-_5RCyVSM6 z@dRH%<>gCDm>*<`OVpXU1m}1##_eClBron@!OnA!`S0s{>t?+#{Kt~A{b%>PhQrDU zbG}aOwg2}bgLCyc-wt2|a29w(7Bet#3xP1>rMq>1fYBl1>Eakt!T9#pL9QkTfny(a zcRjy5&#~(Na*p@+K21yT59l%2aFma$`ozqC+(CKDU;f^CV=!BYnUO`nfdPZ~7q{T` zy7e*-f7|>&^ZR$Rr~?1p@8+A&?YejR&&6Mhe2e{xT;$an*!uedSS~!ZKYw1u{dSz) zJkBoRhhIau41N1kqu%eEH$7|bdC~BOmP;QtF)8s2J2deh7O?z1>Fl5C)AipUSD3#( z#4RX*VKtI-1Q;{tWhh@=-EmXuwvvZslvZW&L<>ZQNd_5_w16C+pX( yXPU5W=bDBS)*fN`KKuF;w$5N;5x6n?fb`@a#(fD>-%bMt8iS{+pUXO@geCyf970S0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json new file mode 100644 index 00000000000..9d9b20f4549 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by BriBrooo (Discord), original from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 3301f555db07a61251e95f8ebe07a2cd77d5a141 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Feb 2024 14:17:02 +0100 Subject: [PATCH 02/17] Added formal chemistry suit --- .../Entities/Clothing/Uniforms/jumpsuits.yml | 13 +++++++- .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1494 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1815 bytes .../Jumpsuit/chemshirtsuit.rsi/icon.png | Bin 0 -> 824 bytes .../chemshirtsuit.rsi/inhand-left.png | Bin 0 -> 998 bytes .../chemshirtsuit.rsi/inhand-right.png | Bin 0 -> 1013 bytes .../Jumpsuit/chemshirtsuit.rsi/meta.json | 30 ++++++++++++++++++ 7 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index f5497646d6c..ef1f3d391c4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -242,4 +242,15 @@ - type: Sprite sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi \ No newline at end of file + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi + +- type: entity #Delta-V Chemistry jumpsuit variant + parent: ClothingUniformBase + id: ClothingUniformJumpsuitChemShirt + name: formal chemistry suit + description: There's still some odd stains on this suit. Hm. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..d3ef6e2d02e062245d38ed442f44157cef17157c GIT binary patch literal 1494 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 PlMjQZtDnm{r-UW|BtF*! literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6ddc5b7a9a30fd7f4458038bee35d0a84bc6ed90 GIT binary patch literal 1013 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aR zNUMMJ(nY$mB?5&f0*)>e4HR%+nK1p;g|H2;CN1&QR>}1UTC#&nkB^o8;?ea7>ldtk zuu6fWOX1OrH`kR^=b5yMWxhW>`*%Un`KQm=J}fth++OvJac|1(mnlvWXV-EbEdL?! zY^F=V6y0Ra%`;rD|ENqceXRKI+pDpF0+LP-RA5(GPm@buW8L`jmyfPGZ%18?qllua%@G|jnKrfmD)B^ ztKQxF|Ne4N`m(+67P4IU{mNo~vO|IVit94Zzh5bQmG1C>b%);8KdJ9B-_5RCyVSM6 z@dRH%<>gCDm>*<`OVpXU1m}1##_eClBron@!OnA!`S0s{>t?+#{Kt~A{b%>PhQrDU zbG}aOwg2}bgLCyc-wt2|a29w(7BevL9R^{>`x|p%U z;@WDHDdIH}4_M9FUU@vOE!cgg{ok&|7f-C|;AwXjm+n7)Z?ic2I{}SDuWOmM?6{lv z{KNFqOMhS6x$geLZ406``ah*U{K}PKHoI{7WlPb!ufMuXR_^<%u*o`C>(K8hM=a+0 zrEb3IvHI$yy8Zg~`4OFqJf3~7yfiWBab=}2>w;NVvz~U%I-BO_vQm`ojtzhQqi&tI zhW0XiozIyp@;5Eb+hacQz!DP&X6&dSmHAeKg@5$ZzK@pam$q)#e{j3!(d#RQ->wE| zurc1MxZ;xG5VkdWO;7kww~wW-B+@mle&{cdjZj(deB2_$si4_8zM=G`L^~Hp9aC3H zf^*`j8{#?(JlMDO9CCU;^Onq3&rf9ux%0Hn8gnvK%;U?M%C$}BpuVF_3j4KJkLR#u eEO^IO$2hyZYvzkP|JDFg6N9I#pUXO@geCy5?$h-E literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json new file mode 100644 index 00000000000..b0df83e8a62 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by BriBrooo. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand original sprite scaled down by potato1234_x, original monkey sprite made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 35b401ac44d88471fb11c8abf40bd45e3ff3d69e Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Feb 2024 14:26:08 +0100 Subject: [PATCH 03/17] Added chemist's tie --- .../DeltaV/Entities/Clothing/Neck/ties.yml | 11 +++++++ .../chemtie.rsi/equipped-NECK-hamster.png | Bin 0 -> 855 bytes .../Neck/Ties/chemtie.rsi/equipped-NECK.png | Bin 0 -> 616 bytes .../Clothing/Neck/Ties/chemtie.rsi/icon.png | Bin 0 -> 909 bytes .../Neck/Ties/chemtie.rsi/inhand-left.png | Bin 0 -> 801 bytes .../Neck/Ties/chemtie.rsi/inhand-right.png | Bin 0 -> 812 bytes .../Clothing/Neck/Ties/chemtie.rsi/meta.json | 30 ++++++++++++++++++ 7 files changed, 41 insertions(+) create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK-hamster.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml index 42d074502bd..7c00069bad0 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml @@ -52,3 +52,14 @@ sprite: DeltaV/Clothing/Neck/Ties/greentie.rsi - type: Clothing sprite: DeltaV/Clothing/Neck/Ties/greentie.rsi + +- type: entity #Delta-V chemist's tie + parent: ClothingNeckBase + id: ClothingNeckTieChem + name: chemistry tie + description: An safety-orange tie. + components: + - type: Sprite + sprite: DeltaV/Clothing/Neck/Ties/chemtie.rsi + - type: Clothing + sprite: DeltaV/Clothing/Neck/Ties/chemtie.rsi diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK-hamster.png b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..0005bee7d65bb7717b305af8818320c8449cf4db GIT binary patch literal 855 zcmV-d1E~CoP)10A!&8-Q+ zclZ$InM6>OEn_LOm_^t4d1N)?A@26-Ue_@O@`@z`zCQA-Y?wBg(;&5F8!qpWhvcG| zC!dgGCI=+ny1L}?o67}{zg#x6=>@>=_7nIjUl3^a< z9fgH7l1M;+gbFsH!A6|9#GQ5aO*MSWDAObJX`l*|jslAG#;8`SsXU1-LG?{AKQG?wfk8rA3c{$PRFM)6%2^ z;A$5bel|o?Y)AoKzp4Ts7eF`%4Bi9%>)x)K?{WSFWViW??tsH1V4U@ljX(bAXbG#% zO^5&h010qNS#tmY3ljhU3ljkVnw%H_00EClL_t(|0qt4AZNo4Ol!|`3K!@oV{dUKW z(J4AX7wFT0P|zR(pG--$0_ZM4V1=Sd-tlC_VBWSZF@K(z!58czKnfsdKu3UF0D1`O z2RBp{z(o|#USfnL6!iNe_F&wTO;|+nm|vFyCgA8!ftrN^>W>g&hQ%%guyh*XlmZYl zEOse?rPBzf6o8mvu}c9goklpN0K^Q7T?%07G{PwbAZA$XQUFV*5l$%pF~ee)0$4hY za1JTJMr0`X4EtyeLj=qKcy$hX0-DF;_Z=CP;C;N7-$%J^=o!8K%W%{ea`l+}ELZDr zbXWntV>8C(XE~ysH$VDkK==swPOr44SAYmuNzOf3q<|jQR=P(DSgD&mSfqd+)>gVl h3RtO|Jy_@!a03#b#*kb?LH_^%002ovPDHLkV1f}Sik<)f literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..492d8f19149d288d5190c63a89408241e31c6d34 GIT binary patch literal 616 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aR zNUMMJ(nY$mB?5&f0*)>e4HR%+nK1p;g|H2;CN1&QR>}1UTC#&nkB^o8;?ea7>ldtk zuu6fWOX1OrH`kR^=b5yMWxhW>`*%Un`KQm=J}fth++OvJac|1(mnlvWXV-EbEdL?! zY^F=V6y0Ra%`;rD|ENqceXRKI+pDpF0+LP-RA5(GPm@buW8L`jmyfPGZ%18?qllua%@G|jnKrfmD)B^ ztKQxF|Ne4N`m(+67P4IU{mNo~vO|IVit94Zzh5bQmG1C>b%);8KdJ9B-_5RCyVSM6 z@dRH%<>gCDm>*<`OVpXU1m}1##_eClBron@!OnA!`S0s{>t?+#{Kt~A{b%>PhQrDU zbG}aOwg2}bgLCyc-wt2|a29w(7BevL9RguSQ4OyKpx^>e7srqa#<#aN@-`?4um+Uq z94`nsUZA^Gaibc`jysDNKKfy^pee|NiG@Qz!J&bHk%`5KD`#!@zVn~1Y&;%1>-7~W z#ozW$Cs=D1eqV90`YGE5Z=gTe~DWM4fbJ7QO literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c4ad8bd7e00c47120463734fd688b3c96db88c97 GIT binary patch literal 909 zcmV;819JR{P)10A!&8-Q+ zclZ$InM6>OEn_LOm_^t4d1N)?A@26-Ue_@O@`@z`zCQA-Y?wBg(;&5F8!qpWhvcG| zC!dgGCI=+ny1L}?o67}{zg#x6=>@>=_7nIjUl3^a< z9fgH7l1M;+gbFsH!A6|9#GQ5aO*MSWDAObJX`l*|jslAG#;8`SsXU1-LG?{AKQG?wfk8rA3c{$PRFM)6%2^ z;A$5bel|o?Y)AoKzp4Ts7eF`%4Bi9%>)x)K?{WSFWViW??tsH1V4U@ljX(bAXbG#% zO^5&h010qNS#tmY3labT3lag+-G2N400G5GL_t(o3GJ0lO2j}Ag*(%6MrB}j9>A5L zJHeGV5!?%&zys(71W(|0PT^KiRB-Fs)j)8@IC1Q+q(UpnG) zrynJ(qG}>1C69l}-WR)G#)Pt=#WiG~q`m_q|>?vY^7NR2eEb zb)EEFj@=`Dmq18R^MU*0mOXerzrr#EoZl(NUk%{jeMr;+$4{vgC@`(xpY>w_#!;2L zvtDg!6=?K;Vnna~RiajK+Cl~Vi0LaZo9jl+UbR93EJSLIJY!7&izD|cB=Gna>Doqt jQ>R_0Q=n7euNC+Le0|lVtA6&S00000NkvXXu0mjf1U|0} literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8eeceda4bb8a3ccdd52cec83f9ae06a542ef1be9 GIT binary patch literal 801 zcmV++1K#|JP)10A!&8-Q+ zclZ$InM6>OEn_LOm_^t4d1N)?A@26-Ue_@O@`@z`zCQA-Y?wBg(;&5F8!qpWhvcG| zC!dgGCI=+ny1L}?o67}{zg#x6=>@>=_7nIjUl3^a< z9fgH7l1M;+gbFsH!A6|9#GQ5aO*MSWDAObJX`l*|jslAG#;8`SsXU1-LG?{AKQG?wfk8rA3c{$PRFM)6%2^ z;A$5bel|o?Y)AoKzp4Ts7eF`%4Bi9%>)x)K?{WSFWViW??tsH1V4U@ljX(bAXbG#% zO^5&h010qNS#tmY3ljhU3ljkVnw%H_00CJ^L_t(|0qvT>4Z<)CMPmeqb|g073Ii}3 z48R0%g^ij6hd@AOzX3Ri znK1(aW>P5(1Oy0$Gh+q<%%oBn2nY}gXT}T!Xs7bBi7B_V`O)^@_Q&f<|3@h94CRG+ zHa}L fse*I2cTd0r;IK-~LdWe800000NkvXXu0mjf8;EBM literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..84bb4358033e1f853602e4c2b8278f246e556aca GIT binary patch literal 812 zcmV+{1JnG8P)10A!&8-Q+ zclZ$InM6>OEn_LOm_^t4d1N)?A@26-Ue_@O@`@z`zCQA-Y?wBg(;&5F8!qpWhvcG| zC!dgGCI=+ny1L}?o67}{zg#x6=>@>=_7nIjUl3^a< z9fgH7l1M;+gbFsH!A6|9#GQ5aO*MSWDAObJX`l*|jslAG#;8`SsXU1-LG?{AKQG?wfk8rA3c{$PRFM)6%2^ z;A$5bel|o?Y)AoKzp4Ts7eF`%4Bi9%>)x)K?{WSFWViW??tsH1V4U@ljX(bAXbG#% zO^5&h010qNS#tmY3ljhU3ljkVnw%H_00Cr4L_t(|0qt2i4#F@Hv=J0Z!+)r0XrYIi z7g56lcmcHV9-6qIFfzzeq78BmIXKK%vMg4Z-I<+9BvxB%74n)OgLl|T02Khv04)G6 z06qk10a^f@0a^fD0DKG30<-`)1GE6R0QeRNT0m>9+`ezLb?3jWX%j%VwX%z|dZW+t zyvdcHea9H1%Jqi+^bIQDXGjK0OacZXI@vTjPJ5R`xgr~t5r3%FE(pad*H1%NeN zz@-8NC13$60IcBxE)^gs0Siz8U=0^=sQ^I&jR+hKjj-E_cSr*O~wi zwmgIPu^4BTWy Date: Tue, 6 Feb 2024 14:32:42 +0100 Subject: [PATCH 04/17] Added enclosed shoes --- .../Entities/Clothing/Shoes/specific.yml | 14 ++++++++++ .../enclosedshoes.rsi/equipped-FEET.png | Bin 0 -> 744 bytes .../Shoes/Specific/enclosedshoes.rsi/icon.png | Bin 0 -> 691 bytes .../enclosedshoes.rsi/inhand-left.png | Bin 0 -> 732 bytes .../enclosedshoes.rsi/inhand-right.png | Bin 0 -> 740 bytes .../Specific/enclosedshoes.rsi/meta.json | 26 ++++++++++++++++++ 6 files changed, 40 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml create mode 100644 Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/equipped-FEET.png create mode 100644 Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml new file mode 100644 index 00000000000..35a2d2d13ce --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml @@ -0,0 +1,14 @@ +- type: entity #Delta-V realistic chemistry shoes + parent: ClothingShoesBase + id: ClothingShoesEnclosedChem + name: enclosed shoes + description: Those shoes will protect you from melting your feet while working. + components: + - type: Sprite + sprite: DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi + - type: Clothing + sprite: DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 1.05 \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/equipped-FEET.png b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..52e0fb52949880351fb13c5c6da716d9497a14cf GIT binary patch literal 744 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-uQyYn z#Buwq#2JYp&Mt>}#dx^_1$q-Fbepbl4C|hk-*~HVdCL|yU0x^WE0=Cxs1L}#5GBCk zDsb_}o!df1w#%D@e#z{wwyUW>|NY_4=Lh6Yt*l&}&G)HwksKe}l&LpXJ*qk0*3CHQ z%kfa>=pG%HmlF2NZQ#9(z6% zPMojD%ymDiYSFoTvGiAeQa8%+o^QVUYGq24#l=HeVduI1IjTSJoOEl(@n1sat2W3? zv{6bIX*O_V(ooUZ=-8)JcarsHWcB@&v)hj>s|cygo^tW%L`Chm`72ak&YCnw%vROE zZ`0QA|9_iYx*YuV-8+Vo{j;7um$3N0Fv{@k{ou=M<~2TMUB~VFf7zSNZ_!`8f7I;J!Gcf2WgD_*oQu{JsbSQYbIEGX(zP)A0*JL1a>|@fD zsZ0HK6f*4jula;QM@gDn{X&iJEPwn)hXW2>Jul{>0IL@B$+>riH zgF$qsPD$^x#u7C9}vLCNCKu6ds6>Ph<^_+dAUu^uQCwHzK|Gu}XGmc9Rd@5XC+=ju6BxsHa^RBD|qkiWB&A@^9m&K5n>XXm*z=06Cn t@rtgyEHCiu@3D^?U(ViWu(NnS!(Oe*Sm~GDlE46D@O1TaS?83{1OOd7Ly!Of literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b9889427dbf3bc82055d6e9f969a0aa1ef520d13 GIT binary patch literal 691 zcmV;k0!;mhP)Opo`-!*WS1 zkWa{QivyBxJzeto&EulaUmjbz%mPREdJ4rhmfBb@Svq-=9MiRm+?>bzl89ogWSK{K z#$Y3Z6p|1ip@L0laFAd&xUP0vOB#L-#=cy1%RDJ@du;&XWyO{ zV!;3a010qNS#tmY4#WTe4#WYKD-Ig~008SrL_t(o3GGrr3WGolj9BnesbH}O`v&R% zUr~HRJya@K^eWXX%o10((jIzg_Oi)jk_od*q(>c42h;&|;NKkxzA+%r&$g|qZYGu( z1Hg;oLS=cid^h-bfl27)4)NreZTQnd$Y=E3Eb}A~P17Sa&4c*n!!ZtHNpdi0+djEw zgwX?@dwUmvC^tZm1;Q|-y1v^vvc_Q7^`-{g5h#fV_ZH-6h#ZMHDL8)fGD2<*v1|3?|1urA8=!qmem1uKpjvA)PdhP ZFaoZ|*86aR zNUMMJ(nY$mB?5&f0*)>e4HR%+nK1p;g|H2;CN1&QR>}1UTC#&nkB^o8;?ea7>ldtk zuu6fWOX1OrH`kR^=b5yMWxhW>`*%Un`KQm=J}fth++OvJac|1(mnlvWXV-EbEdL?! zY^F=V6y0Ra%`;rD|ENqceXRKI+pDpF0+LP-RA5(GPm@buW8L`jmyfPGZ%18?qllua%@G|jnKrfmD)B^ ztKQxF|Ne4N`m(+67P4IU{mNo~vO|IVit94Zzh5bQmG1C>b%);8KdJ9B-_5RCyVSM6 z@dRH%<>gCDm>*<`OVpXU1m}1##_eClBron@!OnA!`S0s{>t?+#{Kt~A{b%>PhQrDU zbG}aOwg2}bgLCyc-wt2|a29w(7Bet#3xP1>rMq>1fYBl1>Eakt!T9#pLEdHqp4Nw3 zxCv{hl;wNx>!rSzzZBKG7w%ejJNeA#IluO; z?+QNkKW^58+Vx3O*G#fYb`e|u=Z^K~?7-uGAIciv)|Gr*_4Es$fx>GR(Rkx6daK@M ze@f(K;!tQ{z(f4;cW7Vn?dz@o?1%i?bvLe9Jy$`y?zCpnjh6)>5APR7cZILQ2W5f{3zmobfsT9Fwhu0UHx3vIVCg!0IeBA^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e5e685c8500a15ccefdc3c84d196a424b57acce6 GIT binary patch literal 740 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aR zNUMMJ(nY$mB?5&f0*)>e4HR%+nK1p;g|H2;CN1&QR>}1UTC#&nkB^o8;?ea7>ldtk zuu6fWOX1OrH`kR^=b5yMWxhW>`*%Un`KQm=J}fth++OvJac|1(mnlvWXV-EbEdL?! zY^F=V6y0Ra%`;rD|ENqceXRKI+pDpF0+LP-RA5(GPm@buW8L`jmyfPGZ%18?qllua%@G|jnKrfmD)B^ ztKQxF|Ne4N`m(+67P4IU{mNo~vO|IVit94Zzh5bQmG1C>b%);8KdJ9B-_5RCyVSM6 z@dRH%<>gCDm>*<`OVpXU1m}1##_eClBron@!OnA!`S0s{>t?+#{Kt~A{b%>PhQrDU zbG}aOwg2}bgLCyc-wt2|a29w(7Bet#3xP1>rMq>1fYBl2>Eakt!T9!;p-{7efJ5LU zPk-lhE53wx^<5PVc?pL(eXgBJ(>Nf&HFc(c^Wp`&``?BoOK>POFfd^w6G%cYO`2QkcDV>+8n?O@-%XW>$$^pMG!i_u9_tdFhY$#@ov#-|6}N zOZ&jQNz-GVOn9P?@jU-_R~&W&DABUFuO|gw@KmNYhDvm4$8?xtguT|fwT>JLm>wU)OZvJP^Vg|CW w?|a`->MOdSF-!GAbGTp{i+}?|<35(Sf19F~?VjlE4h%d7Pgg&ebxsLQ02{+bumAu6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/meta.json new file mode 100644 index 00000000000..c9cd5639c17 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d672aade35db25affc6ed5e1c7aa0b640f118d4c", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 7702e0cbb5d62633d60b0d804bb1d7ab846d5e46 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Feb 2024 14:37:16 +0100 Subject: [PATCH 05/17] Added chemistry gloves --- .../DeltaV/Entities/Clothing/Hands/gloves.yml | 20 ++++++++++++++ .../hvchemresgloves.rsi/equipped-HAND.png | Bin 0 -> 886 bytes .../Hands/Gloves/hvchemresgloves.rsi/icon.png | Bin 0 -> 872 bytes .../hvchemresgloves.rsi/inhand-left.png | Bin 0 -> 686 bytes .../hvchemresgloves.rsi/inhand-right.png | Bin 0 -> 691 bytes .../Gloves/hvchemresgloves.rsi/meta.json | 26 ++++++++++++++++++ 6 files changed, 46 insertions(+) create mode 100644 Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/equipped-HAND.png create mode 100644 Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml index d9121410ec9..f26952d2c69 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml @@ -41,3 +41,23 @@ damage: types: Blunt: 9.5 + +- type: entity #Delta-V heavy duty chemistry gloves + parent: ClothingHandsBase + id: ClothingHandsGlovesChemist + name: heavy chemical resistant gloves + description: Perfect for dealing with chemicals that wants your skin to melt away. + components: + - type: Sprite + sprite: DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi + - type: Clothing + sprite: DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi + - type: Fiber + fiberMaterial: fibers-rubber + fiberColor: fibers-black + - type: Armor + modifiers: + coefficients: + Caustic: 1.05 + - type: TemperatureProtection + coefficient: 1 \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/equipped-HAND.png b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..aac97955556fc77cbbb1b3912b578b6f376db0b2 GIT binary patch literal 886 zcmV-+1Bv{JP)g_{?7I>sm%{BB?82>lU6>RIMm1(-7P$swVFV4=R~h zLij}3tI2@Ex27Jq_|4?B#a||CkPtv+F%q}^^y%LVV6*u)S(e%Hc;}LrUX0PV|0iFNqtUZj zEEYbo`uE-L$85JpXzTS?z29~6*Z#|gNRLrS0+J8aIc2|#tu8vJ{Id@M2tWV=5P$## zAOHafKmY;|fB*y_(3Zet^4eAuxw|I7O}OjhZIPUAz@b#uLJ|=OKmY>QClFM-uj>8^ zQx)4wYX31)Jv_9uo!I&Aap@1Od>AuU0D~MNS% zG}ZrOcZb;in{4~yvGt?PZ>|1*Yw<(_jUfm?00Izz00bZafgTC$0oHMz9^Lrr?EnA( M07*qoM6N<$f=02KzyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ac7e65ccce36591e13bbce8ae657efc442f07988 GIT binary patch literal 872 zcmV-u1DE`XP)tcQZ4b|w|aH1Ya6}El%ayHM|ein^rEm#Lujk0S-dAaq-Ntu z;S*t>E&~eRT6&_+Zx(0j{AIBo4bOw!>ZxQ}IMKptR?iDh2z&FnlG>QZ`Vx1lupE&* zB4-qXFhK$+Bq*^#jv{`^1=(49-(=0V#HM&ud25u>#gQQ^UZ1EX>6((97Cj|Tj;{~n@P5-9sY4%(6N>lS5gJ%aWZ<<=- z0Iqgn_*skV@tWk2V^62y;{y6(FnABHwfe3a_nbdLbX$JW9ULCPxYT>r{{X@uXYD?p zx(5IN010qNS#tmY3labT3lag+-G2N400E#$L_t(o3GJ1=Zo@DPgw>zHTLYw9y7~Pd zDOenQrKKof0j^Y%jS{JY)TpxVRXy&30OAT=}O z+wE)EY+h6r#k2@%5-<`C$Kyv7(D!{3QY)g#IyoR#gh<4GzYjGc9tF}es|BoLsyVYx)Q+7`F2b&;~PxrA{msz|Qoc z8KSgQOHv?&MMra1fGnLN7b$KaM9&zX6jD5fIbso5LLEW>PC1%O$203d$!>O5BFeNt z+;JWqy!$rpPClCp#==@L~_8A(^uIo5Kl;) zJdPW)hRp|qcf=spTDiOr-+!M$N yAHP;y|IS`Sp4=WI|IPxh>(znPfz^S3F)_$+8uzzH${0000Y-uQyYn z#Buwq#2JYp&Mt>}#dx^_1$q-Fbepbl4C|hk-*~HVdCL|yU0x^WE0=Cxs1L}#5GBCk zDsb_}o!df1w#%D@e#z{wwyUW>|NY_4=Lh6Yt*l&}&G)HwksKe}l&LpXJ*qk0*3CHQ z%kfa>=pG%HmlF2NZQ#9(z6% zPMojD%ymDiYSFoTvGiAeQa8%+o^QVUYGq24#l=HeVduI1IjTSJoOEl(@n1sat2W3? zv{6bIX*O_V(ooUZ=-8)JcarsHWcB@&v)hj>s|cygo^tW%L`Chm`72ak&YCnw%vROE zZ`0QA|9_iYx*YuV-8+Vo{j;7um$3N0Fv{@k{ou=M<~2TMUB~VFf7zSNZ_!`8f7I;J!Gca%qfiUBxyLEqng3ml%978G?-`?8I*JL2Va3SkX z>ha$H|5eOxe&kj$H8N|lGnjEW>fP%lFE6z{PJ1V)mTp;cR!yJkH!^+Aej##8&^YMccaF`TmnXx}TB$ zeB4U%;mHZnMXJRMT_@jPID3xn%w#UC*1#-&kkEK(^^dIWhuP2n)!ZI;a=OACu>{$D zUu+L$GDhup|8cbMUaaxErb%!2?_R(FcI$_DChl__X1n*6TmmLQ1_n=8KbLh*2~7Ys CCM+ia literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..49626b924c0dda0eefdd4158fe7c186870fa90e6 GIT binary patch literal 691 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-uQyYn z#Buwq#2JYp&Mt>}#dx^_1$q-Fbepbl4C|hk-*~HVdCL|yU0x^WE0=Cxs1L}#5GBCk zDsb_}o!df1w#%D@e#z{wwyUW>|NY_4=Lh6Yt*l&}&G)HwksKe}l&LpXJ*qk0*3CHQ z%kfa>=pG%HmlF2NZQ#9(z6% zPMojD%ymDiYSFoTvGiAeQa8%+o^QVUYGq24#l=HeVduI1IjTSJoOEl(@n1sat2W3? zv{6bIX*O_V(ooUZ=-8)JcarsHWcB@&v)hj>s|cygo^tW%L`Chm`72ak&YCnw%vROE zZ`0QA|9_iYx*YuV-8+Vo{j;7um$3N0Fv{@k{ou=M<~2TMUB~VFf7zSNZ_!`8f7I;J!Gca%qfiUBxyLEqng0DSY978G?-`?8D*JL2Ta3SkX z>ha$H|5eOxe&jZpe!|Hr=IV?|d-7uX9=|h9%=F&KA)w&Uz`)4Fg3JgIlsJBSv(P)e zE4Q9o8as;2UAA(I*!e5}QqQT^E@N19vb1)}Ji%=b7oVRtl}(~8d*<_v-{rrtU*x>|F5`gL@jVddYUuCzZ+=?a%EArkZ3a(QKbLh* G2~7aX;4Z`f literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json new file mode 100644 index 00000000000..e6321f48aea --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by bribrooo (Discord), original from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 4c0483d6edf194f48dd3c2480da01f7ea847ef96 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Feb 2024 14:42:46 +0100 Subject: [PATCH 06/17] Added glasses + fixed errors on modifiers --- .../DeltaV/Entities/Clothing/Eyes/glasses.yml | 14 ++++++++++ .../DeltaV/Entities/Clothing/Hands/gloves.yml | 2 +- .../Entities/Clothing/Shoes/specific.yml | 2 +- .../safetyglasses.rsi/equipped-EYES.png | Bin 0 -> 626 bytes .../Eyes/Glasses/safetyglasses.rsi/icon.png | Bin 0 -> 704 bytes .../Glasses/safetyglasses.rsi/inhand-left.png | Bin 0 -> 666 bytes .../safetyglasses.rsi/inhand-right.png | Bin 0 -> 662 bytes .../Eyes/Glasses/safetyglasses.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml create mode 100644 Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/equipped-EYES.png create mode 100644 Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml new file mode 100644 index 00000000000..db011c4e560 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml @@ -0,0 +1,14 @@ +- type: entity #Delta-V safety glasses + parent: ClothingEyesBase + id: ClothingEyesGlassesChemist + name: safety glasses + description: Glasses made for chemists and other workers dealing around reagents. + components: + - type: Sprite + sprite: DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi + - type: Clothing + sprite: DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.85 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml index f26952d2c69..3c52da854a1 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml @@ -58,6 +58,6 @@ - type: Armor modifiers: coefficients: - Caustic: 1.05 + Caustic: 0.95 - type: TemperatureProtection coefficient: 1 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml index 35a2d2d13ce..0cc0cce4dcb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml @@ -11,4 +11,4 @@ - type: Armor modifiers: coefficients: - Caustic: 1.05 \ No newline at end of file + Caustic: 0.95 \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/equipped-EYES.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..cb575b236fa0f203936d38100354091214f985cb GIT binary patch literal 626 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+nXs- zq)mRS#;Kw}7nervZZWPv0o}t2=GUBfH{E(s!M%sa*vsSg0$=Whu2+`bUQ{1&dqJ+F zfQX~Z>1%h*6faA<2RNPoaJI5y|7W>#a~P`)RzLaDS9#)Tca+A1^7U@l@5H{p@#6S7 z31>ss@ac!T1#cZYzc|F(=Es@1x38nz@|9LYIkW=1&u zaJjMiWW%BD%jCBIIQwMF(Rj7&i5Hk|oSpZsMELmZh?5zX4?Pq8^`e7beV!5j$md!3 zp-JvfdKL*QHOQM6dgV-7+TmXmS9a}|dFW@|V1a(6{HaE>EH0%Sc`dqCC3f_B zPX?KN|5rc1Dl6^Qt9M_VpRZ1=>2tnr7oy$vu{ulQs&T=d1Eu>O>YteRY@h3T6O;3X zJIWq>TDI^g|AQ>?w)t0Qh^_YIv-}pqWv915pNskXh0S?ySJj>WDeSWCsrcQ44+VWZ z_GUlkf3hY0@8^p@Cj%pZv%n*=n1Ml08H5=tmfDwrV#U+NF{Fa=?XAt(am_}HRL@2#-D iv8@D$ZifV>M&T#+@&aEN6Fvf6&EV=OPBDBqG|_QRJ;sLK8=dw0J$D7Nu)Ka#Hk!JQ+&n z-v94YPfkzOx;uQ(`Dz%SqhQ~MO4%@ePYt7T2DTTt&Ncjb+0*Q|=;emyJ_hFwT;4Ra z*a2Ma!qBrC)uL6&CdZmg!p8;lMquC`y4P#Fs^4?|1mSJ@MR#y`1Y=U~-1q}?+h{*S zQH%)y000SaNLh0L01FZT01FZU(%pXi0002@Nkl?em-@=KZqyhA%s*K2k$-SeX;l0FYK-;iVNcGS|Y%+8^j#=w?MdKL1U<~ z6zfc6LC9Hh9k=>0%rW@LnkJAtAUaH8xXb(3w0qK~Y3|aiV^+Wv0iU`oOWOLL5$1qD zfIktPesa9hnZ|+nXs- zq)mRS#;Kw}7nervZZWPv0o}t2=GUBfH{E(s!M%sa*vsSg0$=Whu2+`bUQ{1&dqJ+F zfQX~Z>1%h*6faA<2RNPoaJI5y|7W>#a~P`)RzLaDS9#)Tca+A1^7U@l@5H{p@#6S7 z31>ss@ac!T1#cZYzc|F(=Es@1x38nz@|9LYIkW=1&u zaJjMiWW%BD%jCBIIQwMF(Rj7&i5Hk|oSpZsMELmZh?5zX4?Pq8^`e7beV!5j$md!3 zp-JvfdKL*QHOQM6dgV-7+TmXmS9a}|dFW@|V1a(6{HaE>EH0%Sc`dqCC3f_B zPX?KN|5rc1Dl6^Qt9M_VpRZ1=>2tnr7oy$vu{ulQs&T=d1Eu>O>YteRY@h3T6O;3X zJIWq>TDI^g|AQ>?w)t0Qh^_YIv-}pqWv915pNskXh0S?ySJj>WDeSWCsrcQ44+VWZ z_GUlkf3hY0@8^p@Cj%pZv%n*=n1Ml08H5=tmfDvA1uuEJIEGX(zP;th*Q_AG8c@Am zt~0q{iQKxGM^##S+kCc|oadFAdHzGpslpu`0tyZd42(=H2!;;#mwWc7kMfJ|TXk)& z`TeNs@KkrdC*kRCd6Euhl8Pi*+jHbs9O3F=Il0lOezy+C?OG#V fVTjZGIcgY#vus`bR*6mr`i{ZV)z4*}Q$iB}2=X05 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8b095f6a93e897a6a379e37c20ed704c25b44993 GIT binary patch literal 662 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+nXs- zq)mRS#;Kw}7nervZZWPv0o}t2=GUBfH{E(s!M%sa*vsSg0$=Whu2+`bUQ{1&dqJ+F zfQX~Z>1%h*6faA<2RNPoaJI5y|7W>#a~P`)RzLaDS9#)Tca+A1^7U@l@5H{p@#6S7 z31>ss@ac!T1#cZYzc|F(=Es@1x38nz@|9LYIkW=1&u zaJjMiWW%BD%jCBIIQwMF(Rj7&i5Hk|oSpZsMELmZh?5zX4?Pq8^`e7beV!5j$md!3 zp-JvfdKL*QHOQM6dgV-7+TmXmS9a}|dFW@|V1a(6{HaE>EH0%Sc`dqCC3f_B zPX?KN|5rc1Dl6^Qt9M_VpRZ1=>2tnr7oy$vu{ulQs&T=d1Eu>O>YteRY@h3T6O;3X zJIWq>TDI^g|AQ>?w)t0Qh^_YIv-}pqWv915pNskXh0S?ySJj>WDeSWCsrcQ44+VWZ z_GUlkf3hY0@8^p@Cj%pZv%n*=n1Ml08H5=tmfDvA1|@X3X?<21X_p4gm#+1~|hZe8II}@ATw$eULc$ z_ilyeQ`4aB)&A!!XMMcMJ(K@*wHyCA)7{T?lh4`Dwd}er@%gUrntRhX`+qgqT50<9 z*suDx*~$x7qZ$b}8_c*9{oqS~pR>KklW-Yc{rcwf?emQKp8-t@-lYG0Pwe5-NqjK( d{Mm7Uy~WAu`31)KK%mbUJYD@<);T3K0RZExA0hw% literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json new file mode 100644 index 00000000000..92f2876d386 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by BriBrooo (Discord) for DeltaV-Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From f6328c25da3503577f9c6d7a099a889a5ff5c774 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Feb 2024 14:45:18 +0100 Subject: [PATCH 07/17] Updated the ChemDrobe with new items --- .../Catalog/VendingMachines/Inventories/chemdrobe.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml index c5d9e726ad9..eb46290d17e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml @@ -5,11 +5,17 @@ ClothingUniformJumpskirtChemistry: 2 ClothingOuterCoatLabChem: 2 ClothingShoesColorWhite: 2 + ClothingUniformJumpsuitChemShirt: 2 #Delta V: Add a new chemist jumpsuit, formal variant + ClothingNeckTieChem: 2 #Delta V: Add chemist's tie to go along a new variant of their suit + ClothingShoesEnclosedChem: 2 #Delta V: Add realistic chemistry shoes ClothingBackpackChemistry: 2 + ClothingOuterApronChemist: 2 #Delta V: Add realistic PPE apron for chemistry ClothingBackpackSatchelChemistry: 2 ClothingBackpackDuffelChemistry: 2 ChemBag: 2 ClothingBeltMedical: 2 + ClothingEyesGlassesChemist: 2 #Delta V: Add safety glasses + ClothingHandsGlovesChemist: 2 #Delta V: Add heavy duty chemistry gloves ClothingHandsGlovesLatex: 2 ClothingHeadsetMedical: 2 ClothingOuterWinterChem: 2 From a2af8d51f4da13ffc4271f002c626c0a29941a1f Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Wed, 21 Feb 2024 22:42:57 +0100 Subject: [PATCH 08/17] modified the chemdrobe file --- .../VendingMachines/Inventories/chemdrobe.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml index eb46290d17e..433210dce7b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml @@ -5,18 +5,19 @@ ClothingUniformJumpskirtChemistry: 2 ClothingOuterCoatLabChem: 2 ClothingShoesColorWhite: 2 - ClothingUniformJumpsuitChemShirt: 2 #Delta V: Add a new chemist jumpsuit, formal variant - ClothingNeckTieChem: 2 #Delta V: Add chemist's tie to go along a new variant of their suit - ClothingShoesEnclosedChem: 2 #Delta V: Add realistic chemistry shoes ClothingBackpackChemistry: 2 - ClothingOuterApronChemist: 2 #Delta V: Add realistic PPE apron for chemistry ClothingBackpackSatchelChemistry: 2 ClothingBackpackDuffelChemistry: 2 ChemBag: 2 ClothingBeltMedical: 2 - ClothingEyesGlassesChemist: 2 #Delta V: Add safety glasses - ClothingHandsGlovesChemist: 2 #Delta V: Add heavy duty chemistry gloves ClothingHandsGlovesLatex: 2 ClothingHeadsetMedical: 2 ClothingOuterWinterChem: 2 - ClothingShoesBootsWinterChem: 2 #Delta V: Add departmental winter boots + # DeltaV - Personal Protective Equipment - Add various PPE equipment including new clothings + ClothingUniformJumpsuitChemShirt: 2 # New chemist jumpsuit, formal variant + ClothingNeckTieChem: 2 # Chemist's tie to go along a new variant of their suit + ClothingShoesEnclosedChem: 2 # Realistic chemistry shoes + ClothingOuterApronChemist: 2 # Realistic PPE apron for chemistry + ClothingEyesGlassesChemist: 2 # Safety glasses + ClothingHandsGlovesChemist: 2 # Heavy duty chemistry gloves + # End of modified code \ No newline at end of file From 20ba583e561195ac1dee84237541303966e5033f Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Wed, 21 Feb 2024 22:44:38 +0100 Subject: [PATCH 09/17] modified the outerclothing misc file --- .../Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml index a102e79d8ea..dd452fb0fdd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml @@ -1,4 +1,4 @@ -- type: entity #Delta-V realistic PPE apron for chemistry +- type: entity parent: ClothingOuterStorageBase id: ClothingOuterApronChemist name: chemical resistand apron From 4afb02f46e7d0bc41280314e48a5973acb50e560 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Wed, 21 Feb 2024 22:45:46 +0100 Subject: [PATCH 10/17] modified glasses file --- Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml index db011c4e560..45032bed308 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml @@ -1,4 +1,4 @@ -- type: entity #Delta-V safety glasses +- type: entity parent: ClothingEyesBase id: ClothingEyesGlassesChemist name: safety glasses From f48c94f10aaedc15f5ea7f6ab0835360ccf4704c Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Wed, 21 Feb 2024 22:46:35 +0100 Subject: [PATCH 11/17] modified the gloves file --- Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml index 3c52da854a1..ff900e74038 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml @@ -42,7 +42,7 @@ types: Blunt: 9.5 -- type: entity #Delta-V heavy duty chemistry gloves +- type: entity parent: ClothingHandsBase id: ClothingHandsGlovesChemist name: heavy chemical resistant gloves From 9b2892c9cad40c885989931d5d8529491bd3140f Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Wed, 21 Feb 2024 22:47:30 +0100 Subject: [PATCH 12/17] modified ties file --- Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml index 7c00069bad0..2b421e96752 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml @@ -53,7 +53,7 @@ - type: Clothing sprite: DeltaV/Clothing/Neck/Ties/greentie.rsi -- type: entity #Delta-V chemist's tie +- type: entity parent: ClothingNeckBase id: ClothingNeckTieChem name: chemistry tie From 6bae8056e41fb4dd9f40dfe2edd4a2467ca681a9 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Wed, 21 Feb 2024 22:48:06 +0100 Subject: [PATCH 13/17] modified specific shoes file --- .../Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml index 0cc0cce4dcb..86c7d4ef53c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml @@ -1,4 +1,4 @@ -- type: entity #Delta-V realistic chemistry shoes +- type: entity parent: ClothingShoesBase id: ClothingShoesEnclosedChem name: enclosed shoes From 434da620d4ebb0dac2a3e65a3d5b84fd76bc687f Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Wed, 21 Feb 2024 22:48:59 +0100 Subject: [PATCH 14/17] modified jumpsuits file --- .../Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index ef1f3d391c4..f3fdeabd107 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -244,7 +244,7 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi -- type: entity #Delta-V Chemistry jumpsuit variant +- type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitChemShirt name: formal chemistry suit From 3cac87452a40e5f46fcb2f3b20004fbe0c6a0ffe Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Thu, 7 Mar 2024 22:30:50 -0500 Subject: [PATCH 15/17] Update glasses.yml Signed-off-by: VMSolidus --- .../Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml index 45032bed308..8642867effd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml @@ -2,7 +2,7 @@ parent: ClothingEyesBase id: ClothingEyesGlassesChemist name: safety glasses - description: Glasses made for chemists and other workers dealing around reagents. + description: Glasses made for chemists and other workers dealing with caustic reagents. components: - type: Sprite sprite: DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi @@ -11,4 +11,4 @@ - type: Armor modifiers: coefficients: - Caustic: 0.85 \ No newline at end of file + Caustic: 0.85 From 54a13a4ff131d2519416e1d6bef8f6fbe8d406e3 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Thu, 7 Mar 2024 22:32:45 -0500 Subject: [PATCH 16/17] Update gloves.yml Touching up descriptions Signed-off-by: VMSolidus --- .../Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml index ff900e74038..1dc8942c097 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml @@ -45,8 +45,8 @@ - type: entity parent: ClothingHandsBase id: ClothingHandsGlovesChemist - name: heavy chemical resistant gloves - description: Perfect for dealing with chemicals that wants your skin to melt away. + name: heavy nitrile gloves + description: A pair of thick gloves that provide some protection from caustic chemicals. components: - type: Sprite sprite: DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi @@ -60,4 +60,4 @@ coefficients: Caustic: 0.95 - type: TemperatureProtection - coefficient: 1 \ No newline at end of file + coefficient: 1 From 866a53f028747c75cc2df9ee2de23aa6d4e73e95 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Thu, 7 Mar 2024 22:33:18 -0500 Subject: [PATCH 17/17] Update misc.yml Signed-off-by: VMSolidus --- .../DeltaV/Entities/Clothing/OuterClothing/misc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml index dd452fb0fdd..fd7f70bd710 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingOuterStorageBase id: ClothingOuterApronChemist - name: chemical resistand apron + name: chemical resistant apron suffix: Chemistry description: Made out of thick rubber, the color of this apron still leaves you perplexed. components: @@ -14,4 +14,4 @@ coefficients: Caustic: 0.25 - type: TemperatureProtection - coefficient: 1 \ No newline at end of file + coefficient: 1