diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/observer_say.dm similarity index 100% rename from code/modules/mob/dead/observer/say.dm rename to code/modules/mob/dead/observer/observer_say.dm diff --git a/code/modules/mob/living/brain/say.dm b/code/modules/mob/living/brain/brain_say.dm similarity index 100% rename from code/modules/mob/living/brain/say.dm rename to code/modules/mob/living/brain/brain_say.dm diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/alien_say.dm similarity index 100% rename from code/modules/mob/living/carbon/alien/say.dm rename to code/modules/mob/living/carbon/alien/alien_say.dm diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/carbon_say.dm similarity index 100% rename from code/modules/mob/living/carbon/say.dm rename to code/modules/mob/living/carbon/carbon_say.dm diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/human_say.dm similarity index 100% rename from code/modules/mob/living/carbon/human/say.dm rename to code/modules/mob/living/carbon/human/human_say.dm diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/living_say.dm similarity index 100% rename from code/modules/mob/living/say.dm rename to code/modules/mob/living/living_say.dm diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/ai_say.dm similarity index 100% rename from code/modules/mob/living/silicon/ai/say.dm rename to code/modules/mob/living/silicon/ai/ai_say.dm diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/pai_say.dm similarity index 100% rename from code/modules/mob/living/silicon/pai/say.dm rename to code/modules/mob/living/silicon/pai/pai_say.dm diff --git a/code/modules/mob/living/silicon/robot/say.dm b/code/modules/mob/living/silicon/robot/robot_say.dm similarity index 100% rename from code/modules/mob/living/silicon/robot/say.dm rename to code/modules/mob/living/silicon/robot/robot_say.dm diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/silicon_say.dm similarity index 100% rename from code/modules/mob/living/silicon/say.dm rename to code/modules/mob/living/silicon/silicon_say.dm diff --git a/code/modules/mob/living/simple_animal/friendly/drone/say.dm b/code/modules/mob/living/simple_animal/friendly/drone/drone_say.dm similarity index 100% rename from code/modules/mob/living/simple_animal/friendly/drone/say.dm rename to code/modules/mob/living/simple_animal/friendly/drone/drone_say.dm diff --git a/code/modules/mob/living/simple_animal/slime/say.dm b/code/modules/mob/living/simple_animal/slime/slime_say.dm similarity index 100% rename from code/modules/mob/living/simple_animal/slime/say.dm rename to code/modules/mob/living/simple_animal/slime/slime_say.dm diff --git a/code/modules/mob/say.dm b/code/modules/mob/mob_say.dm similarity index 100% rename from code/modules/mob/say.dm rename to code/modules/mob/mob_say.dm diff --git a/tgstation.dme b/tgstation.dme index 2398c238b80..8e4010c022a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2096,8 +2096,8 @@ #include "code\modules\mob\mob_helpers.dm" #include "code\modules\mob\mob_lists.dm" #include "code\modules\mob\mob_movement.dm" +#include "code\modules\mob\mob_say.dm" #include "code\modules\mob\mob_transformation_simple.dm" -#include "code\modules\mob\say.dm" #include "code\modules\mob\status_procs.dm" #include "code\modules\mob\transform_procs.dm" #include "code\modules\mob\update_icons.dm" @@ -2114,7 +2114,7 @@ #include "code\modules\mob\dead\observer\notificationprefs.dm" #include "code\modules\mob\dead\observer\observer.dm" #include "code\modules\mob\dead\observer\observer_movement.dm" -#include "code\modules\mob\dead\observer\say.dm" +#include "code\modules\mob\dead\observer\observer_say.dm" #include "code\modules\mob\living\blood.dm" #include "code\modules\mob\living\bloodcrawl.dm" #include "code\modules\mob\living\damage_procs.dm" @@ -2126,36 +2126,37 @@ #include "code\modules\mob\living\living_defense.dm" #include "code\modules\mob\living\living_defines.dm" #include "code\modules\mob\living\living_movement.dm" +#include "code\modules\mob\living\living_say.dm" #include "code\modules\mob\living\login.dm" #include "code\modules\mob\living\logout.dm" -#include "code\modules\mob\living\say.dm" #include "code\modules\mob\living\status_procs.dm" #include "code\modules\mob\living\taste.dm" #include "code\modules\mob\living\ventcrawling.dm" #include "code\modules\mob\living\brain\brain.dm" #include "code\modules\mob\living\brain\brain_item.dm" +#include "code\modules\mob\living\brain\brain_say.dm" #include "code\modules\mob\living\brain\death.dm" #include "code\modules\mob\living\brain\emote.dm" #include "code\modules\mob\living\brain\life.dm" #include "code\modules\mob\living\brain\MMI.dm" #include "code\modules\mob\living\brain\posibrain.dm" -#include "code\modules\mob\living\brain\say.dm" #include "code\modules\mob\living\brain\status_procs.dm" #include "code\modules\mob\living\carbon\carbon.dm" #include "code\modules\mob\living\carbon\carbon_defense.dm" #include "code\modules\mob\living\carbon\carbon_defines.dm" #include "code\modules\mob\living\carbon\carbon_movement.dm" +#include "code\modules\mob\living\carbon\carbon_say.dm" #include "code\modules\mob\living\carbon\damage_procs.dm" #include "code\modules\mob\living\carbon\death.dm" #include "code\modules\mob\living\carbon\emote.dm" #include "code\modules\mob\living\carbon\examine.dm" #include "code\modules\mob\living\carbon\inventory.dm" #include "code\modules\mob\living\carbon\life.dm" -#include "code\modules\mob\living\carbon\say.dm" #include "code\modules\mob\living\carbon\status_procs.dm" #include "code\modules\mob\living\carbon\update_icons.dm" #include "code\modules\mob\living\carbon\alien\alien.dm" #include "code\modules\mob\living\carbon\alien\alien_defense.dm" +#include "code\modules\mob\living\carbon\alien\alien_say.dm" #include "code\modules\mob\living\carbon\alien\damage_procs.dm" #include "code\modules\mob\living\carbon\alien\death.dm" #include "code\modules\mob\living\carbon\alien\emote.dm" @@ -2163,7 +2164,6 @@ #include "code\modules\mob\living\carbon\alien\login.dm" #include "code\modules\mob\living\carbon\alien\logout.dm" #include "code\modules\mob\living\carbon\alien\organs.dm" -#include "code\modules\mob\living\carbon\alien\say.dm" #include "code\modules\mob\living\carbon\alien\screen.dm" #include "code\modules\mob\living\carbon\alien\status_procs.dm" #include "code\modules\mob\living\carbon\alien\update_icons.dm" @@ -2198,10 +2198,10 @@ #include "code\modules\mob\living\carbon\human\human_defines.dm" #include "code\modules\mob\living\carbon\human\human_helpers.dm" #include "code\modules\mob\living\carbon\human\human_movement.dm" +#include "code\modules\mob\living\carbon\human\human_say.dm" #include "code\modules\mob\living\carbon\human\inventory.dm" #include "code\modules\mob\living\carbon\human\life.dm" #include "code\modules\mob\living\carbon\human\physiology.dm" -#include "code\modules\mob\living\carbon\human\say.dm" #include "code\modules\mob\living\carbon\human\species.dm" #include "code\modules\mob\living\carbon\human\status_procs.dm" #include "code\modules\mob\living\carbon\human\suicides.dm" @@ -2240,12 +2240,13 @@ #include "code\modules\mob\living\silicon\examine.dm" #include "code\modules\mob\living\silicon\laws.dm" #include "code\modules\mob\living\silicon\login.dm" -#include "code\modules\mob\living\silicon\say.dm" #include "code\modules\mob\living\silicon\silicon.dm" #include "code\modules\mob\living\silicon\silicon_defense.dm" #include "code\modules\mob\living\silicon\silicon_movement.dm" +#include "code\modules\mob\living\silicon\silicon_say.dm" #include "code\modules\mob\living\silicon\ai\ai.dm" #include "code\modules\mob\living\silicon\ai\ai_defense.dm" +#include "code\modules\mob\living\silicon\ai\ai_say.dm" #include "code\modules\mob\living\silicon\ai\death.dm" #include "code\modules\mob\living\silicon\ai\examine.dm" #include "code\modules\mob\living\silicon\ai\laws.dm" @@ -2254,7 +2255,6 @@ #include "code\modules\mob\living\silicon\ai\logout.dm" #include "code\modules\mob\living\silicon\ai\multicam.dm" #include "code\modules\mob\living\silicon\ai\robot_control.dm" -#include "code\modules\mob\living\silicon\ai\say.dm" #include "code\modules\mob\living\silicon\ai\vox_sounds.dm" #include "code\modules\mob\living\silicon\ai\freelook\cameranet.dm" #include "code\modules\mob\living\silicon\ai\freelook\chunk.dm" @@ -2263,9 +2263,9 @@ #include "code\modules\mob\living\silicon\pai\death.dm" #include "code\modules\mob\living\silicon\pai\pai.dm" #include "code\modules\mob\living\silicon\pai\pai_defense.dm" +#include "code\modules\mob\living\silicon\pai\pai_say.dm" #include "code\modules\mob\living\silicon\pai\pai_shell.dm" #include "code\modules\mob\living\silicon\pai\personality.dm" -#include "code\modules\mob\living\silicon\pai\say.dm" #include "code\modules\mob\living\silicon\pai\software.dm" #include "code\modules\mob\living\silicon\robot\death.dm" #include "code\modules\mob\living\silicon\robot\emote.dm" @@ -2278,7 +2278,7 @@ #include "code\modules\mob\living\silicon\robot\robot_defense.dm" #include "code\modules\mob\living\silicon\robot\robot_modules.dm" #include "code\modules\mob\living\silicon\robot\robot_movement.dm" -#include "code\modules\mob\living\silicon\robot\say.dm" +#include "code\modules\mob\living\silicon\robot\robot_say.dm" #include "code\modules\mob\living\simple_animal\animal_defense.dm" #include "code\modules\mob\living\simple_animal\constructs.dm" #include "code\modules\mob\living\simple_animal\corpse.dm" @@ -2314,11 +2314,11 @@ #include "code\modules\mob\living\simple_animal\friendly\sloth.dm" #include "code\modules\mob\living\simple_animal\friendly\snake.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm" +#include "code\modules\mob\living\simple_animal\friendly\drone\drone_say.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\drones_as_items.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\extra_drone_types.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\interaction.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\inventory.dm" -#include "code\modules\mob\living\simple_animal\friendly\drone\say.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\verbs.dm" #include "code\modules\mob\living\simple_animal\friendly\drone\visuals_icons.dm" #include "code\modules\mob\living\simple_animal\guardian\guardian.dm" @@ -2408,8 +2408,8 @@ #include "code\modules\mob\living\simple_animal\slime\emote.dm" #include "code\modules\mob\living\simple_animal\slime\life.dm" #include "code\modules\mob\living\simple_animal\slime\powers.dm" -#include "code\modules\mob\living\simple_animal\slime\say.dm" #include "code\modules\mob\living\simple_animal\slime\slime.dm" +#include "code\modules\mob\living\simple_animal\slime\slime_say.dm" #include "code\modules\mob\living\simple_animal\slime\subtypes.dm" #include "code\modules\modular_computers\laptop_vendor.dm" #include "code\modules\modular_computers\computers\_modular_computer_shared.dm"