From dfbdf11da31ce54b44549dd310f180cdd2b878af Mon Sep 17 00:00:00 2001 From: Sivirus Date: Sun, 3 Dec 2023 16:45:07 +0300 Subject: [PATCH] NewModular_New_Wallet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Перенёс этот кал в модуль. Поправил ошибку с наименованием при помещении карты в кошелёк. Добавил в корневой файл кошельков три переменные, для упрощения добавления новых кошельков. --- .../objects/items/weapons/storage/wallets.dm | 7 +++--- modular_ss220/clothing/_clothing.dme | 1 + modular_ss220/clothing/code/wallets.dm | 22 ++++++++++++++++++ .../clothing/icons/object/wallets.dmi | Bin 0 -> 2725 bytes 4 files changed, 27 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..73762bdb22c4 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -32,6 +32,7 @@ slot_flags = SLOT_FLAG_ID var/obj/item/card/id/front_id = null + var/photo_overlay = "photo" //edit ss220 // allows for clicking of stuff on our person/on the ground to put in the wallet, so easy to stick your ID in your wallet use_to_pickup = TRUE @@ -69,7 +70,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") //edit ss220 // fuck yeah, ass photo in my wallet var/obj/item/photo/photo = locate(/obj/item/photo) in contents @@ -79,12 +80,12 @@ MA.pixel_x = 11 MA.pixel_y = 1 . += MA - . += mutable_appearance(icon, "photo_overlay") + . += mutable_appearance(icon, "[photo_overlay]_overlay") //edit ss220 /obj/item/storage/wallet/update_name(updates) . = ..() if(front_id) - name = "wallet displaying [front_id]" + name = "[name] displaying [front_id]" //edit ss220 else name = initial(name) diff --git a/modular_ss220/clothing/_clothing.dme b/modular_ss220/clothing/_clothing.dme index 433e10db4734..d86a1752d9d6 100644 --- a/modular_ss220/clothing/_clothing.dme +++ b/modular_ss220/clothing/_clothing.dme @@ -8,3 +8,4 @@ #include "code/under.dm" #include "code/cloaks.dm" #include "code/garment_bag.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..5e497a977594 --- /dev/null +++ b/modular_ss220/clothing/code/wallets.dm @@ -0,0 +1,22 @@ +/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..bf1ac0051e6ed9634efc843b10e195c9ada0a997 GIT binary patch literal 2725 zcmai0c{JN;7yiYrsI=DFyN&4*Qer7;DXD#LF{oD2R#5AVEr=zeG)0u6)}pF*Vl7Fk zZBRO)O32TA!u&%b{DbcSKvYpKw)s#WR1(hUX^g_Zocvx0 zcRFR7Jfep&t`IgmIau+Q7&)-`bZQwLyX?OPE2_GD!OAV@ouOg&d}xPY`!-r3%z#BI z+Ke=>^40Lo_Gv8upZC|&AxW2Ng#AFx;G!pS#K%OD#WI!Ld^3W|gU!il`O}`Vr`J;1!aPxSQD5BA`8)yVXv;@M`h;8MangQ(fYI zsMm!n4YQAWzSd!v9NZ>IP7-?(P5j7^F8$|H2_cM)vh{ixk6hF3`lA_~oc0f$jUdP! zL^fwwJ!wWQk({(|qRf*J-3*~mbkKGlG@hH|7MZ}`Wm&jZ`3cQW6I{zbZ{vnwfExDx ztB;D;Ef|02{0PxVe)C3mFd9pS2Nw95YRq{vcY{Fs8ShfoW{G%3V$9~*otSBU3DIzI z0~-ep%MT#QtJXGG@8#3QBJT{H7a3Md=_#=o-wGfN_X+~2QX@s|xBH=YwbjcS`wesE zT4FRo0OFw*+K<=VwVxE&-c>p1JF4WryaBp7hW~wPvysqYZ!vq2vw_>(mxF3u;sw}2 z=T?!QVFzK+gFXdM<2IQW6FhbIRzFhnzK)DafOJSQSpMB98$SaLkjg~%XAPoI>r^Ts z&+}BnL7sKV1UYgPIRyZ^Y@}AIeUX=TT)}y{{Y$5#UNDoOE8k;x`6S+a-_^RgzG&VT z)!VE3!fFVNFal8bkJz|vPEyhI`D#6$birF=qgLKMWs|8HGo!kz?wan4GNV)4NqLFK zA2002T8(IgfNr;nB_Q;YAw$nsJlT6}XSmEi&^Z z_eO>*b4ej8?H{#H< zTi`bysfL_q@pTu5d#&YMOo4Ds}mHykyB}YR64Rq6tvaTM^nw0v`2tnc%XN*)*(K#>uzhp?@E zEN=LG*yFUj(U;?Cuya4XzzcKWHB6bgA_DM!4oWE(0H?|s%l=z%A9OjE2|l#PEAnBd z++gc4`twh{)H4s9Tk@3sE?19PzN>SpQBnTL1K4ySEVr+nl>$^I4u&695?q==0Z!NQ z3mz$P{M|=*0s7jZ!D#14Yx&(3yw0-Kr@qElmR$=}d7;b;IHrF|ax3WC1$wB)guHDl zK?Mj3e=yDJD`Ro?zrg`ghmH(iE@#=bx5WF5bqpu_EYkbT(WB4+b)eV|Q*>ISLH8~F z0Tvtm-bhzXxRdZcn1j^1*Eg)SO>;*rlWmbO^hX@)60H>zoHLP76(jMmR4%uYG991|K(k)q%Vgp- zv>{B#8@rkcdNE0wB!5QoDvZ6GPzDW-I^Xv5ui19VON;QYt-sVfQnovth{nMsl zy}c%gMA2tx%d5F7}C1OKj*jey-qRCeRuFDIGrgqs^Cd#Ygueb@6< z9}jh5@szQvhhGJ@3pcK2O&E>sr~}4`7y(w!A>z)URYTTHBX3VJDz4Y$Y^JMFp(EhR zDoT&|_Vug;#SKu?LfjYy2Rv!|CAJ?95i6f@KjI))Cl`a`$CB>pMh=gaAeV;*80 z5a8*tDYlFSXEP)8WJNb<9!$XEdw`TYxa|=SS_6(F#D|d=?mZ7bARJyc(nzepn*xzkl)? zf~k7Pp?&G)Q_Qk1W%t!jJ$$4md6>>qGSeod+3}vn3TkblWuMgoc17eWmD92&RCkP1 z3CB&PcWmo?!-;p=Dk&+nbF#iEcWU z<$JL|J(D76ZTm&&3CL-FBa*Z2&{@g9o?)MkNPOI#34gHdtuJVSrHJcnzg7LMd2Ra^ zHbyq(Jy5f@J$D6xjIV5}gQzGBrK2+_k3*Yx@7;(BBj3ujdnnm=8&ED?5o2V9k~YGX z=SZ$df{ujJpfu^EwxJP?i_+&m>g9uwjAE2EBrqxUgR9{ XtbUW|($&oUcLJ7hJF|w%H