diff --git a/Resources/Locale/ru-RU/_deadspace/entities/clothing/outerclothing/vests.ftl b/Resources/Locale/ru-RU/_deadspace/entities/clothing/outerclothing/vests.ftl new file mode 100644 index 0000000000000..6cb0caf134c37 --- /dev/null +++ b/Resources/Locale/ru-RU/_deadspace/entities/clothing/outerclothing/vests.ftl @@ -0,0 +1,2 @@ +ent-ClothingOuterArmorMukhtar = бронежилет K9 + .desc = Лёгкий тактический бронежилет для служебных собак отдела службы безопасности. По бокам заметны синие патчи с белой буквой «N». Обеспечивает минимальную защиту от большинства типов повреждений. Подходит для длительного ношения и не сковывает движений. diff --git a/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml index e1694d252cf4a..cbd0eddbfe25a 100644 --- a/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml @@ -124,6 +124,11 @@ uiWindowPos: 1,1 strippingWindowPos: 1,2 displayName: Suit +# DS14-start + blacklist: + tags: + - PetOnly +# DS14-end - name: pocket1 slotTexture: pocket fullTextureName: template_small diff --git a/Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml index fc4a30fe4d31e..736268028ad50 100644 --- a/Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml @@ -16,6 +16,11 @@ uiWindowPos: 1,1 strippingWindowPos: 1,2 displayName: Suit +# DS14-start + blacklist: + tags: + - PetOnly +# DS14-end - name: gloves slotTexture: gloves slotFlags: GLOVES diff --git a/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml index b9d96272f02a6..c279b68b2fc1a 100644 --- a/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml @@ -22,6 +22,11 @@ uiWindowPos: 1,1 strippingWindowPos: 1,2 displayName: Suit +# DS14-start + blacklist: + tags: + - PetOnly +# DS14-end - name: gloves slotTexture: gloves slotFlags: GLOVES diff --git a/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml index 80b9c6eea4e63..48001198169dd 100644 --- a/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml @@ -15,6 +15,11 @@ uiWindowPos: 1,1 strippingWindowPos: 2,2 displayName: Suit +# DS14-start + blacklist: + tags: + - PetOnly +# DS14-end - name: neck slotTexture: neck slotFlags: NECK diff --git a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml index cc67365c02285..a39b4eef9d180 100644 --- a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml @@ -58,6 +58,11 @@ whitelist: tags: - MonkeyWearable +# DS14-start + blacklist: + tags: + - PetOnly +# DS14-end - name: back slotTexture: back slotFlags: BACK diff --git a/Resources/Prototypes/_DeadSpace/Entities/Clothing/OuterClothing/k9_vest_dog.yml b/Resources/Prototypes/_DeadSpace/Entities/Clothing/OuterClothing/k9_vest_dog.yml new file mode 100644 index 0000000000000..4d3c2891f3c74 --- /dev/null +++ b/Resources/Prototypes/_DeadSpace/Entities/Clothing/OuterClothing/k9_vest_dog.yml @@ -0,0 +1,34 @@ +- type: entity + parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseSecurityContraband] + id: ClothingOuterArmorMukhtar + name: K9 vest + description: Light tactical armored vest for security service dogs. Features are blue patches with a white letter "N" on the sides. Provides minimal protection against most types of damage. Suitable for long-term wear and does not restrict movement. + components: + - type: Sprite + sprite: _DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi + - type: Clothing + sprite: _DeadSpace/Clothing/OuterClothing/Armor/k9_armor_equipped.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + - type: StaminaResistance + damageCoefficient: 0.65 + - type: ExplosionResistance + damageCoefficient: 0.90 + - type: EmitSoundOnPickup + sound: + path: /Audio/_DeadSpace/Items/Handing/armor_rustle/plate_armor_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/_DeadSpace/Items/Handing/armor_rustle/plate_armor_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_DeadSpace/Items/Handing/armor_rustle/plate_armor_drop.ogg + - type: Tag + tags: + - MukhtarWearable + - PetOnly diff --git a/Resources/Prototypes/_DeadSpace/Entities/Mobs/NPCs/mukhtar.yml b/Resources/Prototypes/_DeadSpace/Entities/Mobs/NPCs/mukhtar.yml index 038921e26f950..587aa15621beb 100644 --- a/Resources/Prototypes/_DeadSpace/Entities/Mobs/NPCs/mukhtar.yml +++ b/Resources/Prototypes/_DeadSpace/Entities/Mobs/NPCs/mukhtar.yml @@ -13,6 +13,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: mukhtar + animation: true scale: 0.9, 0.9 - type: Physics - type: Fixtures diff --git a/Resources/Prototypes/_DeadSpace/InventoryTemplates/mukhtar_inventory_template .yml b/Resources/Prototypes/_DeadSpace/InventoryTemplates/mukhtar_inventory_template .yml index 5f8adb2ecfa4f..fff413fe3163c 100644 --- a/Resources/Prototypes/_DeadSpace/InventoryTemplates/mukhtar_inventory_template .yml +++ b/Resources/Prototypes/_DeadSpace/InventoryTemplates/mukhtar_inventory_template .yml @@ -11,6 +11,8 @@ whitelist: tags: - PetWearable + - CorgiWearable + - MukhtarWearable - name: suitstorage slotTexture: suit_storage slotFlags: SUITSTORAGE @@ -21,6 +23,17 @@ whitelist: components: - GasTank + - name: outerClothing + slotTexture: suit + slotFlags: OUTERCLOTHING + stripTime: 6 + uiWindowPos: 1,1 + strippingWindowPos: 1,3 + displayName: Suit + whitelist: + tags: + - MukhtarWearable + - PetWearable - name: id slotTexture: id slotFlags: IDCARD @@ -37,4 +50,4 @@ displayName: Eyes whitelist: tags: - - MukhtarWearable \ No newline at end of file + - MukhtarWearable diff --git a/Resources/Prototypes/_DeadSpace/InventoryTemplates/supersoldier_inventory_template.yml b/Resources/Prototypes/_DeadSpace/InventoryTemplates/supersoldier_inventory_template.yml index dc8bc066cd3ce..5a43594875243 100644 --- a/Resources/Prototypes/_DeadSpace/InventoryTemplates/supersoldier_inventory_template.yml +++ b/Resources/Prototypes/_DeadSpace/InventoryTemplates/supersoldier_inventory_template.yml @@ -22,6 +22,9 @@ uiWindowPos: 1,1 strippingWindowPos: 1,2 displayName: Suit + blacklist: + tags: + - PetOnly - name: gloves slotTexture: gloves slotFlags: GLOVES @@ -148,4 +151,4 @@ displayName: Back blacklist: tags: - - PetOnly \ No newline at end of file + - PetOnly diff --git a/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/equipped-OUTERCLOTHING-dog.png new file mode 100644 index 0000000000000..d2b61dbfcc036 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/equipped-OUTERCLOTHING-dog.png differ diff --git a/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/icon.png b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/icon.png new file mode 100644 index 0000000000000..1e40c8d65132a Binary files /dev/null and b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/icon.png differ diff --git a/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/inhand-left.png b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/inhand-left.png new file mode 100644 index 0000000000000..0ad3ea974ed70 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/inhand-right.png b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/inhand-right.png new file mode 100644 index 0000000000000..c3d365c1c55f1 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/meta.json b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/meta.json new file mode 100644 index 0000000000000..b4fb655175adf --- /dev/null +++ b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Golubok_epta (discord) for Space Station 14 server Мёртвый Космос", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING-dog", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor_equipped.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor_equipped.rsi/equipped-OUTERCLOTHING-dog.png new file mode 100644 index 0000000000000..d2b61dbfcc036 Binary files /dev/null and b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor_equipped.rsi/equipped-OUTERCLOTHING-dog.png differ diff --git a/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor_equipped.rsi/meta.json b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor_equipped.rsi/meta.json new file mode 100644 index 0000000000000..2d4099197c5cf --- /dev/null +++ b/Resources/Textures/_DeadSpace/Clothing/OuterClothing/Armor/k9_armor_equipped.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Golubok_epta (discord) for Space Station 14 server Мёртвый Космос", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING-dog", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/meta.json b/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/meta.json index 6c2dd9ce2814e..cfbe3be9ccd32 100644 --- a/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/meta.json +++ b/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/meta.json @@ -1,15 +1,61 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by stranik2435 (discord), resprite by ravanesus (discord) for Space Station 14 server Мёртвый Космос", + "copyright": "Sprite made by stranik2435 (discord), resprite by ravanesus (discord), resprite by Golubok_epta (discord) for Space Station 14 server Мёртвый Космос", "size": { - "x": 32, - "y": 32 + "x": 64, + "y": 64 }, "states": [ { "name": "mukhtar", - "directions": 4 + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] }, { "name": "mukhtar_dead", diff --git a/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/mukhtar.png b/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/mukhtar.png index db4e5dd6f7fca..b0f1b304a79eb 100644 Binary files a/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/mukhtar.png and b/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/mukhtar.png differ diff --git a/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/mukhtar_dead.png b/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/mukhtar_dead.png index f2b7f5ca77cc0..f1edf2c2416aa 100644 Binary files a/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/mukhtar_dead.png and b/Resources/Textures/_DeadSpace/Mobs/Pets/mukhtar.rsi/mukhtar_dead.png differ