diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index f721bcc5fc..8ddedbd561 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -266,7 +266,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) //message from the initiator without a target, all admins will see this //won't bug irc /datum/admin_help/proc/MessageNoRecipient(msg) - msg = copytext_char(msg, 1, MAX_MESSAGE_LEN) + msg = copytext_char(sanitize(msg), 1, MAX_MESSAGE_LEN) var/ref_src = "[REF(src)]" //Message to be sent to all admins var/admin_msg = "Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [keywords_lookup(msg)]" diff --git a/modular_eros/code/modules/mob/eros_emotes.dm b/modular_eros/code/modules/mob/eros_emotes.dm index 3203e5984c..a3f6fb6ed0 100644 --- a/modular_eros/code/modules/mob/eros_emotes.dm +++ b/modular_eros/code/modules/mob/eros_emotes.dm @@ -1,3 +1,4 @@ +// SPLURT emotes /datum/emote/living/tilt key = "tilt" key_third_person = "tilts their head" @@ -100,3 +101,62 @@ return to_chat(user, "Your ass feels full, again.") user.fart_cooldown = 0 + +// Hyperstation Emotes +/datum/emote/living/cackle + key = "cackle" + key_third_person = "cackles" + message = "cackles hysterically!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/cackle/run_emote(mob/living/user, params) + if(ishuman(user)) + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + playsound(user, 'modular_eros/sound/voice/cackle_yeen.ogg', 50, 1, -1) + . = ..() + +/datum/emote/speen + key = "speen" + key_third_person = "speeeeens!" + restraint_check = TRUE + mob_type_allowed_typecache = list(/mob/living, /mob/dead/observer) + mob_type_ignore_stat_typecache = list(/mob/dead/observer) + +/datum/emote/speen/run_emote(mob/user) + . = ..() + if(.) + user.spin(20, 1) + + if(iscyborg(user) && user.has_buckled_mobs()) + var/mob/living/silicon/robot/R = user + var/datum/component/riding/riding_datum = R.GetComponent(/datum/component/riding) + if(riding_datum) + for(var/mob/M in R.buckled_mobs) + riding_datum.force_dismount(M) + else + R.unbuckle_all_mobs() + +/datum/emote/speen/run_emote(mob/living/user, params) + if(ishuman(user)) + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + playsound(user, 'modular_eros/sound/voice/speen.ogg', 50, 1, -1) + . = ..() + +/datum/emote/sound/human/chirp + key = "chirp" + key_third_person = "chirps" + message = "chirps!" + sound = 'modular_eros/sound/voice/chirp.ogg' + +/datum/emote/sound/human/caw + key = "caw" + key_third_person = "caws" + message = "caws!" + sound = 'modular_eros/sound/voice/caw.ogg' + diff --git a/modular_eros/code/modules/mob/hyper_emotes.dm b/modular_eros/code/modules/mob/hyper_emotes.dm deleted file mode 100644 index 368bb99750..0000000000 --- a/modular_eros/code/modules/mob/hyper_emotes.dm +++ /dev/null @@ -1,11 +0,0 @@ -/datum/emote/sound/human/chirp - key = "chirp" - key_third_person = "chirps" - message = "chirps!" - sound = 'modular_eros/sound/voice/chirp.ogg' - -/datum/emote/sound/human/caw - key = "caw" - key_third_person = "caws" - message = "caws!" - sound = 'modular_eros/sound/voice/caw.ogg' diff --git a/modular_eros/sound/voice/cackle_yeen.ogg b/modular_eros/sound/voice/cackle_yeen.ogg new file mode 100644 index 0000000000..8d76cda277 Binary files /dev/null and b/modular_eros/sound/voice/cackle_yeen.ogg differ diff --git a/modular_eros/sound/voice/speen.ogg b/modular_eros/sound/voice/speen.ogg new file mode 100644 index 0000000000..b01f86b517 Binary files /dev/null and b/modular_eros/sound/voice/speen.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 26668a4f3f..1f2db53ab1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3815,7 +3815,6 @@ #include "modular_eros\code\modules\arousal\genitals_sprite_accessories.dm" #include "modular_eros\code\modules\keybindings\keybind\movement.dm" #include "modular_eros\code\modules\mob\eros_emotes.dm" -#include "modular_eros\code\modules\mob\hyper_emotes.dm" #include "modular_eros\code\modules\mob\mob.dm" #include "modular_eros\code\modules\mob\mob_defines.dm" #include "modular_eros\code\modules\mob\dead\new_player\sprite_accesories\ears.dm"