From: SonicHDC <100022571+SonicHDC@users.noreply.github.com> Date: Sat, 30 Mar 2024 03:31:32 +0000 (+1200) Subject: Zippable coats (#26494) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=52db14a19dcafa5592be0e2d23a4a628c9ab981e;p=space-station-14.git Zippable coats (#26494) * Update base_clothingouter.yml * Update coats.yml * Change Flipped to Opened * labcoat * coat * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * Update meta.json * cmo * gene * rd * robo * sci * viro * Locale zip-unzip * Missing meta * Fix wrong sprites --- diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl index 539b4fd9e7..525820920b 100644 --- a/Resources/Locale/en-US/foldable/components/foldable-component.ftl +++ b/Resources/Locale/en-US/foldable/components/foldable-component.ftl @@ -4,4 +4,7 @@ foldable-deploy-fail = You can't deploy the {$object} here. fold-verb = Fold unfold-verb = Unfold -fold-flip-verb = Flip \ No newline at end of file +fold-flip-verb = Flip + +fold-zip-verb = Zip up +fold-unzip-verb = Unzip diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 82df2c21e8..310661f6ca 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -43,6 +43,48 @@ - type: StaticPrice price: 80 +- type: entity + abstract: true + parent: [ClothingOuterStorageBase, BaseFoldable] + id: ClothingOuterStorageFoldableBase + components: + - type: Appearance + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-zip-verb + foldVerbText: fold-unzip-verb + - type: FoldableClothing + foldedEquippedPrefix: open + foldedHeldPrefix: open + - type: Sprite + layers: + - state: icon + map: [ "unfoldedLayer" ] + - state: icon-open + map: ["foldedLayer"] + visible: false + +- type: entity + abstract: true + parent: ClothingOuterStorageFoldableBase + id: ClothingOuterStorageFoldableBaseOpened + suffix: opened + components: + - type: Foldable + folded: true + - type: Clothing + equippedPrefix: open + - type: Item + heldPrefix: open + - type: Sprite + layers: + - state: icon + map: [ "unfoldedLayer" ] + visible: false + - state: icon-open + map: ["foldedLayer"] + visible: true + - type: entity abstract: true parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index bb2f598cd0..ca0e2d4b4d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -114,7 +114,7 @@ Quantity: 20 - type: entity - parent: ClothingOuterStorageBase + parent: ClothingOuterStorageFoldableBase id: ClothingOuterCoatLab name: lab coat description: A suit that protects against minor chemical spills. @@ -129,7 +129,12 @@ Caustic: 0.75 - type: entity - parent: ClothingOuterStorageBase + parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLab] + id: ClothingOuterCoatLabOpened + name: lab coat + +- type: entity + parent: ClothingOuterStorageFoldableBase id: ClothingOuterCoatLabChem name: chemist lab coat description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder. @@ -144,7 +149,12 @@ Caustic: 0.75 - type: entity - parent: ClothingOuterStorageBase + parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabChem] + id: ClothingOuterCoatLabChemOpened + name: chemist lab coat + +- type: entity + parent: ClothingOuterStorageFoldableBase id: ClothingOuterCoatLabViro name: virologist lab coat description: A suit that protects against bacteria and viruses. Has an green stripe on the shoulder. @@ -158,9 +168,13 @@ coefficients: Caustic: 0.75 +- type: entity + parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabViro] + id: ClothingOuterCoatLabViroOpened + name: virologist lab coat - type: entity - parent: ClothingOuterStorageBase + parent: ClothingOuterStorageFoldableBase id: ClothingOuterCoatLabGene name: geneticist lab coat description: A suit that protects against minor chemical spills. Has an blue stripe on the shoulder. @@ -174,9 +188,13 @@ coefficients: Caustic: 0.75 +- type: entity + parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabGene] + id: ClothingOuterCoatLabGeneOpened + name: geneticist lab coat - type: entity - parent: ClothingOuterStorageBase + parent: ClothingOuterStorageFoldableBase id: ClothingOuterCoatLabCmo name: chief medical officer's lab coat description: Bluer than the standard model. @@ -191,7 +209,12 @@ Caustic: 0.75 - type: entity - parent: ClothingOuterStorageBase + parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabCmo] + id: ClothingOuterCoatLabCmoOpened + name: chief medical officer's lab coat + +- type: entity + parent: ClothingOuterStorageFoldableBase id: ClothingOuterCoatRnd name: scientist lab coat description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder. @@ -206,7 +229,12 @@ Caustic: 0.75 - type: entity - parent: ClothingOuterStorageBase + parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatRnd] + id: ClothingOuterCoatRndOpened + name: scientist lab coat + +- type: entity + parent: ClothingOuterStorageFoldableBase id: ClothingOuterCoatRobo name: roboticist lab coat description: More like an eccentric coat than a labcoat. Helps pass off bloodstains as part of the aesthetic. Comes with red shoulder pads. @@ -221,7 +249,12 @@ Caustic: 0.75 - type: entity - parent: ClothingOuterStorageBase + parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatRobo] + id: ClothingOuterCoatRoboOpened + name: roboticist lab coat + +- type: entity + parent: ClothingOuterStorageFoldableBase id: ClothingOuterCoatRD name: research director lab coat description: Woven with top of the line technology, this labcoat helps protect against radiation in similar way to the experimental hardsuit. @@ -236,6 +269,11 @@ Caustic: 0.75 Radiation: 0.9 +- type: entity + parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatRD] + id: ClothingOuterCoatRDOpened + name: research director lab coat + - type: entity parent: ClothingOuterStorageBase id: ClothingOuterCoatPirate diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json index 775a3c2151..02abb07806 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png new file mode 100644 index 0000000000..489f958b9e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png new file mode 100644 index 0000000000..54bd14c8aa Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json index 775a3c2151..02abb07806 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png new file mode 100644 index 0000000000..57d3618504 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png new file mode 100644 index 0000000000..5f3b6bdd5d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json index 775a3c2151..02abb07806 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png new file mode 100644 index 0000000000..31025b7dda Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png new file mode 100644 index 0000000000..01e8e0fbc1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json index 775a3c2151..02abb07806 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png new file mode 100644 index 0000000000..d95cfab8a7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png new file mode 100644 index 0000000000..2fbbaa54df Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/meta.json index f10d1d8014..5a13fa99f3 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/open-inhand-left.png new file mode 100644 index 0000000000..3a3f3f85b0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/open-inhand-right.png new file mode 100644 index 0000000000..7be0d59725 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json index 775a3c2151..02abb07806 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png new file mode 100644 index 0000000000..83d3f527c8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png new file mode 100644 index 0000000000..99937faf28 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json index 775a3c2151..02abb07806 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-left.png new file mode 100644 index 0000000000..5dc3a92fdc Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-right.png new file mode 100644 index 0000000000..c28ef52261 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json index 775a3c2151..02abb07806 100644 --- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png new file mode 100644 index 0000000000..2dde993a3d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png new file mode 100644 index 0000000000..285c57c33f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png differ