From 82715a00a58b558f794825ef2a8e4bf395b8797e Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 28 Feb 2025 07:17:36 +1100 Subject: [PATCH] Long Winter Coat for Mimes (#3056) * Mime long winter coat * YML fixes * In hand sprites * wrong path * Deltanedas review fix * price increase on crate * retry --- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../VendingMachines/Inventories/theater.yml | 1 + .../Prototypes/Loadouts/loadout_groups.yml | 1 + .../Clothing/OuterClothing/wintercoats.yml | 12 +++++++- .../_DV/Loadouts/Jobs/Civilian/mime.yml | 6 ++++ .../_DV/Recipes/Lathes/Packs/clothing.yml | 1 + .../_DV/Recipes/Lathes/clothing.yml | 6 ++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 863 bytes .../WinterCoats/mimelongcoat.rsi/icon.png | Bin 0 -> 455 bytes .../mimelongcoat.rsi/inhand-left.png | Bin 0 -> 556 bytes .../mimelongcoat.rsi/inhand-right.png | Bin 0 -> 447 bytes .../WinterCoats/mimelongcoat.rsi/meta.json | 26 ++++++++++++++++++ 12 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/OuterClothing/WinterCoats/mimelongcoat.rsi/meta.json 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 0000000000000000000000000000000000000000..d58d155aaca49b1d3c9c374ca5c209bf32d93861 GIT binary patch literal 863 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uw9zK0z!SYQ&o|>B4nKNf*&Yb!5>C^xJ|J&Q!Z`!n}zP=tPB^kSU zDUjkR3GxdDO2Ghw(EW4gfa0759+AZi419+{nDKc2iWH!rM2TxeNpOBzNqJ&XDnmeG zW?qS&pKFMMsh**piO~IJ%|JDLsS%!OzP=1vKsE;ugTSTW$qWokd7dtgArbCx!)_P7 zR^VajT>ba||J$NrvW#upisk&$XPv#$J0T)>0?&@m@*mZHRI{Ah-XA5t=Bdp?Pv;}t zR{Ot4GutJd`JUDPW6u4byo@LBd{cKy6JQm3uu{26+>z(Zy@{XCD88D}`a`pD(Y<yKB%(d1pm0*Cj>bZw32j4FJ`vo>M6^Tu!Yxn`WVKHPa#O5_C3k3iOs=KHwK z1gBXP9}9jfs1dNR$!g`@3xYPR5*@Qu9Nw~d3tUufiL1;~X8bergSORv#R)9$N|L*z zl?1rhJKGf6l%{F-&*icIlU=NAyMQ6z(<7TT zsCvTs`1Cf5pV1l_cUk+wr+=N0cB#LQV_x$7k0$@!S^6u4_i(c8?_OZKt1do?$LRj- z?21sgjE=cW|1-**-SqN}#Gc82In;ODY6yLt%xjt}VPLPQa*M%R;b&n*aA>vD(Ruu9 z%2ceJj`p>mjb&F$IDULv#Nk9Go`Z!R4Cjt5U>0WL^Y<)}v0{i|HB5hV#=@o~!O1!_ zY6>4i7^9w`q2f_D#yf)ByIYywKVkdQ%5+C?-R~ubv@&8_J{JeK&WX}rEAn8H;?@}9 zEnJVxeynluQ?>b)x+iH?=|LfvIhBm5F~SRaA`&}yCvqzMx9+|nKUbFV9;?ZvGC^aj zjn;eESzmlvFY;ymp(P3|cP3w%)4(mlWX6@$(soJDs=wgUsVi$A?&-K&X3TW%tbP0l+XkKSY~D% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7bcc984f714dcb3cdcdcce9729d376e655c56c7a GIT binary patch literal 455 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik70(?ST51+oVVEHB>Pfbm2=FFLA&YXGr^r^kQ{iaQu{{R19UtbS0Maat@ zNb!^e`2_<7VSqvC{<(8Nan1sd$YKTtzQZ8Qcszea3Q$m@#5JNMI6tkVJh3R1As{g` zuSCz!HAKNw&rr`q=>D>1pc=l^2+uTMUj{88n*)eJ;8O5pAbHKx#WBRf|Lw$slMXBJ zIQO#bnDYPs{i(uEcl@lYZ{5yPQ#p2?$=a;`qJ4oDbJzmWr%N^1U0J5;Yuim>aCuj8 z=*1=8D{f-VqMNR6RnKL}nR`JnA%BmpS-@_4i(TIjwtv6;LuVOGh}cB6osj3u%Y zr!=hCp80TNnG@%Vv&u&2C)X7RtlnHx&X8-jJToa bT>OvWhNNoE!i%MCAdh;w`njxgN@xNATy3&H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e487dc71b8125cd4d001e0efe8a38ddec088ae98 GIT binary patch literal 556 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv=}#LT=BJwMkF1yemk zJrkk(%bI~|_);T0(|mmyw18|5AO?X;!IOd3HG8@^hE&A8z2)!M>>$GSVWqXO{(-2& zraK(Jr(U)GV)7>D;XUmgQ?ilaPpOf!{Hv8;Uti5X`FZ6B*NoTg zJ3bW#?Y`^h_wVi2X{?sFoHAekZ@Rbn)n~=?>$ch5&{00Hcg>l%v9GT8Jjvi*x>j8Y z4u0L!F?OEbQ0e62Gv`3r=6~C-8%3lqda|QLJt#>*-X|fm*yW~BbJ?pqONBP}@oVr! zKfdt#XNEgNTua5b+b_)B7ry=Y?r8rm#?5E=;+v!yBsf2PJo0a^V{naq^WAu+^eem% e?43kRllL)LixjEnxvdBQ#fqn^pUXO@geCwTtm{Ak literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b578f580d4909b7ea483c4e9f2dd19bd043dcc4f GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zE?B+^$W&8Pv$wbZ|NsBYnKRFvIdk~*4WQuB-#6oc6lY10UocP# z3>bp_D}+FT1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUN zo{7-?Wz9e}e5nzhX}-P;T0k}j5QD&_;K@MpmZytjNQC>_Y2JK?6?j;4>z@5nf45oK zbeVSWt`~=tTUm}sN2+jLuu);v3<#RQ^faC&?b0Biqb9V*&TXlGn!z z7=;aPoqhj6)}Zl3X=@>)@SF)vA{v?=jgy+_=`E!R?Ux976>d&9Ma`R=3_4Y6v zXFIlT@9}ijnjl8blaZ_{5l43mALZV_5z+eF@|4nr=^J=hBA(5!^N26hnDLqQk#&u? Trt-@|kY_zz{an^LB{Ts5pkAKr literal 0 HcmV?d00001 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 + } + ] +}