From 9f87fbdd35dce5cae01de81bd16cab3f7c89c534 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Wed, 1 May 2019 18:54:14 +0200 Subject: [PATCH 1/4] Examine species colors --- code/Diona.png | Bin 0 -> 1614 bytes code/Grey.png | Bin 0 -> 1037 bytes code/Unathi.png | Bin 0 -> 915 bytes code/modules/mob/living/carbon/human/examine.dm | 7 ++++--- .../mob/living/carbon/human/species/grey.dm | 1 + .../mob/living/carbon/human/species/kidan.dm | 1 + .../mob/living/carbon/human/species/slime.dm | 1 + .../mob/living/carbon/human/species/tajaran.dm | 2 +- 8 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 code/Diona.png create mode 100644 code/Grey.png create mode 100644 code/Unathi.png diff --git a/code/Diona.png b/code/Diona.png new file mode 100644 index 0000000000000000000000000000000000000000..d311226d5f586660a74b7893e3c54baacf814848 GIT binary patch literal 1614 zcmV-U2C?~xP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1>;FXK~#8N?O8Ey zTQLmvy?ldSC5unc3v_AbKXhr=Y~2cvU7E#&R?8?skud zBTbLz^!M)7@ME(37i{S2?cw*=yN~bReSH7n2Tgx`PJg%Q|3cM^rvsJN8HcAxFY;?y z^HkQ^&);fyUeko)XMd5%{mP$dPb(?k7}x8Co6f34HpXQ-**mOyg9dE$W4Gv9O%W3AdmUlw&1R+c}Xj`cP=Zf-REGQ!4-PJlGJO~ zt+AC}AQi&lDp%Lyjp)U#ka{xeWD`PXgQ0!y_{jPXD7q2ze)1iOc32W^c zQf9QlkH^+?w28ppr9L}NQ!Zq&XIHa#ZfET?;9Vj_Ed4vk4JGUD!sR&MK~gTpt%=R6 z&YPw{{ED1hER9GYAr53gIi-JQ+8#Y z=qfuQLLARnVs>KD-g%z+zeiXvetx^B>1T?M2bJj1S+lDl+My&PQ8aTs!gaq#GVk03 z%{cdB<7EzO?HR6KK=~8GDzXPMrh~~<>00v1ZRdZG>a&H7JXH*&Y2t_PGvg#d3}94Z zF^WmYzCFm@UcOz47aDkrDRLMK16i=QYK&#Ft^jyv6Gi;cE?=^i9^LkO(XSMA$wE-O z3mn3I5**%^BD?YkK?#WU!b(6WA0i45-)V|qw-S^%@!CePp7WC~1 zHMZbz$wN7qYhT=^`*7<(A=#T6rCm&1YZmknN9o$GxRPBv$e~S^jj7j#96Krxy#a4I zeIEttAh{bVc-j|8R@&f#nkaH%B8uOCH;UU{9a>-U;AA^Xh+?ULUa}-OyoE4V^2p@h z4)vox(2M?`HX=3Y^`iSpqJHM2O#SCmu%%uUG-~wQu2^f&kkV?Kz8#^)9eDRVQN&U+ z>Y>wgEUwx?>CtjkXe=9--L~OBtqg9vsu%73d@s5 zg6DpZ3|6q?6-5?)P-CIX9l6vFwW?55=K*5*^rWd)VTNRxpY|_>6-W6+Q!x zu`rMYd#lC>aAmVwt`~7xV>Qut==?y?kSKfk_)3TrMfXE?<&k-t-y=3krx!0^L%m3g z?NlbzE#X>wh7=5KuxwC%7u;LA($Y_O5c{Lr;8Zb?riCBA!%Qx+Yuiq^WmoF?rIq5! z1U1RZZc8DrP>yiD%7BTeiW>(q=r62+u3UjIQ;A~Ur{#@S_|Dza&1ZqYwhK|rLF)&Z zdBK=3T&Eg2Xl1V)bjdUV5$Q!N5aIU=^dtX)QuTsL=2w%j<@XEq8t1rMZ_n`cB7^J7 zBSv`|HNG^&)?3OetZ#wa`ILiY8chy#`7YVI-+7M&P)F&Z9ct~SE zJ*5lyWY)(F!_|unG;Y65V!cR-)&FEoryh*kI1yhj1_lN~uy$0rN#X*k^lCBmVqjn` z?02s8-6!}=eoYv9F)*+I>NiChZ$uyrhF%N|3@pXai-CcGWq5x63(iT?!$6PL6aWAK M07*qoM6N<$f^umB`Tzg` literal 0 HcmV?d00001 diff --git a/code/Grey.png b/code/Grey.png new file mode 100644 index 0000000000000000000000000000000000000000..c79600304e5494aa0dec4955d8f011dc8967b1c6 GIT binary patch literal 1037 zcmV+o1oHcdP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1ENVpK~!i%?U}ny zD=`p;_r3O|Qt}+MX-`8zla7L|kPy;Af+iATyGU?ALZYJ0@ny!I8GF6!#3-A@zozl} z_x;=P2AXYE)r?gEt(vtepjES01+;3`8V0oQ+va)MLup>>)=l$Q#iD};RQ>YV)UIQd zvyt9jvV`P{&RLD!7a5C93Q)b9Iqc^8QQZRP)Ap?OAppg03%#`G1E^W)&g;SqsyB$A z=;1TyW?{}O7mK3=^pvH}araFd1=Lg0F2A6PnZK4T7?_7D*KdVMCE|oCvTSZPL6*a7 z9TOg9#D&%hjQ~0@gc3Hyu(yE#G+Ysxl8V$uG10f$+=PRAz5BDe=5e<+HS2p*ynTEJ z4?N#~KCZm^diC@{A3{+Hd+uIM@fQJAi^PZ8fWr{8zJ>iRY!>1!w#xMz!TsL$OStGm z;OKmOQDjit4;(PZ!lPrRAsPxL08I?xRsoGv?F2w!EZ8VuZW^O>OLfD6R>08B!>2C2 zKi!xj2h@jt4xalLV|nRJm4Wi(;nvuo3Z05?TmD5rX}@~4WH+r@r^E4$%k?Ya`Drs8 z9*(ZWjuTTda?dz}e%wNsSrW;*l^O&zHH4g-R|-%d(ydogK3RIs;n0Ifg&EWojetl< zio(MZEp+Y^>LCGj$Cli_T)(&3R&Zc`uVcsQxMyv_8AL%qlS2SoK5(oApjahiBA}vq ztQF0FTH}E7%iRZf2)^KiuCxvcsMQE|xqg>;WJF1t0%&}LiUJyMr4(m$0-!E~PM4je zYp9E50d*Nv2%4yrY_lomW~~_j3M%y+Pso1^XeW6BMLWGISA6`i%K$o^C)&Sg#fFxz z+;pjzfwmd~boVRXU)(}?%Xg;j5Xbr26HxWgw;I}xTtB89Iv+SQ@U!EToQY!Cn>$6} z6x|A;IZ``3gqpVZLl1TdDL^A*=_mXRjJ^+gCT>gZ5YZD6L{0$IdEj>yJn@+lp${6G zX^g+U1KKx(;@Q~XJvin0kwy2#X~fPfAc=QtgLDplA9f+wCpv>}snE>B9e;cXT#F00 zs3f3TXmEk4(cBn(bBM^-QQLQF&QU;>5I7nsK(&G|QJPR)ha$_C0krC9#IkZ30b3!F zISNy32~|LkO)A$8rq3NU_I)`?&$-~U*^>_00000NkvXX Hu0mjfz?P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D11L#EK~!i%?Up}M z>o5?;eFP3emzra62RAtY=LiKipry#9NDB>3W?2Lth)EjK)!{)u~-n#Cvqk*(`2XtQJEd}~~ zdbzoMzPa6RX+UZFV5X9@q!G$v4|f`i{+NRjicwRENCU^^Qo7uug80Y?BPHI)lkNe2s$O0bQ%6~r;HW#SJa?9uWBd*0bTwLmqRJtRN9p? z^X+>cSG9gnq^P@|N2t1-lZ!ouF1i0TkXbmOjN6?=piDUVxl^Fj+cO`iGU<;=vUhyE z-T^4jYa->a#-DdjU+`Di6wxlOg*llzMye%Hd>Q zW>@x5xI@~lry?j#V0#lrVN!|n_*_OhWxy!T&IzS^-B1s@2rGVD$$u3} zTSAW&ty({*49c*OE+{-}gV+tmDKN8wGV4^&@^uzUHn`snoGp84`8GJBC{KivM&3~IH0&>T=21yn)F!&Q!=P)42pvy?JWj{Yf7qEj+ErO}!IB|{da>Ysp;G}kz& z49cL83MnNQf?WA^hMW`kZ)T%VMs~}Y$?qHTFMun*q8EVD$8K&YW10&}GbpRz(iJhR zT0f`|${a&574)I;2p%6af@YmC=gdPHKo+z{Z3s?>8;;%&F0>Sm3++!OqLAsS=#&~G z&cjrNkX1qnSLff`Y@L#>l0s*&s`N7l5+h_$C_w}Vg)L8zN8bW7VM9=cpU&PAPJV6z zN)WvXHUf0CL0+LTc{;Om|MM%n+A3?jsS?NjB<;@~BqY+9J4A770clna;n p)@K^<|EUIL)8f>iY+9I3r#~T&E}+y~oR Date: Wed, 1 May 2019 18:55:30 +0200 Subject: [PATCH 2/4] Code cleanup --- code/Diona.png | Bin 1614 -> 0 bytes code/Grey.png | Bin 1037 -> 0 bytes code/Unathi.png | Bin 915 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 code/Diona.png delete mode 100644 code/Grey.png delete mode 100644 code/Unathi.png diff --git a/code/Diona.png b/code/Diona.png deleted file mode 100644 index d311226d5f586660a74b7893e3c54baacf814848..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1614 zcmV-U2C?~xP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1>;FXK~#8N?O8Ey zTQLmvy?ldSC5unc3v_AbKXhr=Y~2cvU7E#&R?8?skud zBTbLz^!M)7@ME(37i{S2?cw*=yN~bReSH7n2Tgx`PJg%Q|3cM^rvsJN8HcAxFY;?y z^HkQ^&);fyUeko)XMd5%{mP$dPb(?k7}x8Co6f34HpXQ-**mOyg9dE$W4Gv9O%W3AdmUlw&1R+c}Xj`cP=Zf-REGQ!4-PJlGJO~ zt+AC}AQi&lDp%Lyjp)U#ka{xeWD`PXgQ0!y_{jPXD7q2ze)1iOc32W^c zQf9QlkH^+?w28ppr9L}NQ!Zq&XIHa#ZfET?;9Vj_Ed4vk4JGUD!sR&MK~gTpt%=R6 z&YPw{{ED1hER9GYAr53gIi-JQ+8#Y z=qfuQLLARnVs>KD-g%z+zeiXvetx^B>1T?M2bJj1S+lDl+My&PQ8aTs!gaq#GVk03 z%{cdB<7EzO?HR6KK=~8GDzXPMrh~~<>00v1ZRdZG>a&H7JXH*&Y2t_PGvg#d3}94Z zF^WmYzCFm@UcOz47aDkrDRLMK16i=QYK&#Ft^jyv6Gi;cE?=^i9^LkO(XSMA$wE-O z3mn3I5**%^BD?YkK?#WU!b(6WA0i45-)V|qw-S^%@!CePp7WC~1 zHMZbz$wN7qYhT=^`*7<(A=#T6rCm&1YZmknN9o$GxRPBv$e~S^jj7j#96Krxy#a4I zeIEttAh{bVc-j|8R@&f#nkaH%B8uOCH;UU{9a>-U;AA^Xh+?ULUa}-OyoE4V^2p@h z4)vox(2M?`HX=3Y^`iSpqJHM2O#SCmu%%uUG-~wQu2^f&kkV?Kz8#^)9eDRVQN&U+ z>Y>wgEUwx?>CtjkXe=9--L~OBtqg9vsu%73d@s5 zg6DpZ3|6q?6-5?)P-CIX9l6vFwW?55=K*5*^rWd)VTNRxpY|_>6-W6+Q!x zu`rMYd#lC>aAmVwt`~7xV>Qut==?y?kSKfk_)3TrMfXE?<&k-t-y=3krx!0^L%m3g z?NlbzE#X>wh7=5KuxwC%7u;LA($Y_O5c{Lr;8Zb?riCBA!%Qx+Yuiq^WmoF?rIq5! z1U1RZZc8DrP>yiD%7BTeiW>(q=r62+u3UjIQ;A~Ur{#@S_|Dza&1ZqYwhK|rLF)&Z zdBK=3T&Eg2Xl1V)bjdUV5$Q!N5aIU=^dtX)QuTsL=2w%j<@XEq8t1rMZ_n`cB7^J7 zBSv`|HNG^&)?3OetZ#wa`ILiY8chy#`7YVI-+7M&P)F&Z9ct~SE zJ*5lyWY)(F!_|unG;Y65V!cR-)&FEoryh*kI1yhj1_lN~uy$0rN#X*k^lCBmVqjn` z?02s8-6!}=eoYv9F)*+I>NiChZ$uyrhF%N|3@pXai-CcGWq5x63(iT?!$6PL6aWAK M07*qoM6N<$f^umB`Tzg` diff --git a/code/Grey.png b/code/Grey.png deleted file mode 100644 index c79600304e5494aa0dec4955d8f011dc8967b1c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1037 zcmV+o1oHcdP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1ENVpK~!i%?U}ny zD=`p;_r3O|Qt}+MX-`8zla7L|kPy;Af+iATyGU?ALZYJ0@ny!I8GF6!#3-A@zozl} z_x;=P2AXYE)r?gEt(vtepjES01+;3`8V0oQ+va)MLup>>)=l$Q#iD};RQ>YV)UIQd zvyt9jvV`P{&RLD!7a5C93Q)b9Iqc^8QQZRP)Ap?OAppg03%#`G1E^W)&g;SqsyB$A z=;1TyW?{}O7mK3=^pvH}araFd1=Lg0F2A6PnZK4T7?_7D*KdVMCE|oCvTSZPL6*a7 z9TOg9#D&%hjQ~0@gc3Hyu(yE#G+Ysxl8V$uG10f$+=PRAz5BDe=5e<+HS2p*ynTEJ z4?N#~KCZm^diC@{A3{+Hd+uIM@fQJAi^PZ8fWr{8zJ>iRY!>1!w#xMz!TsL$OStGm z;OKmOQDjit4;(PZ!lPrRAsPxL08I?xRsoGv?F2w!EZ8VuZW^O>OLfD6R>08B!>2C2 zKi!xj2h@jt4xalLV|nRJm4Wi(;nvuo3Z05?TmD5rX}@~4WH+r@r^E4$%k?Ya`Drs8 z9*(ZWjuTTda?dz}e%wNsSrW;*l^O&zHH4g-R|-%d(ydogK3RIs;n0Ifg&EWojetl< zio(MZEp+Y^>LCGj$Cli_T)(&3R&Zc`uVcsQxMyv_8AL%qlS2SoK5(oApjahiBA}vq ztQF0FTH}E7%iRZf2)^KiuCxvcsMQE|xqg>;WJF1t0%&}LiUJyMr4(m$0-!E~PM4je zYp9E50d*Nv2%4yrY_lomW~~_j3M%y+Pso1^XeW6BMLWGISA6`i%K$o^C)&Sg#fFxz z+;pjzfwmd~boVRXU)(}?%Xg;j5Xbr26HxWgw;I}xTtB89Iv+SQ@U!EToQY!Cn>$6} z6x|A;IZ``3gqpVZLl1TdDL^A*=_mXRjJ^+gCT>gZ5YZD6L{0$IdEj>yJn@+lp${6G zX^g+U1KKx(;@Q~XJvin0kwy2#X~fPfAc=QtgLDplA9f+wCpv>}snE>B9e;cXT#F00 zs3f3TXmEk4(cBn(bBM^-QQLQF&QU;>5I7nsK(&G|QJPR)ha$_C0krC9#IkZ30b3!F zISNy32~|LkO)A$8rq3NU_I)`?&$-~U*^>_00000NkvXX Hu0mjfz?P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D11L#EK~!i%?Up}M z>o5?;eFP3emzra62RAtY=LiKipry#9NDB>3W?2Lth)EjK)!{)u~-n#Cvqk*(`2XtQJEd}~~ zdbzoMzPa6RX+UZFV5X9@q!G$v4|f`i{+NRjicwRENCU^^Qo7uug80Y?BPHI)lkNe2s$O0bQ%6~r;HW#SJa?9uWBd*0bTwLmqRJtRN9p? z^X+>cSG9gnq^P@|N2t1-lZ!ouF1i0TkXbmOjN6?=piDUVxl^Fj+cO`iGU<;=vUhyE z-T^4jYa->a#-DdjU+`Di6wxlOg*llzMye%Hd>Q zW>@x5xI@~lry?j#V0#lrVN!|n_*_OhWxy!T&IzS^-B1s@2rGVD$$u3} zTSAW&ty({*49c*OE+{-}gV+tmDKN8wGV4^&@^uzUHn`snoGp84`8GJBC{KivM&3~IH0&>T=21yn)F!&Q!=P)42pvy?JWj{Yf7qEj+ErO}!IB|{da>Ysp;G}kz& z49cL83MnNQf?WA^hMW`kZ)T%VMs~}Y$?qHTFMun*q8EVD$8K&YW10&}GbpRz(iJhR zT0f`|${a&574)I;2p%6af@YmC=gdPHKo+z{Z3s?>8;;%&F0>Sm3++!OqLAsS=#&~G z&cjrNkX1qnSLff`Y@L#>l0s*&s`N7l5+h_$C_w}Vg)L8zN8bW7VM9=cpU&PAPJV6z zN)WvXHUf0CL0+LTc{;Om|MM%n+A3?jsS?NjB<;@~BqY+9J4A770clna;n p)@K^<|EUIL)8f>iY+9I3r#~T&E}+y~oR Date: Thu, 2 May 2019 18:50:28 +0200 Subject: [PATCH 3/4] Plasmamen addition --- code/modules/mob/living/carbon/human/species/plasmaman.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 35d02f82509..bb900cdb5b6 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -41,6 +41,7 @@ ) speciesbox = /obj/item/storage/box/survival_plasmaman + flesh_color = "#8b3fba" /datum/species/plasmaman/say_filter(mob/M, message, datum/language/speaking) if(copytext(message, 1, 2) != "*") From d8dcd762a8f6876c83b0379aaa03614efc4d329b Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Mon, 6 May 2019 00:09:27 +0200 Subject: [PATCH 4/4] Gold color --- code/modules/mob/living/carbon/human/species/_species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index d9a501d2251..4c69da6fb22 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -80,7 +80,7 @@ var/dietflags = 0 // Make sure you set this, otherwise it won't be able to digest a lot of foods var/blood_color = "#A10808" //Red. - var/flesh_color = "#FFC896" //Pink. + var/flesh_color = "#d1aa2e" //Gold. var/single_gib_type = /obj/effect/decal/cleanable/blood/gibs var/remains_type = /obj/effect/decal/remains/human //What sort of remains is left behind when the species dusts var/base_color //Used when setting species.