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.

Sign up for GitHub

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

Маяки, кибер-глаза, цель, фиксы #294

Merged
merged 1 commit into from
Oct 21, 2024
Merged

Маяки, кибер-глаза, цель, фиксы #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ ent-DefaultStationBeaconJustice = { ent-DefaultStationBeacon }
ent-DefaultStationBeaconChiefJustice = { ent-DefaultStationBeaconJustice }
.suffix = Chief Justice
.desc = { ent-DefaultStationBeaconJustice.desc }
ent-DefaultStationBeaconProsecutor = { ent-DefaultStationBeaconJustice }
ent-DefaultStationBeaconProsecutor = { ent-DefaultStationBeacon }
.suffix = Prosecutor
.desc = { ent-DefaultStationBeaconJustice.desc }
.desc = { ent-DefaultStationBeacon.desc }
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,4 @@ station-beacon-tools = Хранилище инструментов
station-beacon-disposals = Мусоросброс
station-beacon-cryosleep = Криосон
station-beacon-escape-pod = Спасательная капсула

2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/nyanotrasen/ghost/roles/ghost-role-component.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ ghost-role-information-giant-spider-vampire-name = Онейрофаг
ghost-role-information-giant-spider-vampire-description = Гнездо. Приманка. Засада. Потреблять.
ghost-role-information-cancer-mouse-name = Раковая мышь
ghost-role-information-cancer-mouse-description = Делайте цветные комментарии, но не настолько резкие, чтобы они нарушали правила сервера.
ghost-role-information-friendlyxeno-name = Нейтральный ксеноморф
ghost-role-information-friendlyxeno-description = Вы — одиночный ксеноморф, оторвавшийся от основного гнезда, решивший первым не нападать на живых существ.
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ ent-DefaultStationBeaconJustice = { ent-DefaultStationBeacon }
ent-DefaultStationBeaconChiefJustice = { ent-DefaultStationBeaconJustice }
.suffix = Кабинет верховного судьи
.desc = { ent-DefaultStationBeaconJustice.desc }
ent-DefaultStationBeaconProsecutor = { ent-DefaultStationBeaconJustice }
ent-DefaultStationBeaconProsecutor = { ent-DefaultStationBeacon }
.suffix = Кабинет прокурора
.desc = { ent-DefaultStationBeaconJustice.desc }
.desc = { ent-DefaultStationBeacon.desc }
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/station-goal/station-goals.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ station-goal-anomalies =
2. Физическое описание;
3. Пассивные свойства;
4. Реакция аномалии на различные частицы;
5. Последствия коллапса;
5. Последствия импульса;
6. Местоположение аномалии.

Документ необходимо заверить печатью руководителя научно-исследовательского отдела и отправить по факсу в Центральное Командование.
Expand Down
70 changes: 35 additions & 35 deletions Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,113 +1,113 @@
#Command
- type: entity
parent: DefaultStationBeaconCommand
parent: DefaultStationBeacon
id: DefaultStationBeaconConferenceRoom
suffix: Conference Room
components:
- type: NavMapBeacon
text: station-beacon-conference-room
defaultText: station-beacon-conference-room
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved

#Medical
- type: entity
parent: DefaultStationBeaconMedical
parent: DefaultStationBeacon
id: DefaultStationBeaconVirology
suffix: Virology
components:
- type: NavMapBeacon
text: station-beacon-virology
defaultText: station-beacon-virology
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: DefaultStationBeaconMedical
parent: DefaultStationBeacon
id: DefaultStationBeaconMetempsychosis
suffix: Cloning #Metempsychosis
components:
- type: NavMapBeacon
text: station-beacon-metempsychosis
defaultText: station-beacon-metempsychosis
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: DefaultStationBeaconMedical
parent: DefaultStationBeacon
id: DefaultStationBeaconExam
suffix: Exam
components:
- type: NavMapBeacon
text: station-beacon-exam
defaultText: station-beacon-exam

