From 99d5f2f43b3fbeb499689ec2cecf9389be9c681f Mon Sep 17 00:00:00 2001 From: Dip Date: Tue, 10 Nov 2020 20:50:28 -0300 Subject: [PATCH] Fuck monochrome, polychrome is now the deal --- code/modules/clothing/suits/vg_suits.dm | 12 +---- .../code/modules/client/loadout/glasses.dm | 11 +++++ .../clothing/glasses/polychromic_glasses.dm | 41 ++++++++++++++++++ .../code/modules/clothing/suits/misc.dm | 9 ++++ hyperstation/icons/mob/eyes.dmi | Bin 0 -> 1034 bytes hyperstation/icons/mob/suit.dmi | Bin 0 -> 1426 bytes hyperstation/icons/obj/clothing/glasses.dmi | Bin 0 -> 881 bytes hyperstation/icons/obj/clothing/suits.dmi | Bin 0 -> 343 bytes .../code/modules/client/loadout/glasses.dm | 10 ----- tgstation.dme | 3 ++ 10 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 hyperstation/code/modules/client/loadout/glasses.dm create mode 100644 hyperstation/code/modules/clothing/glasses/polychromic_glasses.dm create mode 100644 hyperstation/code/modules/clothing/suits/misc.dm create mode 100644 hyperstation/icons/mob/eyes.dmi create mode 100644 hyperstation/icons/mob/suit.dmi create mode 100644 hyperstation/icons/obj/clothing/glasses.dmi create mode 100644 hyperstation/icons/obj/clothing/suits.dmi diff --git a/code/modules/clothing/suits/vg_suits.dm b/code/modules/clothing/suits/vg_suits.dm index fe011c60..c750f1cd 100644 --- a/code/modules/clothing/suits/vg_suits.dm +++ b/code/modules/clothing/suits/vg_suits.dm @@ -55,16 +55,6 @@ alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' mutantrace_variation = NO_MUTANTRACE_VARIATION - -/obj/item/clothing/suit/kaminacape - name = "Kamina's Cape" - desc = "Don't believe in yourself, dumbass. Believe in me. Believe in the Kamina who believes in you." - icon_state = "kaminacape" - body_parts_covered = 0 - icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' - mutantrace_variation = NO_MUTANTRACE_VARIATION - /obj/item/clothing/suit/officercoat name = "Officer's Coat" desc = "Ein Mantel gemacht, um die Juden zu bestrafen." @@ -75,7 +65,7 @@ /obj/item/clothing/suit/soldiercoat name = "Soldier's Coat" - desc = "Und das heißt: Erika." + desc = "Und das hei�t: Erika." icon_state = "soldiersuit" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' diff --git a/hyperstation/code/modules/client/loadout/glasses.dm b/hyperstation/code/modules/client/loadout/glasses.dm new file mode 100644 index 00000000..72c02568 --- /dev/null +++ b/hyperstation/code/modules/client/loadout/glasses.dm @@ -0,0 +1,11 @@ +/datum/gear/glasses/garb + name = "polychromic gar glasses" + category = SLOT_GLASSES + path = /obj/item/clothing/glasses/polychromic/garpoly + cost = 2 + +/datum/gear/glasses/gigagarb + name = "polychromic giga gar glasses" + category = SLOT_GLASSES + path = /obj/item/clothing/glasses/polychromic/supergarpoly + cost = 2 diff --git a/hyperstation/code/modules/clothing/glasses/polychromic_glasses.dm b/hyperstation/code/modules/clothing/glasses/polychromic_glasses.dm new file mode 100644 index 00000000..fa6a67fb --- /dev/null +++ b/hyperstation/code/modules/clothing/glasses/polychromic_glasses.dm @@ -0,0 +1,41 @@ +//Archie was here + +/obj/item/clothing/glasses/polychromic + name = "polychromic glasses template" + desc = "You shouldn't be seeing this. Report it if you do." + icon = 'hyperstation/icons/obj/clothing/glasses.dmi' + icon_state = "polygar" + item_color = "polygar" + item_state = "polygar" + alternate_worn_icon = 'hyperstation/icons/mob/eyes.dmi' //Because, as it appears, the item itself is normally not directly aware of its worn overlays, so this is about the easiest way, without adding a new var. + hasprimary = TRUE + primary_color = "#0c0c0c" + vision_correction = 1 + +/obj/item/clothing/glasses/polychromic/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon + . = ..() + if(hasprimary | hassecondary | hastertiary) + if(!isinhands) //prevents the worn sprites from showing up if you're just holding them + if(hasprimary) //checks if overlays are enabled + var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary") //automagical sprite selection + primary_worn.color = primary_color //colors the overlay + . += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite. + if(hassecondary) + var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary") + secondary_worn.color = secondary_color + . += secondary_worn + if(hastertiary) + var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary") + tertiary_worn.color = tertiary_color + . += tertiary_worn + +/obj/item/clothing/glasses/polychromic/garpoly + name = "polychromic gar glasses" + desc = "Go beyond impossible and kick reason to the curb! Doesn't seem to have flash protection and doesn't seem sharp either. It is made out of bluespace prescription glass though." + +/obj/item/clothing/glasses/polychromic/supergarpoly + name = "polychromic giga gar glasses" + desc = "Believe in the you who believes in yourself. Also doesn't seem to have flash protection and doesn't seem sharp either. It is made out of bluespace prescription glass though." + icon_state = "polysupergar" + item_color = "polysupergar" + item_state = "polysupergar" diff --git a/hyperstation/code/modules/clothing/suits/misc.dm b/hyperstation/code/modules/clothing/suits/misc.dm new file mode 100644 index 00000000..15504607 --- /dev/null +++ b/hyperstation/code/modules/clothing/suits/misc.dm @@ -0,0 +1,9 @@ +/obj/item/clothing/suit/kaminacape + name = "Kamina's Cape" + desc = "Don't believe in yourself, dumbass. Believe in me. Believe in the Kamina who believes in you." + icon_state = "kaminacape" + item_state = "kaminacape" + body_parts_covered = 0 + icon = 'hyperstation/icons/obj/clothing/suits.dmi' + alternate_worn_icon = 'hyperstation/icons/mob/suit.dmi' + mutantrace_variation = NO_MUTANTRACE_VARIATION diff --git a/hyperstation/icons/mob/eyes.dmi b/hyperstation/icons/mob/eyes.dmi new file mode 100644 index 0000000000000000000000000000000000000000..628bc237ead5c997ac154038e50ca008042208bb GIT binary patch literal 1034 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSGpa%&N?cNllZ!G7N;32F7#J$% zEbZIKcSu2kE&bo}AD7l$?Fcg$b56F}^4=kcMJW0Nf7Y*We13heDh|i4JGOK87v(P( zE*~!9D{OSyeRpC-+sXNNFHZfTpgQ1Anu)@etkp3N~9QQ?&L z_S@*-C^tJ;+5T*e|Frt+b07LXGLVk@FZ07Lc(Jr8&_r(g(CCB9lH!*$Ffi+Sx;TbZ z%z1nFVApI1hK5AlRQ}Y1(ejB2@(SheEAO7YoBffursWRXHxaIH7b0S2oAk|c`Tbvh zO5Q4qu>U!m8fTtez3SAFuTO8PFL-Xmup^LhO6tvJGA5<}xAyPfW;k8u_3IgPSFJkr zyE!a$>i^eE^m6AvzWMn7dAI#6U-Vur)H%Iv_k+Fb`J4ZWU6uWQ>tlZI^;FOIjOWD5 z=l|Vz)4t05--Ohg|L%$ZzxHwO&zEj{S-zCs@B1xY{UhS`#NU<-v+daqNixh~JU}LK zmTQ5|>F-PZQXc)_pU+lzHf(wO`B?dc`8)orT<9<_2R1G6`Uqwg^mGR=4z>z0<3Y^9)1ZPE6J_yS8FyqwnP>e`nt^IU8Sm zIWKp<=6SpS%k^ddUn`3>_@%mF_sY^(d1sE?^258=zusl{?fdTLnh)i#%3>#&SntT3 zRkQu}R-l6T`1t*M_wN0>^W*Nj?|#eX*F6V?bf?-`K0d`Qe`nj)@LWyn=PuZ|agH3{ z^Zv#HHimQta*54M9EyANOO=GzzBHefS5)=m&R527oxlA{-&S0Ic6_a7Pw4DDb_afb zTsT|e)h~wIQ})<7^n5g_X=@j_CGmLW{`;~!><-AP>}AiGrKaEYNcC97uOB~t%uKy$ zcdVkza9-D^YjqiH;rdN@aGzId4_`fSH@Y)78&qol`;+0N!=RR{#J2 literal 0 HcmV?d00001 diff --git a/hyperstation/icons/mob/suit.dmi b/hyperstation/icons/mob/suit.dmi new file mode 100644 index 0000000000000000000000000000000000000000..2a36355c03fb2ef4bb31e028996c7555a8f6b130 GIT binary patch literal 1426 zcmV;D1#S9?P)004jl0{{R3eocQU0000LP)t-sz`($h z007wl00000|NsC0W&r;)0K^tp$N&HU0d!JMQvg8b*k%9#0DXE?Sad{Xb7OL8aCB*J zZU6vyoKseCa&`CgQ*iP1g$a&%kZoyG?rm18m@SvVe&t z=NXNZ?0*SU{e`_@GN9r90Qrv{s4Ma3xsR`%9 z`l_k*pBq3a{lo*%8XD9c>G3LBFr?80pU9E4LH|Nu<4v@*j|@Y#pChkdL_74u5UhZv z3>R&Q8|@57I`+YW`;_7EiJP*1+bj4?RL67Z>SCiaTT2z z35P8Sj@;AZG|zK28`-tX`~t|e3#V%8=Bf7(sk6sYz3WAG#1TjA<-vu1FApyDhzCiE z2ZN?np2R%ZqmIAIa^-S_4OAwA|n0z8;7 z9Pn*$h7ICL%!BXawB)z;>pWsgG`l2itj9b^rptGVSidgk2tDe`>;s;0#FLl@|2?0_ zl;Jo{Kaz%U%OjpdJV+$UrHB;UwIxh zhCEMO3>m6x^{ocI?`sSXDnlah&nPgY1{Ew1O1Obvfz}7NQ1hU6=~&5-D^zeiD0vI^ zr}e>(H4kbWBrqz=gN6Xfhx`|=xUhzt-Q2(vr-}#X%4|8$gJ#Q)2Rk@&9#rYsBiJ!h zJZKF|JSgl6B@Z$ock)ZqsbMv>Lct^t-mI#GZ)PsdgG?QXcdGP$fnX@^5M~Cz!GfU! zLgIK5SQ7M)IT-kOoFJ@WnFrCaE!Q*8QlFM6*};QH9PzitI#2HALF~7a2N(M1c+mH* z@nkBI5@u!A@{5Qkn#cT>vnJdWS-&2}%8 z5>Iv<;4Z_17wX<}RhZ5z@?=N*JP!^uX;|dRPLy~sexuewSC%IUFY#auB|cqO;7Nd^ z0uSa43p}}r2lZ8%Cp$o$tRY7{Xx3EZ$xS?{ugW|L_{Nid;K(@QL3OpllR#Veq;XxX zhTW@v^Hb1z#-s~Gx%b%z>>!CJ3_-E?P g)sy+b|9yV(H*Oat?9y!a(EtDd07*qoM6N<$f<4l#H2?qr literal 0 HcmV?d00001 diff --git a/hyperstation/icons/obj/clothing/glasses.dmi b/hyperstation/icons/obj/clothing/glasses.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5c030a88bcd0157c6fc10637e116975f61d269a9 GIT binary patch literal 881 zcmV-%1CIQOP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#FW@^dQF6N{9%I8!o#hFZIa4p{fenBIq|C&i0I+)ST+;a(c38(b_tAc-hiCvC z1QCHV!$7m(oCq5L;N)`*002_{c5lo>GJwN~b8aPow^7kr@4oC9wJf+qA)DbJojBk@$e^S!gn&9k`TbpX;up^QOKsFOF9o>=Yz7WhoaZuwrvw4&J19s=6ZEL#wL6K zc%S+;od>Ac2l&yLnQ2FZ>DGD5F6GyFsM-hxM&N*i=4!yTT9##EI)DBhmeqL3J_I>w zt#=CHuJx4Pz?`o}j-M)zsc9?BHGXI3Lm?vDIe%?tZb|Afp9K&R5HY&r1855&`x^Wg zWQ^HMccI7ZC|#0G&w&3)k68kDX#^l`Kw2XJX#>(40Z1E=)(Ak_fV4&c(gvh80+2Q! ztr38<0cni@qzzn=QfgO9jo$}c(MJG1Qf-w4oBd9Zny}V3edT?$Q*(bQ+t)kK0W$TX z?XXKAsJsHeT01g9{k1l{7BrPNMFg`HMpN@l@1G3=8M{`Ub4YSZ(;Z5SDg$oQ<7b)cPRG!xytWyG}iLE>mf2Lo7m%QP})GPdhZk;aXb!i-!gkd z0Nlg3mmaYM?tHjDB7i$J0+2Q!tr38<0cni@qzy>x*9Y(ydTICQn;mei00000NkvXX Hu0mjfgs6{O literal 0 HcmV?d00001 diff --git a/hyperstation/icons/obj/clothing/suits.dmi b/hyperstation/icons/obj/clothing/suits.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b303d60f18102d7a211e8916e18234787bc41d20 GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*8>L*OlDxX3FI;`{0D+G zhGUZ#-2rkKOM?7@862M7NCR^6szM@4TvCgZi!uvJGV}8o7%JujhZPi+e*Y3&@bT*t zEpJ_|b7#&6ZwNKGX#C)j&UqirlMF>Yy*n(7gN!d5dnwF$H0j8s5QSh(YeREmeM8HQ z3Zb3d#;TiFNN8l7I65YEn=3tC978lF?wxR! zx50p;HL*GA5yPU`1s08EjgvO~*SaQMV75;>zM@~g;eSX_uL!4}&&K3LJ;@vw#x1q? zyV$p%csglf|Gk}j>`!c@`QHm>K4bXQv$pPwOpI}Yx5L#`hLvvI0ap`diqBpuKjZ#m k*6dddQk)5OZ`!LEbQ=V$l^m**fR14BboFyt=akR{096u$IsgCw literal 0 HcmV?d00001 diff --git a/modular_citadel/code/modules/client/loadout/glasses.dm b/modular_citadel/code/modules/client/loadout/glasses.dm index 8df5eed9..9e7b68bf 100644 --- a/modular_citadel/code/modules/client/loadout/glasses.dm +++ b/modular_citadel/code/modules/client/loadout/glasses.dm @@ -42,13 +42,3 @@ name = "Prescription glasses" category = SLOT_GLASSES path = /obj/item/clothing/glasses/regular - -/datum/gear/glasses/garb - name = "plain black GAR glasses" - category = SLOT_GLASSES - path = /obj/item/clothing/glasses/garb - -/datum/gear/glasses/gigagarb - name = "plain black giga GAR glasses" - category = SLOT_GLASSES - path = /obj/item/clothing/glasses/garb/supergarb diff --git a/tgstation.dme b/tgstation.dme index cf7c2cfd..95cda5aa 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2989,7 +2989,10 @@ #include "hyperstation\code\mobs\werewolf.dm" #include "hyperstation\code\modules\traits.dm" #include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm" +#include "hyperstation\code\modules\client\loadout\glasses.dm" #include "hyperstation\code\modules\clothing\head.dm" +#include "hyperstation\code\modules\clothing\glasses\polychromic_glasses.dm" +#include "hyperstation\code\modules\clothing\suits\misc.dm" #include "hyperstation\code\modules\crafting\bounties.dm" #include "hyperstation\code\modules\crafting\recipes.dm" #include "hyperstation\code\modules\integrated_electronics\input.dm"