diff --git a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp173.yml b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp173.yml index d37d2d4b6c5..dfccfc1fbc9 100644 --- a/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp173.yml +++ b/Resources/Prototypes/_Scp/Entities/Mobs/Player/Scp/Main/scp173.yml @@ -2,6 +2,8 @@ parent: - BaseScp - MobCombat + - InventoryBase + - StripableInventoryBase id: Scp173 name: SCP-173 suffix: SCP-173 @@ -134,3 +136,5 @@ - ScpResearch - ScpResearchAdvanced - ScpFear + - type: Inventory + templateId: scp173 diff --git a/Resources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.yml b/Resources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.yml index 0a8a78f6cb4..5028b289fe6 100644 --- a/Resources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.yml +++ b/Resources/Prototypes/_Scp/Entities/Objects/ScpParts/parts.yml @@ -84,13 +84,27 @@ - type: entity # Для спавнов id: Scp096PhotoDeveloped - parent: BaseScpMaterial + parent: + - BaseScpMaterial + - ClothingMaskBase name: strange photo description: A small photograph depicting a humanoid creature of anomalously large stature with disproportionately long arms. You peer into its face... oh god... components: - type: Sprite - layers: - - state: scp096-photo + sprite: _Scp/Objects/Research/Scp096/Photo.rsi + state: scp096-photo + - type: Clothing + sprite: _Scp/Objects/Research/Scp096/Clothing.rsi + equipDelay: 3 + unequipDelay: 3 + - type: ScpMask + targetWhitelist: + components: + - Scp173 + damageOriginWhitelist: + components: + - MobState + tearChanceOnDamage: 0.4 - type: Scp096Photo - type: Destructible thresholds: @@ -142,3 +156,6 @@ tags: - Trash - MetaGarbagePreventSaving + - type: ClothingAddComponents + components: + - type: Scp096Photo diff --git a/Resources/Prototypes/_Scp/InventoryTemplates/scp173.yml b/Resources/Prototypes/_Scp/InventoryTemplates/scp173.yml new file mode 100644 index 00000000000..bbde12638c4 --- /dev/null +++ b/Resources/Prototypes/_Scp/InventoryTemplates/scp173.yml @@ -0,0 +1,9 @@ +- type: inventoryTemplate + id: scp173 + slots: + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 0,2 + strippingWindowPos: 0,1 + displayName: Mask diff --git a/Resources/Textures/_Scp/Objects/Research/Scp096/Clothing.rsi/equipped-MASK.png b/Resources/Textures/_Scp/Objects/Research/Scp096/Clothing.rsi/equipped-MASK.png new file mode 100644 index 00000000000..9f48c3b4973 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Research/Scp096/Clothing.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_Scp/Objects/Research/Scp096/Clothing.rsi/meta.json b/Resources/Textures/_Scp/Objects/Research/Scp096/Clothing.rsi/meta.json new file mode 100644 index 00000000000..1f1e16676af --- /dev/null +++ b/Resources/Textures/_Scp/Objects/Research/Scp096/Clothing.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 48 + }, + "states": [ + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Scp/Objects/Research/Scp096/Photo.rsi/meta.json b/Resources/Textures/_Scp/Objects/Research/Scp096/Photo.rsi/meta.json new file mode 100644 index 00000000000..fe8c5564995 --- /dev/null +++ b/Resources/Textures/_Scp/Objects/Research/Scp096/Photo.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Sunrise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scp096-photo" + }, + { + "name": "scp096-photo-undeveloped" + } + ] +} diff --git a/Resources/Textures/_Scp/Objects/Research/research_material.rsi/scp096-photo-undeveloped.png b/Resources/Textures/_Scp/Objects/Research/Scp096/Photo.rsi/scp096-photo-undeveloped.png similarity index 100% rename from Resources/Textures/_Scp/Objects/Research/research_material.rsi/scp096-photo-undeveloped.png rename to Resources/Textures/_Scp/Objects/Research/Scp096/Photo.rsi/scp096-photo-undeveloped.png diff --git a/Resources/Textures/_Scp/Objects/Research/research_material.rsi/scp096-photo.png b/Resources/Textures/_Scp/Objects/Research/Scp096/Photo.rsi/scp096-photo.png similarity index 100% rename from Resources/Textures/_Scp/Objects/Research/research_material.rsi/scp096-photo.png rename to Resources/Textures/_Scp/Objects/Research/Scp096/Photo.rsi/scp096-photo.png diff --git a/Resources/Textures/_Scp/Objects/Research/research_material.rsi/meta.json b/Resources/Textures/_Scp/Objects/Research/research_material.rsi/meta.json index e79672cbfa5..88b7cb07fc7 100644 --- a/Resources/Textures/_Scp/Objects/Research/research_material.rsi/meta.json +++ b/Resources/Textures/_Scp/Objects/Research/research_material.rsi/meta.json @@ -16,12 +16,6 @@ { "name": "scp173-ball" }, - { - "name": "scp096-photo" - }, - { - "name": "scp096-photo-undeveloped" - }, { "name": "scp999-jelly", "delays": [