diff --git a/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl b/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl index 4abafc366a3..864da3d851a 100644 --- a/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl +++ b/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl @@ -555,6 +555,9 @@ ent-MedievalKeyKing = ключ культа истины ent-MedievalKeyCargo = ключ оружейной легиона .desc = За императора! .suffix = { "Средневековье, ключ, снабжение" } +ent-MedievalKeyCathedral = ключ церкви + .desc = Отче наш. + .suffix = { "Средневековье, ключ, научныйруководитель" } ent-MedievalMobGoblin = гоблин .desc = Мелкие бегающие твари. Пока ты успеешь одуматься они тебя уже разденут и убегут. .suffix = { "Средневековье, моб" } @@ -579,6 +582,9 @@ ent-MedievalAirlockChemistryLocked = дверь бандитов волка ent-MedievalAirlockSecurityLocked = дверь оружейной мятежников .desc = Для нее нужен ключ .suffix = { "Средневековье, дверь" } +ent-MedievalAirlockCathedralLocked = дверь церкви + .desc = Для нее нужен ключ + .suffix = { "Средневековье, дверь" } ent-MedievalAirlock = дверь .desc = Для нее не нужен ключ .suffix = { "Средневековье, дверь" } @@ -597,6 +603,9 @@ ent-MedievalAirlockGrilleChemistryLocked = решетчатая дверь ба ent-MedievalAirlockGrilleSecurityLocked = решетчатая дверь оружейной мятежников .desc = Для нее нужен ключ .suffix = { "Средневековье, дверь" } +ent-MedievalAirlockGrilleCathedralLocked = решетчатая дверь церкви + .desc = Для нее нужен ключ + .suffix = { "Средневековье, дверь" } ent-MedievalAirlockGrille = решетчатая дверь .desc = Для нее не нужен ключ .suffix = { "Средневековье, дверь" } @@ -615,6 +624,9 @@ ent-MedievalAirlockReinforcedChemistryLocked = оббитая железом д ent-MedievalAirlockReinforcedSecurityLocked = оббитая железом дверь оружейной мятежников .desc = Для нее нужен ключ .suffix = { "Средневековье, дверь" } +ent-MedievalAirlockReinforcedCathedralLocked = оббитая железом дверь церкви + .desc = Для нее нужен ключ + .suffix = { "Средневековье, дверь" } ent-MedievalAirlockReinforced = оббитая железом дверь .desc = Для нее не нужен ключ .suffix = { "Средневековье, дверь" } diff --git a/Resources/Prototypes/Imperial/Medieval/doors.yml b/Resources/Prototypes/Imperial/Medieval/doors.yml index 9901d524a79..c88554c79c2 100644 --- a/Resources/Prototypes/Imperial/Medieval/doors.yml +++ b/Resources/Prototypes/Imperial/Medieval/doors.yml @@ -105,6 +105,19 @@ accessLists: - Hydroponics +- type: entity + parent: MedievalAirlock + id: MedievalAirlockCathedralLocked + components: + #- type: AccessReader +# access: [["ResearchDirector"]] + - type: DoorBolt + boltsDown: True + - type: LockDoor + accessLists: + - ResearchDirector + + - type: entity parent: MedievalAirlock id: MedievalAirlockJanitorLocked @@ -486,6 +499,18 @@ accessLists: - Hydroponics +- type: entity + parent: MedievalAirlockGrille + id: MedievalAirlockGrilleCathedralLocked + components: + #- type: AccessReader +# access: [["ResearchDirector"]] + - type: DoorBolt + boltsDown: True + - type: LockDoor + accessLists: + - ResearchDirector + - type: entity parent: MedievalAirlockGrille id: MedievalAirlockGrilleJanitorLocked @@ -742,6 +767,18 @@ accessLists: - Hydroponics +- type: entity + parent: MedievalAirlockReinforced + id: MedievalAirlockReinforcedCathedralLocked + components: + #- type: AccessReader +# access: [["ResearchDirector"]] + - type: DoorBolt + boltsDown: True + - type: LockDoor + accessLists: + - ResearchDirector + - type: entity parent: MedievalAirlockReinforced id: MedievalAirlockReinforcedJanitorLocked diff --git a/Resources/Prototypes/Imperial/Medieval/keys.yml b/Resources/Prototypes/Imperial/Medieval/keys.yml index 2d81540b124..be88809588d 100644 --- a/Resources/Prototypes/Imperial/Medieval/keys.yml +++ b/Resources/Prototypes/Imperial/Medieval/keys.yml @@ -264,6 +264,20 @@ tags: - LegionnaireKey +- type: entity + parent: MedievalKeyBase + id: MedievalKeyCathedral + name: Chaplain key + components: + - type: Sprite + sprite: Imperial/Medieval/Misc/keys.rsi + state: chapel + - type: Key + accesses: + - ResearchDirector + - type: Tag + tags: + - CathedralKey - type: job id: TavernaKey @@ -433,6 +447,18 @@ access: - Medical +- type: job + id: CathedralKey + name: key + setPreference: false + description: key + playTimeTracker: Medieval15 + startingGear: CargoTechGear + icon: "CargoTechnician" + supervisors: job-supervisors-hop-qm + access: + - ResearchDirector + - type: entity parent: ClothingBeltStorageBase id: MedievalKeyStorage @@ -459,7 +485,9 @@ - TavernKey - CultOfTruthKey - WizardKey + - CathedralKey - KayotKey + - type: ItemMapper mapLayers: medieval_key: @@ -506,6 +534,10 @@ whitelist: tags: - CultOfTruthKey + chapel: + whitelist: + tags: + - CathedralKey sprite: Imperial/Medieval/Misc/key_storage.rsi - type: Appearance - type: Item @@ -559,3 +591,6 @@ - type: playTimeTracker id: Medieval14 + +- type: playTimeTracker + id: Medieval15 \ No newline at end of file diff --git a/Resources/Textures/Imperial/Medieval/Misc/key_storage.rsi/chapel.png b/Resources/Textures/Imperial/Medieval/Misc/key_storage.rsi/chapel.png new file mode 100644 index 00000000000..75b5fc4a941 Binary files /dev/null and b/Resources/Textures/Imperial/Medieval/Misc/key_storage.rsi/chapel.png differ diff --git a/Resources/Textures/Imperial/Medieval/Misc/key_storage.rsi/meta.json b/Resources/Textures/Imperial/Medieval/Misc/key_storage.rsi/meta.json index db8afad00ad..41560f9409c 100644 --- a/Resources/Textures/Imperial/Medieval/Misc/key_storage.rsi/meta.json +++ b/Resources/Textures/Imperial/Medieval/Misc/key_storage.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "this content is under ICLA licence, read more on https://wiki.imperialspace.net/icla", - "copyright": "by dantanat#7095", + "copyright": "by dantanat#7095, chapel by fichty (discord)", "size": { "x": 32, "y": 32 @@ -46,6 +46,9 @@ { "name": "1" }, + { + "name": "chapel" + }, { "name": "kayot" } diff --git a/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/chapel.png b/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/chapel.png index 72f897bc4b5..2c0b03c4913 100644 Binary files a/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/chapel.png and b/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/chapel.png differ diff --git a/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/meta.json b/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/meta.json index 0292e8d4a27..da969b38d26 100644 --- a/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/meta.json +++ b/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "this content is under ICLA licence, read more on https://wiki.imperialspace.net/icla", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Swept", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Swept, chapel by fichty (discord)", "size": { "x": 32, "y": 32 @@ -49,6 +49,9 @@ { "name": "storage" }, + { + "name": "necro" + }, { "name": "kayot" } diff --git a/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/necro.png b/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/necro.png new file mode 100644 index 00000000000..72f897bc4b5 Binary files /dev/null and b/Resources/Textures/Imperial/Medieval/Misc/keys.rsi/necro.png differ