Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Я хз че коментировать #1952

Closed
wants to merge 56 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
a1e4ab8
Update IdCardConsoleComponent.cs
Kotya556 Mar 8, 2024
e816d48
Update alert-levels.ftl
Kotya556 Mar 8, 2024
4bda004
Update department.ftl
Kotya556 Mar 8, 2024
f768ac1
Update department-desc.ftl
Kotya556 Mar 8, 2024
bcbe8c7
Update meta.json
Kotya556 Mar 8, 2024
f23c063
Add files via upload
Kotya556 Mar 8, 2024
29dfb5a
Update meta.json
Kotya556 Mar 8, 2024
a1ebceb
Add files via upload
Kotya556 Mar 8, 2024
be3ab4f
Add files via upload
Kotya556 Mar 9, 2024
881e1f1
Add files via upload
Kotya556 Mar 9, 2024
88d4cbe
Merge branch 'space-syndicate:master' into master
Kotya556 Mar 9, 2024
71a4ed6
Update admin_ghost.yml
Kotya556 Mar 9, 2024
5cafb95
Update alert_levels.yml
Kotya556 Mar 9, 2024
d50d90e
Update battery_guns.yml
Kotya556 Mar 9, 2024
dcefa94
Update headsets.yml
Kotya556 Mar 9, 2024
6540ef8
Update headsets_alt.yml
Kotya556 Mar 9, 2024
39734c6
Update centcomm.yml
Kotya556 Mar 9, 2024
fc6d7f5
Update nukeops.yml
Kotya556 Mar 9, 2024
4a6b223
Update revolutionary.yml
Kotya556 Mar 9, 2024
169e342
Update traitor.yml
Kotya556 Mar 9, 2024
0ad3b5b
Update zombie.yml
Kotya556 Mar 9, 2024
f30f51c
Update salvage_specialist.yml
Kotya556 Mar 9, 2024
9d6abb3
Update quartermaster.yml
Kotya556 Mar 9, 2024
83ba588
Update bartender.yml
Kotya556 Mar 9, 2024
0857895
Update chef.yml
Kotya556 Mar 9, 2024
a30b93e
Update clown.yml
Kotya556 Mar 9, 2024
d2f8e9e
Delete Resources/Prototypes/Roles/Jobs/Civilian/detective.yml
Kotya556 Mar 9, 2024
e450c0a
Update mime.yml
Kotya556 Mar 9, 2024
14e1312
Update head_of_personnel.yml
Kotya556 Mar 9, 2024
5a6e3f1
Update captain.yml
Kotya556 Mar 9, 2024
baf3e03
Update technical_assistant.yml
Kotya556 Mar 9, 2024
90cef6c
Update station_engineer.yml
Kotya556 Mar 9, 2024
dfcccb6
Update atmospheric_technician.yml
Kotya556 Mar 9, 2024
7078cf6
Update chief_engineer.yml
Kotya556 Mar 9, 2024
e708b19
Update medical_intern.yml
Kotya556 Mar 9, 2024
4b90c27
Update medical_doctor.yml
Kotya556 Mar 9, 2024
82bb7fb
Update paramedic.yml
Kotya556 Mar 9, 2024
76d363e
Update chemist.yml
Kotya556 Mar 9, 2024
f700945
Update chief_medical_officer.yml
Kotya556 Mar 9, 2024
b724f08
Update research_assistant.yml
Kotya556 Mar 9, 2024
17a8297
Update borg.yml
Kotya556 Mar 9, 2024
77bf385
Update scientist.yml
Kotya556 Mar 9, 2024
46214ac
Update research_director.yml
Kotya556 Mar 9, 2024
1171e18
Update security_cadet.yml
Kotya556 Mar 9, 2024
8d7aa95
Update security_officer.yml
Kotya556 Mar 9, 2024
821129e
Update warden.yml
Kotya556 Mar 9, 2024
ae228f9
Update head_of_security.yml
Kotya556 Mar 9, 2024
76598a1
Update departments.yml
Kotya556 Mar 9, 2024
f66da8c
Add files via upload
Kotya556 Mar 9, 2024
1780ae4
Add files via upload
Kotya556 Mar 9, 2024
3b55812
Add files via upload
Kotya556 Mar 9, 2024
144750b
Add files via upload
Kotya556 Mar 9, 2024
b9ade30
Add files via upload
Kotya556 Mar 9, 2024
5a24ed7
Add files via upload
Kotya556 Mar 9, 2024
b19f924
Add files via upload
Kotya556 Mar 9, 2024
b53c929
Delete Resources/Prototypes/Roles/Jobs/Centcom/iaa.yml
Kotya556 Mar 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Content.Shared/Access/Components/IdCardConsoleComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,15 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<string> acc
"External",
"HeadOfPersonnel",
"HeadOfSecurity",
"HoNTP",
"Hydroponics",
"Janitor",
"Kitchen",
"Lawyer",
"Maintenance",
"Medical",
"NanotrasenPrison",
"OfficerBlueShield",
"Quartermaster",
"Research",
"ResearchDirector",
Expand Down
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/alert-levels/alert-levels.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ alert-level-yellow-instructions = Членам экипажа необходим
alert-level-gamma = Гамма
alert-level-gamma-announcement = Центральное командование объявило на станции уровень угрозы "Гамма". Служба безопасности должна постоянно иметь при себе оружие, гражданский персонал обязан немедленно обратиться к главам отделов для получения указаний к эвакуации. Службе Безопасности разрешено применение летальной силы в случае неповиновения.
alert-level-gamma-instructions = Гражданский персонал обязан немедленно обратиться к главам отделов для получения указаний к эвакуации. Корпорация Nanotrasen заверяет вас - опасность скоро будет нейтрализована.
alert-level-omega = Омега
alert-level-omega-announcement = Центральное командование объявило на станции уровень угрозы "Омега". Присутствует большая биологическая угроза на борту станции. Членам экипажа следует изолироваться и ждать дальнейших указаний от центрального командования. Все заражённые если такие есть, должны быть уничтожены! Любые стыковки станции с другими объектами категорически запрещены иначе вы будете уничтожены. Службе безопасности разрешено использование летальной силы в случае неповиновения!
alert-level-omega-instructions = Членам экипажа следует изолироваться и ждать дальнейших указаний от центрального командования.
alert-level-delta = Дельта
alert-level-delta-announcement = Станция находится под угрозой неминуемого уничтожения. Членам экипажа рекомендуется слушать глав отделов для получения дополнительной информации. Службе Безопасности приказано работать по протоколу Дельта.
alert-level-delta-instructions = Членам экипажа необходимо слушать глав отделов для получения дополнительной информации. От этого зависит ваше здоровье и безопасность.
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/job/department-desc.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ department-Medical-description = Поддерживайте здоровье э
department-Security-description = Поддерживайте порядок на станции.
department-Science-description = Изучайте артефакты и аномалии, обеспечивайте членов экипажа новыми продвинутыми устройствами.
department-Specific-description = Должности, которые есть не на всех станциях.
department-NanotrasenPrison-description = Содержите опасных преступников в тюрьме Nanotrasen!
department-Centcom-description = Здесь собраны представители центрального командования.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/job/department.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ department-Medical = Медицинский отдел
department-Security = Служба безопасности
department-Science = Научный отдел
department-Specific = На определённых станциях
department-NanotrasenPrison = Тюрьма Nanotrasen
department-Centcom = Центральное Командование
12 changes: 12 additions & 0 deletions Resources/Prototypes/Access/centcomm.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
- type: accessLevel
id: CentralCommand
name: id-card-access-level-central-command

