From 575da88d6e58c3149b006df8c256cd0bfc6a5df9 Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Wed, 24 Jul 2024 18:15:15 +0300 Subject: [PATCH 01/10] =?UTF-8?q?New=20Robo=20clothing=20and=20wardrobe=20?= =?UTF-8?q?sprites=20##=20=D0=A7=D1=82=D0=BE=20=D1=8D=D1=82=D0=BE=D1=82=20?= =?UTF-8?q?PR=20=D0=B4=D0=B5=D0=BB=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавляет новые шмотки для робототеха, новые шмотки в вендомат робо, а также заменяет стандартный костюм робототеха на новый вариант. Автор спрайтов - fridhelm1 ## Почему это хорошо для игры Новые шмотки стильнее старых ## Изображение изменений ![image](https://github.com/user-attachments/assets/811bee48-7d6d-4873-814f-853202af9c59) ![image](https://github.com/user-attachments/assets/29d616ee-64f8-4b53-9493-969e1f985f7d) ![image](https://github.com/user-attachments/assets/c9e028e7-7651-4e44-b489-f54b3c1ea4d0) ## Тестирование Провел все тесты на локалке, все работает. ## Changelog :cl: add: Добавлены новые шмотки для роботеха tweek: Заменена форма рауднстарт на новую /:cl: --- modular_bandastation/clothing/head/hat.dm | 8 ++++ .../clothing/head/soft_caps.dm | 10 +++++ modular_bandastation/clothing/suits/cloaks.dm | 18 +++++++++ modular_bandastation/clothing/suits/jacket.dm | 7 ++++ .../clothing/suits/wintercoats.dm | 12 ++++++ .../clothing/under/jobs/rnd.dm | 36 ++++++++++++++++++ .../icons/mob/clothing/head/cowboy.dmi | Bin 0 -> 704 bytes .../icons/mob/clothing/head/hats.dmi | Bin 0 -> 812 bytes .../icons/mob/clothing/head/rnd.dmi | Bin 0 -> 839 bytes .../icons/mob/clothing/suits/jacket.dmi | Bin 0 -> 1566 bytes .../icons/mob/clothing/suits/rnd.dmi | Bin 0 -> 2518 bytes .../icons/mob/clothing/suits/wintercoat.dmi | Bin 0 -> 1412 bytes .../icons/mob/clothing/under/rnd.dmi | Bin 0 -> 5373 bytes .../icons/obj/clothing/head/cowboy.dmi | Bin 0 -> 440 bytes .../icons/obj/clothing/head/hats.dmi | Bin 0 -> 468 bytes .../icons/obj/clothing/head/rnd.dmi | Bin 0 -> 411 bytes .../icons/obj/clothing/suits/jacket.dmi | Bin 0 -> 731 bytes .../icons/obj/clothing/suits/rnd.dmi | Bin 0 -> 987 bytes .../icons/obj/clothing/suits/wintercoat.dmi | Bin 0 -> 651 bytes .../icons/obj/clothing/under/rnd.dmi | Bin 0 -> 1582 bytes .../icons/obj/machines/vending.dmi | Bin 0 -> 1707 bytes .../job_outfits/roboticist.dm | 3 ++ modular_bandastation/modular_bandastation.dme | 8 ++++ modular_bandastation/vending/vending.dm | 21 ++++++++++ 24 files changed, 123 insertions(+) create mode 100644 modular_bandastation/clothing/head/hat.dm create mode 100644 modular_bandastation/clothing/head/soft_caps.dm create mode 100644 modular_bandastation/clothing/suits/cloaks.dm create mode 100644 modular_bandastation/clothing/suits/jacket.dm create mode 100644 modular_bandastation/clothing/suits/wintercoats.dm create mode 100644 modular_bandastation/clothing/under/jobs/rnd.dm create mode 100644 modular_bandastation/icons/mob/clothing/head/cowboy.dmi create mode 100644 modular_bandastation/icons/mob/clothing/head/hats.dmi create mode 100644 modular_bandastation/icons/mob/clothing/head/rnd.dmi create mode 100644 modular_bandastation/icons/mob/clothing/suits/jacket.dmi create mode 100644 modular_bandastation/icons/mob/clothing/suits/rnd.dmi create mode 100644 modular_bandastation/icons/mob/clothing/suits/wintercoat.dmi create mode 100644 modular_bandastation/icons/mob/clothing/under/rnd.dmi create mode 100644 modular_bandastation/icons/obj/clothing/head/cowboy.dmi create mode 100644 modular_bandastation/icons/obj/clothing/head/hats.dmi create mode 100644 modular_bandastation/icons/obj/clothing/head/rnd.dmi create mode 100644 modular_bandastation/icons/obj/clothing/suits/jacket.dmi create mode 100644 modular_bandastation/icons/obj/clothing/suits/rnd.dmi create mode 100644 modular_bandastation/icons/obj/clothing/suits/wintercoat.dmi create mode 100644 modular_bandastation/icons/obj/clothing/under/rnd.dmi create mode 100644 modular_bandastation/icons/obj/machines/vending.dmi create mode 100644 modular_bandastation/job_outfits/roboticist.dm create mode 100644 modular_bandastation/vending/vending.dm diff --git a/modular_bandastation/clothing/head/hat.dm b/modular_bandastation/clothing/head/hat.dm new file mode 100644 index 0000000000000..e0af578679cb5 --- /dev/null +++ b/modular_bandastation/clothing/head/hat.dm @@ -0,0 +1,8 @@ +// Roboticist's cowboy hat +/obj/item/clothing/head/cowboy/roboticist_reborn + name = "roboticist's cowboy hat" + desc = "Ковбойская шляпа с малиновой лентой, сочетающая стиль и функциональность. Отличный выбор для тех, кто хочет выделиться на космической станции. На бирке указано: 'Flameholdeir Industries'. Вам точно не хватает револьвера!" + icon = 'modular_bandastation/icons/obj/clothing/head/cowboy.dmi' + worn_icon = 'modular_bandastation/icons/mob/clothing/head/cowboy.dmi' + icon_state = "cowboy_robostics_reborn" + worn_icon_state = "cowboy_robostics_reborn" diff --git a/modular_bandastation/clothing/head/soft_caps.dm b/modular_bandastation/clothing/head/soft_caps.dm new file mode 100644 index 0000000000000..3b758b46c29bf --- /dev/null +++ b/modular_bandastation/clothing/head/soft_caps.dm @@ -0,0 +1,10 @@ +// Roboticist's cap +/obj/item/clothing/head/soft/roboticist_cap_reborn + icon = 'modular_bandastation/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_bandastation/icons/mob/clothing/head/hats.dmi' + name = "roboticist's cap" + desc = "Элегантная кепка в черных тонах с малиновым козырьком. Идеально дополняет рабочую форму, добавляя стиль. На бирке указано: 'Flameholdeir Industries'. С этой кепкой вы точно никогда не опоздаете." + icon_state = "robocapreborn" + soft_type = "robocapreborn" + soft_suffix = null + dog_fashion = null diff --git a/modular_bandastation/clothing/suits/cloaks.dm b/modular_bandastation/clothing/suits/cloaks.dm new file mode 100644 index 0000000000000..531cb5ed27ba6 --- /dev/null +++ b/modular_bandastation/clothing/suits/cloaks.dm @@ -0,0 +1,18 @@ +// Roboticist's cloak +/obj/item/clothing/suit/hooded/roboticist_cloak_reborn + name = "roboticist's coat" + desc = "Стильный плащ с принтом головы борга на спине. Идеален для тех, кто хочет выделиться и показать свою любовь к робототехнике. На бирке указано: 'Flameholdeir Industries'. Бережно обращайтесь с боргами, пока они не сделали из вас лампочку!" + icon_state = "robotics_coat_reborn" + icon = 'modular_bandastation/icons/obj/clothing/suits/rnd.dmi' + worn_icon = 'modular_bandastation/icons/mob/clothing/suits/rnd.dmi' + inhand_icon_state = null + body_parts_covered = CHEST|GROIN|LEGS|ARMS + hoodtype = /obj/item/clothing/head/hooded/roboticist_cloak_reborn + +/obj/item/clothing/head/hooded/roboticist_cloak_reborn + name = "roboticist's hood" + icon = 'modular_bandastation/icons/obj/clothing/head/rnd.dmi' + worn_icon = 'modular_bandastation/icons/mob/clothing/head/rnd.dmi' + icon_state = "robotics_hood_reborn" + body_parts_covered = HEAD + flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS diff --git a/modular_bandastation/clothing/suits/jacket.dm b/modular_bandastation/clothing/suits/jacket.dm new file mode 100644 index 0000000000000..0e5a2a3a8c50d --- /dev/null +++ b/modular_bandastation/clothing/suits/jacket.dm @@ -0,0 +1,7 @@ +// Roboticist's jacket +/obj/item/clothing/suit/toggle/jacket/roboticist_reborn + name = "roboticist's jacket" + desc = "Универсальная куртка из прочного материала, идеально подходит для работы с механическими деталями. Красные полосы на плечах добавляют стильный акцент. Теперь вы не только защищены, но и модны. На бирке указано: 'Flameholdeir Industries'. Будьте стильным, как Адский Бродяга!" + icon_state = "robotics_jacket_reborn" + icon = 'modular_bandastation/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_bandastation/icons/mob/clothing/suits/jacket.dmi' diff --git a/modular_bandastation/clothing/suits/wintercoats.dm b/modular_bandastation/clothing/suits/wintercoats.dm new file mode 100644 index 0000000000000..e9ae30e6499fc --- /dev/null +++ b/modular_bandastation/clothing/suits/wintercoats.dm @@ -0,0 +1,12 @@ +// Roboticist's winter coat +/obj/item/clothing/suit/hooded/wintercoat/science/roboticist_reborn + name = "roboticist's winter coat" + desc = "Пальто, исключительно для разбирающихся в моде. Для крутых и подкрученных перцев. На бирке указано: 'Flameholdeir Industries'. Поможет даже во время самых длинных, холодных и тёмных времен." + icon_state = "coatrobotics_reborn" + icon = 'modular_bandastation/icons/obj/clothing/suits/wintercoat.dmi' + worn_icon = 'modular_bandastation/icons/mob/clothing/suits/wintercoat.dmi' + hoodtype = null + inhand_icon_state = null + +/obj/item/clothing/suit/hooded/wintercoat/science/roboticist_reborn/click_alt(mob/user) + return NONE // Restrict user to zip and unzip coat diff --git a/modular_bandastation/clothing/under/jobs/rnd.dm b/modular_bandastation/clothing/under/jobs/rnd.dm new file mode 100644 index 0000000000000..07b8c96efce86 --- /dev/null +++ b/modular_bandastation/clothing/under/jobs/rnd.dm @@ -0,0 +1,36 @@ +// Roboticist's clothing +/obj/item/clothing/under/rank/rnd/roboticist_reborn + name = "standart roboticist jumpsuit" + desc = "Стандартный комбинезон робототехника нового образца. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - будьте как Сенатор!" + icon_state = "robotics_reborn" + icon = 'modular_bandastation/icons/obj/clothing/under/rnd.dmi' + worn_icon = 'modular_bandastation/icons/mob/clothing/under/rnd.dmi' + +/obj/item/clothing/under/rank/rnd/roboticist_reborn/red + name = "red roboticist's jumpsuit" + desc = "Прочный рабочий комбинезон из высококачественных материалов, обеспечивающий защиту и комфорт. Красный свитер из кашемира, мягкий на ощупь. Да, мы тоже думаем, что золотые заклёпки - это огонь. На бирке указано: 'Flameholdeir Industries'. Теперь вы готовы починить всех боргов, как парень с монтировкой, который спасает мир!" + icon_state = "robotics_reborn_red" + can_adjust = FALSE + +/obj/item/clothing/under/rank/rnd/roboticist_reborn/hoodie + name = "roboticist's hoodie" + desc = "Худи и джоггеры, идущие как единый комбинезон, пояс сделанный из крашенной кожи и золотой пряжки. Выполнены из мягкого и прочного материала, обеспечивая комфорт и свободу движений. Теперь даже борги будут завидовать вашему стилю. На бирке указано: 'Flameholdeir Industries'. В этом костюме вы можете прыгать по крышам, как паркурист-доставщик!" + icon_state = "robotics_reborn_hoodie" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + +/obj/item/clothing/under/rank/rnd/roboticist_reborn/skirt + name = "standart roboticist's jumpskirt" + desc = "Стандартный комбинезон робототехника нового образца с юбкой. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - а кстати, а где моя катана?" + icon_state = "robotics_reborn_skirt" + body_parts_covered = CHEST|GROIN|ARMS + dying_key = DYE_REGISTRY_JUMPSKIRT + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/under/rank/rnd/roboticist_reborn/skirt/red + name = "red roboticist's jumpskirt" + desc = "Прочный рабочий комбинезон из высококачественных материалов, обеспечивающий защиту и комфорт. Красный свитер из кашемира, мягкий на ощупь. Да, мы тоже думаем, что золотые заклёпки - это огонь. На бирке указано: 'Flameholdeir Industries'. Вы сможете заменять протезы рук ВЕЧНОСТЬ и со стилем!" + icon_state = "robotics_reborn_skirt_red" + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + can_adjust = FALSE diff --git a/modular_bandastation/icons/mob/clothing/head/cowboy.dmi b/modular_bandastation/icons/mob/clothing/head/cowboy.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b93f876f2bd1fd1971e8f18c858da4316096328a GIT binary patch literal 704 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=HB})IB`&GO$wiq3C7Jno3=9=> zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5 zQiwvZrsaMc&HYCEH0(9^?@%$`X|YekRCB+Ee`mL`>gE*^DLmroQGrQ$S{=D3macj5 z>N(Rk4u(^Wiu+B)CZ1tnVEpgt;uumf=k2WX-b{`XZRyGznyXG7uJTlT@ocG|+lBx4 zc1BNEiD(Wuxa*1Br!8OoYK-(8t>^pc-}v6p^SZxwer4=egUO+xPfd8*#IJ6tIFk}G zH--Jvzev;hw&_M$=ZlwA3ai~cUu-TF8+zC8xO_INNy4SW2QNJT?pOUUqI%siRs|Qe zu9MSKU*3BA?OOJSKYB*KpQG1K-uu)&mhn?&`1kU6HJ=`=Q|GpSwpsnZ#XSGcC(8O~ zv8uGfZ2s=Azmi{XOnqx%x=DbmD|6${ z{#xdZF0qUeQ;s|lY?&)*bn0)&Y~@#cUt=U6PRnU-VR@`J-Tv73tEcX7$eX{5rO;v8 zlQz9a;*T$^XfTM_m*4c}lt-*n?We?T4BI2x-S#tX%znReU6aV}i#hcS(G9(#2gDMR pSvRoWh+xcNGz%k2=>NV3|5A^$0{nX~eFi2;22WQ%mvv4FO#mw{Jl6mK literal 0 HcmV?d00001 diff --git a/modular_bandastation/icons/mob/clothing/head/hats.dmi b/modular_bandastation/icons/mob/clothing/head/hats.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c01fcf169347ad56631fc4c22bc89faf981f189d GIT binary patch literal 812 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGowN)VzB`&GO$wiq3C7Jno3=9=> zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5 zQiwwEN)3BWd&`XrG)y)3Yxs9|8>?A6|^gU^$VRDw!l+84XG#|58 z@cXwx<5GpmuDTa!SK|7C|F6;B`}LtmTYpyC#lL>L;`+1TfSj#6 zKF#NyzvTV&{lSx2OQToIJ~(;qc>h8J<^wzo#tdf|NM&p~%bxRDuC~ff;dzbAV_5<7 zXUFz_Fi&TGB&e?9=QF!GqiG)h30wJ#73?zor%Hl&9v%B(_Byu*EV!|(;n%b;<%gHQ ze0;QW_0ggq;?J0i&be=y#s6a0oX>)5|8bPZp8LsR-*$)$w{19ge}?Hyp9^2_GH&>v zWVc}3+5d?XPM zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5 zQiwwEN)3C>{VK*gE$o!-?N#?_m}>6V@bBz4R^7ZpB85#nJt{CMPpc#M#L_hnUOi{p z#>(KIppZP_b^m1s2BuC=7srr_Id5nAXA1|49KHXeox_j0iPzZi7K`fL9hZAO?DOp# zyXzPV!^LAor?_17@whvK??yn%8_DY9nNeH5mp+p<_|AU#k8<%j>wF`hqWln%*68$i z8+bQ-f2E7 z6#};|?0=s8vu=+GB(HS z`Nx|575V#iv+o2I&&(aytAk``pWi>__061R*TUHuR9FO!+UP;%}B&*YcLwD}>BAFQdb&&kvIA3L^`bT@7dE%~<>DciRFk zhO5^%+0-fW+37#a+b_Snxy1T}F@w~FCbccE;~w}%D}JkDli7Di^SaTGs-1hz3Ou=W zp()Ll<>L}p(FP9x4pD=u$5QeGir2uE4%EuwCa!(TfF|w`y%f@S-fLe)83p|DbA65pLa&-&0}vC zXS4qJrhaFay+hNEUe0C9Og#t%03w_se>2oE2HsNL_26pD17OZz@O1TaS?83{1OQTm BeOmwk literal 0 HcmV?d00001 diff --git a/modular_bandastation/icons/mob/clothing/suits/jacket.dmi b/modular_bandastation/icons/mob/clothing/suits/jacket.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5cb48d41636033b88268c3db0da672e43fef44d2 GIT binary patch literal 1566 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 literal 0 HcmV?d00001 diff --git a/modular_bandastation/icons/mob/clothing/suits/wintercoat.dmi b/modular_bandastation/icons/mob/clothing/suits/wintercoat.dmi new file mode 100644 index 0000000000000000000000000000000000000000..01bed09ff1326c7e847e1d332e8a157468ebc3d3 GIT binary patch literal 1412 zcmV-~1$+95P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLFr}q$ocrza%rcIKC(~DZeOBiHkEOv#1zk1Q%yoQDSZ?h;7KF ztl;YB0=5JIDdQjkVpjUI000EXNkl-4FG|5fQR$^xv5HB+`hzwRTSV4;(|%#PB)j`&cQdWs z55i`CWZw7QyqTTMdpXbZ)PBYR*92T6Gk|LXu8|qQH38Si4B(o8YlsYRXLva9&=A%h z7gvW4296)r-V2cpfWhxqZ}wFZ^=P*t5mo;6!Z|JH;aJUkeCCEXck#A+5T}9sMMTWB?2f%VKaSIa92uQhCyAHa_L>oEg8Q9t;iZcFt7N zSZ}q|=H`Ze_5$RheW=4DpU+1gHy8AG7;XfmC>(>|ZROOd;&Ju7@k-5YY~-;1r^{FL z`p0@?KmKmzet2H*^sVA;PG(}Jmd+=G{B z5AZ8LGBVnAH@ab(;6`gIZSMB{PKiMf8Gy>adHcG%)8dJ;*`6lgWmMWUgsu09mO!IX zw`xlRrowTSp2z@v_xsAPLGDNE3`mg9EtG7}9Y>27rK4?yx$WpVFZ)gveY29KZ#fz)fldu?H|V|E!$X zk>dIK(!jldvk%$e04~fEkV0etM22zwjrczIbPY5;+NCCb0P+T`g@u24p1_gb^} zjYMz13ga3fk%Q16-9KrWRvzF&;a*6Bhd4am@1QXV_fLaImLK4nfNSh~1N;MdySf-2 Sk$-Oh0000=2_LZXM!q9jC#8c~Mmy$>N~^wA=^ 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 literal 0 HcmV?d00001 diff --git a/modular_bandastation/icons/obj/clothing/head/cowboy.dmi b/modular_bandastation/icons/obj/clothing/head/cowboy.dmi new file mode 100644 index 0000000000000000000000000000000000000000..8aede8dbda0c0f80ca5fccb01177dcd0d7c0de60 GIT binary patch literal 440 zcmV;p0Z0CcP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLKD9DZetlC_gE`xFj>VIKC(~DZeOBiHkEOv#1!T!jOwIttc@! z6~b0laP@NmTLb{gIU&48q@)P|008(&L_t(|ob8rT3xY5Z$G0d9QlApimy{lS?)!h0 zf_kx_w_K3)u)5)y7_pm0QQX1U9NYbW{_jAg)>?cs247WY00v+H2IvcrX1Rue&v7!> zFg^kR!bu#9FbEpqXc~zu%|suFq3Z<<-}lXUHLMQ6TXij0NRyV_C7~cT;jt_o)6(xq z$`1+D((}e2f^@*0ZuGYCT=Yuzd8eBAf@JQ#pkLF2+qMqIz7REuwmyNv?<~*8o zWKxJi@JbDPO?%6Y3p7kM_iOlfb{ng1ULm28cjD;GuqiWUb0sE+%g&!RIWl0vtS0a2 zo0?Y7=e`lhaHw4G1b1ij9tH+RAx{^_kcv5PXBhG|8Hlv4HC)JSFjFGpfW?bSADhm? zj|_6h?|Sc;ozddTKDUK&*(@>d2#rN5{}240G+ij@#r64@1ZD^%T}W@sU^Ee7h+^Pn zZ4h&CW?aB}A%FoWw3k2O%9VqknZK^hiM(?|f7iSScfWW+zvsvDf7qN4sosCoP5&|1 zgvrx|r$4pwi`@5o>Q=8At5lymg}t7+#if7o@wK}`WVddwYbd>-{o%B0=B#PQ+3$zF z)#lt~nDyX==;JxE(Wn2E+D9?^%6>`v^kYkDPUXiGv&XGFmQ1v|mmaAuz4%^qTA4+} vZsF3r?>)PBn671Tt8b~|LvV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sVF}wza%rcI6fmkKPA2>H7UO+Pl<~&C9|j)C~e5anO2mTn+jno zE4cc(fNcQ)PZ%Iz*}jZD0002qNkl>DmI&Psw|nKeZZ+>zz@PgycqLY@Q3B`GkUqlfl>wdV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sVF}wza%rcI6f;eIXkr^z9=;*zbH?Mi!&v&s2Hfgkc%^|C^0t` z!X}_Cz66&>Wd&D17q9~XhMF_BBZ$T40006ONklJ?Oo(uAo4?qM&qMvgYx^*4CE`u9N9`Q z6LZRRjKMhkh-1Y@1(6>In=~vN3&QUy0Fq5>BjhHflVjZ`sZ`oA4&(464)IZm;KYxE zJqTDf7KGo|JK%ACky`83>KRiiy-+_2Lj3r{y`R*+AoAJ^qeRE-{ov)Rb=f|XZ%kx8odh0&i@3dp^@DzYgfP|GEag}P7 zu17DzAi$)M*NGobUgW33^>|l_klr{Z3`1%>EW~989!wSoz|KW}x8=%1`a6IT`yCGh zr*7gWYqg#@JLmajx=^YE?7I6Tz5HR(4}R$m_zU2lcG%AI{Uykd$z4 literal 0 HcmV?d00001 diff --git a/modular_bandastation/icons/obj/clothing/suits/rnd.dmi b/modular_bandastation/icons/obj/clothing/suits/rnd.dmi new file mode 100644 index 0000000000000000000000000000000000000000..27c3e09d5a0332b00a3c59877ede2af709f8e6dd GIT binary patch literal 987 zcmV<110?*3P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sVF}wza%rcI6gT)u_V4IH7UO+Pl<~&C9|j)C~e5anO2mTn+jp$ z)f8WXOPjKStDg(laR8jwG9Wp}Am{)90~kp}K~#90?ODri(?Arxrl7PaO`y<_mTw*a~nqG1B1{WSm$EfJNuD zJ;W`D2(c4@FaB7vAS{Rou@b<(_#>%|uplDr4r8LjzeN z+k7a)?+39Gz|f}x)jL5`NrWz6x#szfJ)D1_sZ2mN5h@f*owXlL%4G7aoJ=M~ooSlv z*=Q`&=vbPnOK+s-AQc0y-?-Ijx7TPyV!uG7L}HZg-@B_Mgd4DUJh6Bzauaz`&wZ$G zt*)~6vLZ+ckgF}SD7!Fm$W?@m-&UmlS|_9POJ-PUaDFnZ!q&Uq6@tXBn0ot~JyrNU zf79C+FNmY(>d!Gs)|Y8t{UaT37{XA7ANBl5LO+#7{tdn7{!Mc)^JCH60Qmjn1xi5> zXD&yrvo6f3J`7-d9DjKKdkua+{89oyRU9=SnK*r()=BF#_)(8`Xg^5U`GHg_-DiLw zepdky{Jxb=igTBf?YDaMntdW@kACRyXTcl@W={OgXOH^KiJu2gH%MoKoETsMsRzbZ zU3&HswOUQtVWklkzjO=$Ilp~ji_Pk1gz>-wY3mKLCco@3{kz zS#f|gWlhNLbMhlK?QP>1Ve`AjfWnt002ov JPDHLkV1h%%&6ofH literal 0 HcmV?d00001 diff --git a/modular_bandastation/icons/obj/clothing/suits/wintercoat.dmi b/modular_bandastation/icons/obj/clothing/suits/wintercoat.dmi new file mode 100644 index 0000000000000000000000000000000000000000..228cb92c2d508af858117a9be88f82c329117cec GIT binary patch literal 651 zcmV;60(AX}P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLFr}q$ocrza%rcIKC(~DZeOBiHkEOv#1y-Yskf!R+N~V3SlcN zxca$(Edc;2n;-s>U%E8_00GZQL_t(|ob6UkPr^VHd=-&OC>WF&h>4hJAe_9CaP#2Z z#G8N1e?YwW3p{wka8(Z`gaeq^HXa0_2_L7mv)ZOqh27d}Oqiru-puR1+3ogGg)v5d ziIqRCzBI5jurwfR;6znfIUf76ae#*&nSp8|#?DH|REfoTG5-Y~I`Tp{fJtlG0qItM zZXR^x$(UFbNiqxj)G*pqvwvfi_0|<#t4UWsnv6K#)LYcB+B{zr3wNNnS7PN-`Q3y) z`FFbj-YJfJ+!u-g2Zel|Pky1_P&2zdqag+l9eFZXXka>>&~P{)!!#+aX}rjJ?vRp6 zjq4Z@gNKehF z17Skg01hBlidQX_O3i49!9z!0BnF~_v;n@_bY_M_?BA70416l?+3cVuqzpL4@9uAD zG_veAMtnr<)ny>miX9k+9!Q%9;a2QD-F)=`n2*Nm{5b(K?O1pR{F7!jvaX@QYfq~G l2QuKtPl|f+|N21Kcmuh~xC@l**GT{X002ovPDHLkV1k7PC6)jH literal 0 HcmV?d00001 diff --git a/modular_bandastation/icons/obj/clothing/under/rnd.dmi b/modular_bandastation/icons/obj/clothing/under/rnd.dmi new file mode 100644 index 0000000000000000000000000000000000000000..124519ebe532d783310921a553dac24bd1bfae83 GIT binary patch literal 1582 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 BD|`R| literal 0 HcmV?d00001 diff --git a/modular_bandastation/job_outfits/roboticist.dm b/modular_bandastation/job_outfits/roboticist.dm new file mode 100644 index 0000000000000..3ccd77800f33e --- /dev/null +++ b/modular_bandastation/job_outfits/roboticist.dm @@ -0,0 +1,3 @@ +// Roboticist's outfit +/datum/outfit/job/roboticist + uniform = /obj/item/clothing/under/rank/rnd/roboticist_reborn diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme index 4740a7129065e..6d4032f6d9aa2 100644 --- a/modular_bandastation/modular_bandastation.dme +++ b/modular_bandastation/modular_bandastation.dme @@ -29,3 +29,11 @@ #include "drinks/_drinks.dme" #include "jukebox/_jukebox.dme" #include "objects/_objects.dme" +#include "clothing/head/hat.dm" +#include "clothing/head/soft_caps.dm" +#include "job_outfits/roboticist.dm" +#include "clothing/suits/cloaks.dm" +#include "clothing/suits/jacket.dm" +#include "clothing/suits/wintercoats.dm" +#include "clothing/under/jobs/rnd.dm" +#include "vending/vending.dm" diff --git a/modular_bandastation/vending/vending.dm b/modular_bandastation/vending/vending.dm new file mode 100644 index 0000000000000..8e39df495ba17 --- /dev/null +++ b/modular_bandastation/vending/vending.dm @@ -0,0 +1,21 @@ +// New sprite for robodrobe and new item list +/obj/machinery/vending/wardrobe/robo_wardrobe/Initialize(mapload) + icon = 'modular_bandastation/icons/obj/machines/vending.dmi' + icon_state = "robodrobe" + + var/list/new_products = list( + /obj/item/clothing/head/beret = 2, + /obj/item/clothing/head/cowboy/roboticist_reborn = 2, + /obj/item/clothing/head/soft/roboticist_cap_reborn = 2, + /obj/item/clothing/suit/hooded/roboticist_cloak_reborn = 2, + /obj/item/clothing/suit/toggle/jacket/roboticist_reborn = 2, + /obj/item/clothing/suit/hooded/wintercoat/science/roboticist_reborn = 2, + /obj/item/clothing/under/rank/rnd/roboticist_reborn = 2, + /obj/item/clothing/under/rank/rnd/roboticist_reborn/red = 2, + /obj/item/clothing/under/rank/rnd/roboticist_reborn/hoodie = 2, + /obj/item/clothing/under/rank/rnd/roboticist_reborn/skirt = 2, + /obj/item/clothing/under/rank/rnd/roboticist_reborn/skirt/red = 2, + ) + new_products |= products + products = new_products + . = ..() From 1963fa90d4eae5c7dbe8c856b079f4b95e559970 Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Wed, 24 Jul 2024 18:32:26 +0300 Subject: [PATCH 02/10] fix tests 1 --- modular_bandastation/vending/vending.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_bandastation/vending/vending.dm b/modular_bandastation/vending/vending.dm index 8e39df495ba17..9d6499dba80ba 100644 --- a/modular_bandastation/vending/vending.dm +++ b/modular_bandastation/vending/vending.dm @@ -2,6 +2,7 @@ /obj/machinery/vending/wardrobe/robo_wardrobe/Initialize(mapload) icon = 'modular_bandastation/icons/obj/machines/vending.dmi' icon_state = "robodrobe" + light_mask = null var/list/new_products = list( /obj/item/clothing/head/beret = 2, From 1aeddb629bfa6bb6fbcff8902e27e565a856c453 Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Wed, 24 Jul 2024 19:28:11 +0300 Subject: [PATCH 03/10] unnecessary space remove --- modular_bandastation/job_outfits/roboticist.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/job_outfits/roboticist.dm b/modular_bandastation/job_outfits/roboticist.dm index 3ccd77800f33e..9502330442322 100644 --- a/modular_bandastation/job_outfits/roboticist.dm +++ b/modular_bandastation/job_outfits/roboticist.dm @@ -1,3 +1,3 @@ // Roboticist's outfit /datum/outfit/job/roboticist - uniform = /obj/item/clothing/under/rank/rnd/roboticist_reborn + uniform = /obj/item/clothing/under/rank/rnd/roboticist_reborn From 6fdfcdf04d4b19d67463f8f0c8a1d92bd1d899f7 Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Fri, 26 Jul 2024 04:02:54 +0300 Subject: [PATCH 04/10] Requested changes --- modular_bandastation/modular_bandastation.dme | 8 -------- modular_bandastation/objects/_objects.dme | 9 +++++++++ .../{ => objects/code}/clothing/head/hat.dm | 5 ++--- .../{ => objects/code}/clothing/head/soft_caps.dm | 5 ++--- .../{ => objects/code}/clothing/suits/cloaks.dm | 10 +++++----- .../{ => objects/code}/clothing/suits/jacket.dm | 5 ++--- .../code}/clothing/suits/wintercoats.dm | 5 ++--- .../{ => objects/code}/clothing/under/jobs/rnd.dm | 5 ++--- .../{ => objects/code}/job_outfits/roboticist.dm | 1 - .../{ => objects/code}/vending/vending.dm | 6 +++--- .../icons/mob/clothing/head/cowboy.dmi | Bin .../{ => objects}/icons/mob/clothing/head/hats.dmi | Bin .../{ => objects}/icons/mob/clothing/head/rnd.dmi | Bin .../icons/mob/clothing/suits/jacket.dmi | Bin .../{ => objects}/icons/mob/clothing/suits/rnd.dmi | Bin .../icons/mob/clothing/suits/wintercoat.dmi | Bin .../{ => objects}/icons/mob/clothing/under/rnd.dmi | Bin .../icons/obj/clothing/head/cowboy.dmi | Bin .../{ => objects}/icons/obj/clothing/head/hats.dmi | Bin .../{ => objects}/icons/obj/clothing/head/rnd.dmi | Bin .../icons/obj/clothing/suits/jacket.dmi | Bin .../{ => objects}/icons/obj/clothing/suits/rnd.dmi | Bin .../icons/obj/clothing/suits/wintercoat.dmi | Bin .../{ => objects}/icons/obj/clothing/under/rnd.dmi | Bin .../{ => objects}/icons/obj/machines/vending.dmi | Bin 25 files changed, 27 insertions(+), 32 deletions(-) rename modular_bandastation/{ => objects/code}/clothing/head/hat.dm (77%) rename modular_bandastation/{ => objects/code}/clothing/head/soft_caps.dm (77%) rename modular_bandastation/{ => objects/code}/clothing/suits/cloaks.dm (74%) rename modular_bandastation/{ => objects/code}/clothing/suits/jacket.dm (79%) rename modular_bandastation/{ => objects/code}/clothing/suits/wintercoats.dm (78%) rename modular_bandastation/{ => objects/code}/clothing/under/jobs/rnd.dm (95%) rename modular_bandastation/{ => objects/code}/job_outfits/roboticist.dm (80%) rename modular_bandastation/{ => objects/code}/vending/vending.dm (84%) rename modular_bandastation/{ => objects}/icons/mob/clothing/head/cowboy.dmi (100%) rename modular_bandastation/{ => objects}/icons/mob/clothing/head/hats.dmi (100%) rename modular_bandastation/{ => objects}/icons/mob/clothing/head/rnd.dmi (100%) rename modular_bandastation/{ => objects}/icons/mob/clothing/suits/jacket.dmi (100%) rename modular_bandastation/{ => objects}/icons/mob/clothing/suits/rnd.dmi (100%) rename modular_bandastation/{ => objects}/icons/mob/clothing/suits/wintercoat.dmi (100%) rename modular_bandastation/{ => objects}/icons/mob/clothing/under/rnd.dmi (100%) rename modular_bandastation/{ => objects}/icons/obj/clothing/head/cowboy.dmi (100%) rename modular_bandastation/{ => objects}/icons/obj/clothing/head/hats.dmi (100%) rename modular_bandastation/{ => objects}/icons/obj/clothing/head/rnd.dmi (100%) rename modular_bandastation/{ => objects}/icons/obj/clothing/suits/jacket.dmi (100%) rename modular_bandastation/{ => objects}/icons/obj/clothing/suits/rnd.dmi (100%) rename modular_bandastation/{ => objects}/icons/obj/clothing/suits/wintercoat.dmi (100%) rename modular_bandastation/{ => objects}/icons/obj/clothing/under/rnd.dmi (100%) rename modular_bandastation/{ => objects}/icons/obj/machines/vending.dmi (100%) diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme index 6d4032f6d9aa2..4740a7129065e 100644 --- a/modular_bandastation/modular_bandastation.dme +++ b/modular_bandastation/modular_bandastation.dme @@ -29,11 +29,3 @@ #include "drinks/_drinks.dme" #include "jukebox/_jukebox.dme" #include "objects/_objects.dme" -#include "clothing/head/hat.dm" -#include "clothing/head/soft_caps.dm" -#include "job_outfits/roboticist.dm" -#include "clothing/suits/cloaks.dm" -#include "clothing/suits/jacket.dm" -#include "clothing/suits/wintercoats.dm" -#include "clothing/under/jobs/rnd.dm" -#include "vending/vending.dm" diff --git a/modular_bandastation/objects/_objects.dme b/modular_bandastation/objects/_objects.dme index 3c50b0a43eb25..e13451369760f 100644 --- a/modular_bandastation/objects/_objects.dme +++ b/modular_bandastation/objects/_objects.dme @@ -2,3 +2,12 @@ #include "code/material_pouch.dm" #include "code/structures/posters.dm" + +#include "code/clothing/head/hat.dm" +#include "code/clothing/head/soft_caps.dm" +#include "code/job_outfits/roboticist.dm" +#include "code/clothing/suits/cloaks.dm" +#include "code/clothing/suits/jacket.dm" +#include "code/clothing/suits/wintercoats.dm" +#include "code/clothing/under/jobs/rnd.dm" +#include "code/vending/vending.dm" diff --git a/modular_bandastation/clothing/head/hat.dm b/modular_bandastation/objects/code/clothing/head/hat.dm similarity index 77% rename from modular_bandastation/clothing/head/hat.dm rename to modular_bandastation/objects/code/clothing/head/hat.dm index e0af578679cb5..f4cd354bda289 100644 --- a/modular_bandastation/clothing/head/hat.dm +++ b/modular_bandastation/objects/code/clothing/head/hat.dm @@ -1,8 +1,7 @@ -// Roboticist's cowboy hat /obj/item/clothing/head/cowboy/roboticist_reborn name = "roboticist's cowboy hat" desc = "Ковбойская шляпа с малиновой лентой, сочетающая стиль и функциональность. Отличный выбор для тех, кто хочет выделиться на космической станции. На бирке указано: 'Flameholdeir Industries'. Вам точно не хватает револьвера!" - icon = 'modular_bandastation/icons/obj/clothing/head/cowboy.dmi' - worn_icon = 'modular_bandastation/icons/mob/clothing/head/cowboy.dmi' + icon = 'modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi' icon_state = "cowboy_robostics_reborn" worn_icon_state = "cowboy_robostics_reborn" diff --git a/modular_bandastation/clothing/head/soft_caps.dm b/modular_bandastation/objects/code/clothing/head/soft_caps.dm similarity index 77% rename from modular_bandastation/clothing/head/soft_caps.dm rename to modular_bandastation/objects/code/clothing/head/soft_caps.dm index 3b758b46c29bf..b0405ab5e32da 100644 --- a/modular_bandastation/clothing/head/soft_caps.dm +++ b/modular_bandastation/objects/code/clothing/head/soft_caps.dm @@ -1,7 +1,6 @@ -// Roboticist's cap /obj/item/clothing/head/soft/roboticist_cap_reborn - icon = 'modular_bandastation/icons/obj/clothing/head/hats.dmi' - worn_icon = 'modular_bandastation/icons/mob/clothing/head/hats.dmi' + icon = 'modular_bandastation/objects/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hats.dmi' name = "roboticist's cap" desc = "Элегантная кепка в черных тонах с малиновым козырьком. Идеально дополняет рабочую форму, добавляя стиль. На бирке указано: 'Flameholdeir Industries'. С этой кепкой вы точно никогда не опоздаете." icon_state = "robocapreborn" diff --git a/modular_bandastation/clothing/suits/cloaks.dm b/modular_bandastation/objects/code/clothing/suits/cloaks.dm similarity index 74% rename from modular_bandastation/clothing/suits/cloaks.dm rename to modular_bandastation/objects/code/clothing/suits/cloaks.dm index 531cb5ed27ba6..26fe3db5e2150 100644 --- a/modular_bandastation/clothing/suits/cloaks.dm +++ b/modular_bandastation/objects/code/clothing/suits/cloaks.dm @@ -1,18 +1,18 @@ -// Roboticist's cloak /obj/item/clothing/suit/hooded/roboticist_cloak_reborn name = "roboticist's coat" desc = "Стильный плащ с принтом головы борга на спине. Идеален для тех, кто хочет выделиться и показать свою любовь к робототехнике. На бирке указано: 'Flameholdeir Industries'. Бережно обращайтесь с боргами, пока они не сделали из вас лампочку!" icon_state = "robotics_coat_reborn" - icon = 'modular_bandastation/icons/obj/clothing/suits/rnd.dmi' - worn_icon = 'modular_bandastation/icons/mob/clothing/suits/rnd.dmi' + icon = 'modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi' inhand_icon_state = null body_parts_covered = CHEST|GROIN|LEGS|ARMS hoodtype = /obj/item/clothing/head/hooded/roboticist_cloak_reborn /obj/item/clothing/head/hooded/roboticist_cloak_reborn name = "roboticist's hood" - icon = 'modular_bandastation/icons/obj/clothing/head/rnd.dmi' - worn_icon = 'modular_bandastation/icons/mob/clothing/head/rnd.dmi' + icon = 'modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi' icon_state = "robotics_hood_reborn" body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS + diff --git a/modular_bandastation/clothing/suits/jacket.dm b/modular_bandastation/objects/code/clothing/suits/jacket.dm similarity index 79% rename from modular_bandastation/clothing/suits/jacket.dm rename to modular_bandastation/objects/code/clothing/suits/jacket.dm index 0e5a2a3a8c50d..27d0757ac888a 100644 --- a/modular_bandastation/clothing/suits/jacket.dm +++ b/modular_bandastation/objects/code/clothing/suits/jacket.dm @@ -1,7 +1,6 @@ -// Roboticist's jacket /obj/item/clothing/suit/toggle/jacket/roboticist_reborn name = "roboticist's jacket" desc = "Универсальная куртка из прочного материала, идеально подходит для работы с механическими деталями. Красные полосы на плечах добавляют стильный акцент. Теперь вы не только защищены, но и модны. На бирке указано: 'Flameholdeir Industries'. Будьте стильным, как Адский Бродяга!" icon_state = "robotics_jacket_reborn" - icon = 'modular_bandastation/icons/obj/clothing/suits/jacket.dmi' - worn_icon = 'modular_bandastation/icons/mob/clothing/suits/jacket.dmi' + icon = 'modular_bandastation/objects/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi' diff --git a/modular_bandastation/clothing/suits/wintercoats.dm b/modular_bandastation/objects/code/clothing/suits/wintercoats.dm similarity index 78% rename from modular_bandastation/clothing/suits/wintercoats.dm rename to modular_bandastation/objects/code/clothing/suits/wintercoats.dm index e9ae30e6499fc..c3d3d01e0fb8d 100644 --- a/modular_bandastation/clothing/suits/wintercoats.dm +++ b/modular_bandastation/objects/code/clothing/suits/wintercoats.dm @@ -1,10 +1,9 @@ -// Roboticist's winter coat /obj/item/clothing/suit/hooded/wintercoat/science/roboticist_reborn name = "roboticist's winter coat" desc = "Пальто, исключительно для разбирающихся в моде. Для крутых и подкрученных перцев. На бирке указано: 'Flameholdeir Industries'. Поможет даже во время самых длинных, холодных и тёмных времен." icon_state = "coatrobotics_reborn" - icon = 'modular_bandastation/icons/obj/clothing/suits/wintercoat.dmi' - worn_icon = 'modular_bandastation/icons/mob/clothing/suits/wintercoat.dmi' + icon = 'modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi' hoodtype = null inhand_icon_state = null diff --git a/modular_bandastation/clothing/under/jobs/rnd.dm b/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm similarity index 95% rename from modular_bandastation/clothing/under/jobs/rnd.dm rename to modular_bandastation/objects/code/clothing/under/jobs/rnd.dm index 07b8c96efce86..5b2aa18d16de4 100644 --- a/modular_bandastation/clothing/under/jobs/rnd.dm +++ b/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm @@ -1,10 +1,9 @@ -// Roboticist's clothing /obj/item/clothing/under/rank/rnd/roboticist_reborn name = "standart roboticist jumpsuit" desc = "Стандартный комбинезон робототехника нового образца. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - будьте как Сенатор!" icon_state = "robotics_reborn" - icon = 'modular_bandastation/icons/obj/clothing/under/rnd.dmi' - worn_icon = 'modular_bandastation/icons/mob/clothing/under/rnd.dmi' + icon = 'modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi' + worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi' /obj/item/clothing/under/rank/rnd/roboticist_reborn/red name = "red roboticist's jumpsuit" diff --git a/modular_bandastation/job_outfits/roboticist.dm b/modular_bandastation/objects/code/job_outfits/roboticist.dm similarity index 80% rename from modular_bandastation/job_outfits/roboticist.dm rename to modular_bandastation/objects/code/job_outfits/roboticist.dm index 9502330442322..1a7e8eb42c67a 100644 --- a/modular_bandastation/job_outfits/roboticist.dm +++ b/modular_bandastation/objects/code/job_outfits/roboticist.dm @@ -1,3 +1,2 @@ -// Roboticist's outfit /datum/outfit/job/roboticist uniform = /obj/item/clothing/under/rank/rnd/roboticist_reborn diff --git a/modular_bandastation/vending/vending.dm b/modular_bandastation/objects/code/vending/vending.dm similarity index 84% rename from modular_bandastation/vending/vending.dm rename to modular_bandastation/objects/code/vending/vending.dm index 9d6499dba80ba..991377f9ffd3c 100644 --- a/modular_bandastation/vending/vending.dm +++ b/modular_bandastation/objects/code/vending/vending.dm @@ -1,9 +1,9 @@ -// New sprite for robodrobe and new item list /obj/machinery/vending/wardrobe/robo_wardrobe/Initialize(mapload) - icon = 'modular_bandastation/icons/obj/machines/vending.dmi' + icon = 'modular_bandastation/objects/icons/obj/machines/vending.dmi' icon_state = "robodrobe" - light_mask = null + . = ..() +/obj/machinery/vending/wardrobe/robo_wardrobe/build_inventories(start_empty) var/list/new_products = list( /obj/item/clothing/head/beret = 2, /obj/item/clothing/head/cowboy/roboticist_reborn = 2, diff --git a/modular_bandastation/icons/mob/clothing/head/cowboy.dmi b/modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi similarity index 100% rename from modular_bandastation/icons/mob/clothing/head/cowboy.dmi rename to modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi diff --git a/modular_bandastation/icons/mob/clothing/head/hats.dmi b/modular_bandastation/objects/icons/mob/clothing/head/hats.dmi similarity index 100% rename from modular_bandastation/icons/mob/clothing/head/hats.dmi rename to modular_bandastation/objects/icons/mob/clothing/head/hats.dmi diff --git a/modular_bandastation/icons/mob/clothing/head/rnd.dmi b/modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi similarity index 100% rename from modular_bandastation/icons/mob/clothing/head/rnd.dmi rename to modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi diff --git a/modular_bandastation/icons/mob/clothing/suits/jacket.dmi b/modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi similarity index 100% rename from modular_bandastation/icons/mob/clothing/suits/jacket.dmi rename to modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi diff --git a/modular_bandastation/icons/mob/clothing/suits/rnd.dmi b/modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi similarity index 100% rename from modular_bandastation/icons/mob/clothing/suits/rnd.dmi rename to modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi diff --git a/modular_bandastation/icons/mob/clothing/suits/wintercoat.dmi b/modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi similarity index 100% rename from modular_bandastation/icons/mob/clothing/suits/wintercoat.dmi rename to modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi diff --git a/modular_bandastation/icons/mob/clothing/under/rnd.dmi b/modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi similarity index 100% rename from modular_bandastation/icons/mob/clothing/under/rnd.dmi rename to modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi diff --git a/modular_bandastation/icons/obj/clothing/head/cowboy.dmi b/modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi similarity index 100% rename from modular_bandastation/icons/obj/clothing/head/cowboy.dmi rename to modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi diff --git a/modular_bandastation/icons/obj/clothing/head/hats.dmi b/modular_bandastation/objects/icons/obj/clothing/head/hats.dmi similarity index 100% rename from modular_bandastation/icons/obj/clothing/head/hats.dmi rename to modular_bandastation/objects/icons/obj/clothing/head/hats.dmi diff --git a/modular_bandastation/icons/obj/clothing/head/rnd.dmi b/modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi similarity index 100% rename from modular_bandastation/icons/obj/clothing/head/rnd.dmi rename to modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi diff --git a/modular_bandastation/icons/obj/clothing/suits/jacket.dmi b/modular_bandastation/objects/icons/obj/clothing/suits/jacket.dmi similarity index 100% rename from modular_bandastation/icons/obj/clothing/suits/jacket.dmi rename to modular_bandastation/objects/icons/obj/clothing/suits/jacket.dmi diff --git a/modular_bandastation/icons/obj/clothing/suits/rnd.dmi b/modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi similarity index 100% rename from modular_bandastation/icons/obj/clothing/suits/rnd.dmi rename to modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi diff --git a/modular_bandastation/icons/obj/clothing/suits/wintercoat.dmi b/modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi similarity index 100% rename from modular_bandastation/icons/obj/clothing/suits/wintercoat.dmi rename to modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi diff --git a/modular_bandastation/icons/obj/clothing/under/rnd.dmi b/modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi similarity index 100% rename from modular_bandastation/icons/obj/clothing/under/rnd.dmi rename to modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi diff --git a/modular_bandastation/icons/obj/machines/vending.dmi b/modular_bandastation/objects/icons/obj/machines/vending.dmi similarity index 100% rename from modular_bandastation/icons/obj/machines/vending.dmi rename to modular_bandastation/objects/icons/obj/machines/vending.dmi From 482e6b22e6150c38f7b6f75440ca1aff772ef1b5 Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Fri, 26 Jul 2024 04:14:12 +0300 Subject: [PATCH 05/10] fix test 2 --- modular_bandastation/objects/code/vending/vending.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_bandastation/objects/code/vending/vending.dm b/modular_bandastation/objects/code/vending/vending.dm index 991377f9ffd3c..9eaa085e617bd 100644 --- a/modular_bandastation/objects/code/vending/vending.dm +++ b/modular_bandastation/objects/code/vending/vending.dm @@ -1,6 +1,7 @@ /obj/machinery/vending/wardrobe/robo_wardrobe/Initialize(mapload) icon = 'modular_bandastation/objects/icons/obj/machines/vending.dmi' icon_state = "robodrobe" + light_mask = null . = ..() /obj/machinery/vending/wardrobe/robo_wardrobe/build_inventories(start_empty) From fffcc2b33845df8146ee5e8ede3368e258bb4706 Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Fri, 26 Jul 2024 12:53:04 +0300 Subject: [PATCH 06/10] no more init --- modular_bandastation/objects/code/vending/vending.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modular_bandastation/objects/code/vending/vending.dm b/modular_bandastation/objects/code/vending/vending.dm index 9eaa085e617bd..c146a35247679 100644 --- a/modular_bandastation/objects/code/vending/vending.dm +++ b/modular_bandastation/objects/code/vending/vending.dm @@ -1,8 +1,7 @@ -/obj/machinery/vending/wardrobe/robo_wardrobe/Initialize(mapload) +/obj/machinery/vending/wardrobe/robo_wardrobe icon = 'modular_bandastation/objects/icons/obj/machines/vending.dmi' icon_state = "robodrobe" light_mask = null - . = ..() /obj/machinery/vending/wardrobe/robo_wardrobe/build_inventories(start_empty) var/list/new_products = list( From 0b48ee8e459042361f3cf9c95c1d7bedf8c1fb2b Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Fri, 26 Jul 2024 19:35:47 +0300 Subject: [PATCH 07/10] No more reborn --- .../objects/code/clothing/head/hat.dm | 6 +++--- .../objects/code/clothing/head/soft_caps.dm | 6 +++--- .../objects/code/clothing/suits/cloaks.dm | 10 ++++----- .../objects/code/clothing/suits/jacket.dm | 4 ++-- .../code/clothing/suits/wintercoats.dm | 8 +++---- .../objects/code/clothing/under/jobs/rnd.dm | 20 +++++++++--------- .../objects/code/job_outfits/roboticist.dm | 2 +- .../objects/code/vending/vending.dm | 20 +++++++++--------- .../icons/mob/clothing/head/cowboy.dmi | Bin 704 -> 697 bytes .../objects/icons/mob/clothing/head/hats.dmi | Bin 812 -> 806 bytes .../objects/icons/mob/clothing/head/rnd.dmi | Bin 839 -> 832 bytes .../icons/mob/clothing/suits/jacket.dmi | Bin 1566 -> 1557 bytes .../objects/icons/mob/clothing/suits/rnd.dmi | Bin 2518 -> 2509 bytes .../icons/mob/clothing/suits/wintercoat.dmi | Bin 1412 -> 1405 bytes .../objects/icons/mob/clothing/under/rnd.dmi | Bin 5373 -> 5366 bytes .../icons/obj/clothing/head/cowboy.dmi | Bin 440 -> 433 bytes .../objects/icons/obj/clothing/head/hats.dmi | Bin 468 -> 462 bytes .../objects/icons/obj/clothing/head/rnd.dmi | Bin 411 -> 404 bytes .../icons/obj/clothing/suits/jacket.dmi | Bin 731 -> 723 bytes .../objects/icons/obj/clothing/suits/rnd.dmi | Bin 987 -> 979 bytes .../icons/obj/clothing/suits/wintercoat.dmi | Bin 651 -> 644 bytes .../objects/icons/obj/clothing/under/rnd.dmi | Bin 1582 -> 1575 bytes 22 files changed, 38 insertions(+), 38 deletions(-) diff --git a/modular_bandastation/objects/code/clothing/head/hat.dm b/modular_bandastation/objects/code/clothing/head/hat.dm index f4cd354bda289..6e054b75d3207 100644 --- a/modular_bandastation/objects/code/clothing/head/hat.dm +++ b/modular_bandastation/objects/code/clothing/head/hat.dm @@ -1,7 +1,7 @@ -/obj/item/clothing/head/cowboy/roboticist_reborn +/obj/item/clothing/head/cowboy/roboticist name = "roboticist's cowboy hat" desc = "Ковбойская шляпа с малиновой лентой, сочетающая стиль и функциональность. Отличный выбор для тех, кто хочет выделиться на космической станции. На бирке указано: 'Flameholdeir Industries'. Вам точно не хватает револьвера!" icon = 'modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi' - icon_state = "cowboy_robostics_reborn" - worn_icon_state = "cowboy_robostics_reborn" + icon_state = "cowboy_robostics" + worn_icon_state = "cowboy_robostics" diff --git a/modular_bandastation/objects/code/clothing/head/soft_caps.dm b/modular_bandastation/objects/code/clothing/head/soft_caps.dm index b0405ab5e32da..f059ccdccbf7f 100644 --- a/modular_bandastation/objects/code/clothing/head/soft_caps.dm +++ b/modular_bandastation/objects/code/clothing/head/soft_caps.dm @@ -1,9 +1,9 @@ -/obj/item/clothing/head/soft/roboticist_cap_reborn +/obj/item/clothing/head/soft/roboticist_cap icon = 'modular_bandastation/objects/icons/obj/clothing/head/hats.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hats.dmi' name = "roboticist's cap" desc = "Элегантная кепка в черных тонах с малиновым козырьком. Идеально дополняет рабочую форму, добавляя стиль. На бирке указано: 'Flameholdeir Industries'. С этой кепкой вы точно никогда не опоздаете." - icon_state = "robocapreborn" - soft_type = "robocapreborn" + icon_state = "robocap" + soft_type = "robocap" soft_suffix = null dog_fashion = null diff --git a/modular_bandastation/objects/code/clothing/suits/cloaks.dm b/modular_bandastation/objects/code/clothing/suits/cloaks.dm index 26fe3db5e2150..530245558de1e 100644 --- a/modular_bandastation/objects/code/clothing/suits/cloaks.dm +++ b/modular_bandastation/objects/code/clothing/suits/cloaks.dm @@ -1,18 +1,18 @@ -/obj/item/clothing/suit/hooded/roboticist_cloak_reborn +/obj/item/clothing/suit/hooded/roboticist_cloak name = "roboticist's coat" desc = "Стильный плащ с принтом головы борга на спине. Идеален для тех, кто хочет выделиться и показать свою любовь к робототехнике. На бирке указано: 'Flameholdeir Industries'. Бережно обращайтесь с боргами, пока они не сделали из вас лампочку!" - icon_state = "robotics_coat_reborn" + icon_state = "robotics_coat" icon = 'modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi' inhand_icon_state = null body_parts_covered = CHEST|GROIN|LEGS|ARMS - hoodtype = /obj/item/clothing/head/hooded/roboticist_cloak_reborn + hoodtype = /obj/item/clothing/head/hooded/roboticist_cloak -/obj/item/clothing/head/hooded/roboticist_cloak_reborn +/obj/item/clothing/head/hooded/roboticist_cloak name = "roboticist's hood" icon = 'modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi' - icon_state = "robotics_hood_reborn" + icon_state = "robotics_hood" body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS diff --git a/modular_bandastation/objects/code/clothing/suits/jacket.dm b/modular_bandastation/objects/code/clothing/suits/jacket.dm index 27d0757ac888a..bdf49af42f51d 100644 --- a/modular_bandastation/objects/code/clothing/suits/jacket.dm +++ b/modular_bandastation/objects/code/clothing/suits/jacket.dm @@ -1,6 +1,6 @@ -/obj/item/clothing/suit/toggle/jacket/roboticist_reborn +/obj/item/clothing/suit/toggle/jacket/roboticist name = "roboticist's jacket" desc = "Универсальная куртка из прочного материала, идеально подходит для работы с механическими деталями. Красные полосы на плечах добавляют стильный акцент. Теперь вы не только защищены, но и модны. На бирке указано: 'Flameholdeir Industries'. Будьте стильным, как Адский Бродяга!" - icon_state = "robotics_jacket_reborn" + icon_state = "robotics_jacket" icon = 'modular_bandastation/objects/icons/obj/clothing/suits/jacket.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi' diff --git a/modular_bandastation/objects/code/clothing/suits/wintercoats.dm b/modular_bandastation/objects/code/clothing/suits/wintercoats.dm index c3d3d01e0fb8d..19bce1d4d9a9c 100644 --- a/modular_bandastation/objects/code/clothing/suits/wintercoats.dm +++ b/modular_bandastation/objects/code/clothing/suits/wintercoats.dm @@ -1,11 +1,11 @@ -/obj/item/clothing/suit/hooded/wintercoat/science/roboticist_reborn +/obj/item/clothing/suit/hooded/wintercoat/science/robotics/alt name = "roboticist's winter coat" desc = "Пальто, исключительно для разбирающихся в моде. Для крутых и подкрученных перцев. На бирке указано: 'Flameholdeir Industries'. Поможет даже во время самых длинных, холодных и тёмных времен." - icon_state = "coatrobotics_reborn" + icon_state = "coatrobotics" icon = 'modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi' - hoodtype = null + hoodtype = NONE inhand_icon_state = null -/obj/item/clothing/suit/hooded/wintercoat/science/roboticist_reborn/click_alt(mob/user) +/obj/item/clothing/suit/hooded/wintercoat/science/robotics/alt/click_alt(mob/user) return NONE // Restrict user to zip and unzip coat diff --git a/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm b/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm index 5b2aa18d16de4..799296027379a 100644 --- a/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm +++ b/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm @@ -1,35 +1,35 @@ -/obj/item/clothing/under/rank/rnd/roboticist_reborn +/obj/item/clothing/under/rank/rnd/roboticist/alt name = "standart roboticist jumpsuit" desc = "Стандартный комбинезон робототехника нового образца. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - будьте как Сенатор!" - icon_state = "robotics_reborn" + icon_state = "robotics" icon = 'modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi' -/obj/item/clothing/under/rank/rnd/roboticist_reborn/red +/obj/item/clothing/under/rank/rnd/roboticist/alt/red name = "red roboticist's jumpsuit" desc = "Прочный рабочий комбинезон из высококачественных материалов, обеспечивающий защиту и комфорт. Красный свитер из кашемира, мягкий на ощупь. Да, мы тоже думаем, что золотые заклёпки - это огонь. На бирке указано: 'Flameholdeir Industries'. Теперь вы готовы починить всех боргов, как парень с монтировкой, который спасает мир!" - icon_state = "robotics_reborn_red" + icon_state = "robotics_red" can_adjust = FALSE -/obj/item/clothing/under/rank/rnd/roboticist_reborn/hoodie +/obj/item/clothing/under/rank/rnd/roboticist/alt/hoodie name = "roboticist's hoodie" desc = "Худи и джоггеры, идущие как единый комбинезон, пояс сделанный из крашенной кожи и золотой пряжки. Выполнены из мягкого и прочного материала, обеспечивая комфорт и свободу движений. Теперь даже борги будут завидовать вашему стилю. На бирке указано: 'Flameholdeir Industries'. В этом костюме вы можете прыгать по крышам, как паркурист-доставщик!" - icon_state = "robotics_reborn_hoodie" + icon_state = "robotics_hoodie" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE -/obj/item/clothing/under/rank/rnd/roboticist_reborn/skirt +/obj/item/clothing/under/rank/rnd/roboticist/alt/skirt name = "standart roboticist's jumpskirt" desc = "Стандартный комбинезон робототехника нового образца с юбкой. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - а кстати, а где моя катана?" - icon_state = "robotics_reborn_skirt" + icon_state = "robotics_skirt" body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/rank/rnd/roboticist_reborn/skirt/red +/obj/item/clothing/under/rank/rnd/roboticist/alt/skirt/red name = "red roboticist's jumpskirt" desc = "Прочный рабочий комбинезон из высококачественных материалов, обеспечивающий защиту и комфорт. Красный свитер из кашемира, мягкий на ощупь. Да, мы тоже думаем, что золотые заклёпки - это огонь. На бирке указано: 'Flameholdeir Industries'. Вы сможете заменять протезы рук ВЕЧНОСТЬ и со стилем!" - icon_state = "robotics_reborn_skirt_red" + icon_state = "robotics_skirt_red" female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY can_adjust = FALSE diff --git a/modular_bandastation/objects/code/job_outfits/roboticist.dm b/modular_bandastation/objects/code/job_outfits/roboticist.dm index 1a7e8eb42c67a..95a8d3885a1c6 100644 --- a/modular_bandastation/objects/code/job_outfits/roboticist.dm +++ b/modular_bandastation/objects/code/job_outfits/roboticist.dm @@ -1,2 +1,2 @@ /datum/outfit/job/roboticist - uniform = /obj/item/clothing/under/rank/rnd/roboticist_reborn + uniform = /obj/item/clothing/under/rank/rnd/roboticist/alt diff --git a/modular_bandastation/objects/code/vending/vending.dm b/modular_bandastation/objects/code/vending/vending.dm index c146a35247679..c901d71f463f9 100644 --- a/modular_bandastation/objects/code/vending/vending.dm +++ b/modular_bandastation/objects/code/vending/vending.dm @@ -6,16 +6,16 @@ /obj/machinery/vending/wardrobe/robo_wardrobe/build_inventories(start_empty) var/list/new_products = list( /obj/item/clothing/head/beret = 2, - /obj/item/clothing/head/cowboy/roboticist_reborn = 2, - /obj/item/clothing/head/soft/roboticist_cap_reborn = 2, - /obj/item/clothing/suit/hooded/roboticist_cloak_reborn = 2, - /obj/item/clothing/suit/toggle/jacket/roboticist_reborn = 2, - /obj/item/clothing/suit/hooded/wintercoat/science/roboticist_reborn = 2, - /obj/item/clothing/under/rank/rnd/roboticist_reborn = 2, - /obj/item/clothing/under/rank/rnd/roboticist_reborn/red = 2, - /obj/item/clothing/under/rank/rnd/roboticist_reborn/hoodie = 2, - /obj/item/clothing/under/rank/rnd/roboticist_reborn/skirt = 2, - /obj/item/clothing/under/rank/rnd/roboticist_reborn/skirt/red = 2, + /obj/item/clothing/head/cowboy/roboticist = 2, + /obj/item/clothing/head/soft/roboticist_cap = 2, + /obj/item/clothing/suit/hooded/roboticist_cloak = 2, + /obj/item/clothing/suit/toggle/jacket/roboticist = 2, + /obj/item/clothing/suit/hooded/wintercoat/science/robotics/alt = 2, + /obj/item/clothing/under/rank/rnd/roboticist/alt = 2, + /obj/item/clothing/under/rank/rnd/roboticist/alt/red = 2, + /obj/item/clothing/under/rank/rnd/roboticist/alt/hoodie = 2, + /obj/item/clothing/under/rank/rnd/roboticist/alt/skirt = 2, + /obj/item/clothing/under/rank/rnd/roboticist/alt/skirt/red = 2, ) new_products |= products products = new_products diff --git a/modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi b/modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi index b93f876f2bd1fd1971e8f18c858da4316096328a..abd9de1e38b8dd7d91eb818e81efadce8e75b727 100644 GIT binary patch delta 53 zcmV-50LuTs1-S)~Bms4iC0Hd`iHkEOv#1!PpNliCC^0t`#5UwoR&e!m0owooyl@`a Lkmgg(v8fjVD-adX delta 60 zcmV-C0K@;e1;7Q6BmsPpC0Hytz9=;*zbH?Mi!&v&s2F4n7iU^gVs0vkZOEmp;OgfB Swg>>qfg!&&7Lm-cq89?G+85CP diff --git a/modular_bandastation/objects/icons/mob/clothing/head/hats.dmi b/modular_bandastation/objects/icons/mob/clothing/head/hats.dmi index c01fcf169347ad56631fc4c22bc89faf981f189d..abfda90672ff85e5ec484041bdf0f7cff272ce7f 100644 GIT binary patch delta 64 zcmV-G0KfmN2Brp(BmsAkB~LIwiHkEOv#1!Pjf*p_C^0t`#5TlG7oV1sSx}Igf=j)! Wf~%hk*dYKwJt@9j)J7Vys)7O{P#M4g delta 70 zcmV-M0J;CB2CN2C^ad+C{KxtGbOXA7^IntGp#5wHx} cATLwiHkEOv#1!PnTs>6C^0t`#5UwoR&e!m0UHkhO4A*D LjFPmkv8JH{8vGR& delta 60 zcmV-C0K@;l2FC`FBmsGmB~>gXz9=;*zbH?Mi!&v&s2F4h7iU^gVs0vkZOEmp;OgfB SwgmuBU?5|V>yOj1pP>S$F&KgX diff --git a/modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi b/modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi index 5cb48d41636033b88268c3db0da672e43fef44d2..0c0fe7fea6ba8a63d4012c70a3e4dbbf94ceff3f 100644 GIT binary patch delta 57 zcmV-90LK5G43!L!BmsDlC08j#iHkEOv#1!Por^QAC^0t`#5TmKJ|3qIWd&D17qF86 PV4f}RxLE30v953hTf!DK delta 66 zcmV-I0KNZ}44w>-BmseuC08;ez9=;*zbH?Mi!&v&s2F4l7iU^gVs0vkZAeI4dXziHkEOv#1!PnTs>6C^0t`#5TmCIv%HbWd&D17qD{x PjY%w6F>*>*v8*ZyZ7~$t delta 66 zcmV-I0KNas6V?-uBmsYsB~>ycz9=;*zbH?Mi!&v&s2F4h7iU^gVs0vkZHQk}d9M0K2@iA^z5oCK diff --git a/modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi b/modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi index 01bed09ff1326c7e847e1d332e8a157468ebc3d3..e718ebd1af9b035f5d23daf0cbde1e0690103eb6 100644 GIT binary patch delta 53 zcmV-50LuS_3;ha^Bmr@eB~&F?iHkEOv#1!Pmy0v4C^0t`#5UwoR&e!m0h7 delta 60 zcmV-C0K@&$&-g2kIE;gvAa7I9XKd= diff --git a/modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi b/modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi index 8aede8dbda0c0f80ca5fccb01177dcd0d7c0de60..3e96432304ad549ef7277a517ceee4004cbfcd62 100644 GIT binary patch delta 52 zcmV-40L%Zl1F-{;Bms1hC0Ha_iHkEOv#1y-Wyr;uR+N~V3SlcNxca$(Z2$ngC?3@{ KX2ZO(s1N}hp%q2| delta 59 zcmV-B0L1^X1Goc_BmsMoC0Hvsz9=;*zbH?Mi!&v&s2Hfikc%^|C^0t`!d6yr^>YDR R1OUo8A-qPUqzSR15CMw_74!fA diff --git a/modular_bandastation/objects/icons/obj/clothing/head/hats.dmi b/modular_bandastation/objects/icons/obj/clothing/head/hats.dmi index c1ce99b9f6134492e3433f703bf93211eb448b13..3d11ac3a2bdecbade7c456c3318c583d75c423bb 100644 GIT binary patch delta 64 zcmV-G0Kfm#1I`1GBmsAkB~LIwiHkEOv#1y-V#vjrR+N~V3SpzGi%-kREGS4#!KGeV W!PU<|Dy9Vxg^&KC^ad+C{KxtGbOXA7$|PY#hF%=n41b=V^IviHkEOv#1y-Zpg)%R+N~V3SlcNxca$(jRycqiye6y Je{)iirS|k~6ukfd delta 58 zcmV-A0LA~51DgYoBmsDlB~>dWz9=;*zbH?Mi!&v&s2C`1$i2}> delta 65 zcmV-H0KWgz1=|IXBmsbtC08*dz9=;*zbH?Mi!&v&s2Hfgkc%^|C^0t`!X}_Cz66&> XWd&D17q9~XhMF_BBZ$T4v865o9NQSS diff --git a/modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi b/modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi index 27c3e09d5a0332b00a3c59877ede2af709f8e6dd..160c163295992479a4713208cd3e0825b93c1ba4 100644 GIT binary patch delta 57 zcmV-90LK5@2h#_TBms7jB~>XziHkEOv#1y-Zpg)%R+N~V3Snbc9gkDJvVyCh3)ndT Pj43QqT*$#&v8ylxo2wU< delta 65 zcmV-H0KWgz2ipgbBmsVrB~>vbz9=;*zbH?Mi!&v&s2C`1$ilUxG`U XvVyCh3)pc0oYpcRImaOAv7;~pW2YOW diff --git a/modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi b/modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi index 228cb92c2d508af858117a9be88f82c329117cec..0433e69c0b86e263ba6c238187634b20c69261c2 100644 GIT binary patch delta 52 zcmV-40L%Z21%w5VBmr=dB~&C>iHkEOv#1y-Y{hA45ti`Bmsw!B~U+DiHkEOv#1y-WXQ#tR+N~V3Sna?j4#g4EGi*hc}9MI lN@gnY>WflSNOTK6Ey@b6elFmE0RVNaR-gB%3Qn=Ra|P+uAZh>r delta 86 zcmV-c0IC0{46Y22Bms_*B~V5 Date: Sat, 27 Jul 2024 10:01:20 +0300 Subject: [PATCH 08/10] another small changes --- modular_bandastation/objects/_objects.dme | 1 - modular_bandastation/objects/code/clothing/suits/cloaks.dm | 2 +- modular_bandastation/objects/code/clothing/under/jobs/rnd.dm | 4 ++-- modular_bandastation/objects/code/job_outfits/roboticist.dm | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 modular_bandastation/objects/code/job_outfits/roboticist.dm diff --git a/modular_bandastation/objects/_objects.dme b/modular_bandastation/objects/_objects.dme index e13451369760f..9ec09081565f7 100644 --- a/modular_bandastation/objects/_objects.dme +++ b/modular_bandastation/objects/_objects.dme @@ -5,7 +5,6 @@ #include "code/clothing/head/hat.dm" #include "code/clothing/head/soft_caps.dm" -#include "code/job_outfits/roboticist.dm" #include "code/clothing/suits/cloaks.dm" #include "code/clothing/suits/jacket.dm" #include "code/clothing/suits/wintercoats.dm" diff --git a/modular_bandastation/objects/code/clothing/suits/cloaks.dm b/modular_bandastation/objects/code/clothing/suits/cloaks.dm index 530245558de1e..edf966ad09a74 100644 --- a/modular_bandastation/objects/code/clothing/suits/cloaks.dm +++ b/modular_bandastation/objects/code/clothing/suits/cloaks.dm @@ -5,7 +5,7 @@ icon = 'modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi' inhand_icon_state = null - body_parts_covered = CHEST|GROIN|LEGS|ARMS + body_parts_covered = CHEST|GROIN|ARMS hoodtype = /obj/item/clothing/head/hooded/roboticist_cloak /obj/item/clothing/head/hooded/roboticist_cloak diff --git a/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm b/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm index 799296027379a..c354a3486fa3a 100644 --- a/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm +++ b/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/rank/rnd/roboticist/alt name = "standart roboticist jumpsuit" - desc = "Стандартный комбинезон робототехника нового образца. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - будьте как Сенатор!" + desc = "Комбинезон робототехника нового образца. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - будьте как Сенатор!" icon_state = "robotics" icon = 'modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi' @@ -20,7 +20,7 @@ /obj/item/clothing/under/rank/rnd/roboticist/alt/skirt name = "standart roboticist's jumpskirt" - desc = "Стандартный комбинезон робототехника нового образца с юбкой. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - а кстати, а где моя катана?" + desc = "Комбинезон робототехника нового образца с юбкой. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - а кстати, а где моя катана?" icon_state = "robotics_skirt" body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT diff --git a/modular_bandastation/objects/code/job_outfits/roboticist.dm b/modular_bandastation/objects/code/job_outfits/roboticist.dm deleted file mode 100644 index 95a8d3885a1c6..0000000000000 --- a/modular_bandastation/objects/code/job_outfits/roboticist.dm +++ /dev/null @@ -1,2 +0,0 @@ -/datum/outfit/job/roboticist - uniform = /obj/item/clothing/under/rank/rnd/roboticist/alt From c870099a63396d4810c67b727bb9b657430897a9 Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Sat, 27 Jul 2024 15:06:00 +0300 Subject: [PATCH 09/10] icon_state hotfix --- .../objects/code/clothing/under/jobs/rnd.dm | 2 +- .../objects/icons/mob/clothing/under/rnd.dmi | Bin 5366 -> 5371 bytes .../objects/icons/obj/clothing/under/rnd.dmi | Bin 1575 -> 1577 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm b/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm index c354a3486fa3a..81196367be0f2 100644 --- a/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm +++ b/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm @@ -1,7 +1,7 @@ /obj/item/clothing/under/rank/rnd/roboticist/alt name = "standart roboticist jumpsuit" desc = "Комбинезон робототехника нового образца. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - будьте как Сенатор!" - icon_state = "robotics" + icon_state = "robotics_alt" icon = 'modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi' worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi' diff --git a/modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi b/modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi index d7d5edf2baeb7e181b50cf957c1c482d05739282..bda02a68e94f3be05f5bd2d079abaf0c3f03e1c4 100644 GIT binary patch delta 91 zcmV-h0Hpu+Df=mqBmt9=B~VK^J~5|6iHkEOv#1!Pmy0v4C^0t`#5TmPI6j4VgNIud;n-kb__lUS81`kI~3$gCeHu> delta 86 zcmV-c0IC1`DfTIlBms_*B~V6KiHkEOv#1!PkBc*{C^0t`#5TlK7@tDC(xOxn6c=Y_ s7L|~woD|1EG?3(^jQsqR%v4pF diff --git a/modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi b/modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi index e3c37d51347382a054558fd01e8523c57321a072..0225516b0ff802df22c28a02c13a1c4d31bfb545 100644 GIT binary patch delta 81 zcmV-X0IvV145)J~5|6iHkEOv#1y-Y{h545ti`Bmsw!B~U+DiHkEOv#1y-WXQ#tR+N~V3Sna?j4#g4EGi*hc}9MI lN@gnY>WflSNOTK6Ey@b6elFmE0RVNaR-gB%3Qn=Ma|P%-AYcFh From 25f2f7bad6c40ea8263e26e55943acdeb48398bf Mon Sep 17 00:00:00 2001 From: AloeNeverDie Date: Sun, 28 Jul 2024 20:29:55 +0300 Subject: [PATCH 10/10] I give up --- modular_bandastation/objects/code/clothing/suits/cloaks.dm | 2 +- modular_bandastation/objects/code/vending/vending.dm | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modular_bandastation/objects/code/clothing/suits/cloaks.dm b/modular_bandastation/objects/code/clothing/suits/cloaks.dm index edf966ad09a74..69b6461b31804 100644 --- a/modular_bandastation/objects/code/clothing/suits/cloaks.dm +++ b/modular_bandastation/objects/code/clothing/suits/cloaks.dm @@ -14,5 +14,5 @@ worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi' icon_state = "robotics_hood" body_parts_covered = HEAD - flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS + flags_inv = HIDEHAIR|HIDEEARS diff --git a/modular_bandastation/objects/code/vending/vending.dm b/modular_bandastation/objects/code/vending/vending.dm index c901d71f463f9..3c692d95e632f 100644 --- a/modular_bandastation/objects/code/vending/vending.dm +++ b/modular_bandastation/objects/code/vending/vending.dm @@ -4,7 +4,7 @@ light_mask = null /obj/machinery/vending/wardrobe/robo_wardrobe/build_inventories(start_empty) - var/list/new_products = list( + products |= list( /obj/item/clothing/head/beret = 2, /obj/item/clothing/head/cowboy/roboticist = 2, /obj/item/clothing/head/soft/roboticist_cap = 2, @@ -17,6 +17,4 @@ /obj/item/clothing/under/rank/rnd/roboticist/alt/skirt = 2, /obj/item/clothing/under/rank/rnd/roboticist/alt/skirt/red = 2, ) - new_products |= products - products = new_products . = ..()