From 6280e327e8703b087d932c092a4deeb0ea7fe2b9 Mon Sep 17 00:00:00 2001 From: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:21:48 -0400 Subject: [PATCH] Removes duplicate emote overlays (#23164) * Removes duplicate emote overlays * Reverts my accidental dme changes --- .../icons/effects/overlay_effects.dmi | Bin 3910 -> 3004 bytes .../code/additionalemotes/overlay_emote.dm | 31 ------------------ 2 files changed, 31 deletions(-) diff --git a/modular_skyrat/master_files/icons/effects/overlay_effects.dmi b/modular_skyrat/master_files/icons/effects/overlay_effects.dmi index be4eebf6c63b62940f00411ba321b956401e574f..2eb0a60bd630e30d89bef68e6f61230537295ce1 100644 GIT binary patch literal 3004 zcmbtWc{Cg77XKotEyPkq$Cjq1@fu1yq~ryu5;C2^qf=T+Xlo~ySW|?lrMf8XOzlfi zqn1>4P+O=OOE)DUmReFuNl{f>B)rT!o%7Cl=lwJ9{qcSGyZ5{2e&^ip-rxOQwYRmF zmHtW^03b`Uv2*|cB07R8NpaEs;Y6doNc6;M8%*`31OX70ccZUW`l*3Z zGS_78uo-pV(LogAY$-}(!4wwuI3dSRu{vfAv2(igUJL82W*e*fa_tMJp0qsM4?k9G zC>`olxZ0KDY~hi2OJ^kLd6c;YJEQnDT$bl^xpg_iU`Rs8Mp2Cssa|C8wMXNCicTqX z>u?~%jDcxo^$*qLW`*z7y6$~`1QWUU*j5nU@9Ra^SdZ0>tk3(U`fh}aOH;hw(r>Obwc*bvcL(6k|l&)nlB{z@-$vfOt3K~3lc4MJvFk3vCF3IH+(0qB$j z?FM4N;JQeKn}ML3HRE(CC8f&%=)4L!AWv4&Adu7(hn4v}J8$f6AgA zcU^ZHR_sL3fzH)l24<$0BMu`>WdWQhhCp=f)#jvb>j5LQkG@W8Mvj(^9>XFH(36U~`4sYHC zs<0C(bJEdZ^yIehDR%kJ69w?YfSGJ|wfUH$Lm?kMU|YHAlP{iACTwyrzs0A5kO31! zSzPd%6x~=)ClbZw=yRS*)Comd$Xc(Jeqi`S*@7V~6*;rLL-jIz`F0R@E~(e*6orI1&>Y;3Z&?&u=V?xj}-m9k(>YWN}uZ_ z_}H?vT5!>yj&CRAmT1*0TzxySmkN5Urza%3T~<1YyuO><&cig=MgbDYC*M9)G@*L$ z1V9!BjEzv?_-r~ndpVcVVbs7(=2t;La=&PO`8wxKNKwe#KBOX7yuH0O*LEji^;qz- zVKO&wyM%at!I7E97u}@UbuXn~mYd2;G?R_`7!Z!zyjEzQzJ!u33hG!gk}Ig@i}c8O zC#=j@Wi8?gG4O9=&v#5HynnCBTtSc@%}!11PFzc!Gk_IK@#P8QDdt!UJRAg@IH`J$yjY+&coWGd{D9LYS1_>|=$13`QOivK zDrdE^mFP()GOmIZ^1}R`kSjf6VhocU(SBzoZo3*}!3it2zaB@&+AjfTNh@U$u6ZrUgLd67xcnb5{r{*gI;(f<`p_!AJ0|n& zhVzp-&8=f@mNOkUtbY>b!6U)^YOjjfQcu$FU!UD42yjyD#o6)=O-XuucT^pc`#3k`{7@tv7q8yI% zxHc1lIr}*NhIyr`W6dbde9`9I?qZ)g_ME%rMGEie7~`=}hmlza7;bnfP2W9LYv=Xm z5wh`S3T=Be{jC{4sU><`0F(FFHfqp%XSqrxbDq4_V?wGa%sr8`hS))W&<_Ll4Y)%^ z*ds8pFT-#uPxDRG%t8~=8V&(7@-C7OB_&mf5`S^h{Miy^nlkt1ALkx33}+D+9L8^!MD(JWnrj>iW2N~1z6;=xz6LAp)KI1<@Kpvyxhe&I= z>W*p+g?x4&#!2G!Z<<)@sQE!rI6I-M2H2~W3NMEoycgT-w~*pwKFp#A4kjNV(PY?i zG33MMFWXymjuxuq3#1 zU&Df}?^ak2EiqWEoUqr_0EuO>GMZ2kOw_51{cu^g5D+}%g7Bd~kHx>-_PogZc|Q~a zl@F12{?mJ zWHKjvREIbm;m*!ZE#K-SsDF13Iy^l5k(8O5YQx~F9iAyVzJoE4P&M&%<$&% zQC^{!vHG{nNlKL)bMh`Xc-YzWH_Qf#%M;l2DWE`x;B)7R(xpsetG z98!AVVPm7tc#xB_ii%pcV1zG>b0?N$q^4dcmJreLnc7RGQpeR1m++b#w|Km!7O#GQ z@b)_p>hH`{uB4oJ#YX3 literal 3910 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 Ofb%g|$J!&oH~tRA22BV6 diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm b/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm index 2c480b67002..e456712124a 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm @@ -75,34 +75,3 @@ overlay.pixel_y = 10 user.flick_overlay_static(overlay, 50) playsound(get_turf(user), 'modular_skyrat/modules/emotes/sound/emotes/annoyed.ogg', 25, TRUE) - - -/datum/emote/living/glasses - key = "glasses" - key_third_person = "glasses" - message = "pushes up their glasses." - -/datum/emote/living/glasses/run_emote(mob/living/carbon/human/user, params, type_override, intentional) - . = ..() - var/obj/O = user.get_item_by_slot(ITEM_SLOT_EYES) - if((istype(O, /obj/item/clothing/glasses)) && get_toggle(user)) - var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "glasses", ABOVE_MOB_LAYER) - if(isteshari(user)) - overlay.pixel_y = -5 - user.flick_overlay_static(overlay, 10) - else - return FALSE - -// These emotes hook into existing ones -/datum/emote/living/sigh - key = "sigh" - key_third_person = "sighs" - -/datum/emote/living/sigh/run_emote(mob/living/carbon/human/user, params, type_override, intentional) - . = ..() - if(iscarbon(user) && get_toggle(user)) - var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "sigh", ABOVE_MOB_LAYER) - if(isteshari(user)) - overlay.pixel_y = -4 - - user.flick_overlay_static(overlay, 50)