- type: accessLevel
id: NanotrasenPrison
name: Тюрьма Nanotrasen

- type: accessLevel
id: HoNTP
name: Глава тюрьмы Nanotrasen

- type: accessLevel
id: OfficerBlueShield
name: Офицер "Синий Щит"
11 changes: 11 additions & 0 deletions Resources/Prototypes/AlertLevels/alert_levels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@
color: PaleVioletRed
emergencyLightColor: PaleVioletRed
forceEnableEmergencyLights: true
omega:
announcement: alert-level-omega-announcement
selectable: false
sound:
path: /Audio/Corvax/Adminbuse/outbreak5.ogg
params:
volume: -2
disableSelection: true
color: Orange
emergencyLightColor: Orange
forceEnableEmergencyLights: true
delta:
announcement: alert-level-delta-announcement
selectable: false
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
key_slots:
- EncryptionKeyCentCom
- EncryptionKeyStationMaster
- EncryptionKeyNanotrasenPrison
- type: Sprite
sprite: Clothing/Ears/Headsets/centcom.rsi
- type: Clothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
key_slots:
- EncryptionKeyCentCom
- EncryptionKeyStationMaster
- EncryptionKeyNanotrasenPrison
- type: Sprite
sprite: Clothing/Ears/Headsets/centcom.rsi
- type: Clothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
prototype: Aghost
- type: Access
groups:
- AllAccess
- AllAccessAdmin
tags:
- NuclearOperative
- SyndicateAgent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,8 @@
id: WeaponPulsePistol
description: A state of the art energy pistol favoured as a sidearm by the NT operatives.
components:
- type: StealTarget
stealGroup: WeaponPulsePistol
- type: Sprite
sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi
layers:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
- type: entity
parent: ClothingHeadset
id: ClothingHeadsetNanotrasenPrison
name: Гарнитура NTP
description: Гарнитура используемая работниками тюрьмы.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyEngineering
- EncryptionKeyNanotrasenPrison
- EncryptionKeySecurity
- EncryptionKeyMedical
- type: Sprite
sprite: FacetsUniverse\Clothing\headsets\NanotrasenPrison.rsi
- type: Clothing
sprite: FacetsUniverse\Clothing\headsets\NanotrasenPrison.rsi

