diff --git a/Resources/Locale/ru-RU/White/prototypes/entities/clothing/neck/necklace.ftl b/Resources/Locale/ru-RU/White/prototypes/entities/clothing/neck/necklace.ftl new file mode 100644 index 0000000000..21cf3bf6e6 --- /dev/null +++ b/Resources/Locale/ru-RU/White/prototypes/entities/clothing/neck/necklace.ftl @@ -0,0 +1,15 @@ +ent-ClothingNeckNecklaceGold = золотой крест + .desc = Сделан из чистого золота. Приятно отсвечивает и дает чувство защищенности. + .suffix = { "" } + +ent-ClothingNeckNecklaceSilver = серебряный крест + .desc = Приятно отсвечивает и дает чувство защищенности. + .suffix = { "" } + +ent-ClothingNeckNecklaceTech = технологичный крест + .desc = Знак верности техно-богу и науке. + .suffix = { "" } + +ent-ClothingNeckNecklaceUnholy = крест антихриста + .desc = Путь в рай закрыт. + .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 22762e6159..3877701036 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -1,6 +1,9 @@ - type: vendingMachineInventory id: PietyVendInventory startingInventory: + ClothingNeckNecklaceSilver: 2 + ClothingNeckNecklaceGold: 1 + ClothingNeckNecklaceTech: 1 ClothingUniformJumpsuitChaplain: 2 ClothingUniformJumpskirtChaplain: 2 ClothingUniformJumpsuitMonasticRobeDark: 1 @@ -23,8 +26,9 @@ emaggedInventory: #ClothingOuterArmorCult: 1 #ClothingHeadHelmetCult: 1 - ClothingOuterRobesCult: 3 - ClothingHeadHatHoodCulthood: 3 - ClothingShoesCult: 4 + #ClothingOuterRobesCult: 3 + #ClothingHeadHatHoodCulthood: 3 + #ClothingShoesCult: 4 BedsheetCult: 4 ClothingNeckScarfStripedBlack: 3 + ClothingNeckNecklaceUnholy: 1 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index fef4d47be0..c6ed578cf5 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -27,11 +27,11 @@ reactionTypes: - Holy - type: Sprite - sprite: Objects/Specific/Chapel/bible.rsi + sprite: White/Objects/Specific/Chapel/bible.rsi state: icon - type: Item size: Small - sprite: Objects/Specific/Chapel/bible.rsi + sprite: White/Objects/Specific/Chapel/bible.rsi - type: Clothing slots: - Belt @@ -73,9 +73,9 @@ specialItem: SpawnPointGhostCerberus respawnTime: 300 - type: Sprite - sprite: Objects/Specific/Chapel/necronomicon.rsi + sprite: White/Objects/Specific/Chapel/necronomicon.rsi - type: Item - sprite: Objects/Specific/Chapel/necronomicon.rsi + sprite: White/Objects/Specific/Chapel/necronomicon.rsi - type: entity id: ActionBibleSummon diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index bc252267a0..61c1bb0e09 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -17,6 +17,7 @@ - type: startingGear id: ChaplainGear equipment: + neck: ClothingNeckNecklaceSilver jumpsuit: ClothingUniformJumpsuitChaplain back: ClothingBackpackChaplainFilled shoes: ClothingShoesColorBlack diff --git a/Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml b/Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml new file mode 100644 index 0000000000..36673f121e --- /dev/null +++ b/Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml @@ -0,0 +1,35 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckNecklaceGold + name: golden necklace + description: It shines + components: + - type: Sprite + sprite: White\Clothing\Neck\gold-cross.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckNecklaceSilver + name: silver necklace + description: It shines + components: + - type: Sprite + sprite: White\Clothing\Neck\silver-cross.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckNecklaceTech + name: technology necklace + description: It shines + components: + - type: Sprite + sprite: White\Clothing\Neck\tech-necklace.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckNecklaceUnholy + name: unholy necklace + description: It shines + components: + - type: Sprite + sprite: White\Clothing\Neck\unholy-necklace.rsi diff --git a/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/equipped-NECK.png b/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/equipped-NECK.png new file mode 100644 index 0000000000..8e5b5ac73c Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/icon.png b/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/icon.png new file mode 100644 index 0000000000..c625874250 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/inhand-left.png new file mode 100644 index 0000000000..9d90db0321 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/inhand-right.png new file mode 100644 index 0000000000..77a78f5a7c Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/meta.json b/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/meta.json new file mode 100644 index 0000000000..efae3b9e2b --- /dev/null +++ b/Resources/Textures/White/Clothing/Neck/gold-cross.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "DEADiSKO", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/equipped-NECK.png b/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/equipped-NECK.png new file mode 100644 index 0000000000..32ab05c2d8 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/icon.png b/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/icon.png new file mode 100644 index 0000000000..1cf29fa3d7 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/inhand-left.png new file mode 100644 index 0000000000..3e979cbe5b Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/inhand-right.png new file mode 100644 index 0000000000..ec5b8d91e8 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/meta.json b/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/meta.json new file mode 100644 index 0000000000..efae3b9e2b --- /dev/null +++ b/Resources/Textures/White/Clothing/Neck/silver-cross.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "DEADiSKO", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/equipped-NECK.png b/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/equipped-NECK.png new file mode 100644 index 0000000000..52a5fd12be Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/icon.png b/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/icon.png new file mode 100644 index 0000000000..de16b42c13 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/inhand-left.png new file mode 100644 index 0000000000..40fa9ca742 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/inhand-right.png new file mode 100644 index 0000000000..ce19a62a0e Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/meta.json b/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/meta.json new file mode 100644 index 0000000000..efae3b9e2b --- /dev/null +++ b/Resources/Textures/White/Clothing/Neck/tech-necklace.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "DEADiSKO", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/equipped-NECK.png b/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/equipped-NECK.png new file mode 100644 index 0000000000..52b1357546 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/icon.png b/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/icon.png new file mode 100644 index 0000000000..5e4afa974f Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/inhand-left.png new file mode 100644 index 0000000000..43b9dff3c8 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/inhand-right.png new file mode 100644 index 0000000000..d132087025 Binary files /dev/null and b/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/meta.json b/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/meta.json new file mode 100644 index 0000000000..efae3b9e2b --- /dev/null +++ b/Resources/Textures/White/Clothing/Neck/unholy-necklace.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "DEADiSKO", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/icon.png b/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/icon.png new file mode 100644 index 0000000000..885b543d18 Binary files /dev/null and b/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/inhand-left.png b/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/inhand-left.png new file mode 100644 index 0000000000..4f01a02575 Binary files /dev/null and b/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/inhand-right.png b/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/inhand-right.png new file mode 100644 index 0000000000..1442109717 Binary files /dev/null and b/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/meta.json b/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/meta.json new file mode 100644 index 0000000000..c2a79e719b --- /dev/null +++ b/Resources/Textures/White/Objects/Specific/Chapel/bible.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "DEADiSKO", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/icon.png b/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/icon.png new file mode 100644 index 0000000000..063350b53a Binary files /dev/null and b/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/inhand-left.png b/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/inhand-left.png new file mode 100644 index 0000000000..e123b63da1 Binary files /dev/null and b/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/inhand-right.png b/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/inhand-right.png new file mode 100644 index 0000000000..f7b3d57654 Binary files /dev/null and b/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/meta.json b/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/meta.json new file mode 100644 index 0000000000..c2a79e719b --- /dev/null +++ b/Resources/Textures/White/Objects/Specific/Chapel/necronomicon.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "DEADiSKO", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file