diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index ff15f5dabe..0ca7f91d09 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -43,7 +43,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 2200 # DeltaV + cost: 2250 # DeltaV category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index b112d42ee1..349961411a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -98,6 +98,7 @@ ClothingOuterRobeTechPriest: 2 ClothingMaskBlushingClown: 1 # moved from emag inventory ClothingMaskBlushingMime: 1 + ClothingOuterWinterLongMime: 1 # End DeltaV Additions ClothingHeadHatCowboyBrown: 1 ClothingHeadHatCowboyBlack: 1 diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 79591c697f..8ff742e2b0 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -578,6 +578,7 @@ minLimit: 0 loadouts: - MimeWintercoat + - MimeWintercoatLong # DeltaV - type: loadoutGroup id: MimeBelt diff --git a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/wintercoats.yml index da8c23c7e4..b91554a284 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/wintercoats.yml @@ -27,7 +27,7 @@ sprite: _DV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi - type: Clothing sprite: _DV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi - + - type: entity parent: ClothingOuterWinterCoat id: ClothingOuterDenimJacket @@ -112,3 +112,13 @@ sprite: _DV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi - type: Clothing sprite: _DV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi + +- type: entity + parent: ClothingOuterWinterCoatLong + id: ClothingOuterWinterLongMime + name: mime's long winter coat + components: + - type: Sprite + sprite: _DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi + - type: Clothing + sprite: _DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/mime.yml index 43740a3097..57714eb339 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/mime.yml @@ -3,3 +3,9 @@ id: FoamSabre equipment: belt: ClothingBeltFoamSheathFilled + +# Outer clothing +- type: loadout # DeltaV + id: MimeWintercoatLong + equipment: + outerClothing: ClothingOuterWinterLongMime diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml index d491c12ec0..9ab5dbb2e1 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/clothing.yml @@ -93,6 +93,7 @@ # Coats - ClothingOuterChiefJustice - ClothingOuterStasecSweater + - ClothingOuterWinterLongMime # Ponchos - ClothingNeckCWPSec - ClothingNeckCWPArctic diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml index 38d338f5d1..95064400d0 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml @@ -342,3 +342,9 @@ result: ClothingBeltSyndicateUtility materials: Cloth: 200 + +# Mime +- type: latheRecipe + parent: BaseCoatRecipe + id: ClothingOuterWinterLongMime + result: ClothingOuterWinterLongMime diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..d58d155aac Binary files /dev/null and b/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/icon.png b/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/icon.png new file mode 100644 index 0000000000..7bcc984f71 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/inhand-left.png new file mode 100644 index 0000000000..e487dc71b8 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/inhand-right.png new file mode 100644 index 0000000000..b578f580d4 Binary files /dev/null and b/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/meta.json b/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/meta.json new file mode 100644 index 0000000000..9182287b17 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by Velitation. Taken from vg at https://github.com/vgstation-coders/vgstation13/blob/a16e41020a93479e9a7e2af343b1b74f7f2a61bd/icons/obj/clothing/suits.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}