From ad654e76b4c5dd3972cd2a07eb2d4f9658965807 Mon Sep 17 00:00:00 2001
From: Nerevar <12636964+Nerev4r@users.noreply.github.com>
Date: Thu, 30 Jun 2022 09:20:07 -0600
Subject: [PATCH] [Modular] Snails & Blushing Fix (again!) (#14604)

* snails fucking again holy shit

* wew

Co-authored-by: Snakebittenn <12636964+Snakebittenn@users.noreply.github.com>
---
 code/modules/surgery/organs/eyes.dm           |   1 +
 .../master_files/icons/mob/human_face.dmi     | Bin 1655 -> 2062 bytes
 .../mob/living/carbon/human/species.dm        |   5 +++++
 3 files changed, 6 insertions(+)

diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index ea38d4fc3b9..591bd7a58ce 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -530,6 +530,7 @@
 /obj/item/organ/internal/eyes/snail
 	name = "snail eyes"
 	desc = "These eyes seem to have a large range, but might be cumbersome with glasses."
+	icon = 'modular_skyrat/master_files/icons/mob/human_face.dmi' //SKYRAT EDIT - Roundstart Snails
 	eye_icon_state = "snail_eyes"
 	icon_state = "snail_eyeballs"
 	eyes_layer = ABOVE_BODY_FRONT_HEAD_LAYER //SKYRAT EDIT - Roundstart Snails
diff --git a/modular_skyrat/master_files/icons/mob/human_face.dmi b/modular_skyrat/master_files/icons/mob/human_face.dmi
index f5e7c2099a89807bfb703d4ee7482d893fd172ab..f71d0216e901ade4b042c76c23b12744807e9262 100644
GIT binary patch
literal 2062
zcmcgtX;2eJ6y5*=r9f1iVhs?iwKh;7$c<nE!3rW!qg4nHKq>}7j>H4QeF#&J#3~X{
z%25hvE#c6VQ-Mh(7KC6Kh{zFX3<1NLkZ^_21UlOObZR@ZGrKcycjx=w`@Z+S{mOg4
zj@C9U0Dz8%yBih&h~fwVn(B%zfOscNvE`AE_?~e)K?)^?$D9d|jshSq|K`(bt#ss;
ziz5#62;GL9-^=KJm$19XOf%3?HrGsEWnPNr7Gv}c+w*i2WHwVnOkF~}XLQ$Q+Q;gh
zi>{}x79T{`g=6(tu_oLdkM%QM9>XrfdTJUDnP9hvrMh5V=dE1cpnlBDBt`_&o(n&}
zr#`*Ur+p%n*i>C7gL?0;`_k@#;zPI<!IMQ2fBFdk8b}W}mm_iclS9>%!8QmhWVd_i
z1EOiIV%3DfcKBQ`7v0zz<^H5%=!N?(2G+FI-3md0b-UI)nH|l1wbERfHx*{zBKvh{
z51}pmmb!6IkQ5K9;E<GH70{{%(oXB55qt^xAcq8}R0&G6j|nXU*@*-PP8rC?;yE}j
zoptm>#}fWx;{=9XANBLd*A)_)q>h851YeMwFL#saUXWbDq9E3w*`I3m5$R}$_<Vm>
z0cpsWS;@0cYBZY1b!_^A%{>9fv2B+2fG2!UwB~1E<3V7Y3(&|nI6eSsdf?v#syZQ`
zmo^1Z$H`O7P12@p(Q)T8VLjAL@M22}w!H%<j22e+rgah4P?PAeh`2)$iM4-+$3OtF
z)9PLd&rVqV_;}Z;w>MD~9!D5k$uMXY$pWRtk^r8ymsyf-jO!z{jKA{uukrsQ6$1te
z%wkC{U9i_6gzbr7_k}hTEO!&>UbU(;Yyk&{y24xNJ)19B486DS`%a=UN}D+|w%onO
z>uAJ^HHF8e^PJd)^S+AgYlwP~+SEtT3c-sxbtGHN5*GWQWXzaaIHp{+U-@Ps!Fg^x
zD|zdbG;}Ox0Uk>CiUut`FaM)bAtAvxgoYBc>7P*d*I0Ez;>4p~fz<H>h#_gQAYe6A
zev;AWBaCHBCQh%*%$$>c-vhz#S8%H24Ga7Il_I4n6vTzRPZhnb!kRG_-x@>zjWGsN
z6$Oc?fVaiUUORS)W!1eubcH!wgJ*`s%_WXGaIV@k-C;a}v1Wxrd$xGlxsRyUk(ywq
z%`BP52<vShLY|6cv*fWJ=qhq>lGQzqmgWoFwhaeC6PHHdnT;!39S!8H+=w0+n6X~i
zyfN+lN^9L^ktA>cVZl+VDkj6(qO=L8G!CYt-gZM#wy36WX@DHbD6+y8G<WQsQ^Ldd
z;*$NS@fCc{9Km#rQc7D=E)*ogS+ln#&yQQ4WH=?$*2&8pDZJYM#Vu&7<W)Ib@)WhY
zolLLb2dJR+O0$=EKBy~H2No5zg3Q6{Zc6Ro@5Y<cR`Ux{atS+%6ePg)&6J-V<OJQW
zxa3=!?Z_6F7|HM9#e>B907Z*@jnr;zBlt0q+L*wKal9?9BwIvwE;FTh)++evCri1y
zI5yB_2C6kD=-n#2tN1&<GUPDG!K_LzTlNu+xl;RFXTcxi18WH~${cC5X!8|Y4^1+M
z7QPu>N;Vu}B=~RyT#?00VxWM)5Ue*7x93ZKjag<9iu#P!f~sdrH=F1EUGCMd7=p+%
z8B`T$U^*3aquJByxGug9@c!{EK@Aucu`1<8Bs?5qoNM>a?Ni*WlGPYs9&eFqctJHK
zcwVdJyXlkg%tX%lzU7hM&Q$_~@g%8*q^>Y&^6nti=a=|ojhKhG76|&T(g61126#cF
zoL^U7eh%f-ubd=WEzj_)^XEntZ%1{Cij4|e6T8ZH+NoX?XQBILJ720gT~vm4w5S@4
zyfh5a$*0++XfznL+#iPe*hYh0yqTWsz^S``I&0T$u1bd3KP7Vbou|YES5r$3*=|p^
QR1A3FvCrF$?i!r-C)Mp%GXMYp

literal 1655
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K59&oS$$v2KW0)SL^RY*jMOKNd)QD#9&W_}(6
zL&coZGaI>@4Mf}?T7K88E17y}$-2m{Afp%B9tzt%4}_iI6}`XD`TD7u=RR%S(a&$5
zJVT~-hsV8p8(!##2UYW#9(<JMp?c2n>V1!|Qxh+KIJoIZ>FwznyelVkA6TURRp;MP
zChlAh*0{fn+?VGrwf@U)E4cEg1;2!vd;G~`hAa7}#@t|FU|sI%;uumf=j~m?d|_{i
zwu^IDM?c-RkT*BOncJssm-_`LZrv@O(zh0#h>B8-6<>XJ&D`&Ep1n5OJbz2Sj`pO}
z4+~~A`22rU%a~x##Bh*>p^1}$C0e#2>UH~5AM+yq=Nmppy}nztOnPU#?)fNDkodjd
z&!66T<upB`?w?|{MCG+k>pNfX?bmxAS8mDv`7{5`!`IT+ayewb_11j)xG1l1rnjm6
z{|UA|Hm{G!?wcBPPaj#K=zn&Goi&^sP>Y2bIMf&fd>9mFFgO@6HYC7ZM3%%hD~7Gt
zZX>*L7TFuQ@BjWT$}3&yZ31^)Ue$a1>BZ}J&uRYov;9rt>&;=T3$}h+JmpiK<@OzC
zmd=`Ae?rb}Ug;yg{a%{+C<;$KEV%LLJ%jj(=?zqKJxV~VW)8^S8+Wcm`FjDM_4=)G
zy6L+nR^RxvCUievO!nS)d+nzL-IGbrep|TOJ9gI3)|wg1ULO5!@M(>3`Hok6?WYF)
zvp#q2)_dD`MSRc1KV{BZCVn3jOTSnyL{;1D`|?u%zlrVpWT`JseV|yXlaK%PWqSRr
zdEX6rD}Kg5S`#{-q2c;LTKSFXfY$N*EAD^V{!0Jm3EP~?Yp)n;etlV~pS~;V^#)M7
zsXw<L=n38D^S<A_{pXMKw+&w->*VHyW~~ihyY>F@o!@J}nHBLz&r@X(I8#o&)Ppbl
z@97X9{xA3b*IBy978w5Pq2d4B#8-b```YtSUpay4tD@%R<@kS@RrijYyl9mHWv4$@
zh$#8+Y5$SP)pm>w>znl%6{(UfP&@|AVPWhGu2t=x^V03zLz%L;?7h*TWVYdH<Z32h
zntQvqKK|TVy^_vn&*e9@PfVY?<8bWzzpsnll};}<0Og#V+H0#Awp^<NCP3ZiV$*kq
zfQx_=oBi%QjMjYm7g=GLr3_#6AK3>?KZOK9#SB@Q8pZYh-_<gHE3L2J|6TOPM1SPC
z2W6PQ8|J)x_4h9*4Rv474P|&X{om(!<7<DM>f}Bq^#R55Lm8s7<CkUr`f<JIDqs6^
zTbuLY#bWE@f$prn-zfXjz9DBHOACdi5X8YZ<d@G=Iv@G?`c+W9;_2$=vd$@?2>?I1
Bi^~82

diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm
index d45e6e08c82..6e29f6ea074 100644
--- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm
+++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm
@@ -384,6 +384,11 @@ GLOBAL_LIST_EMPTY(customizable_races)
 						eye_emissive.pixel_y += species_human.dna.species.offset_features[OFFSET_FACE][2]
 						standing += eye_emissive
 
+		// blush
+		if (HAS_TRAIT(species_human, TRAIT_BLUSHING)) // Caused by either the *blush emote or the "drunk" mood event
+			var/mutable_appearance/blush_overlay = mutable_appearance('icons/mob/human_face.dmi', "blush", -BODY_ADJ_LAYER) //should appear behind the eyes
+			blush_overlay.color = COLOR_BLUSH_PINK
+			standing += blush_overlay
 
 	//Underwear, Undershirts & Socks
 	if(!(NO_UNDERWEAR in species_traits))