diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/books.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/books.ftl index 1bd30001dbd..891ee65c693 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/books.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/misc/books.ftl @@ -1,5 +1,5 @@ ent-BookLoreBase = Лорные книги - .desc = Данные книги содержат в себе лор Корвакса. + .desc = Данные книги содержат в себе лор. ent-BookExpensiveCrystal = Кристаллы особой ценности .desc = Данная книга рассказывает о материалах, которые в обиходе было принято называть Блюспейс и Редспейс кристаллами. ent-BookClones = Туртельский Кризис diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/books.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/books.ftl new file mode 100644 index 00000000000..938be046f32 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/books.ftl @@ -0,0 +1,35 @@ +ent-ADTBookSRPcmd = СРП командного состава + .desc = Стандартные рабочие процедуры командного состава. Стоит соблюдать их, если не хочешь оказаться за решеткой. + +ent-ADTBookSRPcrg = СРП отдела снабжения + .desc = Стандартные рабочие процедуры отдела снабжения. Стоит соблюдать их, если не хочешь оказаться за решеткой. + +ent-ADTBookSRPeng = СРП инженерного отдела + .desc = Стандартные рабочие процедуры инженерного отдела. Стоит соблюдать их, если не хочешь оказаться за решеткой. + +ent-ADTBookSRPjrd = СРП юридического отдела + .desc = Стандартные рабочие процедуры юридического отдела. Стоит соблюдать их, если не хочешь оказаться за решеткой. + +ent-ADTBookSRPmed = СРП медицинского отдела + .desc = Стандартные рабочие процедуры медицинского отдела. Стоит соблюдать их, если не хочешь оказаться за решеткой. + +ent-ADTBookSRPrnd = СРП научного отдела + .desc = Стандартные рабочие процедуры научного отдела. Стоит соблюдать их, если не хочешь оказаться за решеткой. + +ent-ADTBookSRPsec = СРП службы безопасности + .desc = Стандартные рабочие процедуры службы безопасности. Стоит соблюдать их, если не хочешь оказаться за решеткой. + +ent-ADTBookSRPsrv = СРП сервисного отдела + .desc = Стандартные рабочие процедуры сервисного отдела. Стоит соблюдать их, если не хочешь оказаться за решеткой. + +ent-BookSpaceLaw = Корпоративный закон + .desc = Набор правил NanoTrasen для поддержания закона и порядка на своих космических станциях. + +ent-ADTBookPCDsec = Процедуры службы безопасности + .desc = Набор процедур службы безопасности для правильного поддержания закона и порядка на своих космических станциях. Следуйте им, если не хотите быть навсегда уволенным из доблестной службы безопасности. + +ent-ADTBookPCDcmd = Процедуры командного состава + .desc = Набор процедур командного состава для правильного управления сотрудниками и соблюдения порядка на станции. Следуйте им, если не хотите получить запрет на становление главой отдела. + +ent-ADTBookPCDjrd = Процедуры юридического отдела + .desc = Набор процедур юридического отдела для правильного решения юридических вопросов и вынесения судебных вердиктов на станции. Следуйте им, если не хотите получить запрет на становление сотрудником юридического отдела. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/books.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/books.ftl index d079d421fab..0d8b99ff697 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/books.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/books.ftl @@ -1,5 +1,5 @@ ent-BookLoreBase = Лорные книги - .desc = Данные книги содержат в себе лор Корвакса. + .desc = Данные книги содержат в себе лор. ent-BookExpensiveCrystal = Кристаллы особой ценности .desc = Данная книга рассказывает о материалах, которые в обиходе было принято называть Блюспейс и Редспейс кристаллами. ent-BookClones = Туртельский Кризис diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl index ea85eee4453..e6dd043ea96 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl @@ -24,8 +24,6 @@ ent-BookMedicalReferenceBook = Медицинский справочник .desc = Справочник по медицинскому делу, написанный престарелым врачом. Почерк едва различим. ent-BookHowToSurvive = Как выжить .desc = По иронии судьбы автор этой книги умер. -ent-BookSpaceLaw = Корпоративный закон - .desc = Набор правил Nanotrasen для поддержания закона и порядка на своих космических станциях. ent-BookChemicalCompendium = Химпендиум .desc = Исчерпывающее руководство о химическом синтезе, написанное каким-то пожилым скелетом профессора. ent-BookRandom = { ent-BookBase } diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/books.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/books.yml new file mode 100644 index 00000000000..703edd4b213 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/books.yml @@ -0,0 +1,295 @@ +- type: entity + id: BookSpaceLaw + parent: BaseItem + name: space law + description: A set of Nanotrasen guidelines for keeping law and order on their space stations. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: KZ + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%9A%D0%BE%D1%80%D0%BF%D0%BE%D1%80%D0%B0%D1%82%D0%B8%D0%B2%D0%BD%D1%8B%D0%B9_%D0%B7%D0%B0%D0%BA%D0%BE%D0%BD#%D0%9A%D0%BE%D1%80%D0%BF%D0%BE%D1%80%D0%B0%D1%82%D0%B8%D0%B2%D0%BD%D1%8B%D0%B9_%D0%B7%D0%B0%D0%BA%D0%BE%D0%BD # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +# procedures +# procedures +# procedures + +- type: entity + id: ADTBookPCDsec + parent: BaseItem + name: security procedures + description: A set of Nanotrasen guidelines for keeping law and order on their space stations. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: PCD_SEC + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%9F%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D1%81%D0%BB%D1%83%D0%B6%D0%B1%D1%8B_%D0%B1%D0%B5%D0%B7%D0%BE%D0%BF%D0%B0%D1%81%D0%BD%D0%BE%D1%81%D1%82%D0%B8 # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +- type: entity + id: ADTBookPCDcmd + parent: BaseItem + name: command procedures + description: A set of Nanotrasen guidelines for keeping personnel order on their space stations. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: PCD_CMD + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%9F%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D0%BA%D0%BE%D0%BC%D0%B0%D0%BD%D0%B4%D0%BD%D0%BE%D0%B3%D0%BE_%D1%81%D0%BE%D1%81%D1%82%D0%B0%D0%B2%D0%B0 # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +- type: entity + id: ADTBookPCDjrd + parent: BaseItem + name: juridical procedures + description: A set of Nanotrasen guidelines for keeping juridical order on their space stations. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: PCD_JRD + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%9F%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D1%8E%D1%80%D0%B8%D0%B4%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%BE%D0%B3%D0%BE_%D0%BE%D1%82%D0%B4%D0%B5%D0%BB%D0%B0 # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +# srp +# srp +# srp + +- type: entity + id: ADTBookSRPcmd + parent: BaseItem + name: command procedures + description: A set of Nanotrasen guidelines. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: CRP_CMD + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%A1%D1%82%D0%B0%D0%BD%D0%B4%D0%B0%D1%80%D1%82%D0%BD%D1%8B%D0%B5_%D1%80%D0%B0%D0%B1%D0%BE%D1%87%D0%B8%D0%B5_%D0%BF%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D0%BA%D0%BE%D0%BC%D0%B0%D0%BD%D0%B4%D0%BD%D0%BE%D0%B3%D0%BE_%D1%81%D0%BE%D1%81%D1%82%D0%B0%D0%B2%D0%B0 # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +- type: entity + id: ADTBookSRPcrg + parent: BaseItem + name: cargo procedures + description: A set of Nanotrasen guidelines. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: CRP_CRG + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%A1%D1%82%D0%B0%D0%BD%D0%B4%D0%B0%D1%80%D1%82%D0%BD%D1%8B%D0%B5_%D1%80%D0%B0%D0%B1%D0%BE%D1%87%D0%B8%D0%B5_%D0%BF%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D0%BE%D1%82%D0%B4%D0%B5%D0%BB%D0%B0_%D1%81%D0%BD%D0%B0%D0%B1%D0%B6%D0%B5%D0%BD%D0%B8%D1%8F # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +- type: entity + id: ADTBookSRPeng + parent: BaseItem + name: engineering procedures + description: A set of Nanotrasen guidelines. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: CRP_ENG + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%A1%D1%82%D0%B0%D0%BD%D0%B4%D0%B0%D1%80%D1%82%D0%BD%D1%8B%D0%B5_%D1%80%D0%B0%D0%B1%D0%BE%D1%87%D0%B8%D0%B5_%D0%BF%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D0%B8%D0%BD%D0%B6%D0%B5%D0%BD%D0%B5%D1%80%D0%BD%D0%BE%D0%B3%D0%BE_%D0%BE%D1%82%D0%B4%D0%B5%D0%BB%D0%B0 # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +- type: entity + id: ADTBookSRPjrd + parent: BaseItem + name: juridical procedures + description: A set of Nanotrasen guidelines. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: CRP_JRD + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%A1%D1%82%D0%B0%D0%BD%D0%B4%D0%B0%D1%80%D1%82%D0%BD%D1%8B%D0%B5_%D1%80%D0%B0%D0%B1%D0%BE%D1%87%D0%B8%D0%B5_%D0%BF%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D1%8E%D1%80%D0%B8%D0%B4%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%BE%D0%B3%D0%BE_%D0%BE%D1%82%D0%B4%D0%B5%D0%BB%D0%B0 # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +- type: entity + id: ADTBookSRPmed + parent: BaseItem + name: medical procedures + description: A set of Nanotrasen guidelines. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: CRP_MED + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%A1%D1%82%D0%B0%D0%BD%D0%B4%D0%B0%D1%80%D1%82%D0%BD%D1%8B%D0%B5_%D1%80%D0%B0%D0%B1%D0%BE%D1%87%D0%B8%D0%B5_%D0%BF%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D0%BC%D0%B5%D0%B4%D0%B8%D1%86%D0%B8%D0%BD%D1%81%D0%BA%D0%BE%D0%B3%D0%BE_%D0%BE%D1%82%D0%B4%D0%B5%D0%BB%D0%B0 # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +- type: entity + id: ADTBookSRPrnd + parent: BaseItem + name: rnd procedures + description: A set of Nanotrasen guidelines. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: CRP_RND + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%A1%D1%82%D0%B0%D0%BD%D0%B4%D0%B0%D1%80%D1%82%D0%BD%D1%8B%D0%B5_%D1%80%D0%B0%D0%B1%D0%BE%D1%87%D0%B8%D0%B5_%D0%BF%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D0%BD%D0%B0%D1%83%D1%87%D0%BD%D0%BE%D0%B3%D0%BE_%D0%BE%D1%82%D0%B4%D0%B5%D0%BB%D0%B0 # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +- type: entity + id: ADTBookSRPsec + parent: BaseItem + name: security procedures + description: A set of Nanotrasen guidelines. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: CRP_SEC + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%A1%D1%82%D0%B0%D0%BD%D0%B4%D0%B0%D1%80%D1%82%D0%BD%D1%8B%D0%B5_%D1%80%D0%B0%D0%B1%D0%BE%D1%87%D0%B8%D0%B5_%D0%BF%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D0%BE%D1%82%D0%B4%D0%B5%D0%BB%D0%B0_%D1%81%D0%BB%D1%83%D0%B6%D0%B1%D1%8B_%D0%B1%D0%B5%D0%B7%D0%BE%D0%BF%D0%B0%D1%81%D0%BD%D0%BE%D1%81%D1%82%D0%B8 # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 + +- type: entity + id: ADTBookSRPsrv + parent: BaseItem + name: service procedures + description: A set of Nanotrasen guidelines. + components: + - type: Sprite + sprite: ADT/Objects/Misc/books.rsi + layers: + - state: CRP_SRV + - type: Tag + tags: + - Book +# Corvax-HyperLink + - type: HyperLink + url: https://wiki.adventurestation.space/%D0%A1%D1%82%D0%B0%D0%BD%D0%B4%D0%B0%D1%80%D1%82%D0%BD%D1%8B%D0%B5_%D1%80%D0%B0%D0%B1%D0%BE%D1%87%D0%B8%D0%B5_%D0%BF%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_%D1%81%D0%B5%D1%80%D0%B2%D0%B8%D1%81%D0%BD%D0%BE%D0%B3%D0%BE_%D0%BE%D1%82%D0%B4%D0%B5%D0%BB%D0%B0 # ADT Tweak +# Corvax-HyperLink + - type: MeleeWeapon # so you can teach using PAIN + soundHit: + collection: Punch + damage: + types: + Blunt: 1 diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index 25e87e1506c..f75986dd1f4 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -96,6 +96,7 @@ - RobohandsGloves #Blueshield + - type: loadoutGroup id: ADTBlueshieldJumpsuit name: loadout-group-blueshield-jumpsuit diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Juridical/Magistrat.yml b/Resources/Prototypes/ADT/Roles/Jobs/Juridical/Magistrat.yml index ca258ad2391..8b43bb4144c 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Juridical/Magistrat.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Juridical/Magistrat.yml @@ -24,7 +24,7 @@ - Security - Magistrate - Lawyer - - IAA + - IAA special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] @@ -45,6 +45,12 @@ #belt: neck: ClothingNeckLawyerbadge pocket2: RubberStampMagisrat + storage: + back: + - Flash + # ADT-TelescopicBaton + - ADTtelescopicBaton + # ADT-TelescopicBaton # pocket1: ADTtelescopicBaton # underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear # socks: ClothingUnderwearSocksNormal diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml index 274642e4f8f..ba3a84e1832 100644 --- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml +++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml @@ -158,9 +158,6 @@ - id: BookShips prob: 0.1 orGroup: BookLore - - id: BookZP - prob: 0.1 - orGroup: BookLore - id: BookUSSP prob: 0.1 orGroup: BookLore @@ -221,4 +218,4 @@ - id: BookImplants prob: 0.1 orGroup: BookLore - # Corvax-Lore-End \ No newline at end of file + # Corvax-Lore-End diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 4a0da9179ed..62cfe662146 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -22,6 +22,9 @@ prob: 0.3 - id: Flare prob: 0.3 + # ADT-WikiBooks-Start + - id: ADTBookSRPcrg + # ADT-WikiBooks-End - type: entity id: LockerSalvageSpecialistFilled @@ -46,3 +49,6 @@ prob: 0.3 - id: Flare prob: 0.3 + # ADT-WikiBooks-Start + - id: ADTBookSRPcrg + # ADT-WikiBooks-End diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index b3369106b9d..87e27a57e3c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -98,6 +98,9 @@ - id: ADTRPD - id: ADTRPDAmmo # ADT-RPD-End + # ADT-WikiBooks-Start + - id: ADTBookSRPeng + # ADT-WikiBooks-End - type: entity id: LockerAtmosphericsFilled @@ -116,6 +119,9 @@ - id: ADTRPD - id: ADTRPDAmmo # ADT-RPD-End + # ADT-WikiBooks-Start + - id: ADTBookSRPeng + # ADT-WikiBooks-End - type: entity id: LockerEngineerFilledHardsuit @@ -130,6 +136,9 @@ - id: ClothingShoesBootsMag - id: RCD - id: RCDAmmo + # ADT-WikiBooks-Start + - id: ADTBookSRPeng + # ADT-WikiBooks-End - type: entity id: LockerEngineerFilled @@ -143,6 +152,9 @@ - id: trayScanner - id: RCD - id: RCDAmmo + # ADT-WikiBooks-Start + - id: ADTBookSRPeng + # ADT-WikiBooks-End - type: entity id: ClosetRadiationSuitFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 6cde0ed27e2..5f48ba4c8f2 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -25,6 +25,12 @@ - id: ADTCommandBudgetCard - id: ADTCommandBudgetPinPaper # ADT-Economy-End + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookSRPcrg + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerCaptainFilledHardsuit @@ -42,7 +48,7 @@ - id: WeaponDisabler - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 + # - id: SpaceCash1000 # ADT-Economy - id: PlushieNuke prob: 0.1 - id: CigarGoldCase @@ -53,6 +59,11 @@ - id: WeaponAntiqueLaser - id: JetpackCaptainFilled - id: MedalCase + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerCaptainFilled @@ -68,7 +79,7 @@ - id: WeaponDisabler - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 + # - id: SpaceCash1000 # ADT-Economy - id: PlushieNuke prob: 0.1 - id: CigarGoldCase @@ -83,6 +94,11 @@ - id: ClothingHeadCaptainHat - id: ClothingOuterCoatCaptain # Corvax-Resprite-End + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerCaptainFilledNoLaser @@ -98,7 +114,7 @@ - id: WeaponDisabler - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 + # - id: SpaceCash1000 # ADT-Economy - id: PlushieNuke prob: 0.1 - id: CigarGoldCase @@ -108,6 +124,11 @@ - id: RubberStampCaptain - id: JetpackCaptainFilled - id: MedalCase + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerHeadOfPersonnelFilled @@ -139,6 +160,11 @@ - id: ClothingOuterCoatHOP # Corvax-Resprite - id: AccessConfigurator - id: PrinterDocFlatpack # Corvax-Printer + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerChiefEngineerFilledHardsuit @@ -168,6 +194,12 @@ - id: ClothingNeckCloakCe - id: ADTClothingMaskGasCE # End-ADT Tweak + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookSRPeng + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerChiefEngineerFilled @@ -188,6 +220,12 @@ - id: AccessConfigurator - id: RCD - id: RCDAmmo + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookSRPeng + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerChiefMedicalOfficerFilledHardsuit @@ -211,6 +249,12 @@ - id: RubberStampCMO - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookSRPmed + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerChiefMedicalOfficerFilled @@ -231,6 +275,12 @@ - id: RubberStampCMO - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookSRPmed + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerResearchDirectorFilledHardsuit @@ -250,6 +300,12 @@ - id: BoxEncryptionKeyScience - id: ClothingHeadsetAltScience - id: EncryptionKeyBinary + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookSRPrnd + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerResearchDirectorFilled @@ -268,6 +324,12 @@ - id: BoxEncryptionKeyScience - id: ClothingHeadsetAltScience - id: EncryptionKeyBinary + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookSRPrnd + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerHeadOfSecurityFilledHardsuit @@ -303,6 +365,13 @@ - id: BookSecretDocuments - id: BookBusido # Corvax-Books - id: BookSpaceLaw + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookSRPsec + - id: ADTBookPCDsec + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerHeadOfSecurityFilled @@ -330,6 +399,12 @@ - id: HoloprojectorSecurity - id: BookSecretDocuments - id: BookSpaceLaw + # ADT-WikiBooks-Start + - id: ADTBookSRPcmd + - id: ADTBookSRPsec + - id: ADTBookPCDcmd + - id: ADTtelescopicBaton + # ADT-WikiBooks-End - type: entity id: LockerFreezerVaultFilled @@ -343,6 +418,6 @@ - id: WeaponRevolverDeckard - id: ClothingOuterHardsuitBasic - id: JetpackBlue - - id: SpaceCash1000 + # - id: SpaceCash1000 # ADT-Economy - id: BeachBall - id: BikeHorn diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index 22009e75615..ecc7103b783 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -70,6 +70,9 @@ prob: 0.05 orGroup: Surgshrubs - id: ClothingMaskSterile + # ADT-WikiBooks-Start + - id: ADTBookSRPmed + # ADT-WikiBooks-End - type: entity parent: LockerWallMedical @@ -125,6 +128,9 @@ - id: ClothingMaskSterile - id: HandLabeler prob: 0.5 + # ADT-WikiBooks-Start + - id: ADTBookSRPmed + # ADT-WikiBooks-End - type: entity id: LockerParamedicFilled @@ -146,3 +152,6 @@ - id: HandheldGPSBasic - id: MedkitFilled prob: 0.3 + # ADT-WikiBooks-Start + - id: ADTBookSRPmed + # ADT-WikiBooks-End diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml index 4f09061f9a6..0a2d0bb700b 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml @@ -13,3 +13,6 @@ - id: NodeScanner - id: NetworkConfigurator prob: 0.5 + # ADT-WikiBooks-Start + - id: ADTBookSRPrnd + # ADT-WikiBooks-End diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 1fda8154246..ec5602938fc 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -20,6 +20,10 @@ - id: ClothingOuterHardsuitWarden - id: HoloprojectorSecurity - id: BookSpaceLaw + # ADT-WikiBooks-Start + - id: ADTBookSRPsec + - id: ADTBookPCDsec + # ADT-WikiBooks-End - type: entity id: LockerWardenFilled @@ -44,6 +48,10 @@ - id: DoorRemoteArmory - id: HoloprojectorSecurity - id: BookSpaceLaw + # ADT-WikiBooks-Start + - id: ADTBookSRPsec + - id: ADTBookPCDsec + # ADT-WikiBooks-End - type: entity id: LockerSecurityFilled @@ -74,6 +82,10 @@ prob: 0.6 - id: BookSpaceLaw prob: 0.5 + # ADT-WikiBooks-Start + - id: ADTBookSRPsec + - id: ADTBookPCDsec + # ADT-WikiBooks-End - type: entity id: LockerBrigmedicFilled @@ -114,6 +126,11 @@ prob: 0.5 - id: ClothingOuterCoatLabSecurityMedic # Corvax-Resprite prob: 0.5 + # ADT-WikiBooks-Start + - id: ADTBookSRPsec + - id: ADTBookSRPmed + - id: ADTBookPCDsec + # ADT-WikiBooks-End - type: entity id: LockerDetectiveFilled @@ -139,6 +156,10 @@ - id: HoloprojectorSecurity - id: BoxEvidenceMarkers - id: HandLabeler + # ADT-WikiBooks-Start + - id: ADTBookSRPsec + - id: ADTBookPCDsec + # ADT-WikiBooks-End - type: entity id: ClosetBombFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 6d0577a16eb..c411b92f7b4 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -21,6 +21,9 @@ amount: 2 - id: RagItem amount: 2 + # ADT-WikiBooks-Start + - id: ADTBookSRPsrv + # ADT-WikiBooks-End #- type: entity # id: LockerFormalFilled @@ -52,6 +55,9 @@ - id: DrinkMilkCarton amount: 2 - id: DrinkSoyMilkCarton + # ADT-WikiBooks-Start + - id: ADTBookSRPsrv + # ADT-WikiBooks-End - type: entity id: ClosetJanitorFilled @@ -77,6 +83,9 @@ amount: 2 - id: Plunger amount: 2 + # ADT-WikiBooks-Start + - id: ADTBookSRPsrv + # ADT-WikiBooks-End - type: entity id: ClosetLegalFilled @@ -88,6 +97,9 @@ - id: BriefcaseBrownFilled prob: 0.80 - id: ClothingOuterRobesJudge + # ADT-WikiBooks-Start + - id: ADTBookSRPsrv + # ADT-WikiBooks-End - type: entity id: LockerBotanistFilled @@ -108,6 +120,9 @@ - id: HandLabeler - id: ClothingUniformOveralls - id: ClothingHeadHatTrucker + # ADT-WikiBooks-Start + - id: ADTBookSRPsrv + # ADT-WikiBooks-End prob: 0.1 - type: entity diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Crates/service.yml index 79e8c1fa726..17ce9337695 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Crates/service.yml @@ -15,7 +15,6 @@ - id: BookHalifat - id: BookRedspace - id: BookShips - - id: BookZP - id: BookBSS - id: BookConarex - id: BookDione @@ -35,4 +34,4 @@ - id: BookUmpor - id: BookUnath1 - id: BookUnath2 - - id: BookVitz \ No newline at end of file + - id: BookVitz diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/books.yml index 94bf9b46272..de63f0272ce 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/books.yml @@ -3,7 +3,7 @@ id: BookLoreBase abstract: true name: Лорные книги - description: Данные книги содержат в себе лор Корвакса. + description: Данные книги содержат в себе лор. components: - type: Sprite sprite: Corvax/Objects/Misc/books.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml index 6ab91815720..fd4cac781ba 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml @@ -353,38 +353,6 @@ guides: - Chemicals -- type: entity - id: BookSpaceLaw - parent: BaseItem - name: space law - description: A set of Nanotrasen guidelines for keeping law and order on their space stations. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: paper - - state: cover_strong - color: "#87011c" - - state: icon_law - color: "#f7d61a" - - type: Tag - tags: - - Book -# Corvax-HyperLink -# - type: GuideHelp -# openOnActivation: true -# guides: -# - SpaceLaw - - type: HyperLink - url: https://wiki.adventurestation.space/%D0%9A%D0%BE%D1%80%D0%BF%D0%BE%D1%80%D0%B0%D1%82%D0%B8%D0%B2%D0%BD%D1%8B%D0%B9_%D0%B7%D0%B0%D0%BA%D0%BE%D0%BD#%D0%9A%D0%BE%D1%80%D0%BF%D0%BE%D1%80%D0%B0%D1%82%D0%B8%D0%B2%D0%BD%D1%8B%D0%B9_%D0%B7%D0%B0%D0%BA%D0%BE%D0%BD # ADT Tweak -# Corvax-HyperLink - - type: MeleeWeapon # so you can beat stupid cadets - soundHit: - collection: Punch - damage: - types: - Blunt: 1 - - type: entity parent: BookBase id: BookRandom diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index ebce8c8a79f..b0ca8266042 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -46,3 +46,4 @@ storage: back: - Flash + - ADTtelescopicBaton #ADT-CustomADTLoadout diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 32762777d23..fcdd96da17d 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -34,7 +34,7 @@ components: - type: CommandStaff - type: PhantomTyranyTarget # ADT Phantom - + - type: startingGear id: CaptainGear equipment: @@ -46,4 +46,5 @@ storage: back: - Flash + - ADTtelescopicBaton #ADT-CustomADTLoadout # - StationCharter diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml index abc0f2f59db..53579539721 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml @@ -27,3 +27,7 @@ belt: WeaponPistolN1984 pocket1: BoxFolderBlack pocket2: PenCentcom + storage: + back: + - Flash #ADT-CustomADTLoadout + - ADTtelescopicBaton #ADT-CustomADTLoadout diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index de4ed0e2ce7..e409f598126 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -70,3 +70,4 @@ storage: back: - Flash + - ADTtelescopicBaton #ADT-CustomADTLoadout diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 1f24a9fa21b..0c1a4a488af 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -48,3 +48,4 @@ storage: back: - Flash + - ADTtelescopicBaton #ADT-CustomADTLoadout diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 5771b7c2235..b3ca7ad18f6 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -48,3 +48,4 @@ storage: back: - Flash + - ADTtelescopicBaton #ADT-CustomADTLoadout diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index a6aa7bb4724..17625ee25bb 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -38,3 +38,4 @@ storage: back: - Flash + - ADTtelescopicBaton #ADT-CustomADTLoadout diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 0e7fbadbf75..46449c1defb 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -52,3 +52,5 @@ back: - Flash - MagazinePistol + - ADTtelescopicBaton #ADT-CustomADTLoadout + diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_CMD.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_CMD.png new file mode 100644 index 00000000000..bc84b597c53 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_CMD.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_CRG.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_CRG.png new file mode 100644 index 00000000000..8f4341a921f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_CRG.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_ENG.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_ENG.png new file mode 100644 index 00000000000..f1d3c5291cf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_ENG.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_JRD.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_JRD.png new file mode 100644 index 00000000000..ac53b2196fa Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_JRD.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_MED.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_MED.png new file mode 100644 index 00000000000..0a24eeb7e9f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_MED.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_RND.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_RND.png new file mode 100644 index 00000000000..9eeff39b1c8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_RND.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_SEC.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_SEC.png new file mode 100644 index 00000000000..bdc2324378d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_SEC.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_SRV.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_SRV.png new file mode 100644 index 00000000000..434463340e1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/CRP_SRV.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/KZ.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/KZ.png new file mode 100644 index 00000000000..65dffd3d8d4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/KZ.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/PCD_CMD.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/PCD_CMD.png new file mode 100644 index 00000000000..8a83a14a1a3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/PCD_CMD.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/PCD_JRD.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/PCD_JRD.png new file mode 100644 index 00000000000..e6377a89832 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/PCD_JRD.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/PCD_SEC.png b/Resources/Textures/ADT/Objects/Misc/books.rsi/PCD_SEC.png new file mode 100644 index 00000000000..0ac6ce3b190 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/books.rsi/PCD_SEC.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/books.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/books.rsi/meta.json new file mode 100644 index 00000000000..bdc01951617 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/books.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drawn by discord: prazat911 (PCD books were redrawn by juuungarik)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "CRP_CMD" + }, + { + "name": "CRP_CRG" + }, + { + "name": "CRP_JRD" + }, + { + "name": "CRP_MED" + }, + { + "name": "CRP_RND" + }, + { + "name": "CRP_ENG" + }, + { + "name": "CRP_SEC" + }, + { + "name": "CRP_SRV" + }, + { + "name": "KZ" + }, + { + "name": "PCD_SEC" + }, + { + "name": "PCD_CMD" + }, + { + "name": "PCD_JRD" + } + ] +}