From 613330afc3e1c0f67e52e00675e01257afdea26d Mon Sep 17 00:00:00 2001 From: Sivirus Date: Mon, 4 Dec 2023 01:02:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=B5=D0=BB=D0=B8=200.1?= 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/code/wallets.dm | 4 ++-- .../clothing/icons/object/wallets.dmi | Bin 2725 -> 2722 bytes 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 73762bdb22c4..60f70ccb3bc5 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -32,7 +32,6 @@ 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 @@ -70,7 +69,7 @@ return . += mutable_appearance(front_id.icon, front_id.icon_state) . += front_id.overlays - . += mutable_appearance(icon, "[icon_state]_overlay") //edit ss220 + . += 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 @@ -80,12 +79,12 @@ MA.pixel_x = 11 MA.pixel_y = 1 . += MA - . += mutable_appearance(icon, "[photo_overlay]_overlay") //edit ss220 + . += mutable_appearance(icon, "[photo_overlay]_overlay") // SS220 EDIT /obj/item/storage/wallet/update_name(updates) . = ..() if(front_id) - name = "[name] displaying [front_id]" //edit ss220 + name = "[name] displaying [front_id]" // SS220 EDIT else name = initial(name) diff --git a/modular_ss220/clothing/code/wallets.dm b/modular_ss220/clothing/code/wallets.dm index 5e497a977594..eb5a10797499 100644 --- a/modular_ss220/clothing/code/wallets.dm +++ b/modular_ss220/clothing/code/wallets.dm @@ -1,3 +1,5 @@ +/obj/item/storage/wallet + var/photo_overlay = "photo" /obj/item/storage/wallet/wallet_NT name = "leather wallet NT" desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе." @@ -5,7 +7,6 @@ icon_state = "wallet_NT" photo_overlay = "photo_NT" - /obj/item/storage/wallet/wallet_USSP_1 name = "leather wallet USSP" desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." @@ -13,7 +14,6 @@ icon_state = "wallet_USSP_1" photo_overlay = "photo_USSP" - /obj/item/storage/wallet/wallet_USSP_2 name = "leather wallet USSP" desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок." diff --git a/modular_ss220/clothing/icons/object/wallets.dmi b/modular_ss220/clothing/icons/object/wallets.dmi index bf1ac0051e6ed9634efc843b10e195c9ada0a997..251d2b4733d1f7c5a10352eb3d857be12905eb9b 100644 GIT binary patch delta 2472 zcmZuycQo4#7ydl2xg|nHLTTU71T&-Scb?>L;9~p* zh?1W>b0CvZqE^Z($hB~LK1UImX=LGmX>M+Etu4Rhi|?!$>FEnhV5@r1J1^w(tfjBy z-Mw5NALS%|F^xOCpUYR#oRhV-#CFsiR8f!l!u6~zMW-i3VrzY6@ACo7;OEDgDIOam z{9m54v!VO+r;+nSbkrtgc8hXF_yvpLlQV&N75uQbJCw_-5?$nfoGa*|>if`)GW)?h{W2x%H++4$*2*_bvI5J`z<+<(+HmY$J)=J4MHWcs2GEor zB-*lo+mu=TBvCeMasOhJm@gvXV>bx+`=D~RIb?;NPx90F@XKH66SenIZ}>d}n2?oi zg{m_cE*K<0JPmVGiQS(Ns&B#xTLq`QWXW|yErtVxrzVlhy|syTn{g6Kd-pKZq*wAG z9h$g) zAKl0icyEcOj8$3rbcHwDN^lAa{P~NPHe*QS@aR_XG49IO=*0z`;eNtSBm9*5fdq~# zzu_dF^?Lw*y|ERaOx5goT_z)Ip?m@W@;qmky!~|k#bSdtu`~!kdCAzJobhgUgd_4-_1GcA z&+~^h{Jw2H*nB&>9h;ZIczxcy6;vtF5cE;|H&-C__r$;I-4z)8j{NBr?J>a}WoP zO@XlC+}Pej7J5M&m!qSjT9g7MdIQsZd_4+sc|z6po$6C1rh@$h%p6zIp#E-zM&>rN z61tF;Po4*}UT7%C&Z}%nHrW}u#6N_q{sUXYtWP|Mg1@t`tQcfX1Wm)Z00J)PPS(7e z8UQTC3|pH0b`BeOuQ(g${_2o!(=@;XjL84KL$vy#;ISPqWNDZ18goQtc@ZdTccKko zMw1{t{V4`ad@anJCH`;2+*(-ECS3E;j)K_?v;l$_pnvM`dcVVqih*e>d-cPhb;q*Jv_<0R0A6t1O(i=FdOMltkOz( zr;TtTy5ejAqI~8rRqN!%l}Hugfv1JFVyS)l>M;Rs-mfK8*7WL8hY$63lY%lQ&=2=H zC3GTgXBiNcrT_vG+%$l$rhBYMOxfM0`K?c*|D{FPTIlX_Q(HKh#b1KOZ*4Koy~L82 zuKJwJLy!2_6-OVlTcsk-aJ$3^K}tPCeIR5DNl4H8pmj---8jmnx`O{ng_q2B6Ymx1 z?q7ETD7ghGgiK!PS}{J-Cormf#{@IQR&3YP)wqcz&8hmtpgS}wDnSqAEWUSDfvy0q zOtPPR8;aUsT8b{1*?oj4;Of*sE^Uo1rukJgCbwq=hqSIgk-t5R&W7EX$KBMc3rnYy zT7P^g_4*y783#q22OB+7Gj!t+G{=<}>3VYPPRdoe#=KMUtSfp(SW_4)5OSy6k7zDT zwV{e<+F-lr%1(_lxkSS{@_pF)$&W`X-gCoh28>V5Fklf=@|KEo;xc!RQR>ugR9&%V z-$rdWxZ|nB7S~s9&1XYk?irZ)YLIh;Og*5nH&l-hoN7rJ7tj;|4?t_;zgE{ z&e|<5?*^yl+0BA*r>g9Evw5A{###;$wXOVWgy`b-Kvm_ zztA7W%g=FUj5owX@|Ep%8C*bf$3p8dhA+vX%3fPy`B*UwkfW)zcwutQ6Rq)Y&F2Hf zvuC(z!}GDvpal=wXli&u)aXPQ`U%lkPD95^Yu&z%zCU98`TQp(?ZNOh$KT7E9 zHwjruz6@EPx;CpWQ`K4XoxL?cp3MJ6!U3 zDf%Oh4-e%$O$(8xheJovZg1(ww(@%Enn6r(enW}iLXY*)xq|kkC9`*` kpityA5Uu|5|H(l`3tq@-9?Ip~0|94YW^8R#eZwu`KQ;oiga7~l delta 2459 zcmV;M31s%76{QuB&40s5L_t(|ob8=`OdIDN$G^vmXI_?qrICbrokbKz7J{}!q+_9( zGnF#308Sdw27(gQu>egpr7KG{G^K1JQkJqxOInh#twp?Ki`wy~l18D8$yjMq(Mr%% zv{8^3NCGS~!7leW^huK_J*YLWlUFM{1JfyRRU zK_3Etd9f|z)_=F$`i!qD;li>8*0gB!NLQt02;&MQoX6Lo(rE==*H}JB!MM@!!9+9lv_@D*Afb1rrQ&4?Ijz|MX=5 zz#Av4v8Vi)Is%FZV$;z|VZ5N&hKt?NIPh9CTILtg**1cffgzXW z`+G{zGH?NAvkiZ0I)g3CsPA0({PVNyZ67FrUW8`s(P_4^!{P+_vYei2- zonv9U35K}`0LwMIs`7m4d+f&e2fUf2ov^KsA0O)KRL05AQI@?BsyierhE~`GkwE|7$5HyuT9xXtu zzR&9b9+LNh8VmNbqpP__YPDLiwB%S_Uw=z3N?sVoh1a)W=Yc^0p1q@RTnBj5=X*JP zq4TxBt2sy57P0yP4?&S|FUP&`0SL9-xz_W&6SLWdtgMZ|KzMG4xa;%1Fz12?I3xO6 zaD;SlkMphq2({sbeFfC&nJi2*`; z=nxA00}Imnp*;5vh2Hi$hAE6wvX&oZLZ{P7%B)hUARp8M08F`RN%>VO6#yXC{>+r5 zzE-gTYf@F1nUo&?XVLsPUIfNbKH*n7_os>Rb_;ZJ;mzt#MAyJKt3QDu>Y6Z3 zTL0Il-Ui%iv_JSmjWhCig~%4bEz5`R#{fX8<~iKy`kUwt@J2;bwxk+(u4^^$*S8S~ z`X_4l+D#CLd*K5Jtp$X-^8ivOe#QCbVIBGDx+*cK24 za5XR#bUGa>nzB98jnfk_PEWWL2Ef%;d7h)|M_RwWwp8e?1dC}wkH^!M+;9CFjNfR( z)R zqBHy(q#oyhCvtLsku-XZ?^l1JR;$%MbiVMl0ToTz=oWblu4u}}t+Rl&@1KYS{ln$k zaJu!1pbD<{u!27Ej;h-}6JMd~+^ zYBXPgA6Ui$MM8o{`g2D09OMQ2?@~8&m%ukhHSy$xm+&n zaA(_yFz#Fsyr%OwN&Um++rU7E7#N{YrXWQbk7Q*Ml9fqNC{tX90KA?rObdDsQ(RtN zjaY}YLnL&P{v}52UqZwNb{{aA8TlEd@jS!LObUGLe^W0nL07&X< z6&nz>lmdk^MUuXLa>nIusB`|l4(>lPib@-}1lEe4^T$!NuO3z=NyxtxHN&-lnu8^{ zWHe*lUXAFXJGq-TVr1mHsG-3ykD7yyo(XCFBUNf#=qG1Tw(Gm1hweDf`@!})w0B&_ z%;W-|-L(}nx6R!2ZL_f4kt#I+`wJSRABd3FC;C8!z9B;v`b?NG)BwUz0|-M6APhBt zFw_9TPy+}P@XtCPb$s9Wd^pe+ll%lGf2=p-k}T&$MHk$UJw*K9cq4_d8IWW-$BK{7 z2TM)h2%7;?zLv6nJutZ zfN?Av352Z$NR7`AH&WyCBZaVqr%R3T569OnoRJ#i&wm?-bXdxYe?Ne<0rX}Zk_8kN Z=Km2~r^JC)xv>BM002ovPDHLkV1k)y)rbH9