diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 242a288191..d8fa0166e1 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 3000 + cost: 3100 #CD change from 3000 to 3100 category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/_CD/Catalog/VendingMachines/Inventories/quickthreads.yml b/Resources/Prototypes/_CD/Catalog/VendingMachines/Inventories/quickthreads.yml index 237ac7b9b6..98bf6676e4 100644 --- a/Resources/Prototypes/_CD/Catalog/VendingMachines/Inventories/quickthreads.yml +++ b/Resources/Prototypes/_CD/Catalog/VendingMachines/Inventories/quickthreads.yml @@ -41,6 +41,7 @@ ClothingOuterCoatJensen: 3 ClothingOuterCoatCowboyDuster: 2 ClothingOuterCoatMilitaryCoat: 2 + ClothingOuterCoatHarmony: 2 ClothingBeltHalfApron: 2 ClothingOuterVest: 2 ClothingShoesChef: 2 diff --git a/Resources/Prototypes/_CD/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_CD/Entities/Clothing/OuterClothing/coats.yml index ad27925315..1a3f9bb963 100644 --- a/Resources/Prototypes/_CD/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_CD/Entities/Clothing/OuterClothing/coats.yml @@ -22,3 +22,14 @@ - type: Clothing sprite: _CD/Clothing/OuterClothing/Coats/miljacket.rsi +# Harmony Jacket +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatHarmony + name: harmony jacket + description: A black leather coat designed by the small Harmony company. + components: + - type: Sprite + sprite: _CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi + - type: Clothing + sprite: _CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi diff --git a/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..dc4a61dc04 Binary files /dev/null and b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..36a32066a5 Binary files /dev/null and b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/icon.png b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/icon.png new file mode 100644 index 0000000000..3edade9338 Binary files /dev/null and b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/icon.png differ diff --git a/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/inhand-left.png b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/inhand-left.png new file mode 100644 index 0000000000..60484bc72e Binary files /dev/null and b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/inhand-right.png b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/inhand-right.png new file mode 100644 index 0000000000..ab908764e5 Binary files /dev/null and b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/meta.json b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/meta.json new file mode 100644 index 0000000000..0452672c5c --- /dev/null +++ b/Resources/Textures/_CD/Clothing/OuterClothing/Coats/harmonyjacket.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Wizard's Den at commit https://github.com/space-wizards/space-station-14/commit/de54934430c96d4c281aed3bd61aa32ce28f8366 , and modified by Nairod for Cosmatic Drift", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}