From 3b122e1b9124d3878b334323f7556a07d4b80ff6 Mon Sep 17 00:00:00 2001 From: konushi Date: Sun, 12 May 2024 16:57:02 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BC=D0=BD=D0=B5=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D0=BB=D0=B0=D1=82=D0=B8=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/clothing/code/suits.dm | 12 +++++++ modular_ss220/clothing/icons/mob/cloaks.dmi | Bin 914 -> 1953 bytes .../clothing/icons/object/cloaks.dmi | Bin 489 -> 871 bytes modular_ss220/hairs/code/human_hair.dm | 32 ++++++++++++++++++ modular_ss220/hairs/icons/human_hair.dmi | Bin 5391 -> 9554 bytes 5 files changed, 44 insertions(+) diff --git a/modular_ss220/clothing/code/suits.dm b/modular_ss220/clothing/code/suits.dm index 905ce4bdc74d..8f945d21f8d5 100644 --- a/modular_ss220/clothing/code/suits.dm +++ b/modular_ss220/clothing/code/suits.dm @@ -87,6 +87,18 @@ icon_state = "ntsc_uniform" icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' +/obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt + name = "армированная мантия офицера флота Нанотрейзен" + desc = "Один из вариантов торжественного одеяния сотрудников Верховного Командования Нанотрейзен, подойдет для официальной встречи или важного вылета. Сшита из лёгкой и сверхпрочной ткани." + icon = 'modular_ss220/clothing/icons/object/cloaks.dmi' + icon_state = "ntsc_cloak" + icon_override = 'modular_ss220/clothing/icons/mob/cloaks.dmi' + +/obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt/coat_nt + name = "полевой плащ офицера флота Нанотрейзен" + desc = "Парадный плащ нового образца, внедряемый на объектах компании в последнее время. Отличительной чертой является стоячий воротник и резаный подол. Невысокие показатели защиты нивелируются пафосом, источаемым этим плащом." + icon_state = "ntsc_coat" + /obj/item/clothing/suit/hooded/vi_arcane name = "куртка Вай" desc = "Слегка потрёпанный жакет боевой девчушки Вай." diff --git a/modular_ss220/clothing/icons/mob/cloaks.dmi b/modular_ss220/clothing/icons/mob/cloaks.dmi index 99933fa262757a06ad30812b8e680de3bc9f0ba9..ff45056f299e2201f30156f32c71ad649a71a948 100644 GIT binary patch delta 1783 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 literal 5391 zcma)=S5OmN_wEyFXeJb?(n09~=?Kz$N2>H9H8eq5=u!efiXdI8f+D>H1cH>%6ak4q zAar>Nyb_9Z5%~L^Gjq<(cV^DTUTbDwtaY*1to{6+G&2)jI%;-m002Ozucu}4H?RHY zfGGY(c5&bJziBke(l%7;(LB?v=;_!^g7AJ{())d;v{n9JUW)J*IJd-kH6vOnOr=#Rz(1Ty`FxRfhXe(#Z z>0t^v*}bAps?o6Q;*eZLgFn>8yLmiohR{!XYs`0^5q>k*&R}%t*;UBtD8e_DvL7|? z?}$<9wLLTC6p=iYO8a#;4XB(kUkvYdvk)j&C&TWXo+JGscSIRj{>9~T{rMK|`K2!6 zW`>c0(E21&3ey7sFp=tOsar;r5?_C9yra#K+@q_*%Eqh%dSS;ZAR|WM6wm4Q#c)8g zr89y;nMOws#S(!TbaF{UHd|tA-(xYx^KnmfJf6Ka6{-7xUmC0XoSSnK9DTg~O?|hZ zsqeRl5>?L@_ctmCeiMDR;ujQs{7u(5?+Tli+T#zezpxMAx(3%Ww9T)LmvGGsc+#9! zW6g%HI@$LBTogFRDmves;sYg61F77xxIfpI`^|8L1(gbj!rP(Yhp>UWw{UTU*Wm{z z8PO5N_WPAMg z6d$EWOXj{-p62+}!Pe4#54L>*m`Vd7aRjtxXghMMc{vL6iz{2h@PksXggB<<6So;8 zI`wAlIx!s)#+x;8Ogu)`OIwtB8%M6wS3;yII=SDgm%O*dN4&vt^~uTnnjZ$2HX9DHi+#KMTUR{paao_EXG!3pJ5t)bA5F*pwVxaQ~-EI zT#zL_kgg_;tX-d8QN7he|8n#}1zj&3z^j(Qph9~%~Gli1^mr|3k26+1d3x5MLWC6(O z3GA^I0kmKUj8~?NEqxSIqGM$LT#5mJo-eL;C2Pm-voG)|f9aSCn~L_>#LcgNzI^ct zV5B!0+vAWAiHsy<(9?e%&U>`}CAWLy|V>Jye`k~b9qeHI+{g^T(bs5wE!n)4u@ zZO|^7FbQP_z~I`nLvO5t915b&?u4<5;;N}*@qeDexg}?$_6Yay&I+nQ%?EGoaTbx3 z2d}l&f_A$~I{iy1@F)A(DPLB(BX6{42G1tL14iA7Sk4tYi6&8G+Zw+~dR3}o*uF{M zSIYyS{a?16?enTlCJnf1f208>ve#91tcj!B=1_7g@oPl-mhO^ zkD-!PzC_66ZSSnq1BU$#CIIwt(pw8Ar@b(=`a+oUd$8D6kx-|?zmv<8!ho(n@cL<7W|^j`u-F7oE;EQXLkF+$#c9zcE% zv%cRu^;Xvp)9IleFa&YEYxzhoS_y_o*M5o1?(j>~6Ba>Cg`*bs3|KsGAmKNGy`)pP zJcW?wcT4w|KK@`Sqs0ez9!>{nZ&Tq4PoEmo|LS>ZKew<}K|4B^;&aq}Gcw|y(OSOo zQCpDOeoOrgx$dQyL)9bn$(%jmXJ|pY;389aMZ!^|dh(MQpHNorPr54yYR-r#$-X!G%C2!&LCk zy5EtSS>;KicLS0oNj>lLWM7ryX{vIQH>!s!&p}OgDz86#02j+fiZ!%=jDqh9Ulhw# zx!u+K5F?0B^lx$|tQ4+va5Kewhgc-V^KBAJdm|1v&I#pl8_GMYEbkM4@$%5Kd4T&f#MGjE>Ew&(c*1=TWP zHWo_;&1e^w;mzOhWh_!x=Z7MQ_u=>DYSb3gm=roMw^+`Mc1o3Z)pnosh>ACVbY_ znA0Zgmz$m1a-NZ+GtlQ>tJo7&)1vi@Bf@YQa9Fpe$qC(k!d7%}3?B~W<@8K8U8 z@9D-SlIpB%GGw}(QvwI~Kh`*%Qf2{!QjAs`KJq&xu zbB7ThyTk?UgzTaS6Kiq?!ibex3@Y-11SdD?$auc?9Bh5nmyfDm58BULHyL$=qdu{0 zB51(}^$XV-NkrA@8vpzwwh6S*LQz_c7G*N)V|AI2N?Jm4DInBNVXJFB3lk@`h>o8) z!@WilCv?>8GgT+6fgjj=rp0k_*B2Lwi5c-+towgdv$!>r+g6XfZ!;Bn8Bnxpl6(vo zM9ta*g7GriaP@wYR3DGxko5f(G#vf0*C!6Dj~`kHR~;QxsbFExP1zO^@?k!Wp7bTP za2WIOdB!*oscfj(;_)|}RmKY#+wX;~z0Y$zxs*LTKm2jjmbpZgi7Lt$%%E=ei|=V_ z7^S78-}1eguCDl6Rq`?|o1T|eIeii+yb_}|w) zrxY_kDK-%2Yv0^Ou+?qd(T)9NZD68&(5&*FdXaF5+tcL8(2z~gXnoRKDaV!M^dsz8 z?crd`;Nk@wzv0$1kt(Np+w?0mlf*qd^or&*HTu#$?$O9^g9&v{Oh+uTcOE$!174NLy}3 zf0D_z;Cv>IKWPk+B=~>S&$_91>cmhg*l!y`y#iKIIYFcfoI6h1-6RG6<~gE%&%0O{CB2q5e;_L*AdRks_yl z_hOgTXqTqQ!Q-x8uO6MSoz$&vOcSmi{a3xuN<2K#<8W8w zIU1r0N|kBCL7JbRL)wwjjRlL&0%~2c5$I63LQ|?4=@_hbu*O&2fkWs#hX5(&_^=VV z*8Ku&(=I7vo)Zu=^;7Va#YUa2kp7uVl)5rP#UIRbNMuaW_QLuZ7aohj2PG}&t46(F zwRVL~@A3Op|M0}Sbv5K0L~qpDVOM^-bx>~JvSQ+Pe@DeTGL90jdiFrsAnv8I?YcB`&JSz1HL zh7?Zmq*5GbQk@qSwW*R0{(kqNnR{`KWDoUcTJY{QqKs>L(T&}f2h<{XmnPeOQd$gZ z+r}Rx0eien@3$+!P=y?C`75g#i4tTR^@1Rp(PVlLut6t#S)g;s{jqmEcLzD-!4z@33Fqx7RXp- zZyO`T`N2Y3JVRm^^IG_qWTU7J(hZ`5Zr$_K=IsO0nFBhuc YE!Lb5t}F0=9ZrD0wux4whD+lA0Hj?y5dZ)H From 0ea3c21248cf02bd740a7df7095f6c3ae1aa5871 Mon Sep 17 00:00:00 2001 From: konushi Date: Sun, 12 May 2024 18:27:02 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=20=D0=B2=D1=81=D0=B5?= =?UTF-8?q?=20=D0=B2=D0=BD=D0=B8=D0=B7=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/hairs/code/human_hair.dm | 115 ++++++++++++------------- 1 file changed, 57 insertions(+), 58 deletions(-) diff --git a/modular_ss220/hairs/code/human_hair.dm b/modular_ss220/hairs/code/human_hair.dm index cd140ca9049a..86c932ec73ce 100644 --- a/modular_ss220/hairs/code/human_hair.dm +++ b/modular_ss220/hairs/code/human_hair.dm @@ -180,63 +180,6 @@ /datum/sprite_accessory/hair/longemo species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") -/datum/sprite_accessory/hair/butterfly - icon = 'modular_ss220/hairs/icons/human_hair.dmi' - name = "Butterfly" - icon_state = "butterfly" - secondary_theme = "beads" - species_allowed = list("Human", "Slime People") - -/datum/sprite_accessory/hair/cascading_long_bob - icon = 'modular_ss220/hairs/icons/human_hair.dmi' - name = "Cascading Long Bob" - icon_state = "cascading_long_bob" - species_allowed = list("Human", "Slime People") - -/datum/sprite_accessory/hair/jinshi - icon = 'modular_ss220/hairs/icons/human_hair.dmi' - name = "Jinshi" - icon_state = "jinshi" - secondary_theme = "beads" - species_allowed = list("Human", "Slime People") - -/datum/sprite_accessory/hair/long_strait - icon = 'modular_ss220/hairs/icons/human_hair.dmi' - name = "Long Strait" - icon_state = "long_strait" - species_allowed = list("Human", "Slime People") - -/datum/sprite_accessory/hair/pine - icon = 'modular_ss220/hairs/icons/human_hair.dmi' - name = "Pine" - icon_state = "pine" - species_allowed = list("Human", "Slime People") - -/datum/sprite_accessory/hair/short_bob - icon = 'modular_ss220/hairs/icons/human_hair.dmi' - name = "Short Bob" - icon_state = "short_bob" - species_allowed = list("Human", "Slime People") - -/datum/sprite_accessory/hair/waves_mid - icon = 'modular_ss220/hairs/icons/human_hair.dmi' - name = "Waves Mid" - icon_state = "waves_mid" - species_allowed = list("Human", "Slime People") - -/datum/sprite_accessory/hair/whim - icon = 'modular_ss220/hairs/icons/human_hair.dmi' - name = "Whim" - icon_state = "whim" - species_allowed = list("Human", "Slime People") - -/datum/sprite_accessory/hair/vulpkanin/tomahawk_spiker - icon = 'modular_ss220/hairs/icons/human_hair.dmi' - name = "Tomahawk Spiker" - icon_state = "tomahawk_spiker" - species_allowed = list("Human", "Slime People") - - ////////////////////////////// //////START VG HAIRSTYLES///// ////////////////////////////// @@ -513,7 +456,7 @@ /datum/sprite_accessory/hair/long_curls_alt species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") -/* Human hair */ +/* New human hair */ /datum/sprite_accessory/hair/hair_glammetal icon = 'modular_ss220/hairs/icons/human_hair.dmi' name = "Glam Metal" @@ -544,3 +487,59 @@ name = "Zone" icon_state = "zone" species_allowed = list("Human", "Slime People") + +/datum/sprite_accessory/hair/butterfly + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Butterfly" + icon_state = "butterfly" + secondary_theme = "beads" + species_allowed = list("Human", "Slime People") + +/datum/sprite_accessory/hair/cascading_long_bob + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Cascading Long Bob" + icon_state = "cascading_long_bob" + species_allowed = list("Human", "Slime People") + +/datum/sprite_accessory/hair/jinshi + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Jinshi" + icon_state = "jinshi" + secondary_theme = "beads" + species_allowed = list("Human", "Slime People") + +/datum/sprite_accessory/hair/long_strait + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Long Strait" + icon_state = "long_strait" + species_allowed = list("Human", "Slime People") + +/datum/sprite_accessory/hair/pine + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Pine" + icon_state = "pine" + species_allowed = list("Human", "Slime People") + +/datum/sprite_accessory/hair/short_bob + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Short Bob" + icon_state = "short_bob" + species_allowed = list("Human", "Slime People") + +/datum/sprite_accessory/hair/waves_mid + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Waves Mid" + icon_state = "waves_mid" + species_allowed = list("Human", "Slime People") + +/datum/sprite_accessory/hair/whim + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Whim" + icon_state = "whim" + species_allowed = list("Human", "Slime People") + +/datum/sprite_accessory/hair/vulpkanin/tomahawk_spiker + icon = 'modular_ss220/hairs/icons/human_hair.dmi' + name = "Tomahawk Spiker" + icon_state = "tomahawk_spiker" + species_allowed = list("Human", "Slime People")