cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes duplicate emote overlays (#23164)

Browse Source 
* Removes duplicate emote overlays

* Reverts my accidental dme changes
This commit is contained in:
GoldenAlpharex
2023-08-18 10:21:48 -07:00
committed by GitHub
parent d21e06104f
commit 6280e327e8
2 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/master_files/icons/effects/overlay_effects.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm
-31
View File
@@ -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)