Merge pull request #109 from frosty-dev/ups

Ups

Resources/Changelog/ChangelogWhite.yml

@@ -7837,3 +7837,72 @@
   id: 466
   time: '2024-08-05T13:39:31.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/567
+- author: Aviu
+  changes:
+  - message: "\u041C\u043E\u043B\u043D\u0438\u044F \u0440\u0435\u0432\u0435\u043D\u0430\
+      \u043D\u0442\u0430 \u0441\u043D\u043E\u0432\u0430 \u0440\u0430\u0431\u043E\u0442\
+      \u0430\u0435\u0442."
+    type: Fix
+  - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u0430\u043A\u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0449\
+      \u0438\u0442 \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u0430 \u043C\u0430\
+      \u0433\u0430 \u0432 \u0441\u0443\u043C\u043A\u0435."
+    type: Fix
+  - message: "\u0421\u0440\u044B\u0432\u0430\u043D\u0438\u0435 \u043F\u043E\u043B\u0430\
+      \ \u0442\u043E\u043F\u043E\u0440\u043E\u043C \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u043D\u0435 \u043C\u0433\u043D\u043E\u0432\u0435\u043D\u043D\u043E\u0435."
+    type: Fix
+  - message: "\u0413\u043E\u043B\u043E\u043F\u0440\u043E\u0435\u043A\u0446\u0438\u0438\
+      \ \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0434\u0435\u0441\u043F\
+      \u0430\u0432\u043D\u044F\u0442\u0441\u044F."
+    type: Fix
+  - message: "\u0415\u043C\u0430\u0433\u043D\u0443\u0442\u044B\u043C \u0434\u0435\u0444\
+      \u0438\u0431\u043E\u043C \u043D\u0435\u043B\u044C\u0437\u044F \u0448\u043E\u043A\
+      \u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043D\u0430 \u043F\u0440\u043E\u0442\
+      \u0438\u0436\u0435\u043D\u0438\u0438 3\u0445 \u0441\u0435\u043A\u0443\u043D\u0434\
+      \ \u043F\u043E\u0441\u043B\u0435 \u0443\u0434\u0430\u0440\u0430 \u0432 \u0431\
+      \u043E\u0435\u0432\u043E\u043C \u0440\u0435\u0436\u0438\u043C\u0435."
+    type: Tweak
+  id: 467
+  time: '2024-08-07T10:32:35.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/576
+- author: Aviu
+  changes:
+  - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043F\u0440\u0438\u043A\u043E\u043B\
+      \u043E\u0432 \u0432 \u0435\u043C\u0430\u0433\u043D\u0443\u0442\u044B\u0435 \u0430\
+      \u0432\u0442\u043E\u043C\u0430\u0442\u044B \u043F\u043E\u0432\u0430\u0440\u043E\
+      \u0432, \u0431\u0430\u0440\u043C\u0435\u043D\u043E\u0432, \u0445\u0438\u043C\
+      \u0438\u043A\u043E\u0432 \u0438 \u0438\u043D\u0436\u0435\u043D\u0435\u0440\u043E\
+      \u0432."
+    type: Add
+  - message: "\u041F\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u0430\u0432\
+      \u0442\u043E\u043C\u0430\u0442\u043E\u0432 \u0431\u043E\u043B\u044C\u0448\u0435\
+      \ \u043D\u0435 \u043F\u043E\u043F\u043E\u043B\u043D\u044F\u0435\u0442 \u043A\
+      \u0430\u0442\u0430\u043B\u043E\u0433 \u043A\u043E\u043D\u0442\u0440\u0430\u0431\
+      \u0430\u043D\u0434\u044B \u0438 \u0435\u043C\u0430\u0433\u0430."
+    type: Tweak
+  - message: "\u041E\u0442\u043A\u0430\u0442 \u043D\u0435\u0440\u0444\u0430 \u043C\
+      \u0435\u0442\u0430 \u0438 \u044D\u0444\u0435\u0434\u0440\u0438\u043D\u0430."
+    type: Tweak
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0437\u0430\u0436\u0438\u0433\u0430\
+      \u0442\u0435\u043B\u044C\u043D\u0430\u044F \u0431\u043E\u043C\u0431\u0430 \u043F\
+      \u043E\u0434\u0436\u0438\u0433\u0430\u0435\u0442 \u0441\u0438\u043B\u044C\u043D\
+      \u0435\u0435 \u0438 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C\
+      \ \u0430\u043A\u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u043D\u0430 \u0441\
+      \u0438\u0433\u043D\u0430\u043B\u043E\u043C."
+    type: Tweak
+  - message: "\u0412\u0437\u0440\u044B\u0432 \u0442\u043E\u043F\u043B\u0438\u0432\u043D\
+      \u043E\u0433\u043E \u0440\u0435\u0437\u0435\u0440\u0432\u0443\u0430\u0440\u0430\
+      \ \u043D\u0430\u043D\u043E\u0441\u0438\u0442 \u043C\u0435\u043D\u044C\u0448\u0435\
+      \ \u0443\u0440\u043E\u043D\u0430 \u043D\u043E \u043F\u043E\u0434\u0436\u0438\
+      \u0433\u0430\u0435\u0442."
+    type: Tweak
+  - message: "\u0414\u0443\u0430\u0444\u0442\u0435\u0440 \u0448\u043F\u0440\u0438\u0446\
+      \u0430 \u043D\u0435 \u0441\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u0435\u0442\
+      \u0441\u044F \u043F\u0440\u0438 \u0434\u0432\u0438\u0436\u0435\u043D\u0438\u0438\
+      , \u0435\u0441\u043B\u0438 \u0432\u043A\u0430\u043B\u044B\u0432\u0430\u0442\u044C\
+      \ \u0432 \u0441\u0435\u0431\u044F."
+    type: Tweak
+  id: 468
+  time: '2024-08-08T09:07:40.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/584

Resources/Locale/en-US/_white/message/message.ftl

@@ -0,0 +1,5 @@
+chat-manager-send-message-chat-wrap-message = [bold]\[{ $channelName }\]:[/bold] [BubbleContent]{ $message }[/BubbleContent]
+chat-manager-message-channel-name = [color=blue]Network[/color]
+chat-manager-send-message = Message from { $sender } to { $receiver }. Message text: "{ $message }"
+hud-chatbox-select-channel-Servers = Network
+hud-chatbox-channel-Servers = Network

Resources/Locale/en-US/job/role-requirements.ftl

@@ -4,7 +4,13 @@ role-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0"
 role-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime to play this role. (Are you trying to play a trainee role?)
 role-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color] to play this role.
 role-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color] to play this role. (Are you trying to play a trainee role?)
+role-timer-age-to-old = Your character must be under the age of [color=yellow]{$age}[/color] to play this role.
+role-timer-age-to-young = Your character must be over the age of [color=yellow]{$age}[/color] to play this role.
+role-timer-whitelisted-species = Your character must be one of the following species to play this role:
+role-timer-blacklisted-species = Your character must not be one of the following species to play this role:
 
 role-timer-locked = Locked (hover for details)
 
+role-timer-department-unknown = Unknown Department
+
 role-ban = You have been banned from this role.