cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Modular] Updates and adds overlay emotes (#10542)

Browse Source 
* change an overlay emote check so simplemobs can cast it

* syke i added two

* love nitpicking sprites

* *question emote
This commit is contained in:
ghost sheep
2022-01-12 03:54:30 +00:00
committed by GitHub
parent 8e2635161d
commit 50bfdacbd6
3 changed files with 51 additions and 14 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: 4.7 KiB

modular_skyrat/modules/emotes/code/additionalemotes/overlay_emote.dm
+51 -14
View File
@@ -7,7 +7,7 @@
/datum/emote/living/sweatdrop/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
if(iscarbon(user) || issilicon(user))
if(isliving(user))
var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "sweatdrop", ABOVE_MOB_LAYER)
overlay.pixel_x = 10
overlay.pixel_y = 10
@@ -20,13 +20,26 @@
/datum/emote/living/exclaim/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
if(iscarbon(user) || issilicon(user))
if(isliving(user))
var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "exclamation", ABOVE_MOB_LAYER)
overlay.pixel_x = 10
overlay.pixel_y = 28
flick_overlay_static(overlay, user, 50)
playsound(get_turf(user), 'sound/machines/chime.ogg', 25, TRUE)
/datum/emote/living/question
key = "question"
key_third_person = "questions"
/datum/emote/living/question/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
if(isliving(user))
var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "question", ABOVE_MOB_LAYER)
overlay.pixel_x = 10
overlay.pixel_y = 28
flick_overlay_static(overlay, user, 50)
playsound(get_turf(user), 'modular_skyrat/modules/emotes/sound/emotes/question.ogg', 25, TRUE)
/datum/emote/living/realize
key = "realize"
@@ -34,7 +47,7 @@
/datum/emote/living/realize/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
if(iscarbon(user) || issilicon(user))
if(isliving(user))
var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "realize", ABOVE_MOB_LAYER)
overlay.pixel_y = 15
flick_overlay_static(overlay, user, 50)
@@ -46,23 +59,13 @@
/datum/emote/living/annoyed/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
if(iscarbon(user) || issilicon(user))
if(isliving(user))
var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "annoyed", ABOVE_MOB_LAYER)
overlay.pixel_x = 10
overlay.pixel_y = 10
flick_overlay_static(overlay, user, 50)
playsound(get_turf(user), 'modular_skyrat/modules/emotes/sound/emotes/annoyed.ogg', 25, TRUE)
/datum/emote/living/blush
key = "blush"
key_third_person = "blushes"
/datum/emote/living/blush/run_emote(mob/living/carbon/human/user, params, type_override, intentional)
. = ..()
if(iscarbon(user))
var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "blush", ABOVE_MOB_LAYER)
flick_overlay_static(overlay, user, 50)
playsound(get_turf(user), 'modular_skyrat/modules/emotes/sound/emotes/blush.ogg', 25, TRUE)
/datum/emote/living/glasses
key = "glasses"
@@ -77,3 +80,37 @@
flick_overlay_static(overlay, user, 10)
else
return FALSE
////
// These emotes hook into existing ones
/datum/emote/living/blush
key = "blush"
key_third_person = "blushes"
/datum/emote/living/blush/run_emote(mob/living/carbon/human/user, params, type_override, intentional)
. = ..()
if(iscarbon(user))
var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "blush", ABOVE_MOB_LAYER)
flick_overlay_static(overlay, user, 50)
playsound(get_turf(user), 'modular_skyrat/modules/emotes/sound/emotes/blush.ogg', 25, TRUE)
/datum/emote/living/snore
key = "snore"
key_third_person = "snores"
/datum/emote/living/snore/run_emote(mob/living/carbon/human/user, params, type_override, intentional)
. = ..()
if(isliving(user))
var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "snore", ABOVE_MOB_LAYER)
overlay.pixel_y = 6
flick_overlay_static(overlay, user, 100)
/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(isliving(user))
var/mutable_appearance/overlay = mutable_appearance(overlay_emote, "sigh", ABOVE_MOB_LAYER)
flick_overlay_static(overlay, user, 50)
modular_skyrat/modules/emotes/sound/emotes/question.ogg
BIN
View File
Binary file not shown.