Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Killface1980 committed Oct 4, 2017
1 parent 5b1f258 commit 117bb29
Show file tree
Hide file tree
Showing 84 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion About/About.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ModMetaData>
<name>Facial Stuff 0.17.3.4a</name>
<name>Facial Stuff 0.17.3.4b</name>
<author>Killface</author>
<url></url>
<targetVersion>0.17.1557</targetVersion>
Expand Down
Binary file modified Assemblies/FacialStuff.dll
Binary file not shown.
9 changes: 7 additions & 2 deletions Source/RW_FacialStuff/Harmony/HarmonyPatches.cs
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,18 @@ public static void TryInteractWith_Postfix(
FieldInfo PawnFieldInfo = typeof(Pawn_InteractionsTracker).GetField("pawn", BindingFlags.NonPublic | BindingFlags.Instance);
Pawn pawn = (Pawn)PawnFieldInfo?.GetValue(__instance);

if (pawn == null || recipient == null)
{
return;
}

if (__result)
{
if (pawn.GetComp<CompFace>() != null && recipient != null)
if (pawn.GetComp<CompFace>() != null)
{
pawn.GetComp<CompFace>().HeadRotator.LookAtPawn(recipient);
}
if (recipient.GetComp<CompFace>() != null && pawn != null)
if (recipient.GetComp<CompFace>() != null)
{
recipient.GetComp<CompFace>().HeadRotator.LookAtPawn(pawn);
}
Expand Down
Binary file added Textures/MergedHair/Afro_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Afro_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Afro_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Braidbun_Bald_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Braidbun_Bald_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Braidbun_Bald_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Braidbun_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Braidbun_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Braidbun_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/CA_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/CA_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/CA_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/ClassyF_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/ClassyF_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/ClassyF_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/EHSbanzhe_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/EHSbanzhe_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/EHSbanzhe_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/EHSpengsongduan_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/EHSpengsongduan_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/EHSpengsongduan_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Fluffymess_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Fluffymess_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/Fluffymess_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/SM_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/MergedHair/SM_front.png
Binary file added Textures/MergedHair/SM_side.png
Binary file added Textures/MergedHair/SPSAryn_back.png
Binary file added Textures/MergedHair/SPSAryn_front.png
Binary file added Textures/MergedHair/SPSAryn_side.png
Binary file added Textures/MergedHair/SPSBrona_back.png
Binary file added Textures/MergedHair/SPSBrona_front.png
Binary file added Textures/MergedHair/SPSBrona_side.png
Binary file added Textures/MergedHair/SPSElsa_back.png
Binary file added Textures/MergedHair/SPSElsa_front.png
Binary file added Textures/MergedHair/SPSElsa_side.png
Binary file added Textures/MergedHair/SPSTrogo_back.png
Binary file added Textures/MergedHair/SPSTrogo_front.png
Binary file added Textures/MergedHair/SPSTrogo_side.png
Binary file added Textures/MergedHair/Topdog_Bald03_back.png
Binary file added Textures/MergedHair/Topdog_Bald03_front.png
Binary file added Textures/MergedHair/Topdog_Bald03_side.png
Binary file added Textures/MergedHair/Topdog_Bald09_back.png
Binary file added Textures/MergedHair/Topdog_Bald09_front.png
Binary file added Textures/MergedHair/Topdog_Bald09_side.png
Binary file added Textures/MergedHair/Vintage_back.png
Binary file added Textures/MergedHair/Vintage_front.png
Binary file added Textures/MergedHair/Vintage_side.png
Binary file added Textures/MergedHair/WavyLong_back.png
Binary file added Textures/MergedHair/WavyLong_front.png
Binary file added Textures/MergedHair/WavyLong_side.png
Binary file added Textures/MergedHair/Wavy_Bald03_back.png
Binary file added Textures/MergedHair/Wavy_Bald03_front.png
Binary file added Textures/MergedHair/Wavy_Bald03_side.png
Binary file added Textures/MergedHair/Wavy_Bald06_back.png
Binary file added Textures/MergedHair/Wavy_Bald06_front.png
Binary file added Textures/MergedHair/Wavy_Bald06_side.png
Binary file added Textures/MergedHair/Wavy_Bald07_back.png
Binary file added Textures/MergedHair/Wavy_Bald07_front.png
Binary file added Textures/MergedHair/Wavy_Bald07_side.png
Binary file added Textures/MergedHair/ame2_back.png
Binary file added Textures/MergedHair/ame2_front.png
Binary file added Textures/MergedHair/ame2_side.png
Binary file added Textures/MergedHair/ame6_back.png
Binary file added Textures/MergedHair/ame6_front.png
Binary file added Textures/MergedHair/ame6_side.png
Binary file added Textures/MergedHair/daria_back.png
Binary file added Textures/MergedHair/daria_front.png
Binary file added Textures/MergedHair/daria_side.png
Binary file added Textures/MergedHair/jack_back.png
Binary file added Textures/MergedHair/jack_front.png
Binary file added Textures/MergedHair/jack_side.png
Binary file added Textures/MergedHair/jamie_back.png
Binary file added Textures/MergedHair/jamie_front.png
Binary file added Textures/MergedHair/jamie_side.png
Binary file added Textures/MergedHair/regal_back.png
Binary file added Textures/MergedHair/regal_front.png
Binary file added Textures/MergedHair/regal_side.png
Binary file added Textures/MergedHair/sokka_back.png
Binary file added Textures/MergedHair/sokka_front.png
Binary file added Textures/MergedHair/sokka_side.png

0 comments on commit 117bb29

Please sign in to comment.