From b97fedf863e5070ec85a0a1d0e3d9a2ab2156c00 Mon Sep 17 00:00:00 2001 From: ppi13 Date: Sat, 10 Apr 2021 02:17:01 +0200 Subject: [PATCH] Adds the Elusive Black crayon --- code/game/objects/items/crayons.dm | 5 +++++ .../objects/items/weapons/storage/fancy.dm | 4 +++- code/modules/clothing/gloves/color.dm | 2 +- icons/obj/crayons.dmi | Bin 2020 -> 1066 bytes 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 8fb04c81473..73d0a2e376e 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -174,6 +174,11 @@ colourName = "purple" ..() +/obj/item/toy/crayon/black + icon_state = "crayonblack" + colour = "#000000" + colourName = "black" + /obj/item/toy/crayon/white icon_state = "crayonwhite" colour = "#FFFFFF" diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 71852c60541..8cc8f5729f2 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -121,19 +121,21 @@ icon = 'icons/obj/crayons.dmi' icon_state = "crayonbox" w_class = WEIGHT_CLASS_SMALL - storage_slots = 6 + storage_slots = 8 icon_type = "crayon" can_hold = list( /obj/item/toy/crayon ) /obj/item/storage/fancy/crayons/populate_contents() + new /obj/item/toy/crayon/white(src) new /obj/item/toy/crayon/red(src) new /obj/item/toy/crayon/orange(src) new /obj/item/toy/crayon/yellow(src) 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/storage/fancy/crayons/update_icon() diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 146ca3cf25e..b889246f73d 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -78,7 +78,7 @@ desc = "These gloves are fire-resistant." icon_state = "black" item_state = "bgloves" - item_color="brown" + item_color="black" cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS diff --git a/icons/obj/crayons.dmi b/icons/obj/crayons.dmi index 9866fe5a95fc8c708d2eba43507fe0dcecf03a09..d6038054e3e3c55fcfe0c408fc5e265326fcb942 100644 GIT binary patch delta 1058 zcmV+-1l{}O52^@|7k{7#0{{R3yb+fl0001WP)t-sz`(%fa{$3%0RNyu|9$`fqtb@A z6#xJL0D`Chx9?$u52)rHwzjrsXJ`Na|8Geol3_5~0094!0RQp;+5rF8c^swy#F;b9 zssI3`R0Dww{{S=0nE?M%2L}KE|Hh04Nl8g6Dk_L%BB!UP*nimA-{0TBz`$pOfUN)k z00DGTPE!Ct=GbNc007QfFDZ*Bkpc$}5f%?^Sv3av zgE1WB704WwEskyJhREByNc5=X)+WCt?Y~*UkEe50^YT)$2Vl_7@&n(m)+`%!8&zs{ zTb3!%or-f4qJM~x%KT~u$XV8E45{6)?1rL;x&9)FVsdr~bx)$~5Wo^`uY2kM4u$Qg z*bnFp6{FB;y^*S+CCX9hNWX-TccPuZ7{a);I}l?f21*Gh__T!-|3~}4Mhd?OH_{o0 zVZj@k{~dh6Pj&hJu`f<%8cPk)I^zHU0*OgPK~#90?SGnUvzjmzMFYmS>8;PIw-yxm z|9`Qd?Rag?-i)~^OlPkz&afpcPauP5VvG<%2+<3YG`W)|UF-ZsGO&X?cF>{W@afUi zCLgh>_xuqVe;nY}Fqu9zOzk6H!Py)eE?k)5WIB0zJhkaZyn?g&430nkvfvIN8+!a2 z!M8hJ!G96)YgNDJH`y;gUsx-Bz2g%ck@;;?KVzmZ__Y&cel71muf%ZTFK(MD9?ghf ztNH=_^=r4xkouWWKS-L`rCr&zo!hD1*u=jMc0~FoT?+{zgb+dqA%y5BTaxcc{*B~& zlCyvBhZQzFZm{9|cWiiCVnf#dIIIpZKW>gNAAkOMhxuuFf;scs62Bes8=?M9%|6%< z&+m@RZ$|n<`@s1P_1ms9mK#6AagRm8J}O&AY|?D z-+y?URG;8y<{(?qvu|uX$MbUz&&w_?o{yLnB=s{LKfgiAXpFqmSbGiOd)zma2_33G!Fq< zW^f*zj@Lns1Vib)Abnk;uT#-suS@;@S1E)LLI@#5Y`WdO*n-|~A6s`V!03Gig&Pn; c2q7N%3B8sw>2}ef(EtDd07*qoM6N<$f_Q)UJ^%m! literal 2020 zcma)-dpy%^AIF!wX{J5ShoXcDIZN`$DLF1J$2Je{o1DTN8nb0TC5Or(9@Q|0tpl5! zLWwknx?>S@(=A4&kuuEETC3da{_FYge%`Owb$vds>yPV?_v`z*u6$plCk(n93Ic&( z-d=A0(xggP7DQIM7e$`dlE!dGAUe%0IyDj-my#BjoCE?9D5QxK&>Txe@M|2lfGXki zCLVS-HvgaozZw7=g!`Os>P)70u+wKp`ZNf_eO-3tT|rlgPt0?AH#yB!TAyy91fozV_b&3f^gQ=w^UcAwi6Rxtj@ zDTq>t?sr=70Zl04s3OG;x=SUYsSZQDGWIp(B_DD;E6`azUT+iA}7woiO5 z4>3xwRo*^8LKJbSMX9zJ?}@Uc&r3Dj6%i}l@H*L%d}N+NTv}aaEJ>Ikv=U7Yv`vbl zl>aHPU?EOVlWEH7vDwPR&L}u86Fc_Fs2lv&7+p2!QJim+$R_qC%v_e}N5CKznqj-Y z2-pVB&(JG{0KKj9O&`EMpH6JwIFn#R zyW!s7=z|Yh73erH_22(V?4)S7mZrqVA9%mAVv6qf+GM}f-N z)Wy)%w6N+~{qMN z2h>ElCG!KnC%jq6EVZaDVIQn5F6b1TltY@yb;|eid&pe_$|`&8-?@L}zj7ua&d~sa z%oB5RT`+qxrP_B+Wtcu;)n!aBkF7bKT!g5tp^O_$$4)PdV0J*zrmUnnk7F(_E}-pF zr1^goG(o2MJy$LCgB|8GtnHo~9KF1ipuSa)(#qN4TwznV6{4qPD&jL)^=c~6?`;|5 zGC#f!MII$eF6enE*VUX+xb{Z4JSe9kr$Pg2H(L}8Rt}f0-zqMC&0QDo(3eZ)*=J;A zK(AT)Hv&hFiJeYzbw$i@`21}z{4FoZVcCtirph1c%c1iYOcFpYN}HSqyP(acuRleNs~KOw^kG=*_K4o{3lA^hR)zIEEc-waDJP z^>IQ^V&R=O&{?;!t3-_OH!!iDf9ibDVXyi0(BavK!BHF!Cr2?~r;tL7CHZJ+_deay zTfrJ=i_Er*7tN?KP9|d25#ZE@apk$<9y)ocH5ibd2)|}A%GUcr28*nmc}=S9FU-!K zOA7%yit5^szsZsU`q}=u9NJHvLXd5Z0=7YnmIsJAnL0=|T6-R~vi^588M+IUE`} zCDQ<8E}hC>=`|u@2du19f^KfEzKx4OvY`>3`XLY7ceYfSU5S&*VIr=boDN)j;MUB$ z;907`Yp6yySLO=uDiHR6)3;4ol2uF5*!j-}ep&)^xZFLnm`rQ(yGP>?^m(yz{-D`~ z%enso7kS*8_OZ0G@(Z}iBnaMWO@(z~!BwG9I*N!wl}B0cY6enF!jTVIES5_P5a!`3 zI(9LXh)SLDggUM>7>sakH*OlYoM!LhiZ3cD`R(QCwFXkf0KM+x`KyUw1l)*gOa|2ZucD61EOz(I)<=ZmbEX8T=-8V0QNUfU z0$JaVuWmot-Td=@dX_n1)#ge<