From 58410d12fd7ac15d227073d4ff6c0195f35c56f1 Mon Sep 17 00:00:00 2001 From: minthydra Date: Wed, 22 Jan 2025 16:54:51 +1000 Subject: [PATCH 1/6] general test to see if sec magboots are a good fit to the game --- .../Catalog/Fills/Lockers/heads.yml | 1 + .../Catalog/Fills/Lockers/suit_storage.yml | 1 + .../Entities/Clothing/Shoes/magboots.yml | 17 ++++++ .../magboots-sec.rsi/equipped-FEET-vox.png | Bin 0 -> 960 bytes .../Boots/magboots-sec.rsi/equipped-FEET.png | Bin 0 -> 801 bytes .../Shoes/Boots/magboots-sec.rsi/icon-on.png | Bin 0 -> 555 bytes .../Shoes/Boots/magboots-sec.rsi/icon.png | Bin 0 -> 549 bytes .../Boots/magboots-sec.rsi/inhand-left.png | Bin 0 -> 570 bytes .../Boots/magboots-sec.rsi/inhand-right.png | Bin 0 -> 549 bytes .../Shoes/Boots/magboots-sec.rsi/meta.json | 49 ++++++++++++++++++ .../magboots-sec.rsi/on-equipped-FEET-vox.png | Bin 0 -> 963 bytes .../magboots-sec.rsi/on-equipped-FEET.png | Bin 0 -> 795 bytes .../Boots/magboots-sec.rsi/on-inhand-left.png | Bin 0 -> 567 bytes .../magboots-sec.rsi/on-inhand-right.png | Bin 0 -> 549 bytes 14 files changed, 68 insertions(+) create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/equipped-FEET-vox.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/icon-on.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/on-equipped-FEET-vox.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/on-equipped-FEET.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/on-inhand-left.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/on-inhand-right.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 1cc97c2401fc..c36f85e85978 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -319,6 +319,7 @@ prob: 0.50 - id: ClothingBeltSecurityFilled - id: ClothingEyesGlassesSecurity + - id: ClothingShoesBootsMagSec - id: ClothingHeadsetAltSecurity - id: ClothingMaskNeckGaiter - id: ClothingOuterCoatHoSTrench diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 41a11561e80b..3526641ae4b2 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -139,6 +139,7 @@ - type: StorageFill contents: - id: OxygenTankFilled + - id: ClothingShoesBootsMagSec - id: ClothingOuterHardsuitSecurity - id: ClothingMaskBreath - type: AccessReader diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 6610ae87ccf6..2b78fac86f0b 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -118,3 +118,20 @@ - type: InstantAction itemIconStyle: BigItem event: !type:ToggleActionEvent + +- type: entity + parent: [ClothingShoesBase, ClothingShoesBootsMagBase] + id: ClothingShoesBootsMagSec + name: Security Magboots + description: A decades old prototype version of current engineering magboots, the most nt was willing to provide for a department other than thier primary breadwinner. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/magboots-sec.rsi + state: icon + - type: Clothing + sprite: Clothing/Shoes/Boots/magboots-sec.rsi + equipDelay: 7 + unequipDelay: 7 + - type: ClothingSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.70 diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..9bc2f74c9336a25717fd47ce3061c119d6fdedb2 GIT binary patch literal 960 zcmV;x13&zUP)Px&dPzh23547L@)eL0kP-;F0#X7YH-LNv zqy(e{Lau<6K*$Zi{|dAn>9Dm}RkH<}C=}>Tf4{Y}wbibTMrpbt>S)>bu-kWMl?$Im z6ySAa9N@)&)z?FncHY6Cv0}8ltz9{zRD2fEuBJ`um9thAL4+?K z?ozDbAPv0kwOV$i?fl3S+PL+E0#Dl0>Q0?QpIK*f1SlsyizI9gbrac7itl)G^Bjw# zM%`<$D(uO*9A}UF{8-Hjdc1O#5?}u>9^ufR-;|&HyCA=%FnlA)xrm8-L;w?CB}h)< zfFRX25lb9k;;RJ7NgNQQ+9qO&15A9CAUTNxf>hf?EOCH|uM#9DaX^r2n}{V2F!5D_ zc+%Hk)GZnkqGB#f znM`I5Z+AdDSs12Az5i3AVnU!pZSL2M=?8i-61Tt*&%1 z?j)L3T(9Tcy$fjE;9MSi*cvNPX_~`8 iY%O``yuAy{VgCbYlh06>6)2Pd0000Px%*-1n}RCr$Pnm=e1K@`T{1muh;#KK%+w1`@Sa3Xguikeu63JQ`!tu&qg3M*r$ zR%)kK7XIs^m0AQrK}FC+MOp6+yagh;1+N^0Q?o; z7T^|eoB+3g;{h=L3iKU3Ap=+w<37x%S|R`Pp~!99E1SyG(9!8>mP2>1H9T2K=^GhE z@z(SzxIcIf_V=HM>C#ttGdu)SQ>JRY z@7=y64jewMTjSY-%L)!YjRt^wVwEeOuzmn1j=oU>aKkg}H_2jGPMa8cdPlcF&(1@- zGMTYFT>S9XcwdtQg!Mm)i*LanAxDJJSI{QKzRM+3QUyd zMMt_xZrOE8i+9PgI#Yk~z0uw#0Fu-7{sO4>GRaRO|t3Z*Ab03~f3wKxGbR)x|N zCxDW+jar-l8>>R;i4#Cc+eWRr5Px$8Q2X4vlpI;bG9^S}cZtKs0F8=51 zBZjl*&NEQW0U2rl{zE9dJQ_18gA-7`=Q1W}Xw5 z14jo8fI{fXnZ1-HLYSo>L+v@384mvVi_wJeW#eP`#Pk&`2XdT%ga!jQClABpXO9?| ze!e0<1VEO9Eam&h4YmLTZZNVly!`$R>==+Z2*Bh(Y?vdY6-~ency^b9YzWHpV&XFJ zEERJ7IM{;MhBgf7;;>+WIS>>bAkdkxhru=V7kOy_R_K7T6D&9lKKuYX095E8i@X11 zf=3M~gg_41-nxxJKSGlHGyqHWpm>AVW_N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dba53a0930da7c59aaefcacce213b15c43d2e787 GIT binary patch literal 549 zcmV+=0^0qFP)Px$-$_J4R9HvtmcL5^VHn4sQ`0jgPKPwIz-XvwC@CT;nj#RwMVDwSXlRP&hG^~| zX$qo(Xo!XgE^Cl#=ogme73mS0T9+5k3(sLngL=_&&vbmBF)nAAiYYV)Ya;%4Ng0}}8b|*X}<6tU2*Pj5IqiIXY!3?mjI2%a$cLswx7WMF% zAlm&y3?O;az%j%#-|F#cM=E@I%nV)z$DvZESO^fe153KzgM?J7ZwBbn!Q(`64#))t zfR|3WK3z0vTZ0K9z%A_P)Px$@<~KNRCr$Pnz2j6P!Pti2u>memx>+gR>9&Doy5gX(xQVRsH>BLe}Ld1jxG-V z0YVqCL&2hhI=G1hbP&P4#X1ND9Te2a3&hR7yh}>Sy{}W6yzjlc-+h-Xmmh=SZ)A(1<(R$0m}(=tp(OM_dLb6c6>k!%UeF?)9N9$ zTF;@*jH(Y?*HFQP-7HwAfXMNbnm z)NZ%vvR>(UW>mdtys-i(me#y>P;jk+Qb5k%9;x~A^Y58a^`^<9(drGX*;Uj6;G<4Z8AzUKfq0rXlEs{?wS4Cj0R;82sKfdeE}lamV^ zz@a8d0|!W|CMOp-fJ04^1`d!^O-?Rw0Ee0+4ICh;nw(tV01h=t8aO~wH95J!0UT>OU?mbjobv;T1Q6%^K;i(zJwK2r0Nt1$NECo> z%nu|A0OvEO(*S^uko4zpfbPx$-bqA3RCr$PnxRWWQ543{5KN*I%VaB>L=Zt9f+!{}!=XVjm`w_TRWOKA5QG1L z2617a%%DY35E*J3ShQ?7gGqye`s6-%VYr2R!^au-TRIzDzVH0bciszk3Gw`s@VtK^ z04Bh50$c&l1HgwMSAZ+vIRUPK=K`l}Xzi~qW2f*=Shm1;EkOeQUHJ=4(>{dW5C zrurf1;$Q7FQEz7gK#|s}!vtuZ49XW1fFi9`hY8R+8I&(307Y7>4ilhtGALh60E)C$ z9VS5QWKh1C02FDhI!u7p$)J2O0VvX1b(jFHlR^1n0$fSA`u_*wzMT?abN}uN7FEzs+S@^+FPTFC0000Px&eMv+?RCr$PT1`k)Q5gMRL1v2>hrn@DV^j>{PsmVGfkAGZf;J(6MjOLL(MpIg zT0|0otEh$KCK@56O;EZqNT{$FB!7^hBCU-h#5lCb4C=+Xa9_{o-#75)ap8S;Biwtv z=iGD8H*ax1i$XrEkl&v~0C7Ob6_64LxdG%yP)a~bAmj>23547L@)eL0kP-;F0#X7Y zH-LNvqy(e{Lau<6K*$Zi{|dC6>9Dm}WqLACGnto^%Pm;3Se0FyJVoAhKSj{^Pd(Nrv$YCxID&20$>dyltcg=j!X8B zU3EA=P4`*nI=Y?G=xV;F#KG`e0Gx?eb`LMU7N;0|mIH8LPu&sw-M&K(i3gp1RC$uD z#aCos9_V&n=IGat)I0s2eJ;lVUi{aigEaYM!NG4hUqvTc+Lbek#b*(HT-%^tIct>> zL>TN&Q)^F(Cf*ENjmJ~=NbfMU_jM@nguSBfbYW(abv8$UQsT2n!sbvnp8cTs&LVyZ0#Z_5b1#T7P_}#pR#t^4koWLEKZ2eixiS$Z-2KQ-D)bhZHK13&{wNVH&QCjdnDbi%T)uhd zb_e58yiUdSdd}UufW{5Z<*|poQUBn0`vAVo%~IpyH-)F&fH`-5&n2_jKGgsI>Kf%V l&0(T)FL~#@y$f4m{{wV7lt*;uum9 z_cqEpBg9c;ufK4 z%UqEEj7vwiu1VZqJt6Vo>hSpc3%H(a!~@YGar0l6yk;M@ z$4f6~mhLSVdw1`~%InjDV}CixNbd5vHCu_{9wVFd_v0FD9}TNo-v=m1m`$3}eB(zS zN5bO}3(HPsi>uoNy=5rmtX5$!C}sMm9uX0*u==Yfly8f8B=>|2`^)I};5_gyRkQs;7 i`VH#^QuS-T%YWHDG2mQ^oeD6uGkCiCxvXPx$?@2^KRCr$PnlVcQK@f!}2v#D3g%MN4E``D7uo4kWnV?0$B5AD@`~jwnT^b8J z8zGI5B49eTuoF4ZB8`2-G(rjs1?6N9&d%)Z+=Z~SFV!WtZ+GUKH+Lx}Lymtkj^|GR z00%fu04?CS0q_t+3!nuYCx8}k+yHnBpaswZjuV(z3mhCZ1I4y`bw+#p$06qH&N&T- zZ?Voys*hXOSi!{IELx|6Z&n*rYt?BrUm$he=rrl+p-aB+YtKxoH;GppjLBxv+H7_? zSo3zmuYLcHHcPd?Z946i_ROSulbE%^m~5ujo)kBNLhwcRpFg3rGCNO?GvD;GzD1+a zkZybJv1caLo5q_efKs_0EG%Sc_xXk{^F@lTRZt4Z=|!KGw*UX{kyLM*yjq_s0MGM+ z!QeHFBbQsD=(;?&82;A#cpv)^Osbzc08RkY)}-oyX(z)u9{@PiBx&FPN!8@!0taxY zNz%XplB&tc1rFd)lca$IBvq4>3mm|qCP@PaNUA0$7dU`JO_BxF9A=`;YKBP9Jk93Z{Iy8Pe(9UPx$-bqA3RCr$PnjuI-Q51&H5KN*IgOjaj5j3Ia^*gFVYr2R!r_ejFWo)3{QvpRf8Kj=UxqyYWjwE+ z000T_oB&3^^8nx`h!MaDcuoK#;CTS>6u<~z1Ux6uaRfFtLu1*TMu$`^l@m;M-E6*h z#n`0&YbOV^y0+EPf7@d0=CD+ua&?;qvstq1N)*!lO^xC>Ru90%f7@bmxe+tBxSmkE zzC5OMZU09{d+GtW`2SbT&g6_4H{W#i^_u`F_V&|l&ksFM&C|>46W!I%RReJK-%`x< z?2;K9ouHM63)&yZQ@XYwERfymBMmR;eRtsaZvhYlfoU|}lFk&|65fyi3Cfx^ zkO0lyk?@8DNKn?Sfdpvoj)XTPK!UPn4J1HwcO<+a0bI)6{{28&H!A@y=kHv=Qu|l{ zT+ZL63gPNF18_Zm=NgmR=LCRr{w`GrSH}qe=lq>(OlqGK04Y Date: Wed, 22 Jan 2025 23:32:26 +1000 Subject: [PATCH 2/6] Update magboots.yml --- Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 2b78fac86f0b..4b3ba38777bc 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -120,7 +120,7 @@ event: !type:ToggleActionEvent - type: entity - parent: [ClothingShoesBase, ClothingShoesBootsMagBase] + parent: [ClothingShoesBootsMagBase, BaseSecurityContraband] id: ClothingShoesBootsMagSec name: Security Magboots description: A decades old prototype version of current engineering magboots, the most nt was willing to provide for a department other than thier primary breadwinner. From 3c78b6d88e25b91c79352b8d9adddb8567441d48 Mon Sep 17 00:00:00 2001 From: minthydra <92009228+minthydra@users.noreply.github.com> Date: Wed, 22 Jan 2025 23:33:26 +1000 Subject: [PATCH 3/6] Update magboots.yml --- Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 4b3ba38777bc..63fc92909fb0 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -122,7 +122,7 @@ - type: entity parent: [ClothingShoesBootsMagBase, BaseSecurityContraband] id: ClothingShoesBootsMagSec - name: Security Magboots + name: security magboots description: A decades old prototype version of current engineering magboots, the most nt was willing to provide for a department other than thier primary breadwinner. components: - type: Sprite From de28116b9b08f3e08bb8938bee8689db7294146e Mon Sep 17 00:00:00 2001 From: minthydra <92009228+minthydra@users.noreply.github.com> Date: Thu, 23 Jan 2025 21:22:57 +1000 Subject: [PATCH 4/6] Update magboots.yml Updated magboots stats based on community suggestions. --- .../Prototypes/Entities/Clothing/Shoes/magboots.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 63fc92909fb0..ccf7e8542d9a 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -123,15 +123,15 @@ parent: [ClothingShoesBootsMagBase, BaseSecurityContraband] id: ClothingShoesBootsMagSec name: security magboots - description: A decades old prototype version of current engineering magboots, the most nt was willing to provide for a department other than thier primary breadwinner. + description: A decades old prototype version of current engineering magboots, the most NT was willing to provide for a department other than thier primary breadwinner. components: - type: Sprite sprite: Clothing/Shoes/Boots/magboots-sec.rsi state: icon - type: Clothing sprite: Clothing/Shoes/Boots/magboots-sec.rsi - equipDelay: 7 - unequipDelay: 7 + equipDelay: 3 + unequipDelay: 3 - type: ClothingSpeedModifier - walkModifier: 0.75 - sprintModifier: 0.70 + walkModifier: 0.80 + sprintModifier: 0.75 From 35a55232175de5aa57b36b7e120e0b497c0fed76 Mon Sep 17 00:00:00 2001 From: minthydra <92009228+minthydra@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:17:04 +1000 Subject: [PATCH 5/6] Update Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index ccf7e8542d9a..cdf8de3b64c4 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -123,7 +123,7 @@ parent: [ClothingShoesBootsMagBase, BaseSecurityContraband] id: ClothingShoesBootsMagSec name: security magboots - description: A decades old prototype version of current engineering magboots, the most NT was willing to provide for a department other than thier primary breadwinner. + description: A decades old prototype version of current engineering magboots, the most NT was willing to provide for a department other than their primary breadwinner. components: - type: Sprite sprite: Clothing/Shoes/Boots/magboots-sec.rsi From 4249bec3ad1bd67f0c8c12c9b506aba15d7c5666 Mon Sep 17 00:00:00 2001 From: minthydra <92009228+minthydra@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:17:49 +1000 Subject: [PATCH 6/6] Update meta.json --- .../Textures/Clothing/Shoes/Boots/magboots-sec.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/meta.json index 6b1053d8ea22..b7191ebbf2d1 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-sec.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Ubaser. Vox states made by Flareguy, modified from magboots.rsi", + "copyright": "Drawn by Minthydra. Vox states made by Minthydra, modified from magboots.rsi", "size": { "x": 32, "y": 32