diff --git a/Resources/Locale/en-US/_CP14/accent/skeleton.ftl b/Resources/Locale/en-US/_CP14/accent/skeleton.ftl new file mode 100644 index 0000000000..9abc2bef6c --- /dev/null +++ b/Resources/Locale/en-US/_CP14/accent/skeleton.ftl @@ -0,0 +1,30 @@ +cp14accent-skeleton-words-1 = skeleton +cp14accent-skeleton-replacement-1 = ACK ACK! + +cp14accent-skeleton-words-2 = dwarf + +cp14accent-skeleton-words-3 = elf + +cp14accent-skeleton-words-4 = goblin + +cp14accent-skeleton-words-5 = human + +cp14accent-skeleton-words-6 = silva + +cp14accent-skeleton-words-7 = tiefling + +cp14accent-skeleton-words-8 = skeletons + +cp14accent-skeleton-words-9 = dwarfs + +cp14accent-skeleton-words-10 = elfs + +cp14accent-skeleton-words-11 = goblins + +cp14accent-skeleton-words-12 = humans + +cp14accent-skeleton-words-13 = silvas + +cp14accent-skeleton-words-14 = tieflings + +cp14accent-skeleton-words-15 = people diff --git a/Resources/Locale/ru-RU/_CP14/accent/skeleton.ftl b/Resources/Locale/ru-RU/_CP14/accent/skeleton.ftl new file mode 100644 index 0000000000..e69f69cae0 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/accent/skeleton.ftl @@ -0,0 +1,30 @@ +cp14accent-skeleton-words-1 = скелет +cp14accent-skeleton-replacement-1 = АЧК АЧК! + +cp14accent-skeleton-words-2 = дварф + +cp14accent-skeleton-words-3 = эльф + +cp14accent-skeleton-words-4 = гоблин + +cp14accent-skeleton-words-5 = человек + +cp14accent-skeleton-words-6 = сильва + +cp14accent-skeleton-words-7 = тифлинг + +cp14accent-skeleton-words-8 = скелеты + +cp14accent-skeleton-words-9 = дварфы + +cp14accent-skeleton-words-10 = эльфы + +cp14accent-skeleton-words-11 = гоблины + +cp14accent-skeleton-words-12 = люди + +cp14accent-skeleton-words-13 = сильвы + +cp14accent-skeleton-words-14 = тифлинги + +cp14accent-skeleton-words-15 = скелетов diff --git a/Resources/Prototypes/_CP14/Accent/word_replacements.yml b/Resources/Prototypes/_CP14/Accent/word_replacements.yml new file mode 100644 index 0000000000..5f30d90d4d --- /dev/null +++ b/Resources/Prototypes/_CP14/Accent/word_replacements.yml @@ -0,0 +1,18 @@ +- type: accent + id: cp14skeleton + wordReplacements: + cp14accent-skeleton-words-1: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-2: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-3: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-4: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-5: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-6: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-7: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-8: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-9: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-10: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-11: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-12: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-13: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-14: cp14accent-skeleton-replacement-1 + cp14accent-skeleton-words-15: cp14accent-skeleton-replacement-1 diff --git a/Resources/Prototypes/_CP14/Body/Prototypes/skeleton.yml b/Resources/Prototypes/_CP14/Body/Prototypes/skeleton.yml index c9eddedcc4..041dcc5f5f 100644 --- a/Resources/Prototypes/_CP14/Body/Prototypes/skeleton.yml +++ b/Resources/Prototypes/_CP14/Body/Prototypes/skeleton.yml @@ -7,6 +7,8 @@ part: CP14HeadSkeleton connections: - torso + organs: + brain: CP14ClothingMaskBoneMaskMind torso: part: TorsoHuman connections: diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml index 1af453ac4a..8963f80e72 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml @@ -58,3 +58,77 @@ sprite: _CP14/Clothing/Masks/neckerchief.rsi - type: IdentityBlocker - type: IngestionBlocker + +- type: entity + parent: CP14ClothingMaskBase + id: CP14ClothingMaskBoneMask + name: bone mask + description: An enchanted mask formerly belonging to a magical creature. + components: + - type: Sprite + sprite: _CP14/Clothing/Masks/bone_mask.rsi + - type: Clothing + sprite: _CP14/Clothing/Masks/bone_mask.rsi + - type: IdentityBlocker + - type: IngestionBlocker + - type: AddAccentClothing + accent: ReplacementAccent + replacement: cp14skeleton + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.90 + Heat: 0.90 + +- type: entity + parent: CP14ClothingMaskBase + id: CP14ClothingMaskBoneHornedMask + name: horned bone mask + description: An enchanted mask formerly belonging to a magical creature. + components: + - type: Sprite + sprite: _CP14/Clothing/Masks/horned_bone_mask.rsi + - type: Clothing + sprite: _CP14/Clothing/Masks/horned_bone_mask.rsi + - type: IdentityBlocker + - type: IngestionBlocker + - type: AddAccentClothing + accent: ReplacementAccent + replacement: cp14skeleton + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.90 + Heat: 0.90 + +- type: entity + parent: CP14ClothingMaskBoneMask + id: CP14ClothingMaskBoneMaskMind + categories: [ DoNotMap ] + components: + - type: BlockMovement + - type: Actions + - type: Emoting + - type: DoAfter + - type: SkeletonAccent + - type: Speech + speechVerb: Skeleton + - type: Vocal + sounds: + Male: Skeleton + Female: Skeleton + Unsexed: Skeleton + - type: Organ + - type: Brain + - type: Tag + tags: + - MindTransferTarget + - type: Butcherable + butcheringType: Knife + spawned: + - id: CP14ClothingMaskBoneMask + amount: 1 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/test_armor.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml similarity index 52% rename from Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/test_armor.yml rename to Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml index bee4c7d79b..da02159097 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/test_armor.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml @@ -19,3 +19,23 @@ - type: ClothingSpeedModifier walkModifier: 0.96 sprintModifier: 0.96 + +- type: entity + parent: CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingBoneArmor + name: bone armor + description: Bone armour... not the best or most attractive defence. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/bone_armor.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/bone_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + - type: ClothingSpeedModifier + walkModifier: 0.97 + sprintModifier: 0.97 diff --git a/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml b/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml index 2055046b84..58e3aa7b8a 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml @@ -19,6 +19,7 @@ - type: startingGear id: CP14MobSkeletonHalberd equipment: + outerClothing: CP14ClothingOuterClothingBoneArmor shirt: CP14ClothingWarriorsGarbDress pants: CP14ClothingPantsLoincloth neck: CP14ModularSkeletonHalberd @@ -29,6 +30,7 @@ - type: startingGear id: CP14MobSkeletonSword equipment: + outerClothing: CP14ClothingOuterClothingBoneArmor pants: CP14ClothingPantsLoincloth belt1: CP14ModularSkeletonSword shoes: CP14ClothingShoesSandals diff --git a/Resources/Textures/_CP14/Clothing/Masks/bone_mask.rsi/equipped-MASK.png b/Resources/Textures/_CP14/Clothing/Masks/bone_mask.rsi/equipped-MASK.png new file mode 100644 index 0000000000..e333449ef1 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Masks/bone_mask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Masks/bone_mask.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Masks/bone_mask.rsi/icon.png new file mode 100644 index 0000000000..766c264c6f Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Masks/bone_mask.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Masks/bone_mask.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Masks/bone_mask.rsi/meta.json new file mode 100644 index 0000000000..a435f0e14b --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Masks/bone_mask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by perzonaz (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Masks/horned_bone_mask.rsi/equipped-MASK.png b/Resources/Textures/_CP14/Clothing/Masks/horned_bone_mask.rsi/equipped-MASK.png new file mode 100644 index 0000000000..747778067d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Masks/horned_bone_mask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Masks/horned_bone_mask.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Masks/horned_bone_mask.rsi/icon.png new file mode 100644 index 0000000000..3fb89bf8eb Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Masks/horned_bone_mask.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Masks/horned_bone_mask.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Masks/horned_bone_mask.rsi/meta.json new file mode 100644 index 0000000000..a435f0e14b --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Masks/horned_bone_mask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by perzonaz (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..d13b5c5b84 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/icon.png new file mode 100644 index 0000000000..5abbd5774a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/meta.json new file mode 100644 index 0000000000..d378e249fb --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/bone_armor.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by perzonaz (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +}