From 10cd9e73cad07745a358ffcdd63843f181a3feec Mon Sep 17 00:00:00 2001 From: FlutterSnedDraw <131897374+FlutterSnedDraw@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:11:02 +0300 Subject: [PATCH 1/8] breath scarf --- modular_ss220/clothing/code/mask.dm | 8 ++++++++ modular_ss220/clothing/icons/mob/mask.dmi | Bin 0 -> 985 bytes modular_ss220/loadout/code/donor.dm | 5 +++++ 3 files changed, 13 insertions(+) create mode 100644 modular_ss220/clothing/icons/mob/mask.dmi diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index d40bf0302d2c..9ad211b29059 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -53,3 +53,11 @@ /datum/outfit/job/chef mask = /obj/item/clothing/mask/fakemoustache/chef + +/obj/item/clothing/mask/breath/breathscarf + name = "Шарф с системой дыхания" + desc = "Стильный и инновационный шарф, который не только обогревает вас в холод, но и служит дыхательной маской в экстремальных ситуациях." + icon = 'modular_ss220/clothing/icons/mob/mask.dmi' + icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' + icon_state = "breathscarf" + item_state = "breathscarf" diff --git a/modular_ss220/clothing/icons/mob/mask.dmi b/modular_ss220/clothing/icons/mob/mask.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a9c07931e17c03b803f52b2994f8311f3c50b5d1 GIT binary patch literal 985 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoWmO>&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< literal 0 HcmV?d00001 diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm index 60abcf1cd4f1..32a8a0d08942 100644 --- a/modular_ss220/loadout/code/donor.dm +++ b/modular_ss220/loadout/code/donor.dm @@ -102,3 +102,8 @@ display_name = "Медицинский анализатор" path = /obj/item/healthanalyzer cost = 2 + +/datum/gear/donor/breathscarf + display_name = "Дыхательный шарф" + path = /obj/item/clothing/mask/breath/breathscarf + cost = 2 From 49ecf134f4c07b296735bf1a4f98cbd67801c17f Mon Sep 17 00:00:00 2001 From: FlutterSnedDraw <131897374+FlutterSnedDraw@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:33:33 +0300 Subject: [PATCH 2/8] breath scarf --- modular_ss220/loadout/code/donor.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm index 32a8a0d08942..60abcf1cd4f1 100644 --- a/modular_ss220/loadout/code/donor.dm +++ b/modular_ss220/loadout/code/donor.dm @@ -102,8 +102,3 @@ display_name = "Медицинский анализатор" path = /obj/item/healthanalyzer cost = 2 - -/datum/gear/donor/breathscarf - display_name = "Дыхательный шарф" - path = /obj/item/clothing/mask/breath/breathscarf - cost = 2 From 24645027934bc25673d1d1ae96f94a75bbdb7d3d Mon Sep 17 00:00:00 2001 From: FlutterSnedDraw <131897374+FlutterSnedDraw@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:40:33 +0300 Subject: [PATCH 3/8] 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 32a8a0d08942..c8e56285903f 100644 --- a/modular_ss220/loadout/code/donor.dm +++ b/modular_ss220/loadout/code/donor.dm @@ -104,6 +104,6 @@ cost = 2 /datum/gear/donor/breathscarf - display_name = "Дыхательный шарф" + display_name = "Шарф с системой дыхания" path = /obj/item/clothing/mask/breath/breathscarf cost = 2 From 93bdf55a72cffd54d6a26a5a5c3b0df9263be910 Mon Sep 17 00:00:00 2001 From: FlutterSnedDraw <131897374+FlutterSnedDraw@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:53:58 +0300 Subject: [PATCH 4/8] 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 9ad211b29059..96703a213391 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -55,7 +55,7 @@ mask = /obj/item/clothing/mask/fakemoustache/chef /obj/item/clothing/mask/breath/breathscarf - name = "Шарф с системой дыхания" + name = "шарф с системой дыхания" desc = "Стильный и инновационный шарф, который не только обогревает вас в холод, но и служит дыхательной маской в экстремальных ситуациях." icon = 'modular_ss220/clothing/icons/mob/mask.dmi' icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' From 4c77d9a09a229c420bc6c8bde873d94a0f4264d2 Mon Sep 17 00:00:00 2001 From: FlutterSnedDraw <131897374+FlutterSnedDraw@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:56:34 +0300 Subject: [PATCH 5/8] 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 96703a213391..5bd6bdd52691 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -56,7 +56,7 @@ /obj/item/clothing/mask/breath/breathscarf name = "шарф с системой дыхания" - desc = "Стильный и инновационный шарф, который не только обогревает вас в холод, но и служит дыхательной маской в экстремальных ситуациях." + desc = "Стильный и инновационный шарф, который служит дыхательной маской в экстремальных ситуациях." icon = 'modular_ss220/clothing/icons/mob/mask.dmi' icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' icon_state = "breathscarf" From daaa9b9eb44db979ce014759616408f122e0e1a3 Mon Sep 17 00:00:00 2001 From: FlutterSnedDraw <131897374+FlutterSnedDraw@users.noreply.github.com> Date: Fri, 17 Nov 2023 14:16:07 +0300 Subject: [PATCH 6/8] 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 5bd6bdd52691..ba7697f7ab66 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -57,7 +57,7 @@ /obj/item/clothing/mask/breath/breathscarf name = "шарф с системой дыхания" desc = "Стильный и инновационный шарф, который служит дыхательной маской в экстремальных ситуациях." - icon = 'modular_ss220/clothing/icons/mob/mask.dmi' + icon = 'modular_ss220/clothing/icons/object/masks.dmi' icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' icon_state = "breathscarf" item_state = "breathscarf" From ca22a6333c741736101b25f7176ca5caeedb5ea1 Mon Sep 17 00:00:00 2001 From: FlutterSnedDraw <131897374+FlutterSnedDraw@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:06:19 +0300 Subject: [PATCH 7/8] Add files via upload --- modular_ss220/clothing/icons/object/masks.dmi | Bin 0 -> 367 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modular_ss220/clothing/icons/object/masks.dmi diff --git a/modular_ss220/clothing/icons/object/masks.dmi b/modular_ss220/clothing/icons/object/masks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..72ab5940495c2837bdfa646164accdf34a3030ec GIT binary patch literal 367 zcmV-#0g(QQP)fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3K9+sVFtEB%?Svu_#T6i!&v&s2C_}$ic9G;Ln?_lOG6g3xt!v%T_pfLgrel>UT+6t8Hl-&7ZbF?qW;1e4-2N z7$QS(Q`T*UL6=`Z8M7IC{ N002ovPDHLkV1mrql3M@( literal 0 HcmV?d00001 From 2731cd3af8cac08c64f2ac38fd317783a6c5aaae Mon Sep 17 00:00:00 2001 From: FlutterSnedDraw <131897374+FlutterSnedDraw@users.noreply.github.com> Date: Tue, 21 Nov 2023 20:13:57 +0300 Subject: [PATCH 8/8] Update modular_ss220/loadout/code/donor.dm Co-authored-by: dj-34 --- 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 4e94d4604495..c8e56285903f 100644 --- a/modular_ss220/loadout/code/donor.dm +++ b/modular_ss220/loadout/code/donor.dm @@ -102,6 +102,7 @@ display_name = "Медицинский анализатор" path = /obj/item/healthanalyzer cost = 2 + /datum/gear/donor/breathscarf display_name = "Шарф с системой дыхания" path = /obj/item/clothing/mask/breath/breathscarf