diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index d0a358155e..dfbad3f908 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -83,6 +83,10 @@ public sealed partial class ChatUIController : UIController {SharedChatSystem.OOCPrefix, ChatSelectChannel.OOC}, {SharedChatSystem.EmotesPrefix, ChatSelectChannel.Emotes}, {SharedChatSystem.EmotesAltPrefix, ChatSelectChannel.Emotes}, + // CrystallEdge alternative emotes prefix + {SharedChatSystem.CEEmotesPrefix, ChatSelectChannel.Emotes}, + {SharedChatSystem.CEEmotesAltPrefix, ChatSelectChannel.Emotes}, + // CrystallEdge End {SharedChatSystem.AdminPrefix, ChatSelectChannel.Admin}, {SharedChatSystem.RadioCommonPrefix, ChatSelectChannel.Radio}, {SharedChatSystem.DeadPrefix, ChatSelectChannel.Dead} diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs index 8da62efc3a..062438ef22 100644 --- a/Content.Shared/Chat/SharedChatSystem.cs +++ b/Content.Shared/Chat/SharedChatSystem.cs @@ -24,6 +24,10 @@ public abstract class SharedChatSystem : EntitySystem public const char AdminPrefix = ']'; public const char WhisperPrefix = ','; public const char DefaultChannelKey = 'h'; + // CrystallEdge # and % emotes prefix + public const char CEEmotesPrefix = '%'; + public const char CEEmotesAltPrefix = '#'; + // CrystallEdge End public const int VoiceRange = 10; // how far voice goes in world units public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units diff --git a/Resources/Prototypes/_CP14/Species/carcat.yml b/Resources/Prototypes/_CP14/Species/carcat.yml index eba1ee6788..4c88fa226a 100644 --- a/Resources/Prototypes/_CP14/Species/carcat.yml +++ b/Resources/Prototypes/_CP14/Species/carcat.yml @@ -11,6 +11,10 @@ maleFirstNames: CP14_Names_Carcat_First femaleFirstNames: CP14_Names_Carcat_First naming: First + minAge: 18 + maxAge: 110 + youngAge: 20 + oldAge: 80 - type: speciesBaseSprites id: CP14MobCarcatSprites diff --git a/Resources/Prototypes/_CP14/Species/dwarf.yml b/Resources/Prototypes/_CP14/Species/dwarf.yml index eb4975f54c..51a6bddba6 100644 --- a/Resources/Prototypes/_CP14/Species/dwarf.yml +++ b/Resources/Prototypes/_CP14/Species/dwarf.yml @@ -10,6 +10,10 @@ maleFirstNames: CP14_Names_Dwarf_Male_First #TODO femaleFirstNames: CP14_Names_Dwarf_Female_First #TODO lastNames: CP14_Names_Dwarf_Last #TODO + minAge: 18 + maxAge: 350 + youngAge: 100 + oldAge: 175 - type: speciesBaseSprites id: CP14MobDwarfSprites diff --git a/Resources/Prototypes/_CP14/Species/elf.yml b/Resources/Prototypes/_CP14/Species/elf.yml index a0ccbd3776..000eb32cbc 100644 --- a/Resources/Prototypes/_CP14/Species/elf.yml +++ b/Resources/Prototypes/_CP14/Species/elf.yml @@ -10,6 +10,10 @@ maleFirstNames: CP14_Names_Elf_Male_First femaleFirstNames: CP14_Names_Elf_Female_First lastNames: CP14_Names_Elf_Last + minAge: 18 + maxAge: 900 + youngAge: 100 + oldAge: 700 - type: speciesBaseSprites id: CP14MobElfSprites diff --git a/Resources/Prototypes/_CP14/Species/goblin.yml b/Resources/Prototypes/_CP14/Species/goblin.yml index 65f3dad79c..121ccae1df 100644 --- a/Resources/Prototypes/_CP14/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Species/goblin.yml @@ -11,6 +11,10 @@ maleFirstNames: CP14_Names_Goblin_Male_First femaleFirstNames: CP14_Names_Goblin_Female_First naming: First + minAge: 18 + maxAge: 70 + youngAge: 25 + oldAge: 55 - type: speciesBaseSprites id: CP14MobGoblinSprites diff --git a/Resources/Prototypes/_CP14/Species/silva.yml b/Resources/Prototypes/_CP14/Species/silva.yml index d5edeb6a80..d0a90e7229 100644 --- a/Resources/Prototypes/_CP14/Species/silva.yml +++ b/Resources/Prototypes/_CP14/Species/silva.yml @@ -11,6 +11,10 @@ maleFirstNames: CP14_Names_Silva_Male_First femaleFirstNames: CP14_Names_Silva_Female_First naming: First + minAge: 18 + maxAge: 500 + youngAge: 100 + oldAge: 300 - type: speciesBaseSprites id: CP14MobSilvaSprites diff --git a/Resources/Prototypes/_CP14/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml index 3caaff0976..44c5262a3c 100644 --- a/Resources/Prototypes/_CP14/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Species/tiefling.yml @@ -10,6 +10,10 @@ maleFirstNames: CP14_Names_Tiefling_Male_First femaleFirstNames: CP14_Names_Tiefling_Female_First lastNames: CP14_Names_Tiefling_Last + minAge: 18 + maxAge: 120 + youngAge: 50 + oldAge: 80 # The lack of a layer means that # this person cannot have round-start anything