From 500ea25555e174f62cbeffcc1f313d94cd2f9296 Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Tue, 28 Nov 2023 03:55:31 +0200 Subject: [PATCH 1/9] Red_mask --- modular_ss220/clothing/code/mask.dm | 7 +++++++ 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 | 5 ++++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index 5ec1f736a7f7..676e8979a41d 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -53,6 +53,13 @@ /datum/outfit/job/chef mask = /obj/item/clothing/mask/fakemoustache/chef +/obj/item/clothing/mask/gas/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 = "шарф с системой дыхания" 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 Date: Thu, 30 Nov 2023 18:23:21 +0700 Subject: [PATCH 2/9] Update donor.dm --- modular_ss220/loadout/code/donor.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm index b03bcc63a307..284f9f926efa 100644 --- a/modular_ss220/loadout/code/donor.dm +++ b/modular_ss220/loadout/code/donor.dm @@ -237,6 +237,7 @@ display_name = "Шарф с системой дыхания" path = /obj/item/clothing/mask/breath/breathscarf cost = 2 + /datum/gear/donor/red_gas display_name = "ПРС-1" path = /obj/item/clothing/mask/gas/red_gas From 677eac65185778bfbfc8be61d4dd501d0827781e Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Thu, 30 Nov 2023 18:28:44 +0700 Subject: [PATCH 3/9] Update mask.dm --- modular_ss220/clothing/code/mask.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index 676e8979a41d..424d3392adaa 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -53,6 +53,7 @@ /datum/outfit/job/chef mask = /obj/item/clothing/mask/fakemoustache/chef + /obj/item/clothing/mask/gas/red_gas name = "ПРС-1" desc = "Модульный противогаз, предназначен в основном для совместного использования с имплантироваными кибер лёгкими." From 828e294e56031a1eaef53874c12cb1fe659c5944 Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Thu, 30 Nov 2023 18:34:34 +0700 Subject: [PATCH 4/9] Update mask.dm --- modular_ss220/clothing/code/mask.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index 424d3392adaa..7b9b06be7e2e 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -56,7 +56,7 @@ /obj/item/clothing/mask/gas/red_gas name = "ПРС-1" - desc = "Модульный противогаз, предназначен в основном для совместного использования с имплантироваными кибер лёгкими." + desc = "Модульный противогаз с защитой глаз от погодных условий." icon = 'modular_ss220/clothing/icons/object/masks.dmi' icon_state = "red_gas" icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' From 9dff1b32742bf7379379e30113e25ae89609ac12 Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Thu, 30 Nov 2023 18:54:55 +0700 Subject: [PATCH 5/9] outstup --- modular_ss220/loadout/code/donor.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm index 284f9f926efa..bedb354b91bf 100644 --- a/modular_ss220/loadout/code/donor.dm +++ b/modular_ss220/loadout/code/donor.dm @@ -57,6 +57,7 @@ path = /obj/item/clothing/suit/hooded/vi_arcane donator_tier = 3 cost = 2 + /datum/gear/donor/wallet display_name = "Бумажник" path = /obj/item/storage/wallet From d173b7bf09849408433e273efa16d5a9ea0fced9 Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:54:09 +0700 Subject: [PATCH 6/9] Update modular_ss220/clothing/code/mask.dm yep Co-authored-by: dj-34 --- modular_ss220/clothing/code/mask.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index 7b9b06be7e2e..393cbbbc20b2 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -56,7 +56,7 @@ /obj/item/clothing/mask/gas/red_gas name = "ПРС-1" - desc = "Модульный противогаз с защитой глаз от погодных условий." + desc = "Модульный противогаз с защитой глаз от внешней среды." icon = 'modular_ss220/clothing/icons/object/masks.dmi' icon_state = "red_gas" icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' From 1b720e56cf083eca1557653f6486a34a2507a449 Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Wed, 6 Dec 2023 02:11:56 +0700 Subject: [PATCH 7/9] Update mask.dm --- modular_ss220/clothing/code/mask.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index 393cbbbc20b2..05246d8c964d 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -54,7 +54,7 @@ /datum/outfit/job/chef mask = /obj/item/clothing/mask/fakemoustache/chef -/obj/item/clothing/mask/gas/red_gas +/obj/item/clothing/mask/breath/red_gas name = "ПРС-1" desc = "Модульный противогаз с защитой глаз от внешней среды." icon = 'modular_ss220/clothing/icons/object/masks.dmi' From 2fd9af58cb2529c716574d70d5850523d82fc2b6 Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Wed, 6 Dec 2023 02:12:15 +0700 Subject: [PATCH 8/9] Update donor.dm --- modular_ss220/loadout/code/donor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm index bedb354b91bf..23389d5ae956 100644 --- a/modular_ss220/loadout/code/donor.dm +++ b/modular_ss220/loadout/code/donor.dm @@ -241,5 +241,5 @@ /datum/gear/donor/red_gas display_name = "ПРС-1" - path = /obj/item/clothing/mask/gas/red_gas + path = /obj/item/clothing/mask/breath/red_gas donator_tier = 2 From 1aec9b01a6a107747f3ee5ad2f798da82c48c904 Mon Sep 17 00:00:00 2001 From: Yata <108077473+Yata9arasu@users.noreply.github.com> Date: Wed, 6 Dec 2023 02:20:10 +0700 Subject: [PATCH 9/9] Update modular_ss220/clothing/code/mask.dm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ввв Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com> --- modular_ss220/clothing/code/mask.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index 05246d8c964d..bb564a5bc64b 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -56,7 +56,7 @@ /obj/item/clothing/mask/breath/red_gas name = "ПРС-1" - desc = "Модульный противогаз с защитой глаз от внешней среды." + desc = "Стильная дыхательная маска в виде противогаза, не скрывает лицо." icon = 'modular_ss220/clothing/icons/object/masks.dmi' icon_state = "red_gas" icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi'