From 17d4b297911fc862adc1065e11a14985d8702ef5 Mon Sep 17 00:00:00 2001 From: NikNakFlak Date: Wed, 20 Jul 2016 00:13:08 -0700 Subject: [PATCH] Desegregates crayons --- code/game/objects/items/crayons.dm | 10 ++++++++-- code/modules/clothing/gloves/color.dm | 9 +++++---- code/modules/clothing/gloves/miscellaneous.dm | 2 +- icons/obj/crayons.dmi | Bin 2767 -> 2865 bytes 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 3e10d6715a3..de9a36c446c 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -144,7 +144,7 @@ . = TRUE /obj/item/toy/crayon/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = hands_state) - // god bless tgui and all of its arguments + // tgui is a plague upon this codebase SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -466,6 +466,11 @@ item_color = "purple" reagent_contents = list("nutriment" = 1, "purplecrayonpowder" = 1) +/obj/item/toy/crayon/black + icon_state = "crayonblack" + paint_color = "#1C1C1C" //Not completely black because total black looks bad. So Mostly Black. + item_color = "black" + /obj/item/toy/crayon/white icon_state = "crayonwhite" paint_color = "#FFFFFF" @@ -502,7 +507,7 @@ icon = 'icons/obj/crayons.dmi' icon_state = "crayonbox" w_class = 2 - storage_slots = 6 + storage_slots = 7 can_hold = list( /obj/item/toy/crayon ) @@ -515,6 +520,7 @@ new /obj/item/toy/crayon/green(src) new /obj/item/toy/crayon/blue(src) new /obj/item/toy/crayon/purple(src) + new /obj/item/toy/crayon/black(src) update_icon() /obj/item/weapon/storage/crayons/update_icon() diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 8a61348e70a..e70b3ef14b0 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -26,8 +26,8 @@ desc = "These gloves are fire-resistant." name = "black gloves" icon_state = "black" - item_state = "bgloves" - item_color="brown" + item_state = "blackgloves" + item_color="black" cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS @@ -36,10 +36,10 @@ var/can_be_cut = 1 /obj/item/clothing/gloves/color/black/hos - item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way. + item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way. /obj/item/clothing/gloves/color/black/ce - item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way. + item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way. /obj/item/clothing/gloves/color/black/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/wirecutters)) @@ -64,6 +64,7 @@ item_state = "redgloves" item_color = "red" + /obj/item/clothing/gloves/color/red/insulated name = "insulated gloves" desc = "These gloves will protect the wearer from electric shock." diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 6cf66684ab9..007138caadb 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -27,7 +27,7 @@ name = "combat gloves" desc = "These tactical gloves are fireproof and shock resistant." icon_state = "black" - item_state = "bgloves" + item_state = "blackgloves" siemens_coefficient = 0 permeability_coefficient = 0.05 strip_delay = 80 diff --git a/icons/obj/crayons.dmi b/icons/obj/crayons.dmi index c4eebb65c805c035a3f8950cf8c1a99736a0f66f..dd686329a147107e68a09a58eecda2cbb6aca51a 100644 GIT binary patch delta 2799 zcmZ8jdpOf?8~_x(Kgbv^gtbKlqXJkOxgOPJj?FArxKDHSOI z0A$cEjwgicv{2e4#e^D;Eu8}Zku5JbU#GUVwr2n^mb|a)x;U|333&Xm0_f=L>$_>K z4Q_31QK?i`JU|Nq1ZDODywDf8Z%hvl4+o6t_W^;1hK4{O0003T4v$7_7X%r)yStOg zWCnx5WHQy%)Z9`2_V)ICJ|Brhf(WXyu`wcz3XdaWFc=>n9|YwX0zrkB*;3OG2oi-H z2Y)QIYY?~La1#>~7cG_WL^#>k*SFY=siG2YCe+@+rq2cy7_7vIOeBg{Rf}qCYkzcLR-vek zjiRk>LI8ZegrT9Ko}ONIb~f{G*i1CLQ3k)XB(}cpy0nK}Utdq9D6nVk8+Q|y zWtFjfvpIjaX27@<`#&dY5v$u9+MZd`Sa;&(;W8j zlZ)@qN_23cRVN<)O4ZpvdE*eKe2(28#pmm#i=utGDx+FgumB*@i*~g0 z#T9=q%JuU-so3T09klP5T5Q|P=i;MuQoCY?t@TRgff;=%jp<;QBRkvaRaJ`a`mdA5 zbKd8?2YJRv!=oZHJNYeV=5bcGTlN0znc#QZ)$xlB^hr1E1Cj*I-x$s`*DiHkH7Xd? z+DI!vY9^ca>X$QOf_AE&>U#OPyps`w7F9)5w-e|3UIaPSiL#`FrGo?tVRucps@sBg zm#dlnMmADE^_>iJihMd2!aIT#=SE5%Ma;c#CM)Q%0gUMLIH-KKxU=kUaqKZsuYWaTD_FY6>(%_P+afi)dMx_OQmC=&5I(z11{=HW`;3 z*Hg!7Qj%R<5H#e2{5z2{o6L1VJ%AjE_w1h|?kI5)Lwl zUq8RNM4?z|dREv`_H*keH+WGaf#IpCdWtT)?d~moWk;R=dW2g>~bhn zp~JkpPk)G0c?rr(wB^xr=Bzg7PxA!kKBgkb$)qy@IG@~@~E!l-l5fW!&PY?FP8rhD*$>6r{JqL$qbO+f1rgz)Vrkvl>T29(2Df(hR>;PDiZmgDG@B`JuYXenY4~JF2Szxqk6QSxUo;SgjJ~%{1GfLMDH4 z@mvw_di&S3!9>LGH%Sog-wGlln+WACQ*Rt5HiuSxlh(qC-WfQ24`;Gm#n+~)T)dY@ z`uix+w1<^te2z3A8-7`{iMYUvX~bq^&K%ie31Wk}s8dV(OtH2758tsOs15Oqw0_g1 zT}3rY#I+w?mPxx(jp!AqgvKu_rr6mSULc3FksPl*1)n+`m5fPxLbIO`Bbx%NL1yY#xc_3*|6zcXbr^|s&G99bd9E(){j rU$=Y%3a%tCs{gKJQj2RI)VQJ?`vf9GTTovA{SQSuc{oz+0}1~DNw{L~ delta 2726 zcmY*bdpy(YAAh#xmM}!)&?u#p5nVW9GdfZ1h!w@jBG+i5PKpyjTu0mO{} z%@=^A5HE=ZOeRwrmSf%}kw^jp0)Tl}4v+vKAv+q}yI@ME(>WZ@z`%e=B*NqIVzJo7 z#Khd(+|$$3&CTuL!GlC1F(f2}OeTkgg#mxye8dZovV3dyLl`E^JqczPEKP=qVH$z@rB!I$T_t^NZ*QLk z;28kJ0L(#w;57hj0A`uswG*H_0(K$DK*pAoluQATo&k@Gi>plqbOLx52e{Qz4Vaul zI5{~DmxF`^nS=ze&0soL+6vfJSArYBaR>aRdwB}c-#1b0t0q+e`)jg ztq zHBFVRTTqTVixxGD(G~GKA{n<7bw;gZ#;KEk&{tjajk|Jj2B;NF{afupSR96g| zZK&G55F?jNq>F7F9O`yuY#Cco)+`~^-$;{8v%mP)ZLHa1P#r@a^P7kk0LW1s?QMyX zd2_kR?!;p{ZH%KA&uT&*q~Y4uXT#2CGr!z@uBSIhjK-QCtTOaBE+t7QV@)^9 zaTCJm|B996e<3#M-5PYx^-0OV&l}Yb`i}J*?|oTGg%o^f48!%`{2=Y5!^4cgmiD0& zTcdRh6BY7EuhcttC)%Tl&2Ur6tO6rsr0VbPo$uPkMjl{j*1Kqye4_J5OwdOV8Gu*d zIZueso|lA&O3s{%4R-95CFMrMM6-p$tZC8veey`sN`v0$2khu2oaBa#UHgVI5=wt8 zzI`03OVM<=TO6pTof7}(+Pkot1A{~gY@@>GyYT-5rA94EW9aq^`=g8=XFZ=27~H}H ze5+@f4K?y}!53wZFUe_%WleYOgeX>%m_dUi-U<)`=P1ynCRDMjO;~&ei*M3A)g-%f ztk3tT{heozkJF}AQy&y0L$u9ldq%C&oE&z!FYMoS4|ea3n#$)W3*7#V_D`rl8Q55v z6%MbYU*_oLmGt~UOWE3~lV6efh}Rj4E+H8))YFombINM!cN4zhX(e93Q``{B%yW|I zOL2?>r@=g`0P}Iy4s-bOyN(y+nm-X zhs2Md2ZXe|5!keMtbvT?_{OP0;hCp3D_||w`^Lnf$-kA~t{l#JyrURCrNTF~+>Enm zMEFdThgGxH5OBt=ygG-X1Dft%xSga9MnC)J;exuH`~qS1Pi<~Nrz;CuLbYC-3&9gB z=lXsoy7brsCul5XOpE05{icVOtreoB9YtGqAX0{8rJbg)Q^d%{7qRlYGHk_bT6Oc? z^ug0N>TRgqirTDFtjVC&x%awr6vW)aiW~y#X|sg__4zgEyn$8EwDQG5^ZU~@*>M9f z(I;L@_hz8+HimZcPCkE1IZA3uk9WgfH%G82%3C3krOQ`vWySwjK1u=i{2G<00~H1> zNoh5#s1B3Zw^aQn7AQOuRxT~h`1X11PQNR$^WDr#%`=LBJr-CeN`9e;i7(}Zoz!ojNR}BFZ7H;LNva3`6R4nxg5*k zSed>RHAF#J)XcPkjH8%f%PgR(ImK%m z_UjVdKb;r`@zx8?R(qn{E~9a&SHAJ_{r3J#8-|o)d1>kB!$6jD?~q>wmVGQHP+lNV zKxh8`xu+;y>ADE<@2e|2E4^br^Csn0Se5RA`w#LCa=blk8$+S(JeBt99|_L6JQF@; zcH`&>y4{)JY>VhyW{RVJ$FjC~^iM*frEMugLsuaxs;WXl$CA~lf2*V&2=O%GeU{m~ zv=PJh=7v)$GgVvWW~{HA>hy6i?l$Z+!`{rvs8i)BJUn=EEHG!`Fm zAPN5wwUp^iX)( z=7{Dzk3q<+@Ec|FuL5Cg@wc9yKA5AqrqKbU&Tj{jnA5A*{l)K)Ucs_*_YNr zHe|O@UmUcEUg8>?%E`OCPep{w94N?C88k_Gp)+0`5mEP6hxMrmPtqugp^SE9d22;j zw)UDOaRImQ{_3S5KD2VA)k|5`5BV3Ys{#=dEvmnL%#LL<_hP@o8hZJVvmu#FOIw0sdz=a{vGU