- type: entity
parent: DefaultStationBeaconMedical
parent: DefaultStationBeacon
id: DefaultStationBeaconMedicalOutpost
suffix: Medical Outpost
components:
- type: NavMapBeacon
text: station-beacon-med-outpost
defaultText: station-beacon-med-outpost

- type: entity
parent: DefaultStationBeaconMedical
parent: DefaultStationBeacon
id: DefaultStationBeaconPsychologist
suffix: Psych
components:
- type: NavMapBeacon
text: station-beacon-psych
defaultText: station-beacon-psych

#Epistemics
- type: entity
parent: DefaultStationBeaconScience
parent: DefaultStationBeacon
id: DefaultStationBeaconProber
suffix: Prober
components:
- type: NavMapBeacon
text: station-beacon-glimmer-prober
defaultText: station-beacon-glimmer-prober

- type: entity
parent: DefaultStationBeaconScience
parent: DefaultStationBeacon
id: DefaultStationBeaconMantis
suffix: Mantis
components:
- type: NavMapBeacon
text: station-beacon-forensic-mantis
defaultText: station-beacon-forensic-mantis

#Logistics
- type: entity
parent: DefaultStationBeaconSupply
parent: DefaultStationBeacon
id: DefaultStationBeaconMailroom
suffix: Mailroom
components:
- type: NavMapBeacon
text: station-beacon-mailroom
defaultText: station-beacon-mailroom

#Engineering
- type: entity
parent: DefaultStationBeaconEngineering
parent: DefaultStationBeacon
id: DefaultStationBeaconEngiOutpost
suffix: Engi Outpost
components:
- type: NavMapBeacon
text: station-beacon-engi-outpost
defaultText: station-beacon-engi-outpost

#Service
- type: entity
parent: DefaultStationBeaconService
parent: DefaultStationBeacon
id: DefaultStationBeaconJanitorsOffice
suffix: Janitor's Office
components:
- type: NavMapBeacon
text: station-beacon-janitor-office
defaultText: station-beacon-janitor-office

- type: entity
parent: DefaultStationBeaconService
parent: DefaultStationBeacon
id: DefaultStationBeaconReporter
suffix: Reporter
components:
- type: NavMapBeacon
text: station-beacon-reporter
defaultText: station-beacon-reporter

#Surveilance
- type: entity
parent: DefaultStationBeaconAI
parent: DefaultStationBeacon
id: DefaultStationBeaconCameraServerRoom
suffix: Camera Servers
components:
- type: NavMapBeacon
text: station-beacon-camera-servers
defaultText: station-beacon-camera-servers

#General
- type: entity
Expand All @@ -116,24 +116,24 @@
suffix: Boxing Ring
components:
- type: NavMapBeacon
text: station-beacon-boxing-ring
defaultText: station-beacon-boxing-ring

- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconPark
suffix: Park
components:
- type: NavMapBeacon
text: station-beacon-park
defaultText: station-beacon-park

#Security
- type: entity
parent: DefaultStationBeaconSecurity
parent: DefaultStationBeacon
id: DefaultStationBeaconCorpsman
suffix: Corpsman
components:
- type: NavMapBeacon
text: station-beacon-corpsman
defaultText: station-beacon-corpsman

#Justice
- type: entity
Expand All @@ -142,20 +142,20 @@
suffix: Justice
components:
- type: NavMapBeacon
text: station-beacon-justice
defaultText: station-beacon-justice

- type: entity
parent: DefaultStationBeaconJustice
parent: DefaultStationBeacon
id: DefaultStationBeaconChiefJustice
suffix: Chief Justice
components:
- type: NavMapBeacon
text: station-beacon-chiefjustice
defaultText: station-beacon-chiefjustice

- type: entity
parent: DefaultStationBeaconJustice
parent: DefaultStationBeacon
id: DefaultStationBeaconProsecutor
suffix: Prosecutor
components:
- type: NavMapBeacon
text: station-beacon-prosecutor
defaultText: station-beacon-prosecutor
Loading
Loading