From 914c690fdb9d10444f9fd62588ce23e780a6a00d Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 1 Aug 2018 19:30:18 -0300 Subject: [PATCH] Adds another unathi clothing option (#5004) Adds the uniform suggested by this thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11270 Also, an unathi piece of body armor and helmet. All sprites were made by dronz. --- aurorastation.dme | 1 + code/datums/trading/misc.dm | 2 ++ .../preference_setup/loadout/loadout_xeno.dm | 10 ++++++++++ code/modules/clothing/head/helmet.dm | 10 ++++++++++ code/modules/clothing/suits/alien.dm | 2 +- code/modules/clothing/suits/armor.dm | 11 ++++++++++- code/modules/clothing/under/xenos/unathi.dm | 7 +++++++ html/changelogs/alberyk-unathi.yml | 6 ++++++ icons/obj/clothing/robe_coat.dmi | Bin 869 -> 0 bytes icons/obj/unathi_items.dmi | Bin 0 -> 5961 bytes 10 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 code/modules/clothing/under/xenos/unathi.dm create mode 100644 html/changelogs/alberyk-unathi.yml delete mode 100644 icons/obj/clothing/robe_coat.dmi create mode 100644 icons/obj/unathi_items.dmi diff --git a/aurorastation.dme b/aurorastation.dme index 777fa1c933e..ac337b17caa 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1271,6 +1271,7 @@ #include "code\modules\clothing\under\jobs\security.dm" #include "code\modules\clothing\under\xenos\resomi.dm" #include "code\modules\clothing\under\xenos\tajara.dm" +#include "code\modules\clothing\under\xenos\unathi.dm" #include "code\modules\custom_ka\barrels.dm" #include "code\modules\custom_ka\cells.dm" #include "code\modules\custom_ka\core.dm" diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm index 5e4e90e69e8..2e2c8b0f61c 100644 --- a/code/datums/trading/misc.dm +++ b/code/datums/trading/misc.dm @@ -139,6 +139,7 @@ /obj/item/clothing/head/hasturhood = TRADER_THIS_TYPE, /obj/item/clothing/head/helmet/gladiator = TRADER_THIS_TYPE, /obj/item/clothing/head/plaguedoctorhat = TRADER_THIS_TYPE, + /obj/item/clothing/head/helmet/unathi = TRADER_THIS_TYPE, /obj/item/clothing/glasses/monocle = TRADER_THIS_TYPE, /obj/item/clothing/mask/smokable/pipe = TRADER_THIS_TYPE, /obj/item/clothing/mask/gas/plaguedoctor = TRADER_THIS_TYPE, @@ -147,6 +148,7 @@ /obj/item/clothing/suit/judgerobe = TRADER_THIS_TYPE, /obj/item/clothing/suit/wizrobe/magusred = TRADER_THIS_TYPE, /obj/item/clothing/suit/wizrobe/magusblue = TRADER_THIS_TYPE, + /obj/item/clothing/suit/armor/unathi = TRADER_THIS_TYPE, /obj/item/clothing/under/gladiator = TRADER_THIS_TYPE, /obj/item/clothing/under/kilt = TRADER_THIS_TYPE, /obj/item/clothing/under/redcoat = TRADER_THIS_TYPE, diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 4fd6ed102a9..2eb3356ebc3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -40,6 +40,16 @@ un_gloves["white gloves"] = /obj/item/clothing/gloves/white/unathi gear_tweaks += new/datum/gear_tweak/path(un_gloves) +/datum/gear/uniform/unathi + display_name = "sinta tunic (Unathi)" + path = /obj/item/clothing/under/unathi + whitelisted = list("Unathi") + sort_category = "Xenowear" + +/datum/gear/uniform/unathi/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + //skrell items /datum/gear/ears/f_skrell diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 8c9f144df5c..bb86d593a02 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -164,6 +164,16 @@ cold_protection = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE +/obj/item/clothing/head/helmet/unathi + name = "unathi helmet" + desc = "A helmet designated to be worn by an unathi, used commonly by the hegemony levies." + icon = 'icons/obj/unathi_items.dmi' + icon_state = "unathi_helmet" + item_state = "unathi_helmet" + contained_sprite = 1 + species_restricted = list("Unathi") + armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) + //Non-hardsuit ERT helmets. /obj/item/clothing/head/helmet/ert name = "emergency response team helmet" diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index dcf766a0e43..eb727f04035 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -10,7 +10,7 @@ /obj/item/clothing/suit/unathi/robe/robe_coat //I was at a loss for names under-the-hood. name = "tzirzi robes" desc = "A casual Moghes-native garment typically worn by Unathi while planet-side." - icon = 'icons/obj/clothing/robe_coat.dmi' + icon = 'icons/obj/unathi_items.dmi' icon_state = "robe_coat" item_state = "robe_coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 6c2069f490d..1b9343e7695 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -491,8 +491,17 @@ icon_state = "ert_peacekeeper" item_state = "ert_peacekeeper" -//warden armor +//unathi armor +/obj/item/clothing/suit/armor/unathi + name = "unathi body armor" + desc = "An armored chestplate designated to be worn by an unathi, used commonly by the hegemony levies." + icon = 'icons/obj/unathi_items.dmi' + icon_state = "unathi_armor" + item_state = "unathi_armor" + contained_sprite = 1 + species_restricted = list("Unathi") + armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) //All of the armor below is mostly unused diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm new file mode 100644 index 00000000000..1096796f7c0 --- /dev/null +++ b/code/modules/clothing/under/xenos/unathi.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/under/unathi + name = "sinta tunic" + desc = "A tunic common on both Moghes and Ouerea, it's simple and easy to manufacture design makes it universally favorable." + icon = 'icons/obj/unathi_items.dmi' + icon_state = "unathi_tunic" + item_state = "unathi_tunic" + contained_sprite = 1 diff --git a/html/changelogs/alberyk-unathi.yml b/html/changelogs/alberyk-unathi.yml new file mode 100644 index 00000000000..744e9fad90a --- /dev/null +++ b/html/changelogs/alberyk-unathi.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added a new unathi clothing to the loadout." diff --git a/icons/obj/clothing/robe_coat.dmi b/icons/obj/clothing/robe_coat.dmi deleted file mode 100644 index 0b996cfc6bd253daaac74d81218699049b4187a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 869 zcmV-r1DgDaP)NJ0_)_K5@`b$egz+105nJjOJ@p0TL~JD1lrC&VuuWEmknY;6M0YcNBdH;&_5c6?0d!JMQvg8b*k%9#0C##+Sad{Xb7OL8aCB*JZU6vy zoKseCa&`CgQ*iP104N11 zPg*HH82|tROG!jQR9J=Wm)&mTAQXgifcO{#NxP_h|3}?9B-&nt!Im9uZ#=DPse{kQ zpY7ptId$sPf0l^-j(l152exw_4ZL&QH&Gt|*qq=(0KwaZ`X=UE51e(9(OtMsPV9c| zwGl-F6B_huvSAyc@VG$1mFh% zc`Wi=3P$j{o$()xpcEqj(B1BBjcpx!0F$%+=aQB93J+tL0=wV-pgsqc z3;~X9Q|NZPe|&!2Z#V9n2L9z@HuFXP)X7gelObq~QERQKze#N;C$s6hLQ?e&P$)pr zWCW;N097df&qwv1mN0<#s{miw6ruhaz;6MtCawOckL!R`+XzS#yvuBk>j*HOB6|?= z!@f%Bz*7wH)Na6!_5n_vI(6zDa<0YuLAu_c!OIG{vBmokSnSwRe-QAc5j+jo+v+=- zYg+scf?U@N-`j-RO5f-JAblg4>VAMi!ajOf-IlC1>+Wxg1@tKWY;KGEsL#XeIsi9w zKs%%zs&9ajh3+HQ>K_FZ`XtyEK)^0aZyv8V03MzD>bl59Ega|l zbA)JrZ&w2F2Eb|az#_zqIg0%P&k^9bc?e*~FalUfep~dd#kS#h-~9*JT^|4pAu_-l vB*``s58!VAj7~6b0*sDv#{p-;{{{U8ZDST_>8b8u00000NkvXXu0mjfp$&yu diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c4dc0f86ecefeebe1b8d644db91ff2197c5be3c6 GIT binary patch literal 5961 zcmaiYbySpJ)b2Ylz|aicE#2K9-HoJ_fP|!!z|aEHDIy>YjUq@l3?&khD%~M9lyrXc zTX(Jd-*@jH=bW|9+H3Fg?DL$xpZ9&Iud9ZSLyZFf0KSI0vLR|MM2&C=CTdQ6VNZiv zJ_i|_`6@fUe&OTdk8Zp$Rm#6RPQPJ2E7+hUWs~k}0uL*mZu|Vc`4%Py7x%@~l(WGt@*4W= zg443b0h?>$kMNkbqfPV{hOp*%0n-8iAh*y^erg<;hs=NDMLLr|*e!dhUQCtbv9Cxe z;P0E`mq#YXhyFcqt|)#fer8r9z9jwUypN*S+$?UK?ZF4(7*V!budhapa9Z}Jp{Hbx ztk#KM5$K!DQeN5!MdBB!BI(-`v{P1|kItRX^xQ-~zAr21y^}LBDwf;6552#+4eh>c zvuSQID%XwZ(Z@}iClHWZ5daApzr{|4b7_a;nb@H@RN#;>Dw%u$s6H2E)c^Z@K7tL< zu5^amq}@wlJ#K)3XYOryfJEpqYxXljDsfRxT(93ZTm2o;Gtd0)F|A(70$g2tH~0el z=7hj(OYoC7Z>EEXJ`R2 zSnauYx;ONOf&D~|_QNwlE6wKh?};YWH+(3sJGi0{=@(bO_pZ%?yGZO_;`IoFe>+Oi zhHa27=ZKibNuXhk6FrT#@7@u6qRiOHui|oRFJH1BjhVvz^?choLJKh(_oF>Qr?BgECXE$dqQ;9*8D?(LMgIa2H!;b zRhMX0`BD;U4nviC@0}7^f1xAPv*=Y4>=mvEY>)S7n?x_0?N5R2nF$qdE-i3A<_29AgysuGNy2qS7ZM^ESlx>*} z0#N?!_$|2Gt1?+uPomgcSE(Y?Mp)rjcOH>Vgo^6>5Q(Q}#mY-012Z$C^cYjbZ&@$e zrHj0oNpG1{hB!D>aFmC|kMEvCTebHU8;nCVU*D_N9E&F*%BsEc zuKGjcF7=vW7ANcKlzy+h4Fr}hO10UiI3moVr_VM1_$dJ1=*g&%k&p#B2uS_W51|ax zGcu*Trw}m(2Eu;!T0B|&&$nOqWM_m8=yP-KqMtZBa`qYU0M#e=Ky{K#RBr1gE zhq(w}*E&}cBLvvlPcCW3WvqKVW$W?=ZAAXH?1pyB3&-cF*hSYj4qHdg`ASyb6@-$Q z1)n}uq;V*7zGVbkc9Fk!Z7^%TGFv=31#z6$8IrHIC1Lb(3|cpk+bo{4T3=tdU9G>T z(3h|$Qtc5T=E5Lj0M7gdz)&vtY{gW3dA=N z79rNJ&I!dyhq%-(CO8eM!`%Mbhd7Ryuk~}hC3<`7>kVz03PbZNR#kCFS6Ff;@O+f9 zaUTE>%@}8}syoKjS~O{b?qkQg!)qHK;JDrNPkQ+_S(*Gl)`&kKflv4YclS|@)bGoz zKfMC6QF|;T{8|5+k1%b@%d)iELp_UqG4jHy1F;=Ef1V|n1Rom3N|};PfO2i{BuzjK zYm=eey?;~+aC8`EJWEf%iwRhD!x!CaPk7E`CUdt}<^APYXS+g+#aRLr|HwXSd2AeJ z^}nydaBYwX@fU@=Twy(S#s?;z3PtdMrY4upX+mN%{AG48qra@Xl%2gNMuj!2!UqWS zX1fBDpf6LBx%SWz2}fV^Lk?@rXjcDyGFmL7>~zspMLuCc@o%mEOF68S^L$L{^H;66 zIaH`)k;0a8G?a`()_H7e#VVL_5*qEQ1fAaB({Qa)CE`TM-yo?H?H^-s%pHfcdYHZM z&vH*zTv%EAKi-9K8bav9&Gd;Xo zqMOK^iHg_j=tOOZ~D(q7_lV0T~p zqGr>Gs;yh7Ic|gzZU}O3^>(O zeLTHMoGqz*zwRZm{(g%&SW`|%5&%zTWo8zZlz?^1U(Y9N$IL@#QKut_Wf==)hPGMp zNzf*@td#b3ky2j+)`5UP*h9#jK|>Ym*4CEypxywx_^E*d?ziS<3f>yIw~i~pPdxI| zE9fFhFF4oL)n>T!(eN>&^g}sFnStoG7N4#7^fD4=_X9~u$vV}(x}#|Ifozu&s2S~B z`IL!`@sg|lC3sG{5BQab2b)T@7=RdW4s)Bjzd`zy)Ycl*aulk9bvL70#yOMYHHq;s z?F16LBVO@P6Nl^d4YfjbE3cw7`Z zTiD+u<)mq35qM%$l#A227j^MwD~=ah2cA{kMyrv-0Cq;JF+${gdGDx~!#t>f!r}uP zr_E90yeq-Sy`K)ys}akOWX%P5rAV!jBRcBjFN9B!=!nNx4;G7czpR-VGSYk)Qpgo+~egYU-zFM-4VTf>Ycdu{BS9COm7D3<{0ROi6c)hed!wj)`|< zD|1QzjUokh6ljj25$K<+%`NTcKk#;%XW*@^<~y6>;^HJf>A2qp8O+NeW_rZ^JKv$K z(a0{fkJUUd^GpcKP!<_dhg<+831MGbxHpvxTtTWF(4A39{Vx;1MB}kr$(O6G4W0{TU@9=@ zRZzXlPn&bj{XZ&HD5vUoy|Ij})6y-7Wa%75bt)1CW@*D@S`NIGfL=XX?o%WUIs|IwLFFLwe{y zuZh>_0vCCrS9E_H)>Wa&682)esin=UO{Q+2v2;$L)(o$hg(Xh8cvZy8zX*0_@jO(7 zdSK@V#J=_eErVg?r@(}P$S8i%v~$Y<2v*Q>DVu$*Su`w@2#q&*4t81ecV0A5mfkM+ zx08~i%G;ug0g2}wNXN^iggY7Oj{#z7-+85lxO%tqbsPrjN-1f5;9F<0(|qhtKrxC; zcm()NwC{)$=3ZS-CbOZTh0Bru1WCTP62qq{W|D{IRA?Y26P+p;{Uyr zQq-QulDUfF?Wces90XS1uPg4H2SxYU;oXKnV*6Gl2%?F0e5E$ccmyc%;*^VakO9m@ zc+Aq$G%L3cV^k(Mve)bux;@BqJ8P3CH<&SO2c}l3v3hMmscwz7C|nXgXJ!`6(8kAw zOTC`I|KJlIN;*3DQc_a3jdQE#fzgiTBj~6!h6ORgE=s!`939sR7_5?em?*{`uhH6Mf-e<$Fc z7EUW%ky318FE9&+KKe2@cla(~eQyUa^D$BQ))d{i@ua#!U0ACsD|06Jwb)VJF^sRF zX#>N!RxUTuW(RXgP^KynqRtNn6Q!=W3+ zBqj_?cQLy;*ZP6EFvkVq%}R>P(x2H@Uobps_z$m~rAi{bg0ph-k-l%%r{nCk^; zY|MkPB}`o8ETD`@@R#4iFqh^2X1$!d`?vv!jGTPYBxPM)oxZ+4ko)s{jy4+*S8||% zHi}8NEZLyvtdm7XR#8;}08c|2l=zm*SgljAP+Pr>%5B=v+k6k_xpnn=`#D1>`T?^-$G0nnu z_6+A!<*HG9xM~#CFYEevYX*m<1M9Gx5LHR2bp%z_)FzL7Px(*Aehw6l$g-4kq{y7$ zU5>$Fn`!Ky)+)X^qhxts<o1om zVNXj2vX=t*QEbDZcq;5So-@zcupm(LnfR>f!>`b`0d_tctBZI?tqo?wGIb}@u~v0X zG>;IMJHy^;9hx}V?3yzL0Z9E2xYHV|U}d~jCMx@)+qMji(jM*+AiZKTWf?<}ggavquQxCPh`_jQ^coazY^%NLa$)}PVp z^oeX0I7^BaZ)Dv&MZ*@v(xu(pQnO#O!zT^KYz2sqjs*hXU+MH@yJK}a?SI%?)NBXB zj{H;R9O|Z8A!}X|XJ21-7372w_P12p9>v&I;N;4W|G%WM(~{P(Jnq4KLquFTlScWF zu;I&R)^X2_fL~34Y!H||e+IL*@3>@!Un<{1y>7TGjsj0eC5-VkK9d0*pucG_q1?0^ z<&v56>#=GNU6ZBYgVh(6ler1|g`zn|>}Ku(2Q-OEADpRkO@)F8~0)12t} z095S2pRT@D=1TxTn9#%xB70~R{o+<3yEo$NuIolL)!|07Ch<^!B!+hZq!S?cHFHGM9 zVI41UD?e8#n45EoP~#U(a-il0YJA@y*}G8rhpBn`n~VB!ZZS!dkRtY5OP7)+As5S6 zMjbMi$Z}SMIN>2vk1bKHGZ=S!oE>+2X_yKRGrE_lMb`Q%M9#Uvf;dT8;_oVv6@ASS z4UO1e?LoNl6%S;!z88HY`(lsMdMvsL@?S8=bCW`6%-^>!UJR@^K zS23!jG)uEDXAL&9(#cz{bH=qyWlw5eA6{THD5R3RhbtT8OGsZ zSO07T!aT^hxQEjm#Xx|^*+s9kOyVav(=49qsQcs9wDi(4yh`6}Lu8LPnY~-`uPM7O z`9Yuu%!<9y<)~-eks&E9uLSL2&l}b0WwqHzB3~TA=zZD+H~m>$ML?_iIoVpdyw<$HU_`H_ z)=+P&N#3-y)q`bW-a{GU)%R2WC45xLm`TM&RjkNC>CuN^ViqP1j26f7FSJ0%@mU6| z^unll-RQ)=A1gUJ1wGZ);<6o&b*C6# z>zD7G4s3)IV-z88duN-DM8#TcwQ0Q(*uA literal 0 HcmV?d00001