diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index 18995446b1..9016bce6cb 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -107,10 +107,10 @@ sprite: Objects/Specific/Chapel/tanakh.rsi - type: entity - parent: Bible - name: druidic tablet - description: "It's the mystery of the druids!" id: BibleDruid + name: druidic tablet + parent: Bible + description: "It's the mystery of the druids!" components: - type: Sprite sprite: Objects/Specific/Chapel/mysteryofthedruids.rsi @@ -118,10 +118,10 @@ sprite: Objects/Specific/Chapel/mysteryofthedruids.rsi - type: entity - parent: Bible - name: communist manifesto - description: "Remove the mask of humanity from Capital." id: BibleCommunistManifesto + name: communist manifesto + parent: Bible + description: "Remove the mask of humanity from Capital." components: - type: Sprite sprite: Objects/Specific/Chapel/communistmanifesto.rsi @@ -140,12 +140,45 @@ sprite: Objects/Specific/Chapel/satanicbible.rsi - type: entity + id: BibleNarsie + name: tome of nar'sie parent: Bible - name: codex nanotrasimus - description: "A familiar book containing the Sacred Operating Procedures." + description: "What could possibly go wrong with a book covered in blood?" + components: + - type: Sprite + sprite: Objects/Specific/Chapel/tomeofnarsie.rsi + - type: Item + sprite: Objects/Specific/Chapel/tomeofnarsie.rsi + +- type: entity id: BibleNanoTrasen + name: codex nanotrasimus + parent: Bible + description: "A familiar book containing the Sacred Operating Procedures." components: - type: Sprite sprite: Objects/Specific/Chapel/codexnanotrasimus.rsi - type: Item sprite: Objects/Specific/Chapel/codexnanotrasimus.rsi + +- type: entity + id: BibleHonk + name: mirth of the honkmother + parent: Bible + description: "Oh great and glorious Mother, Mistress of Mirth, Matron of Mask and Merriments, Blessed is she amongst us jesters." + components: + - type: Sprite + sprite: Objects/Specific/Chapel/honk.rsi + - type: Item + sprite: Objects/Specific/Chapel/honk.rsi + +- type: entity + id: BibleRatvar + name: tablet of ratvar + parent: Bible + description: "A holy relic of the Clockwork Cult, blessed by the Clockwork Justice, Ratvar." + components: + - type: Sprite + sprite: Objects/Specific/Chapel/ratvartablet.rsi + - type: Item + sprite: Objects/Specific/Chapel/ratvartablet.rsi diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml index eb252a0c43..4f501057b2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml @@ -1,3 +1,33 @@ +# Playtime requirement for NanoTrasen Bible, Codex NanoTrasimus +- type: loadoutEffectGroup + id: NanoTrasenBibleRequirement + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobCaptain + time: 7200 #2 hrs + +# Playtime requirement for Druid Bible, Druidic Tablet +- type: loadoutEffectGroup + id: DruidBibleRequirement + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobBotanist + time: 18000 #5 hrs + +# Playtime requirement for Clown Bible, Mirth of the Honkmother +- type: loadoutEffectGroup + id: ClownBibleRequirement + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobClown + time: 18000 #5 hrs + # Head - type: loadout id: ChaplainHead @@ -87,12 +117,18 @@ - type: loadout id: BibleDruid + effects: + - !type:GroupLoadoutEffect + proto: DruidBibleRequirement storage: back: - BibleDruid - type: loadout id: BibleNanoTrasen + effects: + - !type:GroupLoadoutEffect + proto: NanoTrasenBibleRequirement storage: back: - BibleNanoTrasen @@ -108,3 +144,24 @@ storage: back: - BibleTanakh + +- type: loadout + id: BibleNarsie + storage: + back: + - BibleNarsie + +- type: loadout + id: BibleHonk + effects: + - !type:GroupLoadoutEffect + proto: ClownBibleRequirement + storage: + back: + - BibleHonk + +- type: loadout + id: BibleRatvar + storage: + back: + - BibleRatvar diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 7930b3ff1b..79266b70ec 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -381,10 +381,13 @@ minLimit: 1 loadouts: - Bible - - BibleDruid - BibleNanoTrasen + - BibleDruid - BibleSatanic - BibleTanakh + - BibleHonk + - BibleRatvar + - BibleNarsie - type: loadoutGroup id: JanitorHead diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png index 2f29dff1c7..8b98bf5436 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png index 0d7d9cf676..1dcacda0e3 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png index 6e5e4cd27a..20c3c84cb2 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json index c0dd9096bc..2240b862c6 100644 --- a/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chapel/codexnanotrasimus.rsi/meta.json @@ -1,23 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Originally drawn by @Trosling (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } - diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png index a38632e437..ba16466073 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png index 35fc35abf1..b65eae74ef 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png index 7e0df50bb5..bb02dc20cd 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json index c0dd9096bc..2240b862c6 100644 --- a/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chapel/communistmanifesto.rsi/meta.json @@ -1,23 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Originally drawn by @Trosling (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } - diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/icon.png new file mode 100644 index 0000000000..caa8572835 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-left.png new file mode 100644 index 0000000000..95b5790e89 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-right.png new file mode 100644 index 0000000000..f1a5163cbc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/honk.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/meta.json new file mode 100644 index 0000000000..2240b862c6 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chapel/honk.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png index 4e24e24ad2..85d3b716a3 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png index 4be96c2070..f27ffd7038 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png index bdf1c5e363..d345671051 100644 Binary files a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json index c0dd9096bc..2240b862c6 100644 --- a/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chapel/mysteryofthedruids.rsi/meta.json @@ -1,23 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Originally drawn by @Trosling (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } - diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/icon.png new file mode 100644 index 0000000000..0e294639fa Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-left.png new file mode 100644 index 0000000000..71ed63d933 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-right.png new file mode 100644 index 0000000000..dcfac241cd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/meta.json new file mode 100644 index 0000000000..2240b862c6 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chapel/ratvartablet.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/icon.png b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/icon.png new file mode 100644 index 0000000000..92a2b5e138 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-left.png new file mode 100644 index 0000000000..9cc27ac3c5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-right.png new file mode 100644 index 0000000000..98151112f4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/meta.json b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/meta.json new file mode 100644 index 0000000000..2240b862c6 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Chapel/tomeofnarsie.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sprites created by Davyei (Discord) for Spacestation 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}