From fc69178bb27f26b049c47b8594b7ff30bfab9d35 Mon Sep 17 00:00:00 2001 From: Sivirus <142601348+Sivirus@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:46:05 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=B5=D0=BB=D0=B8=20(#71?= =?UTF-8?q?9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавил в игру 3 кошелька, НТ и СССП. ## Что этот PR делает Добавляет в игру 3 кошеля (2 кошеля) ## Почему это хорошо для игры Потому что не плохо. ## Изображения изменений ![image](https://github.com/ss220club/Paradise-SS220/assets/142601348/01363a8c-7919-4288-9ef9-459c4109a5e2) ## Тестирование Не знаю как тестить кошельки. Вопрос: Надо ли? ## Changelog :cl: add: Три кошелька, пока только через админ панельку можно получить, если пойму как, кину донатерам. imageadd: Целых 7 спрайтов /:cl: --------- Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com> --- .../objects/items/weapons/storage/wallets.dm | 4 +-- modular_ss220/clothing/_clothing.dme | 1 + modular_ss220/clothing/code/wallets.dm | 30 ++++++++++++++++++ .../clothing/icons/object/wallets.dmi | Bin 0 -> 2722 bytes modular_ss220/loadout/code/donor.dm | 10 ++++++ 5 files changed, 43 insertions(+), 2 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..8279b5151c23 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,7 +79,7 @@ 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) . = ..() 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..446912d266f0 --- /dev/null +++ b/modular_ss220/clothing/code/wallets.dm @@ -0,0 +1,30 @@ +/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" + storage_slots = 5 + +/datum/prize_item/wallet_USSP_1 + name = "Настоящий кошелёк СССП!" + desc = "Красота" + typepath = /obj/item/storage/wallet/wallet_USSP_1 + cost = 35 + +/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 Date: Wed, 6 Dec 2023 12:52:15 +0200 Subject: [PATCH 2/2] Bounty: New donor item "PRS-1" (#783) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Добавляет новый донорский предмет "ПРС-1" ## Почему это хорошо для игры Ещё одна вещь для тех , кто хочет выделиться ## Изображения изменений ![assist1](https://github.com/ss220club/Paradise-SS220/assets/108077473/7673f75e-5401-4741-af4b-50ea4443003f) ![assist2](https://github.com/ss220club/Paradise-SS220/assets/108077473/9fa5f095-4747-494d-8fe0-07f07601d362) ![assist3](https://github.com/ss220club/Paradise-SS220/assets/108077473/4e797ce0-f2eb-49af-855f-83f87979bce5) ## Тестирование Протестировано ## Changelog :cl: add: Добавлен донорский предмет "ПРС-1" /:cl: --------- Co-authored-by: dj-34 Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com> Co-authored-by: Volodymir Ohorodnytskyi <102746941+Legendaxe@users.noreply.github.com> --- modular_ss220/clothing/code/mask.dm | 8 ++++++++ modular_ss220/clothing/icons/mob/mask.dmi | Bin 985 -> 605 bytes modular_ss220/clothing/icons/object/masks.dmi | Bin 367 -> 555 bytes modular_ss220/loadout/code/donor.dm | 10 ++++++++++ 4 files changed, 18 insertions(+) diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index 5ec1f736a7f7..bb564a5bc64b 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -54,6 +54,14 @@ /datum/outfit/job/chef mask = /obj/item/clothing/mask/fakemoustache/chef +/obj/item/clothing/mask/breath/red_gas + name = "ПРС-1" + desc = "Стильная дыхательная маска в виде противогаза, не скрывает лицо." + icon = 'modular_ss220/clothing/icons/object/masks.dmi' + icon_state = "red_gas" + icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' + item_state = "red_gas" + /obj/item/clothing/mask/breath/breathscarf name = "шарф с системой дыхания" desc = "Стильный и инновационный шарф, который служит дыхательной маской в экстремальных ситуациях." diff --git a/modular_ss220/clothing/icons/mob/mask.dmi b/modular_ss220/clothing/icons/mob/mask.dmi index a9c07931e17c03b803f52b2994f8311f3c50b5d1..2362205420f416970b04fef7d6da0ffeda1dc519 100644 GIT binary patch delta 521 zcmV+k0`~pc2i*jJiBL{Q4GJ0x0000DNk~Le0001h0001B2m=5B0OF*IdjJ3cHc(7d zMZmzo4Gj+#78xKQBP1j!8yg-H5)}V%0N6JGDk>@w5fLaTC^IuNvl{?jUS4~9dqY4# z7#J9|lrKF10004WQchC+un=tY}69~G24M^ZC z&|V`nfe8JN3&595I`(G*KS0mFMMUq|9Rztm@vMNql6wih76~DQ5JCtc&B`&GO$wiq3C7Jno3=9=> zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5 zQiwvZ=1L9IjVg;REH`TSc6J-9ZeAg=WNNqZS`9;U(IaL@R+;VF!Z5ukl{MU6d_y$D zlXR`W0vYV<85o%5JY5_^D(1YMbJ6RLgGk%v)bEG(ZV>;rb%}zjhLhkc*ZXULjC~FK zOPbC|>$Mf6C#mIWs?>^(lKgXH8ySp48!wZE^>)k259cFdTyu zX>)(GA3y&7cXM;@=DT^bzgB(zbMJES^)0!#W8&&!eeDiS{L$W?KYzXXY{k0krDq>M zb}p{{Tl?*YrnVfX6z4X${2>33ffz$FBN;>_QwV>3;m4)+_W$q9 zpIiIN-{1aQRsOnzd)YRXJ4|U_Uixv;glpM)GdEVgGybo`sO22OyTof_`>H43T%CAL zJm2oJ_bq$pD)4khm9Kw8#01rk-Cf0t%^g-4Y){Lr`=ahLvj#}4tl?eu#$Q87!13xl z7ZW#~mG+9eEy9^Ctg6Cof9~&3)cnhN(^?_SQN~fk`=$Sl)%FcJQzE?Tn|?DV{PC4Q z#5}32E|wKqzNt60&d;lI*y+;wLZqm+-Qr zNuNpAC>uQGVL`njxgN@xNAC@Z7< diff --git a/modular_ss220/clothing/icons/object/masks.dmi b/modular_ss220/clothing/icons/object/masks.dmi index 72ab5940495c2837bdfa646164accdf34a3030ec..9c82cc1ce06651914956e59140828ab1332a202b 100644 GIT binary patch delta 451 zcmV;!0X+Wi0;>d&7k@wq0{{R3owtGP0000>P)t-sz`(#378wl<4;vdEBqS&j5){C| zz%w&5vl{^aZ~)jh04gdf5fKr>GXQ&gdl(oPe0+RVR8$TQ4pdQ5YinyLC@5ZDUPC}Y zJv}`Xfi#2w0004WQchCx z&9CI6UY&q?GN`&>e|UQct(-R$ zpO*njRS&71=WX5%KgeJ23McP$I-SCqC{I>@9531!eHlld0n?-nV6>jVs2f-+J3n7Z zVqp&Vmj%|l75j^2F^3dJ03iS|MsIC?7Y7ZbK)fM6$$=<}jqr1bNAvQG-eFn)O z9DQ!5WDe11h~2vQY>kqW&mb*59vH|M{O9@r-H{b(Y9B