- type: entity
parent: ClothingHeadsetAlt
id: ClothingHeadsetAltNanotrasenPrison
name: Полноразмерная гарнитура главы NTP
description: Гарнитура властелина коле... тюрьмы Nanotrasen.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyCentCom
- EncryptionKeyEngineering
- EncryptionKeyMedical
- EncryptionKeySecurity
- EncryptionKeyNanotrasenPrison
- type: Sprite
sprite: FacetsUniverse\Clothing\headsets\NanotrasenPrison.rsi
- type: Clothing
sprite: FacetsUniverse\Clothing\headsets\NanotrasenPrison.rsi

- type: entity
parent: ClothingHeadset
id: ClothingHeadsetOBS
name: Гарнитура Офицера "Синий Щит"
description: Гарнитура защитника глав станции.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyCentCom
- EncryptionKeyCommon
- EncryptionKeyCommand
- type: Sprite
sprite: Clothing/Ears/Headsets/command.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/command.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretOBS
name: берет офицера "Синий Щит"
description: Берет настоящего мужчины!
components:
- type: Sprite
sprite: FacetsUniverse\Clothing\Head\BeretOBS.rsi
- type: Clothing
sprite: FacetsUniverse\Clothing\Head\BeretOBS.rsi
- type: Tag
tags:
- ClothMade
- HamsterWearable
- WhitelistChameleon
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitHoNTP
name: Комбинезон главы тюрьмы Nanotrasen
description: Только для главных!
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitNTP
name: Комбинезон офицера тюрьмы Nanotrasen
description: Только для работников космической тюрьмы!
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/ert_security.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/ert_security.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitNTPMedic
name: Комбинезон доктора тюрьмы Nanotrasen
description: Только для работников космической тюрьмы!
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/ert_medic.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/ert_medic.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitNTP_engineer
name: Комбинезон инженера тюрьмы Nanotrasen
description: Только для работников космической тюрьмы!
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitOBS
name: Комбинезон Офицера "Синий Щит"
description: Комбинезон живого щита для глав...
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
parent: DoorRemoteDefault
id: DoorRemoteNTP
name: Пульт управления тюрьмы Nanotrasen
description: Пульт управления.
components:
- type: Sprite
layers:
- state: door_remotebase
- state: door_remotelightscolour
color: "#cb0000"
- state: door_remotescreencolour
color: "#830000"
- type: Access
groups:
- NanotrasenPrison
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
parent: BaseItem
id: SecretDocumentsGT
name: Секретные документы ГТ
description: Совершенно секретно! В этих документах написано как действовать при ЧП на космической тюрьме.
components:
- type: Sprite
sprite: FacetsUniverse\bureaucracy.rsi
layers:
- state: folder-ntp-doc
- type: Tag
tags:
- Book
- HighRiskItem
- type: StealTarget
stealGroup: SecretDocumentsGT
27 changes: 27 additions & 0 deletions Resources/Prototypes/FacetsUniverse/Entities/Misc/stamps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
- type: entity
name: Печать магистрата
parent: RubberStampBase
id: RubberStampMagistrate
suffix: НЕ МАППИТЬ
components:
- type: Stamp
stampedName: Магистрат
stampedColor: "#292929"
stampState: "paper_stamp-ok"
- type: Sprite
sprite: FacetsUniverse\stamps.rsi
state: stamp-magistrate

- type: entity
name: Печать главы космической тюрьмы
parent: RubberStampBase
id: RubberStampHoNTP
suffix: НЕ МАППИТЬ
components:
- type: Stamp
stampedName: Глава космической тюрьмы
stampedColor: "#0300A6"
stampState: "paper_stamp-cap"
- type: Sprite
sprite: FacetsUniverse\stamps.rsi
state: stamp-hontp
Loading
Loading