From 8dd6166fd0e0d4fb1003dbf1b01007e1e5b42f1c Mon Sep 17 00:00:00 2001 From: icekot8 <3.akk111222333@gmail.com> Date: Thu, 13 Jun 2024 22:47:55 +0300 Subject: [PATCH 1/4] 1 --- .../Corvax/Entities/Clothing/OuterClothing/coats.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml index 14cba1a6f47..099e0dfbff1 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingOuterStorageBase + parent: ClothingOuterCoatHoSTrench id: ClothingOuterCoatHoSGreatcoat name: armored greatcoat description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence. @@ -17,7 +17,7 @@ Heat: 0.7 - type: entity - parent: ClothingOuterStorageBase + parent: ClothingOuterCoatDetective id: ClothingOuterCoatDetectiveDark name: noir trenchcoat description: A hard-boiled private investigator's dark trenchcoat. @@ -26,9 +26,6 @@ sprite: Corvax/Clothing/OuterClothing/Coats/noirdet.rsi - type: Clothing sprite: Corvax/Clothing/OuterClothing/Coats/noirdet.rsi - - type: StorageFill - contents: - - id: SmokingPipeFilledTobacco - type: Armor modifiers: coefficients: @@ -38,7 +35,7 @@ Heat: 0.9 - type: entity - parent: ClothingOuterStorageBase + parent: ClothingOuterCoatWarden id: ClothingOuterCoatWardenAlt name: warden's jacket description: A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets. From d4be4ddecca463d06cd68b8295fa702e1388afcf Mon Sep 17 00:00:00 2001 From: icekot8 <3.akk111222333@gmail.com> Date: Thu, 13 Jun 2024 23:24:59 +0300 Subject: [PATCH 2/4] 2 --- .../Entities/Clothing/OuterClothing/coats.yml | 8 ++++++-- .../hos_greatcoat.rsi/equipped-OUTERCLOTHING.png | Bin .../OuterClothing/Coats/hos_greatcoat.rsi/icon.png | Bin .../Coats/hos_greatcoat.rsi/inhand-left.png | Bin .../Coats/hos_greatcoat.rsi/inhand-right.png | Bin .../OuterClothing/Coats/hos_greatcoat.rsi/meta.json | 0 6 files changed, 6 insertions(+), 2 deletions(-) rename Resources/Textures/{ => Corvax}/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/{ => Corvax}/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png (100%) rename Resources/Textures/{ => Corvax}/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png (100%) rename Resources/Textures/{ => Corvax}/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png (100%) rename Resources/Textures/{ => Corvax}/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json (100%) diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml index 099e0dfbff1..cef7368f392 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml @@ -5,9 +5,9 @@ description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence. components: - type: Sprite - sprite: Clothing/OuterClothing/Coats/hos_greatcoat.rsi + sprite: Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi - type: Clothing - sprite: Clothing/OuterClothing/Coats/hos_greatcoat.rsi + sprite: Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi - type: Armor modifiers: coefficients: @@ -15,6 +15,8 @@ Slash: 0.7 Piercing: 0.4 Heat: 0.7 + - type: ExplosionResistance + damageCoefficient: 1.0 - type: entity parent: ClothingOuterCoatDetective @@ -51,6 +53,8 @@ Slash: 0.8 Piercing: 0.4 Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 1.0 - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png rename to Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png rename to Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png rename to Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json b/Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json rename to Resources/Textures/Corvax/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json From ba263a3389c9dd35051ef0ececa411289feafeaf Mon Sep 17 00:00:00 2001 From: icekot8 <93311212+icekot8@users.noreply.github.com> Date: Thu, 13 Jun 2024 23:29:18 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D1=81=D0=BB=D1=83=D1=88=D0=B0=D0=B5=D0=BC?= =?UTF-8?q?=20=D0=BB=D0=B0=D0=B7=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> --- .../Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml index cef7368f392..1515de054ce 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml @@ -19,7 +19,7 @@ damageCoefficient: 1.0 - type: entity - parent: ClothingOuterCoatDetective + parent: ClothingOuterCoatDetectiveLoadout id: ClothingOuterCoatDetectiveDark name: noir trenchcoat description: A hard-boiled private investigator's dark trenchcoat. From 237a4e91ddb42b7ce441d7f1c443202ef053a0f1 Mon Sep 17 00:00:00 2001 From: icekot8 <93311212+icekot8@users.noreply.github.com> Date: Thu, 13 Jun 2024 23:45:23 +0300 Subject: [PATCH 4/4] . --- .../Corvax/Entities/Clothing/OuterClothing/coats.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml index 1515de054ce..126847d5938 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml @@ -15,8 +15,6 @@ Slash: 0.7 Piercing: 0.4 Heat: 0.7 - - type: ExplosionResistance - damageCoefficient: 1.0 - type: entity parent: ClothingOuterCoatDetectiveLoadout @@ -53,8 +51,6 @@ Slash: 0.8 Piercing: 0.4 Heat: 0.8 - - type: ExplosionResistance - damageCoefficient: 1.0 - type: entity parent: ClothingOuterStorageBase