Skip to content

Commit

Permalink
Merge branch 'master' into Bluespace-harvester
Browse files Browse the repository at this point in the history
  • Loading branch information
PyotrIgn authored Apr 30, 2024
2 parents f93a680 + 86ce806 commit 1f37c53
Show file tree
Hide file tree
Showing 10 changed files with 1,670 additions and 9 deletions.
8 changes: 7 additions & 1 deletion Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1712,5 +1712,11 @@ Entries:
- author: Xelasto
changes:
- {message: "Сотрудники научно-экспериментального отдела NanoTrasen по работе с блюспейсом создали новую машину для добычи ресурсов. Блюспейс-сборщик — энергозатратная, экспериментальная разработка по добыче ресурсов из других измерений.", type: Add}
id: 55738
id: 55739
time: '2024-04-30T16:20:00.0000000+00:00'

- author: Котя
changes:
- {message: "Структура организма генокрадов резко изменилась, в связи с чем неизвестным образом искусственно выведенные личинки стали бесполезны.", type: Remove}
id: 55740
time: '2024-04-29T18:20:00.0000000+00:00'
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
ent-ADTSecretBookBase = { ent-BookBase }
.desc = { ent-BookBase.desc }
ent-ADTSecretBookRandom = { ent-BookRandom }
.desc = { ent-BookRandom.desc }
ent-ADTSecretBookSpaceEncyclopedia = { ent-BookSpaceEncyclopedia }
.desc = { ent-BookSpaceEncyclopedia.desc }
ent-ADTSecretBookTheBookOfControl = { ent-BookTheBookOfControl }
.desc = { ent-BookTheBookOfControl.desc }
ent-ADTSecretBookBartendersManual = { ent-BookBartendersManual }
.desc = { ent-BookBartendersManual.desc }
ent-ADTSecretBookChefGaming = { ent-BookChefGaming }
.desc = { ent-BookChefGaming.desc }
ent-ADTSecretBookLeafLoversSecret = { ent-BookLeafLoversSecret }
.desc = { ent-BookLeafLoversSecret.desc }
ent-ADTSecretBookEngineersHandbook = { ent-BookEngineersHandbook }
.desc = { ent-BookEngineersHandbook.desc }
ent-ADTSecretBookScientistsGuidebook = { ent-BookScientistsGuidebook }
.desc = { ent-BookScientistsGuidebook.desc }
ent-ADTSecretBookSecurity = { ent-BookSecurity }
.desc = { ent-BookSecurity.desc }
ent-ADTSecretBookHowToKeepStationClean = { ent-BookHowToKeepStationClean }
.desc = { ent-BookHowToKeepStationClean.desc }
ent-ADTSecretBookHowToRockAndStone = { ent-BookHowToRockAndStone }
.desc = { ent-BookHowToRockAndStone.desc }
ent-ADTSecretBookMedicalReferenceBook = { ent-BookMedicalReferenceBook }
.desc = { ent-BookMedicalReferenceBook.desc }
ent-ADTSecretBookHowToSurvive = { ent-BookHowToSurvive }
.desc = { ent-BookHowToSurvive.desc }
ent-ADTSecretBookChemicalCompendium = { ent-BookChemicalCompendium }
.desc = { ent-BookChemicalCompendium.desc }
ent-ADTSecretBookEscalation = { ent-BookEscalation }
.desc = { ent-BookEscalation.desc }
ent-ADTSecretBookEscalationSecurity = { ent-BookEscalationSecurity }
.desc = { ent-BookEscalationSecurity.desc }
ent-ADTSecretBookAtmosDistro = { ent-BookAtmosDistro }
.desc = { ent-BookAtmosDistro.desc }
ent-ADTSecretBookAtmosWaste = { ent-BookAtmosWaste }
.desc = { ent-BookAtmosWaste.desc }
ent-ADTSecretBookAtmosAirAlarms = { ent-BookAtmosAirAlarms }
.desc = { ent-BookAtmosAirAlarms.desc }
ent-ADTSecretBookAtmosVentsMore = { ent-BookAtmosVentsMore }
.desc = { ent-BookAtmosVentsMore.desc }
ent-ADTSecretBookNarsieLegend = { ent-BookNarsieLegend }
.desc = { ent-BookNarsieLegend.desc }
ent-ADTSecretBookTruth = { ent-BookTruth }
.desc = { ent-BookTruth.desc }
ent-ADTSecretBookWorld = { ent-BookWorld }
.desc = { ent-BookWorld.desc }
ent-ADTSecretBookIanAntarctica = { ent-BookIanAntarctica }
.desc = { ent-BookIanAntarctica.desc }
ent-ADTSecretBookSlothClownSSS = { ent-BookSlothClownSSS }
.desc = { ent-BookSlothClownSSS.desc }
ent-ADTSecretBookSlothClownPranks = { ent-BookSlothClownPranks }
.desc = { ent-BookSlothClownPranks.desc }
ent-ADTSecretBookSlothClownMMD = { ent-BookSlothClownMMD }
.desc = { ent-BookSlothClownMMD.desc }
ent-ADTSecretBookStruck = { ent-BookStruck }
.desc = { ent-BookStruck.desc }
ent-ADTSecretBookSun = { ent-BookSun }
.desc = { ent-BookSun.desc }
ent-ADTSecretBookPossum = { ent-BookPossum }
.desc = { ent-BookPossum.desc }
ent-ADTSecretBookCafe = { ent-BookCafe }
.desc = { ent-BookCafe.desc }
ent-ADTSecretBookFeather = { ent-BookFeather }
.desc = { ent-BookFeather.desc }
ent-ADTSecretBookIanLostWolfPup = { ent-BookIanLostWolfPup }
.desc = { ent-BookIanLostWolfPup.desc }
ent-ADTSecretBookIanRanch = { ent-BookIanRanch }
.desc = { ent-BookIanRanch.desc }
ent-ADTSecretBookIanOcean = { ent-BookIanOcean }
.desc = { ent-BookIanOcean.desc }
ent-ADTSecretBookIanMountain = { ent-BookIanMountain }
.desc = { ent-BookIanMountain.desc }
ent-ADTSecretBookIanCity = { ent-BookIanCity }
.desc = { ent-BookIanCity.desc }
ent-ADTSecretBookIanArctic = { ent-BookIanArctic }
.desc = { ent-BookIanArctic.desc }
ent-ADTSecretBookIanDesert = { ent-BookIanDesert }
.desc = { ent-BookIanDesert.desc }
ent-ADTSecretBookNames = { ent-BookNames }
.desc = { ent-BookNames.desc }
ent-ADTSecretBookEarth = { ent-BookEarth }
.desc = { ent-BookEarth.desc }
ent-ADTSecretBookAurora = { ent-BookAurora }
.desc = { ent-BookAurora.desc }
ent-ADTSecretBookTemple = { ent-BookTemple }
.desc = { ent-BookTemple.desc }
ent-ADTSecretBookWatched = { ent-BookWatched }
.desc = { ent-BookWatched.desc }
ent-ADTSecretBookMedicalOfficer = { ent-BookMedicalOfficer }
.desc = { ent-BookMedicalOfficer.desc }
ent-ADTSecretBookMorgue = { ent-BookMorgue }
.desc = { ent-BookMorgue.desc }
ent-ADTSecretBookRufus = { ent-BookRufus }
.desc = { ent-BookRufus.desc }
ent-ADTSecretBookMap = { ent-BookMap }
.desc = { ent-BookMap.desc }
ent-ADTSecretBookJourney = { ent-BookJourney }
.desc = { ent-BookJourney.desc }
ent-ADTSecretBookInspiration = { ent-BookInspiration }
.desc = { ent-BookInspiration.desc }
ent-ADTSecretBookDemonomicon = { ent-BookDemonomicon }
.desc = { ent-BookDemonomicon.desc }
ent-ADTSecretBookChemistryInsane = { ent-BookChemistryInsane }
.desc = { ent-BookChemistryInsane.desc }
ent-ADTSecretBookBotanicalTextbook = { ent-BookBotanicalTextbook }
.desc = { ent-BookBotanicalTextbook.desc }
ent-ADTSecretBookGnominomicon = { ent-BookGnominomicon }
.desc = { ent-BookGnominomicon.desc }
ent-ADTSecretBookFishing = { ent-BookFishing }
.desc = { ent-BookFishing.desc }
ent-ADTSecretBookDetective = { ent-BookDetective }
.desc = { ent-BookDetective.desc }
ent-ADTSecretBookBusido = { ent-BookBusido }
.desc = { ent-BookBusido.desc }
Loading

0 comments on commit 1f37c53

Please sign in to comment.