diff --git a/Resources/Locale/ru-RU/ADT/clothing/misc.ftl b/Resources/Locale/ru-RU/ADT/clothing/misc.ftl new file mode 100644 index 00000000000..c1a2b0b7358 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/clothing/misc.ftl @@ -0,0 +1,8 @@ +ent-ADTClothingHeadHatBlackroseFlowerWreath = венок из черных роз + .desc = Венок из черных роз, переплетенных темной зеленью. +ent-ADTClothingHeadHatMacFlowerWreath = маковый венок + .desc = Венок сплетенный из алых маков, переплетенных между собой. +ent-ADTClothingHeadHatDandelionFlowerWreath = солнечный венок + .desc = Венок из ярко-желтых одуванчиков, плотно прилегающих друг к другу. +ent-ADTClothingHeadHatRoseFlowerWreath = венок из красных роз + .desc = Венок из красных роз с бархатистыми лепестками и темно-зелеными листьями. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/misc.yml index 7af241d5149..6a1d6a5a99d 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/misc.yml @@ -52,4 +52,60 @@ volume: -10 range: 10 #радиус голоса sound: - path: /Audio/ADT/Ambience/Music/robotnik.ogg \ No newline at end of file + path: /Audio/ADT/Ambience/Music/robotnik.ogg + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBlackroseFlowerWreath + name: ClothingHeadHatBlackroseFlowerWreath-name + description: ClothingHeadHatBlackroseFlowerWreath-desc + components: + - type: Sprite + sprite: ADT/Clothing/Head/Misc/blackrose-wreath.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Misc/blackrose-wreath.rsi + slots: + - HEAD + - neck + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatMacFlowerWreath + name: ClothingHeadHatMacFlowerWreath-name + description: ClothingHeadHatMacFlowerWreath-desc + components: + - type: Sprite + sprite: ADT/Clothing/Head/Misc/mac-wreat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Misc/mac-wreat.rsi + slots: + - HEAD + - neck + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatRoseFlowerWreath + name: ClothingHeadHatRoseFlowerWreath-name + description: ClothingHeadHatRoseFlowerWreath-desc + components: + - type: Sprite + sprite: ADT/Clothing/Head/Misc/rose-wreat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Misc/rose-wreat.rsi + slots: + - HEAD + - neck + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatDandelionFlowerWreath + name: ClothingHeadHatDandelionFlowerWreath-name + description: ClothingHeadHatDandelionFlowerWreath-desc + components: + - type: Sprite + sprite: ADT/Clothing/Head/Misc/dandelion-wreat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Misc/dandelion-wreat.rsi + slots: + - HEAD + - neck diff --git a/Resources/Prototypes/ADT/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/ADT/Loadouts/Miscellaneous/trinkets.yml index c218a95a891..a362528ae37 100644 --- a/Resources/Prototypes/ADT/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/ADT/Loadouts/Miscellaneous/trinkets.yml @@ -66,9 +66,38 @@ storage: back: - ADTClothingMaskPaperBlank - + - type: loadout id: ADTHandheldStationMapUnpowered storage: back: - HandheldStationMapUnpowered + +# Flowers +- type: loadout + id: ADTFlowerWreath1 + storage: + back: + - ADTClothingHeadHatBlackroseFlowerWreath + groupBy: "flowerwreath" + +- type: loadout + id: ADTFlowerWreath2 + storage: + back: + - ADTClothingHeadHatMacFlowerWreath + groupBy: "flowerwreath" + +- type: loadout + id: ADTFlowerWreath3 + storage: + back: + - ADTClothingHeadHatRoseFlowerWreath + groupBy: "flowerwreath" + +- type: loadout + id: ADTFlowerWreath4 + storage: + back: + - ADTClothingHeadHatDandelionFlowerWreath + groupBy: "flowerwreath" diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 3eda34e970c..74cdc3b4c0f 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -14,6 +14,7 @@ storage: back: - ClothingHeadHatFlowerWreath + groupBy: "flowerwreath" #ADT-Tweak - type: loadout id: Hairflower diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 93f088866a7..6567e7b4f60 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -74,6 +74,10 @@ - ADTHandheldStationMapUnpowered - ADTModStorageVoucher - ADTClothingGeorgeRibbonPin + - ADTFlowerWreath1 + - ADTFlowerWreath2 + - ADTFlowerWreath3 + - ADTFlowerWreath4 # ADT-Tweak-End - type: loadoutGroup diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-HELMET-vox.png b/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..f7718154383 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..40919a06b98 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-NECK.png new file mode 100644 index 00000000000..977abef7c17 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/icon.png new file mode 100644 index 00000000000..500be211c5a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/meta.json new file mode 100644 index 00000000000..8146153a2e8 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Misc/blackrose-wreath.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "made by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-HELMET-vox.png b/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..f96b2de1d74 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..34e4ca64fc8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-NECK.png new file mode 100644 index 00000000000..2c126dd5263 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/icon.png new file mode 100644 index 00000000000..93d3ce03ce6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/meta.json new file mode 100644 index 00000000000..8146153a2e8 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Misc/dandelion-wreat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "made by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-HELMET-vox.png b/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..c141e79774a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..15882c50172 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-NECK.png new file mode 100644 index 00000000000..57ed02d1cea Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/icon.png new file mode 100644 index 00000000000..1f1638a5fa7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/meta.json new file mode 100644 index 00000000000..8146153a2e8 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Misc/mac-wreat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "made by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-HELMET-vox.png b/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..b22f8e621f3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..7e6687d3841 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-NECK.png new file mode 100644 index 00000000000..a0b14cd9136 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/icon.png new file mode 100644 index 00000000000..a78469a0271 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/meta.json new file mode 100644 index 00000000000..8146153a2e8 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Misc/rose-wreat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "made by Prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + } + ] +}