From 741556d0789bdc5f6481357d6745fbbd9ea86e4a Mon Sep 17 00:00:00 2001 From: Sivirus Date: Mon, 4 Dec 2023 01:14:20 +0300 Subject: [PATCH] New_Wallets_3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправил конфликт, поправил спрайт и перенёс переменную в модуль --- .../objects/items/weapons/storage/wallets.dm | 6 ++--- modular_ss220/clothing/_clothing.dme | 1 + modular_ss220/clothing/code/wallets.dm | 22 ++++++++++++++++++ .../clothing/icons/object/wallets.dmi | Bin 0 -> 2722 bytes 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 modular_ss220/clothing/code/wallets.dm create mode 100644 modular_ss220/clothing/icons/object/wallets.dmi diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index d38608a45eb8..60f70ccb3bc5 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -69,7 +69,7 @@ return . += mutable_appearance(front_id.icon, front_id.icon_state) . += front_id.overlays - . += mutable_appearance(icon, "wallet_overlay") + . += mutable_appearance(icon, "[icon_state]_overlay") // SS220 EDIT // fuck yeah, ass photo in my wallet var/obj/item/photo/photo = locate(/obj/item/photo) in contents @@ -79,12 +79,12 @@ MA.pixel_x = 11 MA.pixel_y = 1 . += MA - . += mutable_appearance(icon, "photo_overlay") + . += mutable_appearance(icon, "[photo_overlay]_overlay") // SS220 EDIT /obj/item/storage/wallet/update_name(updates) . = ..() if(front_id) - name = "wallet displaying [front_id]" + name = "[name] displaying [front_id]" // SS220 EDIT else name = initial(name) diff --git a/modular_ss220/clothing/_clothing.dme b/modular_ss220/clothing/_clothing.dme index e84178f0c88e..59210474bced 100644 --- a/modular_ss220/clothing/_clothing.dme +++ b/modular_ss220/clothing/_clothing.dme @@ -9,3 +9,4 @@ #include "code/cloaks.dm" #include "code/garment_bag.dm" #include "code/hev_suit.dm" +#include "code/wallets.dm" diff --git a/modular_ss220/clothing/code/wallets.dm b/modular_ss220/clothing/code/wallets.dm new file mode 100644 index 000000000000..eb5a10797499 --- /dev/null +++ b/modular_ss220/clothing/code/wallets.dm @@ -0,0 +1,22 @@ +/obj/item/storage/wallet + var/photo_overlay = "photo" +/obj/item/storage/wallet/wallet_NT + name = "leather wallet NT" + desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе." + icon = 'modular_ss220/clothing/icons/object/wallets.dmi' + icon_state = "wallet_NT" + photo_overlay = "photo_NT" + +/obj/item/storage/wallet/wallet_USSP_1 + name = "leather wallet USSP" + desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." + icon = 'modular_ss220/clothing/icons/object/wallets.dmi' + icon_state = "wallet_USSP_1" + photo_overlay = "photo_USSP" + +/obj/item/storage/wallet/wallet_USSP_2 + name = "leather wallet USSP" + desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." + icon = 'modular_ss220/clothing/icons/object/wallets.dmi' + icon_state = "wallet_USSP_2" + photo_overlay = "photo_USSP" diff --git a/modular_ss220/clothing/icons/object/wallets.dmi b/modular_ss220/clothing/icons/object/wallets.dmi new file mode 100644 index 0000000000000000000000000000000000000000..251d2b4733d1f7c5a10352eb3d857be12905eb9b GIT binary patch literal 2722 zcmai$XHe5w7l;2b(xpf*k$@ne(z~=o0cq0IMT$shE4_wl=nF;!7jTh)iJ?jpP`cDe zu>ew(B1mr$LyI90TG;HDcfY(dJ9F=qAG> z{@JX|47-Sl&}KMX^lf{jk!PrTh<6auJ1_tMBC*-&Z`iw(`HhKfHIenL-+ty9-;_2? z8rFFTFJd#2`c%~08S!zoaB?&G!KOD^9b0lu#oXS%&%hvaDY%KHaX%RnqPIi9QX@=C zJXAe0-Rp9B9HK6K^?O+<-U$}7NE!|Zq* zge9lo1^uSExv8}_yf+?yVMa?#oj(P(toOM6SSHU(LM89FOZ5p+j$#)wIK%oleB{j8 znQKdIM$ADK_2`crDQ#&wJ;9Kz_2u0U`-%qN-%d|*SsUU1^q83m-J?B-m?K7Ql4rKa zDuR!h_(OU!W)lK+M}aOIFsmV_#2Jlv<^KgYrv1eD{dEVD4_Am*chnYE1TpoF6ZUnc4-vTISM+{&HVx4xYjk?Zh)~nXh=S@ zg+pAEc)&G&F(apRNE2=FUE+n)1ovQ!$WRqYXkyGooP_{I-FIRG2v?BSexjQGvEEkH zW9yF4AL5P!QCV%~R8LM}i0J$IVdYsrVM2E09rEwp@L|o~5)Dbqvht}4FP7z?G!*#5 zM=fpopzy)r&7dQk%BSdsd7R;1;;%-{6Uv)4aD4eSN3ram{hC)BTk)wBjgA*(l2R7( z#{eM1#mMC4tMdnwb)3l!1LS&I;kgW{M#|jc5lkn+e%oIesK-!-Z4S?B1`b^fb?0VO zpH(Dah5YYVlxpqf z&I_LdYt#E&9PE@Un;|v0K#zdQyI#Lu|FbYbW?bSxUW+~eggyj|g(Dw*<^}GOHuKbC z3Ua=>4e~t~zh$h&5MDI4FQ>nn8D@+4Q9XJfU(O7pHwJ=lCZx*e03MSpSDyfv;| zC|Xut_YoGmLRk56B*-=@6zzKL(VkX8y8)Du`{FpBdT)480cMz}X+_;xNw4hIzsDxC zC0$!rXUhv-UX~XsEy8POWM(FeSVOXqPjg`V4ov|=xv{+mOtkzq4hIJZ*4(RWMtGkwg{wQGPNfCt$`vCtL$Z(<83k;=Mx#dks zCclO+@($vvf5#M_)+g>qX}+?ntQcTU0!=A$00dm%?d&;(G6S12LpRKRIwAXC%gw~Q zK0lyYH}!J?!!kc_6D_~Wx@{*2+^|i2fj*=#Jq{4DJ=O-$BgsNNeQ5@#cv?=gm-xLz zB3hU;#$B)u{Lkod1~6`b_O7q%^)GHzjH0%@XP+Xp{5)3P`6lmmlq|ug;e23Ul0~d- zPkVd2BxP@R*9|8l2o|w0td=b}*@XTgKZk`UgvBNwM!<5$wB$dfu!x$8l8)E`9&SN# zFNOgUS3&TnM}|Rz&pW6NdbG@M^#Jco!iHnqM6!*RVd6t(1>(KCB65x~W< zfmGTWTTJz>XiRO-4hn8vkCeGJ6!%Q=+8pk>UL7)%w$}RfW2xuQ7>#%+>@3*mzOo^L zjo%zsUa0HAwlg7J@%k4zIr>YY)n!>C!B8F4i!R;B_vh@zef=R-kMXpFo@5idGD>!v430?T{R;>ICd)8P(f)G~TPM6LBGz#x%=OhgU4{l)o zo$vn+do>b1OmA%fwL~GqegB&^3?yO7X45Rl*qi*$+j6mYdQOP@#XK6|n|h_%E9Cw8 zGB!P1HMl>DzS_B&`mEmc-OHj>pZVnRB+C1vGH3AUd!otnL`#z^CFFhc^k|6DXP|++ zKXRRM0p)7t3s-OajU9@wS#aO;yjQbGHkKU{D*Qd32M=XG$q1I9g+WIUFKI_MGJ2UB zaJV-rw%%3@4|72~Dt$bG37@X!1W9K7cA}Qb`$cVkqEdM{f8)m34tr