diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs index 400a5fb5fc..ab1b29f58f 100644 --- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs +++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs @@ -13,6 +13,7 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager { // Corvax-Localization-Start { "хд", "chatsan-laughs" }, + { "хд.", "chatsan-laughs" }, { "о-о", "chatsan-wide-eyed" }, // cyrillic о { "о.о", "chatsan-wide-eyed" }, // cyrillic о { "0_о", "chatsan-wide-eyed" }, // cyrillic о @@ -20,18 +21,26 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager { "о7", "chatsan-salutes" }, // cyrillic о { "0_o", "chatsan-wide-eyed" }, { "лмао", "chatsan-laughs" }, + { "лмао.", "chatsan-laughs" }, { "рофл", "chatsan-laughs" }, + { "рофл.", "chatsan-laughs" }, { "яхз", "chatsan-shrugs" }, + { "яхз.", "chatsan-shrugs" }, { ":0", "chatsan-surprised" }, { ":р", "chatsan-stick-out-tongue" }, // cyrillic р { "кек", "chatsan-laughs" }, + { "кек.", "chatsan-laughs" }, { "T_T", "chatsan-cries" }, { "Т_Т", "chatsan-cries" }, // cyrillic T { "=_(", "chatsan-cries" }, { "!с", "chatsan-laughs" }, + { "!с.", "chatsan-laughs" }, { "!в", "chatsan-sighs" }, + { "!в.", "chatsan-sighs" }, { "!х", "chatsan-claps" }, + { "!х.", "chatsan-claps" }, { "!щ", "chatsan-snaps" }, + { "!щ.", "chatsan-snaps" }, { "))", "chatsan-smiles-widely" }, { ")", "chatsan-smiles" }, { "((", "chatsan-frowns-deeply" }, @@ -39,12 +48,19 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager // Corvax-Localization-End // Lost-Paradise-Localization-Start { "орууу", "chatsan-laughs" }, + { "орууу.", "chatsan-laughs" }, { "хз", "chatsan-shrugs" }, + { "хз.", "chatsan-shrugs" }, { "хсс", "chatsan-shrugs" }, + { "хсс.", "chatsan-shrugs" }, { "хссс", "chatsan-shrugs" }, + { "хссс.", "chatsan-shrugs" }, { "шшш", "chatsan-hiss" }, + { "шшш.", "chatsan-hiss" }, { "авууу", "chatsan-awoo" }, + { "авууу.", "chatsan-awoo" }, { "няяя", "chatsan-nyaaa" }, + { "няяя.", "chatsan-nyaaa" }, // Lost-Paradise-Localization-End // I could've done this with regex, but felt it wasn't the right idea. { ":)", "chatsan-smiles" }, diff --git a/Content.Server/Corvax/TTS/TTSSystem.Sanitize.cs b/Content.Server/Corvax/TTS/TTSSystem.Sanitize.cs index 8ff595530a..9d2d37d079 100644 --- a/Content.Server/Corvax/TTS/TTSSystem.Sanitize.cs +++ b/Content.Server/Corvax/TTS/TTSSystem.Sanitize.cs @@ -137,6 +137,9 @@ private string ReplaceWord2Num(Match word) {"с4", "Си 4"}, // cyrillic {"c4", "Си 4"}, // latinic {"бсс", "Бэ Эс Эс"}, + {"слр", "Эс Эл Эр"}, + {"осщ", "О Сэ Щэ"}, + {"сщ", "Сэ Ща"}, }; private static readonly IReadOnlyDictionary ReverseTranslit = diff --git a/Resources/Locale/ru-RU/_LostParadise/misc/speech/lp-speech-chatsan.ftl b/Resources/Locale/ru-RU/_LostParadise/misc/speech/lp-speech-chatsan.ftl index 47e8f378b9..8884392722 100644 --- a/Resources/Locale/ru-RU/_LostParadise/misc/speech/lp-speech-chatsan.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/misc/speech/lp-speech-chatsan.ftl @@ -1,17 +1,13 @@ -lp-chatsan-word-1 = сщ -lp-chatsan-replacement-1 = Офицер Синий Щит -lp-chatsan-word-2 = осщ -lp-chatsan-replacement-2 = Офицер Синий Щит lp-chatsan-word-3 = общ -lp-chatsan-replacement-3 = Офицер Синий Щит +lp-chatsan-replacement-3 = осщ lp-chatsan-word-4 = блющилд -lp-chatsan-replacement-4 = Офицер Синий Щит +lp-chatsan-replacement-4 = Синий Щит lp-chatsan-word-5 = Урог -lp-chatsan-replacement-5 = Адольф Гитле +lp-chatsan-replacement-5 = Адольф Гитлер lp-chatsan-word-6 = Миун lp-chatsan-replacement-6 = Нытик попущенный lp-chatsan-word-7 = фурри -lp-chatsan-replacement-7 = пушистик +lp-chatsan-replacement-7 = ксенос lp-chatsan-word-8 = фурриёб lp-chatsan-replacement-8 = ксенофил lp-chatsan-word-9 = амогус diff --git a/Resources/Locale/ru-RU/connection-messages.ftl b/Resources/Locale/ru-RU/connection-messages.ftl index 03f41c3230..140bdc387c 100644 --- a/Resources/Locale/ru-RU/connection-messages.ftl +++ b/Resources/Locale/ru-RU/connection-messages.ftl @@ -31,7 +31,7 @@ ban-banned-1 = Вам, или другому пользователю этого ban-banned-2 = Причина бана: "{ $reason }" ban-banned-3 = Попытки обойти этот бан, например, путём создания нового аккаунта, будут фиксироваться. soft-player-cap-full = Сервер заполнен! -panic-bunker-account-denied = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Повторите попытку позже -panic-bunker-account-denied-reason = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Повторите попытку позже Причина: "{ $reason }" -panic-bunker-account-reason-account = Ваш аккаунт Space Station 14 слишком новый. Он должен быть старше { $minutes } минут -panic-bunker-account-reason-overall = Необходимо минимальное отыгранное Вами время на сервере — { $hours } час(-ов) +panic-bunker-account-denied = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Если произошла ошибка, переподключитесь. +panic-bunker-account-denied-reason = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Если произошла ошибка, переподключитесь. Причина: "{ $reason }" +panic-bunker-account-reason-account = Ваш аккаунт Space Station 14 слишком новый. Он должен быть старше { $minutes } минут. Если произошла ошибка, переподключитесь. +panic-bunker-account-reason-overall = Необходимо минимальное отыгранное Вами время на сервере — { $hours } час(-ов). Если произошла ошибка, переподключитесь. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/wallmounts/signs/posters.ftl index e7928d9553..86cadf8b84 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/wallmounts/signs/posters.ftl @@ -1,4 +1,4 @@ -ent-PosterLegitFuckAround = Потрахайся... +ent-PosterLegitFuckAround = Повыпендривайся... .desc = ...и узнай. Проспонсировано Межгалактической Федерацией Барменов, ответление Дельта. ent-PosterContrabandGotWood = Хорошее дерево? .desc = Мрачная старая реклама лесозаготовочной компании. "Я твой друг." - нацарапано в углу. diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 9ce58ff4d7..528b93764b 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -508,8 +508,8 @@ corvax-chatsan-word-125: corvax-chatsan-replacement-125 # Corvax-ChatSanitize-End # LP-ChatSanitize-Start - lp-chatsan-word-1: lp-chatsan-replacement-1 - lp-chatsan-word-2: lp-chatsan-replacement-2 + #lp-chatsan-word-1: lp-chatsan-replacement-1 + #lp-chatsan-word-2: lp-chatsan-replacement-2 lp-chatsan-word-3: lp-chatsan-replacement-3 lp-chatsan-word-4: lp-chatsan-replacement-4 lp-chatsan-word-5: lp-chatsan-replacement-5 diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml index 581f4d9b1e..d661c26216 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml @@ -1,8 +1,8 @@ - type: vendingMachineInventory id: PrideDrobeInventory startingInventory: - ClothingNeckRussianPin: 99 - ClothingUnderSocksCoder: 99 + ClothingNeckRussianPin: 10 + ClothingUnderSocksCoder: 3 ClothingNeckCloakTrans: 3 ClothingNeckCloakAce: 3 ClothingNeckCloakAro: 3 diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index 4bde493900..8b877136bc 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -58,4 +58,7 @@ innerClothingSkirt: ClothingUniformJumpskirtChiefJustice satchel: ClothingBackpackSatchelFilled # TODO- make Justice departmebt bags duffelbag: ClothingBackpackDuffelFilled + storage: + back: + - LPPTelebaton diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml index 95c0e64644..1d5ea2a780 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml @@ -1,37 +1,51 @@ - type: emote id: HarpyRing category: Vocal - chatMessages: [ журчит ] + chatMessages: [ звенит ] chatTriggers: - - журчит + - rings + - звенит + - звенит. - type: emote id: HarpyPew category: Vocal - chatMessages: [ визжит ] + chatMessages: [ стреляет ] chatTriggers: - - визжит + - pews + - pewpews + - стреляет + - стреляет. - type: emote id: HarpyBang category: Vocal - chatMessages: [ грохочет ] + chatMessages: [ бабахает ] chatTriggers: + - bangs + - бабахает + - бабахает. - грохочет + - грохочет. - type: emote id: HarpyRev category: Vocal - chatMessages: [ ревёт ] + chatMessages: [ шумит ] chatTriggers: - - ревёт + - revs + - шумит + - шумит. - type: emote id: HarpyCaw category: Vocal chatMessages: [ каркает ] chatTriggers: + - caws - каркает + - каркает. + - каркает! #Vulpkanin - type: emote @@ -39,25 +53,38 @@ category: Vocal chatMessages: [ лает ] chatTriggers: + - barks - лает + - лает. + - гавкает + - гавкает. + - гавкает! - type: emote id: Snarl category: Vocal - chatMessages: [ рычит ] + chatMessages: [ ворчит ] chatTriggers: - - рычит + - snarls + - snarls. + - ворчит + - ворчит. - type: emote id: Whine category: Vocal chatMessages: [ скулит ] chatTriggers: + - whines - скулит + - скулит. - type: emote id: Howl category: Vocal chatMessages: [ воет ] chatTriggers: + - howls - воет + - воет. + - воет! diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 8368e90b5d..c317894e8d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -34,8 +34,8 @@ - type: Vocal sounds: Male: UnisexReptilian - Female: UnisexReptilian - Unsexed: UnisexReptilian + Female: FemaleReptilian + Unsexed: FemaleReptilian - type: Damageable damageContainer: Biological damageModifierSet: Scale diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml index fbe2d2c217..b336e5be52 100644 --- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml @@ -83,7 +83,7 @@ - type: Machine board: HydroponicsTrayMachineCircuitboard - type: WiresPanel - - type: TTS # Corvax-TTS + - type: TTS voice: Tikva - type: AmbientSound volume: -9 diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml index fa471f3d70..a6211a9a99 100644 --- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml @@ -2,37 +2,57 @@ - type: emote id: Hiss category: Vocal - chatMessages: [ hisses ] + chatMessages: [ шипит ] chatTriggers: - hisses + - шипит + - шипит. + - шипит! - type: emote id: Meow category: Vocal - chatMessages: [ meows ] + chatMessages: [ мяукает ] chatTriggers: - meows - miaus - nyas - mraows + - мяукает + - мяукает. + - мрякает + - мрякает. - type: emote id: Mew category: Vocal - chatMessages: [ mews ] + chatMessages: [ мавает ] chatTriggers: - mews + - мавает + - мавает. + - мавает! - type: emote id: Growl category: Vocal - chatMessages: [ growls ] + chatMessages: [ рычит ] chatTriggers: - growls + - рычит + - рычит. + - рычит! + - type: emote id: Purr category: Vocal - chatMessages: [ purrs ] + chatMessages: [ мурлыкает ] chatTriggers: - purrs + - мурлыкает + - мурлыкает. + - мурчит + - мурчит. + - мурлычет + - мурлычет. diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index fcd470898a..8f2b486807 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -62,3 +62,6 @@ innerClothingSkirt: ClothingUniformJumpskirtQM satchel: ClothingBackpackSatchelQuartermasterFilled duffelbag: ClothingBackpackDuffelQuartermasterFilled + storage: + back: + - LPPTelebaton diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index efe071bcd7..9df1e2d5f4 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -63,3 +63,6 @@ innerClothingSkirt: ClothingUniformJumpskirtCaptain satchel: ClothingBackpackSatchelCaptainFilled duffelbag: ClothingBackpackDuffelCaptainFilled + storage: + back: + - LPPTelebaton \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index a878892dbb..13e1d14c67 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -96,3 +96,6 @@ innerClothingSkirt: ClothingUniformJumpskirtHoP satchel: ClothingBackpackSatchelHOPFilled duffelbag: ClothingBackpackDuffelHOPFilled + storage: + back: + - LPPTelebaton diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 448ba195a6..75297d6e83 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -56,3 +56,6 @@ innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer satchel: ClothingBackpackSatchelChiefEngineerFilled duffelbag: ClothingBackpackDuffelChiefEngineerFilled + storage: + back: + - LPPTelebaton diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index db98d74736..acaa6039a7 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -63,3 +63,6 @@ innerClothingSkirt: ClothingUniformJumpskirtCMO satchel: ClothingBackpackSatchelCMOFilled duffelbag: ClothingBackpackDuffelCMOFilled + storage: + back: + - LPPTelebaton diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 9d137b7062..00885696c9 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -69,3 +69,6 @@ innerClothingSkirt: ClothingUniformJumpskirtResearchDirector satchel: ClothingBackpackSatchelResearchDirectorFilled duffelbag: ClothingBackpackDuffelResearchDirectorFilled + storage: + back: + - LPPTelebaton diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 00f4c6314c..0ef43bfd9b 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -63,3 +63,6 @@ innerClothingSkirt: ClothingUniformJumpskirtHoS satchel: ClothingBackpackSatchelHOSFilled duffelbag: ClothingBackpackDuffelHOSFilled + storage: + back: + - LPPTelebaton diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml index 65c209ccb8..6497358fc8 100644 --- a/Resources/Prototypes/Voice/disease_emotes.yml +++ b/Resources/Prototypes/Voice/disease_emotes.yml @@ -1,44 +1,47 @@ - type: emote id: Sneeze category: Vocal - chatMessages: [ sneezes ] + chatMessages: [ чихает ] - type: emote id: Cough category: Vocal - chatMessages: [ coughs ] + chatMessages: [ кашляет ] chatTriggers: - coughs # Corvax-Localization-Start - кашель - кашляет - кашлянул + - кашель. + - кашляет. + - кашлянул. # Corvax-Localization-End - type: emote id: CatMeow category: Vocal - chatMessages: [ meows ] + chatMessages: [ мяукает ] - type: emote id: CatHisses category: Vocal - chatMessages: [ hisses ] + chatMessages: [ шипит ] - type: emote id: MonkeyScreeches category: Vocal - chatMessages: [ screeches ] + chatMessages: [ визжит ] - type: emote id: RobotBeep category: Vocal - chatMessages: [ beeps ] + chatMessages: [ бипает ] - type: emote id: Yawn category: Vocal - chatMessages: [ yawns ] + chatMessages: [ зевает ] chatTriggers: - yawns # Corvax-Localization-Start diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 685401c02a..9a957dee3a 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -88,6 +88,26 @@ collection: MaleCry Weh: collection: Weh + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + CatMeow: + collection: CatMeows + CatHisses: + collection: CatHisses + MonkeyScreeches: + collection: MonkeyScreeches + RobotBeep: + collection: RobotBeeps + Yawn: + collection: MaleYawn + Snore: + collection: Snores + Sigh: + collection: MaleSigh + Hiss: + collection: FelinidHisses - type: emoteSounds id: MaleSlime diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/heads.yml index 7584d24aa3..5aa6424953 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/heads.yml @@ -6,9 +6,9 @@ - type: StorageFill contents: - id: LPPClothingOuterHardsuitBlueshield - - id: ClothingHandsGlovesCombat - - id: LPPBlueshieldlaser - id: MedkitCombatFilled - id: MedkitAdvancedFilled - id: PinpointerUniversal - id: LPPBlueShieldClothingMaskGas + - id: OxygenTankFilled + - id: NitrogenTankFilled diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml index 38df39e4dc..63c2c89fbb 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml @@ -12,9 +12,9 @@ requiredLegs: 2 - type: Vocal sounds: - Male: MaleTajaran - Female: FemaleTajaran - Unsexed: FemaleTajaran + Male: MaleFelinid + Female: FemaleFelinid + Unsexed: FemaleFelinid #- type: Carriable - type: Hunger starvationDamage: diff --git a/Resources/Prototypes/_LostParadise/Maps/normandy.yml b/Resources/Prototypes/_LostParadise/Maps/normandy.yml index b8f93d1a76..c24d3aa495 100644 --- a/Resources/Prototypes/_LostParadise/Maps/normandy.yml +++ b/Resources/Prototypes/_LostParadise/Maps/normandy.yml @@ -54,6 +54,7 @@ Detective: [ 1, 1 ] Prisoner: [ 2, 3 ] Brigmedic: [ 1, 1 ] + PrisonGuard: [ 1, 1 ] # Logistics CargoTechnician: [ 3, 4 ] Quartermaster: [ 1, 1 ] diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml index f296878c8d..eee2530e67 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml @@ -34,7 +34,7 @@ equipment: jumpsuit: LPPClothingUniformJumpsuitBlueshield head: LPPClothingHeadHatBeretBlueshield - back: LPPClothingBackpackBlueshieldFilled + back: LPPClothingBackpackBlueshield shoes: ClothingShoesBootsCombatFilled eyes: LPPBlueHudGlasses gloves: ClothingHandsGlovesCombat @@ -44,12 +44,13 @@ ears: ClothingHeadsetAltCommand pocket1: LPPBlueshieldlaser pocket2: HandheldCrewMonitor + belt: ClothingBeltSecurityFilled socks: LPPClothingUnderSocksNorm underwear: LPPBoxer underwear: LPPBriefs breast: LPPBraAltWhite - satchel: LPPClothingBackpackSatchelBlueshieldFilled - duffelbag: LPPClothingBackpackDuffelBlueshieldFilled + satchel: LPPClothingBackpackSatchelBlueshield + duffelbag: LPPClothingBackpackDuffelBlueshield storage: back: - Flash diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml index a325dd6984..efa92d6946 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml @@ -60,3 +60,6 @@ innerClothingSkirt: ClothingUniformJumpskirtAdjutant satchel: ClothingBackpackSatchelHOPFilled duffelbag: ClothingBackpackDuffelHOPFilled + storage: + back: + - LPPTelebaton diff --git a/Resources/Prototypes/_LostParadise/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_LostParadise/Voice/speech_emote_sounds.yml index 557b2523fd..9edb6e795a 100644 --- a/Resources/Prototypes/_LostParadise/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_LostParadise/Voice/speech_emote_sounds.yml @@ -77,6 +77,8 @@ collection: Whistles Crying: collection: FemaleCry + Weh: + collection: Weh Sneeze: collection: FemaleSneezes Cough: @@ -95,5 +97,5 @@ collection: Snores Sigh: collection: FemaleSigh - Weh: - collection: Weh + Hiss: + collection: FelinidHisses \ No newline at end of file diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json index 042eda20c6..1ace847243 100644 --- a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/7f654b6e8e59021607a9e888dfeb79920401c372/icons/mob/huds/hud.dmi", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/7f654b6e8e59021607a9e888dfeb79920401c372/icons/mob/huds/hud.dmi, edited by JayJacobs", "size": { "x": 8, "y": 8