From 096f729865638845822dee2f8e8897191086af15 Mon Sep 17 00:00:00 2001 From: MemeSnorfer <116136632+MemeSnorfer@users.noreply.github.com> Date: Tue, 21 Jan 2025 18:31:12 -0800 Subject: [PATCH] Kepori Balaclava + Webbing Sprice (#4061) ## About The Pull Request Adds Kepori variants of various combat webbings and balaclavas, sprites credited to Moffball. ![image](https://github.com/user-attachments/assets/36661e5f-d7aa-4dcb-82dc-fefc9a3162a9) ![image](https://github.com/user-attachments/assets/d9fbf465-fce1-4ff0-a5aa-fa1e2d189090) (also amends a mistake I had made in a previous balaclava pr I made concerning NGR balaclavas) ## Why It's Good For The Game Sprite support for a species is good I think. ## Changelog :cl: MemeSnorfer & Moffball imageadd: Kepori will no longer be haunted by floating combat webbings and balaclavas. Hurray! fix: Fixes a mistake concerning NGR balaclavas not fitting Sarathi snouts. /:cl: --- code/game/objects/items/storage/belt.dm | 4 +++- code/modules/clothing/factions/clip.dm | 1 + code/modules/clothing/factions/hardliners.dm | 1 + code/modules/clothing/factions/ngr.dm | 4 +++- code/modules/clothing/masks/boxing.dm | 2 +- code/modules/clothing/masks/breath.dm | 1 + icons/mob/species/kepori/onmob_belt_kepori.dmi | Bin 184 -> 3557 bytes icons/mob/species/kepori/onmob_mask_kepori.dmi | Bin 710 -> 2392 bytes 8 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 616e3011c2f2..3b550ffbb2c4 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -168,6 +168,7 @@ icon_state = "medicwebbing" item_state = "medicwebbing" custom_premium_price = 900 + supports_variations = KEPORI_VARIATION /obj/item/storage/belt/medical/ComponentInitialize() . = ..() @@ -447,6 +448,7 @@ icon_state = "militarywebbing" item_state = "militarywebbing" resistance_flags = FIRE_PROOF + supports_variations = KEPORI_VARIATION unique_reskin = list( "None" = "militarywebbing", @@ -905,7 +907,7 @@ desc = "A set of tactical webbing for operators of the IRMG, can hold security gear." icon_state = "inteq_webbing" item_state = "inteq_webbing" - supports_variations = VOX_VARIATION + supports_variations = VOX_VARIATION | KEPORI_VARIATION /obj/item/storage/belt/security/webbing/inteq/skm/PopulateContents() . = ..() diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm index 41019a0e62ab..d5b1215dcc5f 100644 --- a/code/modules/clothing/factions/clip.dm +++ b/code/modules/clothing/factions/clip.dm @@ -393,6 +393,7 @@ item_state = "combat_balaclava" alternate_worn_layer = BODY_LAYER flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR + supports_variations = KEPORI_VARIATION //gloves diff --git a/code/modules/clothing/factions/hardliners.dm b/code/modules/clothing/factions/hardliners.dm index 3f9f0f2871cb..021098b9cf53 100644 --- a/code/modules/clothing/factions/hardliners.dm +++ b/code/modules/clothing/factions/hardliners.dm @@ -220,6 +220,7 @@ item_state = "hl_webbing" icon = 'icons/obj/clothing/faction/hardliners/belt.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/belt.dmi' + supports_variations = KEPORI_VARIATION /obj/item/storage/belt/security/webbing/hardliners/sidewinder/PopulateContents() . = ..() diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm index 5d6a9891707a..6c4be5f25dad 100644 --- a/code/modules/clothing/factions/ngr.dm +++ b/code/modules/clothing/factions/ngr.dm @@ -229,6 +229,7 @@ item_state = "ngr_balaclava" icon = 'icons/obj/clothing/faction/ngr/mask.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/ngr/mask.dmi' + supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION | KEPORI_VARIATION /obj/item/clothing/mask/breath/ngr name = "NGR face mask" @@ -237,7 +238,7 @@ item_state = "ngr_facemask" icon = 'icons/obj/clothing/faction/ngr/mask.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/ngr/mask.dmi' - supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION + supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION | KEPORI_VARIATION ////////// //Neck// @@ -262,6 +263,7 @@ item_state = "ngr_webbing" icon = 'icons/obj/clothing/faction/ngr/belt.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/ngr/belt.dmi' + supports_variations = KEPORI_VARIATION /obj/item/storage/belt/security/webbing/ngr/cobra/PopulateContents() . = ..() diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index d8713138ba97..7b2f67d4d60c 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -14,7 +14,7 @@ flags_cover = MASKCOVERSMOUTH visor_flags_cover = MASKCOVERSMOUTH resistance_flags = NONE - supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION | VOX_VARIATION + supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION | VOX_VARIATION | KEPORI_VARIATION equipping_sound = EQUIP_SOUND_VFAST_GENERIC unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index d24e4efb2640..98520a30b597 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -49,3 +49,4 @@ desc = "A surprisingly advanced balaclava. While it doesn't muffle your voice, it has a mouthpiece for internals. Comfy to boot! This one is a variataion commonly used by the IRMG to protect it's members idenites." icon_state = "inteq_balaclava" item_state = "inteq_balaclava" + supports_variations = KEPORI_VARIATION diff --git a/icons/mob/species/kepori/onmob_belt_kepori.dmi b/icons/mob/species/kepori/onmob_belt_kepori.dmi index 4a5a4ba7b32a424e1d1997c33d98c6cbc5e66041..d8b5a2b953569da58ac4b9a57b036adf164f29b5 100644 GIT binary patch literal 3557 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 literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9$P6U&q%z}y6mx)2h%1m@US)d=NHLZK`2{mL zJiCzw=P@u;%n1%FC@TH_CAi?@*C$%ux?1PXoDbd*YH-o` z!6TjXKAI;P3Uzi^7zY_&Huh?eNmkZNWev9%-@wN3shhuKN_zPkps_rjE{-7_Gm{e} Z?g4oZ7#Nx4F1rI+44$rjF6*2UngC^=H`D+C diff --git a/icons/mob/species/kepori/onmob_mask_kepori.dmi b/icons/mob/species/kepori/onmob_mask_kepori.dmi index 51391bd773c28c93d5a4ec23180ab4d87b88416a..b974573a39dfed65acc1bedbfeb68c90c8c7041f 100644 GIT binary patch literal 2392 zcmai0cTf{}77lvUmBm6)j^YRwLJO-rda3-8uJW-tU_?zklAm@B7}oxa+X1(o%|2 z002PR;+mQ59xm-=o`l%md!8}rxd)kedt`u_r@x0E1{;8R;0pi*W!pJm{c!wMJM8k> z4A4p&*#CiQSBcOa1Win7QLQz)0S~q6As}1OFvv1e$wRGTDw&dOf80(3L{cZ~8bPZd zM&K$4DlQ&$vby-_tEhNT`I&QIIm$(|GjPif7S{b1T2|`Chuw9TIVmgtDTl4D4Ll_} zo4w@JP-g5y-`YE1*Zf6dPXGo{9uU}rZ9@P+BG|&r#6BpS$6Ab+Lnw7Ep9@u=NkaBn zv!p5KyHBK0UW%Jb%8gcY&KB?Hx4i6vzE_cw*D~42Gpmd_zZEx7k(r^hskStqKrQ>s z4$2N$WafYZ7x+y6PmikuZ_j3f{NI9RKM=O%MfWE1XDl?WPDME*@zc%Q`JZfm$#t|*6DxKY?aP}}38XA^wM$DnucK>ggVIBlQDJJU7==Ei z1tThV0(Zxc2%nGFG$5UtlAB0eJJst7o}R~*oLP0)tb<)C~zo^U+eJ}`LyvY)@|l{Vobi-8Ekur-)H zvQFz^!G#+WrGNLF?B_bAT5xmL^#n8A8FXcCn zGZV_z#0snOJVw_dxJ!%v@(bc#{ z+~ARxiz-eVy`^Qn$+bA-6+8Dv+k4Qff_+`HyRS1tm24$%oK|nCk5$J#=Y>ATA#?P_ zs`k6H;yT~gHht5VF z4Wzb65E3sr70z27+MzY+PRbg@Z|Oe6a&FP;?0aL~x~M)t)*^=O3G~7Img)%9Vn|KQ zz+G+DoJXsRB#H*s^{*m6jlMf+mNGH4__Nbvdso4cw0RFYesU1!|kOOj9;dStB3~0jmMc9E>LbM!cfOECct4{$8K7+(Jhi z1sKF6+UY8a5|UAvOon>>YNNs9M7huEf;}EyN1dD3i&64yxkHyfYviDau46~|jyUZE z$hSI0JU%wpu3)7Rt$E3T)~iW=Q9jd)9*C*KWEe5@Y=qFtN1f3OD`g1rbWeL-k*p`{pH#Qs|aPU_Un&4!%cX^LzrpH0< zJ|45Gys{5*dDCR^-mYUoXc4rkS)DFBf0n-b&RaXBdv%jvCucqdhX#*P;nL1rTR6rKqdox?I zjl&I6wfcE_GoXKS#@xOKuk&PuVvz@RmL+EFu^U@htW?$)hQp<3I@a~Xnr7ZPXe?OZr7i+zL}Brdgk-= zdy;o|6&-)S4EbCTndU+lYZ7ZIm|Hat4j?4x9&rCIFKZ}J-gPnohzMuVZcit5nj%nX z@+7?qZ$R62=83iBL{Q4GJ0x0000DNk~Le0001B0000$2nGNE0Od4t4gdfEb&(}& zf8%>C@$R1n%($*lFRI_WM(|i&FmG= zI0pa#fPe-E#wvcBH-9z%rZhVJKKVQ*f1#(V+s(}`R@9~`cmg^)`jTL4;`Z^M=YaxW z>prCB&>fb`&u(|wx$%|B>a(-$OEheqfq7`6bt%OW$L24}t zVy99RybuYn^9fUv(@7%4f**Seik<-DuL!*)^-D#q0(fw^SNA;CuL7?`I@+%vi5>XN zvqK$?_M`n>D}nO~5h)3IIh_Ll000000001hz}^A(iPwpOz)w&B0000