diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index aff5ebe8b32..111e56a2a35 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -212,7 +212,7 @@ public void TrySendInGameICMessage(
         }
 
         bool shouldCapitalize = (desiredType != InGameICChatType.Emote);
-        bool shouldPunctuate = _configurationManager.GetCVar(CCVars.ChatPunctuation) && (desiredType != InGameICChatType.Emote);
+        bool shouldPunctuate = _configurationManager.GetCVar(CCVars.ChatPunctuation);
         // Capitalizing the word I only happens in English, so we check language here
         bool shouldCapitalizeTheWordI = (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en")
             || (CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Name == "en");
diff --git a/Content.Server/Speech/Components/GoblinAccentComponent.cs b/Content.Server/Speech/Components/GoblinAccentComponent.cs
new file mode 100644
index 00000000000..2fb98e60a14
--- /dev/null
+++ b/Content.Server/Speech/Components/GoblinAccentComponent.cs
@@ -0,0 +1,7 @@
+using Content.Server.Speech.EntitySystems;
+
+namespace Content.Server.Speech.Components;
+
+[RegisterComponent]
+[Access(typeof(GoblinAccentSystem))]
+public sealed partial class GoblinAccentComponent : Component {}
diff --git a/Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs b/Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs
new file mode 100644
index 00000000000..c86bbe3fbb3
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Speech.Components;
+using Robust.Shared.Random;
+using System.Text.RegularExpressions;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed class GoblinAccentSystem : EntitySystem
+{
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GoblinAccentComponent, AccentGetEvent>(OnAccentGet);
+    }
+
+    // converts left word when typed into the right word. For example typing you becomes ye.
+    public string Accentuate(string message, GoblinAccentComponent component)
+    {
+        var msg = message;
+
+        msg = _replacement.ApplyReplacements(msg, "goblin");
+        return msg;
+    }
+
+    private void OnAccentGet(EntityUid uid, GoblinAccentComponent component, AccentGetEvent args)
+    {
+        args.Message = Accentuate(args.Message, component);
+    }
+}
diff --git a/Content.Server/_NF/Goblin/Components/GoblinComponent.cs b/Content.Server/_NF/Goblin/Components/GoblinComponent.cs
new file mode 100644
index 00000000000..35533e98cc3
--- /dev/null
+++ b/Content.Server/_NF/Goblin/Components/GoblinComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server._NF.Goblin.Components;
+
+[RegisterComponent]
+public sealed partial class GoblinComponent : Component
+{
+
+}
diff --git a/Resources/Audio/_NF/Voice/Goblin/attributions.yml b/Resources/Audio/_NF/Voice/Goblin/attributions.yml
new file mode 100644
index 00000000000..5da1cf34088
--- /dev/null
+++ b/Resources/Audio/_NF/Voice/Goblin/attributions.yml
@@ -0,0 +1,32 @@
+- files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643664/"
+- files: ["goblin-cackle-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/spookymodem/sounds/202096/"
+- files: ["goblin-cackle-05.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)"
+  source: "https://freesound.org/people/Nanakisan/sounds/253532/"
+- files: ["goblin-scream-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643655/"
+- files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/Duisterwho/sounds/643497/"
+- files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: https://freesound.org/people/SnowFightStudios/sounds/643657/
+- files: ["goblin-chatter-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)"
+  source: https://freesound.org/people/Fenodyrie/sounds/565923/
+- files: ["goblin-hiss-01.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)"
+  source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg
new file mode 100644
index 00000000000..74d3e2e0555
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg
new file mode 100644
index 00000000000..42587638db5
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg
new file mode 100644
index 00000000000..7db2a2f7bea
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg
new file mode 100644
index 00000000000..1b9d67543c7
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg
new file mode 100644
index 00000000000..8d98dbda60d
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-chatter-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-chatter-01.ogg
new file mode 100644
index 00000000000..4f236f781dc
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-chatter-01.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cry-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cry-01.ogg
new file mode 100644
index 00000000000..a2fb7901674
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cry-01.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cry-02.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cry-02.ogg
new file mode 100644
index 00000000000..a6e765ef487
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-cry-02.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-hiss-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-hiss-01.ogg
new file mode 100644
index 00000000000..563a6a8cb9a
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-hiss-01.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-01.ogg
new file mode 100644
index 00000000000..d30730dd273
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-01.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-02.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-02.ogg
new file mode 100644
index 00000000000..740e0d09733
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-02.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-03.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-03.ogg
new file mode 100644
index 00000000000..84fe764d040
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-03.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-scream-04.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-04.ogg
new file mode 100644
index 00000000000..f55d83810a9
Binary files /dev/null and b/Resources/Audio/_NF/Voice/Goblin/goblin-scream-04.ogg differ
diff --git a/Resources/Audio/_NF/Voice/Goblin/license.txt b/Resources/Audio/_NF/Voice/Goblin/license.txt
new file mode 100644
index 00000000000..824f0bdbeda
--- /dev/null
+++ b/Resources/Audio/_NF/Voice/Goblin/license.txt
@@ -0,0 +1,32 @@
+- files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643664/"
+- files: ["goblin-cackle-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/spookymodem/sounds/202096/"
+- files: ["goblin-cackle-05.ogg"]
+  license: "CC BY 4.0"
+  copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)"
+  source: "https://freesound.org/people/Nanakisan/sounds/253532/"
+- files: ["goblin-scream-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/SnowFightStudios/sounds/643655/"
+- files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: "https://freesound.org/people/Duisterwho/sounds/643497/"
+- files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
+  source: https://freesound.org/people/SnowFightStudios/sounds/643657/
+- files: ["goblin-chatter-01.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)"
+  source: https://freesound.org/people/Fenodyrie/sounds/565923/
+- files: ["goblin-hiss-01.ogg"]
+  license: "CC BY 4.0"
+  copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)"
+  source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/
diff --git a/Resources/Audio/_NF/Vulpikanin/bark.ogg b/Resources/Audio/_NF/Vulpikanin/bark.ogg
deleted file mode 100644
index e0e77281d82..00000000000
Binary files a/Resources/Audio/_NF/Vulpikanin/bark.ogg and /dev/null differ
diff --git a/Resources/Audio/_NF/Vulpikanin/growl1.ogg b/Resources/Audio/_NF/Vulpikanin/growl1.ogg
deleted file mode 100644
index d5152d9c057..00000000000
Binary files a/Resources/Audio/_NF/Vulpikanin/growl1.ogg and /dev/null differ
diff --git a/Resources/Audio/_NF/Vulpikanin/growl2.ogg b/Resources/Audio/_NF/Vulpikanin/growl2.ogg
deleted file mode 100644
index 5c48053ac68..00000000000
Binary files a/Resources/Audio/_NF/Vulpikanin/growl2.ogg and /dev/null differ
diff --git a/Resources/Audio/_NF/Vulpikanin/growl3.ogg b/Resources/Audio/_NF/Vulpikanin/growl3.ogg
deleted file mode 100644
index bcacf2442f0..00000000000
Binary files a/Resources/Audio/_NF/Vulpikanin/growl3.ogg and /dev/null differ
diff --git a/Resources/Audio/_NF/Vulpikanin/howl.ogg b/Resources/Audio/_NF/Vulpikanin/howl.ogg
deleted file mode 100644
index 778fd6b2483..00000000000
Binary files a/Resources/Audio/_NF/Vulpikanin/howl.ogg and /dev/null differ
diff --git a/Resources/Audio/_NF/Vulpikanin/scream1.ogg b/Resources/Audio/_NF/Vulpikanin/scream1.ogg
deleted file mode 100644
index 8c5cf335a4a..00000000000
Binary files a/Resources/Audio/_NF/Vulpikanin/scream1.ogg and /dev/null differ
diff --git a/Resources/Audio/_NF/Vulpikanin/scream2.ogg b/Resources/Audio/_NF/Vulpikanin/scream2.ogg
deleted file mode 100644
index 0ff2ac25ce4..00000000000
Binary files a/Resources/Audio/_NF/Vulpikanin/scream2.ogg and /dev/null differ
diff --git a/Resources/Locale/en-US/_NF/accent/goblin_accent.ftl b/Resources/Locale/en-US/_NF/accent/goblin_accent.ftl
new file mode 100644
index 00000000000..1a7848827fb
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/accent/goblin_accent.ftl
@@ -0,0 +1,737 @@
+# a mix of cockney and cant (rogue/vagabond slang)
+# cockney: https://www.eastlondonhistory.co.uk/history-east-end-cockney/   (th -> f/v, tt -> ', er -> ah, -ing -> -in')
+# cant: https://www.gutenberg.org/files/47018/47018-h/47018-h.htm
+
+accent-goblin-words-1 = a lot
+accent-goblin-words-2 = airlock
+accent-goblin-words-3 = airlocks
+accent-goblin-words-4 = am
+accent-goblin-words-5 = am not
+accent-goblin-words-6 = an idea
+accent-goblin-words-7 = antag
+accent-goblin-words-8 = anything
+accent-goblin-words-9 = are
+accent-goblin-words-10 = are not
+accent-goblin-words-11 = aren’t
+accent-goblin-words-12 = arent
+accent-goblin-words-13 = arrest
+accent-goblin-words-14 = arrested
+accent-goblin-words-15 = arresting
+accent-goblin-words-16 = arrests
+accent-goblin-words-17 = attack
+accent-goblin-words-18 = attacked
+accent-goblin-words-19 = attacking
+accent-goblin-words-20 = attacks
+accent-goblin-words-21 = bag
+accent-goblin-words-22 = bags
+accent-goblin-words-23 = bailiff
+accent-goblin-words-24 = bailiffs
+accent-goblin-words-25 = beat
+accent-goblin-words-26 = beaten
+accent-goblin-words-27 = beating
+accent-goblin-words-28 = beats
+accent-goblin-words-29 = beer
+accent-goblin-words-30 = bocadillo
+accent-goblin-words-31 = bolt
+accent-goblin-words-32 = bolted
+accent-goblin-words-33 = boot
+accent-goblin-words-34 = boots
+accent-goblin-words-35 = booze
+accent-goblin-words-36 = bored
+accent-goblin-words-37 = boring
+accent-goblin-words-38 = bottle
+accent-goblin-words-39 = bottles
+accent-goblin-words-40 = boy
+accent-goblin-words-41 = boys
+accent-goblin-words-42 = brig
+accent-goblin-words-43 = brother
+accent-goblin-words-44 = brothers
+accent-goblin-words-45 = bullshit
+accent-goblin-words-46 = bullshitting
+accent-goblin-words-47 = bus
+accent-goblin-words-48 = captain
+accent-goblin-words-49 = captains
+accent-goblin-words-50 = cash
+accent-goblin-words-51 = centcom
+accent-goblin-words-52 = cheap
+accent-goblin-words-53 = cheater
+accent-goblin-words-54 = close
+accent-goblin-words-55 = closed
+accent-goblin-words-56 = closing
+accent-goblin-words-57 = clothes
+accent-goblin-words-58 = clown
+accent-goblin-words-59 = clowns
+accent-goblin-words-60 = command
+accent-goblin-words-61 = corpse
+accent-goblin-words-62 = crew
+accent-goblin-words-63 = crewman
+accent-goblin-words-64 = crewmember
+accent-goblin-words-65 = crewmen
+accent-goblin-words-66 = crime
+accent-goblin-words-67 = crimes
+accent-goblin-words-68 = crowbar
+accent-goblin-words-69 = crowbars
+accent-goblin-words-70 = cuff
+accent-goblin-words-71 = cuffed
+accent-goblin-words-72 = cuffing
+accent-goblin-words-73 = cuffs
+accent-goblin-words-74 = cut
+accent-goblin-words-75 = cuts
+accent-goblin-words-76 = cutting
+accent-goblin-words-77 = dead
+accent-goblin-words-78 = depot
+accent-goblin-words-79 = depots
+accent-goblin-words-80 = destroy
+accent-goblin-words-81 = destroyed
+accent-goblin-words-82 = destroying
+accent-goblin-words-83 = diner
+accent-goblin-words-84 = dock
+accent-goblin-words-85 = docks
+accent-goblin-words-86 = doctor
+accent-goblin-words-87 = door
+accent-goblin-words-88 = doors
+accent-goblin-words-89 = drink
+accent-goblin-words-90 = drinking
+accent-goblin-words-91 = drinks
+accent-goblin-words-92 = duffel
+accent-goblin-words-93 = duffel bag
+accent-goblin-words-94 = dwarf
+accent-goblin-words-95 = dwarves
+accent-goblin-words-96 = emitter
+accent-goblin-words-97 = everything
+accent-goblin-words-98 = experienced
+accent-goblin-words-99 = fast
+accent-goblin-words-100 = father
+accent-goblin-words-101 = fathers
+accent-goblin-words-102 = flies
+accent-goblin-words-103 = fly
+accent-goblin-words-104 = flying
+accent-goblin-words-105 = follow
+accent-goblin-words-106 = followed
+accent-goblin-words-107 = following
+accent-goblin-words-108 = follows
+accent-goblin-words-109 = food
+accent-goblin-words-110 = food ship
+accent-goblin-words-111 = food ships
+accent-goblin-words-112 = food shuttle
+accent-goblin-words-113 = food shuttles
+accent-goblin-words-114 = food truck
+accent-goblin-words-115 = food trucks
+accent-goblin-words-116 = fool
+accent-goblin-words-117 = foolish
+accent-goblin-words-118 = football
+accent-goblin-words-119 = fucking
+accent-goblin-words-120 = gave
+accent-goblin-words-121 = give
+accent-goblin-words-122 = gives
+accent-goblin-words-123 = giving
+accent-goblin-words-124 = going to
+accent-goblin-words-125 = gonna
+accent-goblin-words-126 = hammy
+accent-goblin-words-127 = hamper
+accent-goblin-words-128 = hampster
+accent-goblin-words-129 = hampter
+accent-goblin-words-130 = hamster
+accent-goblin-words-131 = hand
+accent-goblin-words-132 = handcuffs
+accent-goblin-words-133 = harass
+accent-goblin-words-134 = harasses
+accent-goblin-words-135 = harassing
+accent-goblin-words-136 = harassment
+accent-goblin-words-137 = harbour
+accent-goblin-words-138 = hard
+accent-goblin-words-139 = has
+accent-goblin-words-140 = has not
+accent-goblin-words-141 = hasn’t
+accent-goblin-words-142 = hasnt
+accent-goblin-words-143 = have
+accent-goblin-words-144 = have not
+accent-goblin-words-145 = haven’t
+accent-goblin-words-146 = havent
+accent-goblin-words-147 = he
+accent-goblin-words-148 = head
+accent-goblin-words-149 = heal
+accent-goblin-words-150 = healing
+accent-goblin-words-151 = hear
+accent-goblin-words-152 = heard
+accent-goblin-words-153 = hearing
+accent-goblin-words-154 = hears
+accent-goblin-words-155 = heat
+accent-goblin-words-156 = heaven
+accent-goblin-words-157 = helix
+accent-goblin-words-158 = hell
+accent-goblin-words-159 = hellish
+accent-goblin-words-160 = hello
+accent-goblin-words-161 = helmet
+accent-goblin-words-162 = her
+accent-goblin-words-163 = heresy
+accent-goblin-words-164 = heretical
+accent-goblin-words-165 = hers
+accent-goblin-words-166 = herself
+accent-goblin-words-167 = hey
+accent-goblin-words-168 = hi
+accent-goblin-words-169 = hide
+accent-goblin-words-170 = hideous
+accent-goblin-words-171 = high
+accent-goblin-words-172 = highly
+accent-goblin-words-173 = him
+accent-goblin-words-174 = himself
+accent-goblin-words-175 = hint
+accent-goblin-words-176 = hinting
+accent-goblin-words-177 = hints
+accent-goblin-words-178 = hire
+accent-goblin-words-179 = hired
+accent-goblin-words-180 = hires
+accent-goblin-words-181 = hiring
+accent-goblin-words-182 = his
+accent-goblin-words-183 = hiss
+accent-goblin-words-184 = hit
+accent-goblin-words-185 = hold
+accent-goblin-words-186 = holding
+accent-goblin-words-187 = holly
+accent-goblin-words-188 = honour
+accent-goblin-words-189 = hope
+accent-goblin-words-190 = horizon
+accent-goblin-words-191 = horror
+accent-goblin-words-192 = horrors
+accent-goblin-words-193 = hose
+accent-goblin-words-194 = hospital
+accent-goblin-words-195 = hospitaller
+accent-goblin-words-196 = hot
+accent-goblin-words-197 = hothead
+accent-goblin-words-198 = hotheaded
+accent-goblin-words-199 = hotshot
+accent-goblin-words-200 = how
+accent-goblin-words-201 = however
+accent-goblin-words-202 = human
+accent-goblin-words-203 = humans
+accent-goblin-words-204 = hurl
+accent-goblin-words-205 = hurt
+accent-goblin-words-206 = hurting
+accent-goblin-words-207 = hush
+accent-goblin-words-208 = ideas
+accent-goblin-words-209 = idiot
+accent-goblin-words-210 = in the know
+accent-goblin-words-211 = in trouble
+accent-goblin-words-212 = inexperienced
+accent-goblin-words-213 = is
+accent-goblin-words-214 = is not
+accent-goblin-words-215 = isn’t
+accent-goblin-words-216 = isnt
+accent-goblin-words-217 = jailer
+accent-goblin-words-218 = jailers
+accent-goblin-words-219 = jest
+accent-goblin-words-220 = jester
+accent-goblin-words-221 = jesters
+accent-goblin-words-222 = jests
+accent-goblin-words-223 = kill
+accent-goblin-words-224 = killed
+accent-goblin-words-225 = killing
+accent-goblin-words-226 = kills
+accent-goblin-words-227 = know
+accent-goblin-words-228 = knowing
+accent-goblin-words-229 = knowledgeable
+accent-goblin-words-230 = leg
+accent-goblin-words-231 = legs
+accent-goblin-words-232 = lemme
+accent-goblin-words-233 = lie
+accent-goblin-words-234 = lied
+accent-goblin-words-235 = lies
+accent-goblin-words-236 = little
+accent-goblin-words-237 = look
+accent-goblin-words-238 = looked
+accent-goblin-words-239 = looking
+accent-goblin-words-240 = looks
+accent-goblin-words-241 = lying
+accent-goblin-words-242 = man
+accent-goblin-words-243 = McCargo
+accent-goblin-words-244 = meat
+accent-goblin-words-245 = medic
+accent-goblin-words-246 = men
+accent-goblin-words-247 = merc
+accent-goblin-words-248 = mercenaries
+accent-goblin-words-249 = mercenary
+accent-goblin-words-250 = mercs
+accent-goblin-words-251 = money
+accent-goblin-words-252 = mother
+accent-goblin-words-253 = mothers
+accent-goblin-words-254 = mouth
+accent-goblin-words-255 = moving
+accent-goblin-words-256 = murder
+accent-goblin-words-257 = murdered
+accent-goblin-words-258 = murdering
+accent-goblin-words-259 = myself
+accent-goblin-words-260 = neat
+accent-goblin-words-261 = neato
+accent-goblin-words-262 = nfsd
+accent-goblin-words-263 = nice
+accent-goblin-words-264 = no sense
+accent-goblin-words-265 = nonsense
+accent-goblin-words-266 = nonsensical
+accent-goblin-words-267 = nsfd
+accent-goblin-words-268 = officer
+accent-goblin-words-269 = paper
+accent-goblin-words-270 = papers
+accent-goblin-words-271 = pay
+accent-goblin-words-272 = person
+accent-goblin-words-273 = pilot
+accent-goblin-words-274 = pirate
+accent-goblin-words-275 = pirates
+accent-goblin-words-276 = poor
+accent-goblin-words-277 = prison
+accent-goblin-words-278 = prowler
+accent-goblin-words-279 = quickly
+accent-goblin-words-280 = reporter
+accent-goblin-words-281 = reporters
+accent-goblin-words-282 = restaurant
+accent-goblin-words-283 = rich
+accent-goblin-words-284 = rob
+accent-goblin-words-285 = robbed
+accent-goblin-words-286 = run
+accent-goblin-words-287 = saw
+accent-goblin-words-288 = scientific
+accent-goblin-words-289 = scientist
+accent-goblin-words-290 = scientists
+accent-goblin-words-291 = sec
+accent-goblin-words-292 = seccie
+accent-goblin-words-293 = security
+accent-goblin-words-294 = see
+accent-goblin-words-295 = seeing
+accent-goblin-words-296 = seen
+accent-goblin-words-297 = shit
+accent-goblin-words-298 = shitter
+accent-goblin-words-299 = shoe
+accent-goblin-words-300 = shoes
+accent-goblin-words-301 = shut up
+accent-goblin-words-302 = shut your mouth
+accent-goblin-words-303 = shuttle
+accent-goblin-words-304 = shuttles
+accent-goblin-words-305 = sleep
+accent-goblin-words-306 = sleeping
+accent-goblin-words-307 = slime
+accent-goblin-words-308 = slimes
+accent-goblin-words-309 = smart
+accent-goblin-words-310 = smoke
+accent-goblin-words-311 = smoked
+accent-goblin-words-312 = smokes
+accent-goblin-words-313 = smoking
+accent-goblin-words-314 = soccer
+accent-goblin-words-315 = something
+accent-goblin-words-316 = speak
+accent-goblin-words-317 = speaking
+accent-goblin-words-318 = spesos
+accent-goblin-words-319 = spoke
+accent-goblin-words-320 = steal
+accent-goblin-words-321 = stealing
+accent-goblin-words-322 = stole
+accent-goblin-words-323 = stolen
+accent-goblin-words-324 = stop
+accent-goblin-words-325 = stupid
+accent-goblin-words-326 = syndi
+accent-goblin-words-327 = syndicate
+accent-goblin-words-328 = syndicates
+accent-goblin-words-329 = syndie
+accent-goblin-words-330 = syndies
+accent-goblin-words-331 = syndis
+accent-goblin-words-332 = take
+accent-goblin-words-333 = takes
+accent-goblin-words-334 = taking
+accent-goblin-words-335 = talk
+accent-goblin-words-336 = talking
+accent-goblin-words-337 = talks
+accent-goblin-words-338 = templar
+accent-goblin-words-339 = theft
+accent-goblin-words-340 = thief
+accent-goblin-words-341 = thieving
+accent-goblin-words-342 = thing
+accent-goblin-words-343 = think
+accent-goblin-words-344 = thinking
+accent-goblin-words-345 = thought
+accent-goblin-words-346 = thoughts
+accent-goblin-words-347 = tobacco
+accent-goblin-words-348 = took
+accent-goblin-words-349 = trick
+accent-goblin-words-350 = tricked
+accent-goblin-words-351 = tricky
+accent-goblin-words-352 = warden
+accent-goblin-words-353 = wardens
+accent-goblin-words-354 = watch
+accent-goblin-words-355 = watched
+accent-goblin-words-356 = watches
+accent-goblin-words-357 = watching
+accent-goblin-words-358 = water
+accent-goblin-words-359 = whether
+accent-goblin-words-360 = with
+accent-goblin-words-361 = without
+accent-goblin-words-362 = write
+accent-goblin-words-363 = writes
+accent-goblin-words-364 = writing
+accent-goblin-words-365 = written
+accent-goblin-words-366 = wrote
+
+accent-goblin-words-replace-1 = swag
+accent-goblin-words-replace-2 = jiggah
+accent-goblin-words-replace-3 = jiggahs
+accent-goblin-words-replace-4 = be
+accent-goblin-words-replace-5 = ain’t
+accent-goblin-words-replace-6 = wrinkle
+accent-goblin-words-replace-7 = cur
+accent-goblin-words-replace-8 = anyfin’
+accent-goblin-words-replace-9 = be
+accent-goblin-words-replace-10 = ain’t
+accent-goblin-words-replace-11 = ain’t
+accent-goblin-words-replace-12 = ain’t
+accent-goblin-words-replace-13 = snaffle
+accent-goblin-words-replace-14 = snaffled
+accent-goblin-words-replace-15 = snafflin’
+accent-goblin-words-replace-16 = snaffles
+accent-goblin-words-replace-17 = frummagemm
+accent-goblin-words-replace-18 = frummagemmed
+accent-goblin-words-replace-19 = frummagemmin'
+accent-goblin-words-replace-20 = frummagemms
+accent-goblin-words-replace-21 = poke
+accent-goblin-words-replace-22 = pokes
+accent-goblin-words-replace-23 = jiggah-dubbah
+accent-goblin-words-replace-24 = jiggah-dubbahs
+accent-goblin-words-replace-25 = slog
+accent-goblin-words-replace-26 = slogged
+accent-goblin-words-replace-27 = sloggin'
+accent-goblin-words-replace-28 = slogs
+accent-goblin-words-replace-29 = lush
+accent-goblin-words-replace-30 = grubbin’-ken
+accent-goblin-words-replace-31 = slour
+accent-goblin-words-replace-32 = sloured
+accent-goblin-words-replace-33 = stampah
+accent-goblin-words-replace-34 = stampahs
+accent-goblin-words-replace-35 = lush
+accent-goblin-words-replace-36 = 'um-drummed
+accent-goblin-words-replace-37 = 'um-drum
+accent-goblin-words-replace-38 = bo’le
+accent-goblin-words-replace-39 = bo’les
+accent-goblin-words-replace-40 = article
+accent-goblin-words-replace-41 = articles
+accent-goblin-words-replace-42 = quod
+accent-goblin-words-replace-43 = brovah
+accent-goblin-words-replace-44 = brovahs
+accent-goblin-words-replace-45 = fudge
+accent-goblin-words-replace-46 = fudgin’
+accent-goblin-words-replace-47 = ra’lah
+accent-goblin-words-replace-48 = bossman
+accent-goblin-words-replace-49 = bossmen
+accent-goblin-words-replace-50 = dimmocks
+accent-goblin-words-replace-51 = tufts
+accent-goblin-words-replace-52 = slop
+accent-goblin-words-replace-53 = rook
+accent-goblin-words-replace-54 = dub
+accent-goblin-words-replace-55 = dubbed
+accent-goblin-words-replace-56 = dubbin’
+accent-goblin-words-replace-57 = dunnage
+accent-goblin-words-replace-58 = lark
+accent-goblin-words-replace-59 = larks
+accent-goblin-words-replace-60 = tufts
+accent-goblin-words-replace-61 = croakah
+accent-goblin-words-replace-62 = laggah
+accent-goblin-words-replace-63 = jack tar
+accent-goblin-words-replace-64 = laggah
+accent-goblin-words-replace-65 = jack tars
+accent-goblin-words-replace-66 = job
+accent-goblin-words-replace-67 = jobs
+accent-goblin-words-replace-68 = jilt
+accent-goblin-words-replace-69 = jilts
+accent-goblin-words-replace-70 = bracelet
+accent-goblin-words-replace-71 = braceleted
+accent-goblin-words-replace-72 = bracele’in’
+accent-goblin-words-replace-73 = bracelets
+accent-goblin-words-replace-74 = chive
+accent-goblin-words-replace-75 = chives
+accent-goblin-words-replace-76 = chivin’
+accent-goblin-words-replace-77 = croakah
+accent-goblin-words-replace-78 = fence
+accent-goblin-words-replace-79 = fences
+accent-goblin-words-replace-80 = coopah
+accent-goblin-words-replace-81 = coopah'd
+accent-goblin-words-replace-82 = coopin’
+accent-goblin-words-replace-83 = grubbin’-ken
+accent-goblin-words-replace-84 = jiggah
+accent-goblin-words-replace-85 = jiggahs
+accent-goblin-words-replace-86 = crocus
+accent-goblin-words-replace-87 = jiggah
+accent-goblin-words-replace-88 = jiggahs
+accent-goblin-words-replace-89 = bub
+accent-goblin-words-replace-90 = bubbin’
+accent-goblin-words-replace-91 = bubs
+accent-goblin-words-replace-92 = trap
+accent-goblin-words-replace-93 = trap
+accent-goblin-words-replace-94 = stunty
+accent-goblin-words-replace-95 = stunties
+accent-goblin-words-replace-96 = emi’ah
+accent-goblin-words-replace-97 = everyfin’
+accent-goblin-words-replace-98 = baked
+accent-goblin-words-replace-99 = dashin'
+accent-goblin-words-replace-100 = favah
+accent-goblin-words-replace-101 = favahs
+accent-goblin-words-replace-102 = drags
+accent-goblin-words-replace-103 = drag
+accent-goblin-words-replace-104 = draggin’
+accent-goblin-words-replace-105 = dog
+accent-goblin-words-replace-106 = dogged
+accent-goblin-words-replace-107 = doggin’
+accent-goblin-words-replace-108 = dogs
+accent-goblin-words-replace-109 = grub
+accent-goblin-words-replace-110 = grubbin’-ken
+accent-goblin-words-replace-111 = grubbin’-ken
+accent-goblin-words-replace-112 = grubbin’-ken
+accent-goblin-words-replace-113 = grubbin’-ken
+accent-goblin-words-replace-114 = grubbin’-ken
+accent-goblin-words-replace-115 = grubbin’-ken
+accent-goblin-words-replace-116 = cake
+accent-goblin-words-replace-117 = cranky
+accent-goblin-words-replace-118 = soccer
+accent-goblin-words-replace-119 = fuckin’
+accent-goblin-words-replace-120 = bunged
+accent-goblin-words-replace-121 = bung
+accent-goblin-words-replace-122 = bungs
+accent-goblin-words-replace-123 = bungin’
+accent-goblin-words-replace-124 = goin' to
+accent-goblin-words-replace-125 = goin' to
+accent-goblin-words-replace-126 = li’le snack
+accent-goblin-words-replace-127 = 'amper
+accent-goblin-words-replace-128 = li’le snack
+accent-goblin-words-replace-129 = li’le snack
+accent-goblin-words-replace-130 = li’le snack
+accent-goblin-words-replace-131 = 'and
+accent-goblin-words-replace-132 = darbies
+accent-goblin-words-replace-133 = 'arass
+accent-goblin-words-replace-134 = 'arasses
+accent-goblin-words-replace-135 = 'arassin’
+accent-goblin-words-replace-136 = 'arassment
+accent-goblin-words-replace-137 = 'arbour
+accent-goblin-words-replace-138 = 'ard
+accent-goblin-words-replace-139 = 'as
+accent-goblin-words-replace-140 = 'as not
+accent-goblin-words-replace-141 = ain’t
+accent-goblin-words-replace-142 = ain’t
+accent-goblin-words-replace-143 = 'ave
+accent-goblin-words-replace-144 = 'ave not
+accent-goblin-words-replace-145 = ain’t
+accent-goblin-words-replace-146 = ain’t
+accent-goblin-words-replace-147 = 'e
+accent-goblin-words-replace-148 = 'ead
+accent-goblin-words-replace-149 = 'eal
+accent-goblin-words-replace-150 = 'ealin’
+accent-goblin-words-replace-151 = 'ear
+accent-goblin-words-replace-152 = 'eard
+accent-goblin-words-replace-153 = 'earin’
+accent-goblin-words-replace-154 = 'ears
+accent-goblin-words-replace-155 = 'eat
+accent-goblin-words-replace-156 = 'eaven
+accent-goblin-words-replace-157 = 'elix
+accent-goblin-words-replace-158 = 'ell
+accent-goblin-words-replace-159 = 'ellish
+accent-goblin-words-replace-160 = 'ello
+accent-goblin-words-replace-161 = 'elmet
+accent-goblin-words-replace-162 = 'er
+accent-goblin-words-replace-163 = 'eresy
+accent-goblin-words-replace-164 = 'eretical
+accent-goblin-words-replace-165 = 'ers
+accent-goblin-words-replace-166 = 'erseuf
+accent-goblin-words-replace-167 = oi
+accent-goblin-words-replace-168 = oi
+accent-goblin-words-replace-169 = 'ide
+accent-goblin-words-replace-170 = 'ideous
+accent-goblin-words-replace-171 = 'igh
+accent-goblin-words-replace-172 = 'ighly
+accent-goblin-words-replace-173 = 'im
+accent-goblin-words-replace-174 = 'imseuf
+accent-goblin-words-replace-175 = 'int
+accent-goblin-words-replace-176 = 'intin’
+accent-goblin-words-replace-177 = 'ints
+accent-goblin-words-replace-178 = 'ire
+accent-goblin-words-replace-179 = 'ired
+accent-goblin-words-replace-180 = 'ires
+accent-goblin-words-replace-181 = 'irin’
+accent-goblin-words-replace-182 = 'is
+accent-goblin-words-replace-183 = 'iss
+accent-goblin-words-replace-184 = 'it
+accent-goblin-words-replace-185 = 'old
+accent-goblin-words-replace-186 = 'oldin’
+accent-goblin-words-replace-187 = 'olly
+accent-goblin-words-replace-188 = 'onour
+accent-goblin-words-replace-189 = 'ope
+accent-goblin-words-replace-190 = 'orizon
+accent-goblin-words-replace-191 = 'orror
+accent-goblin-words-replace-192 = 'orrors
+accent-goblin-words-replace-193 = 'ose
+accent-goblin-words-replace-194 = 'ospital
+accent-goblin-words-replace-195 = 'ospitaller
+accent-goblin-words-replace-196 = 'ot
+accent-goblin-words-replace-197 = 'ot'ead
+accent-goblin-words-replace-198 = 'ot'eaded
+accent-goblin-words-replace-199 = 'otshot
+accent-goblin-words-replace-200 = 'aw
+accent-goblin-words-replace-201 = 'owever
+accent-goblin-words-replace-202 = 'uman
+accent-goblin-words-replace-203 = 'umans
+accent-goblin-words-replace-204 = 'url
+accent-goblin-words-replace-205 = 'urt
+accent-goblin-words-replace-206 = 'urtin’
+accent-goblin-words-replace-207 = 'ush
+accent-goblin-words-replace-208 = wrinkles
+accent-goblin-words-replace-209 = natural
+accent-goblin-words-replace-210 = wide awake
+accent-goblin-words-replace-211 = in for it
+accent-goblin-words-replace-212 = half baked
+accent-goblin-words-replace-213 = be
+accent-goblin-words-replace-214 = ain’t
+accent-goblin-words-replace-215 = ain’t
+accent-goblin-words-replace-216 = ain’t
+accent-goblin-words-replace-217 = jiggah-dubbah
+accent-goblin-words-replace-218 = jiggah-dubbahs
+accent-goblin-words-replace-219 = skit
+accent-goblin-words-replace-220 = skit
+accent-goblin-words-replace-221 = skits
+accent-goblin-words-replace-222 = skits
+accent-goblin-words-replace-223 = burke
+accent-goblin-words-replace-224 = burked
+accent-goblin-words-replace-225 = burkin’
+accent-goblin-words-replace-226 = burks
+accent-goblin-words-replace-227 = savey
+accent-goblin-words-replace-228 = savey
+accent-goblin-words-replace-229 = wide awake
+accent-goblin-words-replace-230 = stampe
+accent-goblin-words-replace-231 = stampes
+accent-goblin-words-replace-232 = let me
+accent-goblin-words-replace-233 = flam
+accent-goblin-words-replace-234 = flamed
+accent-goblin-words-replace-235 = flams
+accent-goblin-words-replace-236 = li’le
+accent-goblin-words-replace-237 = ogle
+accent-goblin-words-replace-238 = ogled
+accent-goblin-words-replace-239 = oglin’
+accent-goblin-words-replace-240 = ogles
+accent-goblin-words-replace-241 = flamin’
+accent-goblin-words-replace-242 = article
+accent-goblin-words-replace-243 = grubbin’-ken
+accent-goblin-words-replace-244 = prog
+accent-goblin-words-replace-245 = crocus
+accent-goblin-words-replace-246 = articles
+accent-goblin-words-replace-247 = blade
+accent-goblin-words-replace-248 = blades
+accent-goblin-words-replace-249 = blade
+accent-goblin-words-replace-250 = blades
+accent-goblin-words-replace-251 = dimmocks
+accent-goblin-words-replace-252 = movah
+accent-goblin-words-replace-253 = movahs
+accent-goblin-words-replace-254 = gob
+accent-goblin-words-replace-255 = movin’
+accent-goblin-words-replace-256 = burke
+accent-goblin-words-replace-257 = burked
+accent-goblin-words-replace-258 = burkin’
+accent-goblin-words-replace-259 = meseuf
+accent-goblin-words-replace-260 = dimbah
+accent-goblin-words-replace-261 = dimbah
+accent-goblin-words-replace-262 = coppahs
+accent-goblin-words-replace-263 = rootah
+accent-goblin-words-replace-264 = fudge
+accent-goblin-words-replace-265 = fudge
+accent-goblin-words-replace-266 = fudge
+accent-goblin-words-replace-267 = coppahs
+accent-goblin-words-replace-268 = coppah
+accent-goblin-words-replace-269 = linendraper
+accent-goblin-words-replace-270 = linendrapers
+accent-goblin-words-replace-271 = bit
+accent-goblin-words-replace-272 = bloke
+accent-goblin-words-replace-273 = jarvey
+accent-goblin-words-replace-274 = rampsman
+accent-goblin-words-replace-275 = rampsmen
+accent-goblin-words-replace-276 = quisby
+accent-goblin-words-replace-277 = lock-up
+accent-goblin-words-replace-278 = prowlah
+accent-goblin-words-replace-279 = winkin’
+accent-goblin-words-replace-280 = penny-a-liner
+accent-goblin-words-replace-281 = penny-a-liners
+accent-goblin-words-replace-282 = grubbin’-ken
+accent-goblin-words-replace-283 = flush
+accent-goblin-words-replace-284 = fylche
+accent-goblin-words-replace-285 = fylched
+accent-goblin-words-replace-286 = pike
+accent-goblin-words-replace-287 = staged
+accent-goblin-words-replace-288 = rumgumptious
+accent-goblin-words-replace-289 = gnostic
+accent-goblin-words-replace-290 = gnostics
+accent-goblin-words-replace-291 = coppah
+accent-goblin-words-replace-292 = beak
+accent-goblin-words-replace-293 = coppah
+accent-goblin-words-replace-294 = stags
+accent-goblin-words-replace-295 = staggin’
+accent-goblin-words-replace-296 = staged
+accent-goblin-words-replace-297 = dung
+accent-goblin-words-replace-298 = dungah
+accent-goblin-words-replace-299 = stampah
+accent-goblin-words-replace-300 = stampahs
+accent-goblin-words-replace-301 = avast
+accent-goblin-words-replace-302 = avast ya gob
+accent-goblin-words-replace-303 = shu’le
+accent-goblin-words-replace-304 = shu’les
+accent-goblin-words-replace-305 = doss
+accent-goblin-words-replace-306 = dossin’
+accent-goblin-words-replace-307 = ooze
+accent-goblin-words-replace-308 = oozes
+accent-goblin-words-replace-309 = dimbah-dambah
+accent-goblin-words-replace-310 = blow a cloud
+accent-goblin-words-replace-311 = blew a clowd
+accent-goblin-words-replace-312 = blows a cloud
+accent-goblin-words-replace-313 = blowin’ a cloud
+accent-goblin-words-replace-314 = football
+accent-goblin-words-replace-315 = somefin'
+accent-goblin-words-replace-316 = pa'ah
+accent-goblin-words-replace-317 = pa'ahin’
+accent-goblin-words-replace-318 = dimmocks
+accent-goblin-words-replace-319 = pa'ed
+accent-goblin-words-replace-320 = fylche
+accent-goblin-words-replace-321 = fylchin’
+accent-goblin-words-replace-322 = fylched
+accent-goblin-words-replace-323 = fylched
+accent-goblin-words-replace-324 = avast
+accent-goblin-words-replace-325 = duffah
+accent-goblin-words-replace-326 = lobster
+accent-goblin-words-replace-327 = lobster
+accent-goblin-words-replace-328 = lobsters
+accent-goblin-words-replace-329 = lobster
+accent-goblin-words-replace-330 = lobsters
+accent-goblin-words-replace-331 = lobsters
+accent-goblin-words-replace-332 = knap
+accent-goblin-words-replace-333 = knaps
+accent-goblin-words-replace-334 = knappin'
+accent-goblin-words-replace-335 = gab
+accent-goblin-words-replace-336 = gabbin'
+accent-goblin-words-replace-337 = gabs
+accent-goblin-words-replace-338 = templah
+accent-goblin-words-replace-339 = fylchin’
+accent-goblin-words-replace-340 = fylchah
+accent-goblin-words-replace-341 = fylchin’
+accent-goblin-words-replace-342 = fin’
+accent-goblin-words-replace-343 = fink
+accent-goblin-words-replace-344 = finkin’
+accent-goblin-words-replace-345 = fought
+accent-goblin-words-replace-346 = foughts
+accent-goblin-words-replace-347 = fogus
+accent-goblin-words-replace-348 = knapped
+accent-goblin-words-replace-349 = rig
+accent-goblin-words-replace-350 = rigged
+accent-goblin-words-replace-351 = riggy
+accent-goblin-words-replace-352 = jiggah-dubbah
+accent-goblin-words-replace-353 = jiggah-dubbahs
+accent-goblin-words-replace-354 = tout
+accent-goblin-words-replace-355 = touted
+accent-goblin-words-replace-356 = touts
+accent-goblin-words-replace-357 = toutin’
+accent-goblin-words-replace-358 = wo’ah
+accent-goblin-words-replace-359 = wever
+accent-goblin-words-replace-360 = wiv
+accent-goblin-words-replace-361 = wivout
+accent-goblin-words-replace-362 = screeve
+accent-goblin-words-replace-363 = screeves
+accent-goblin-words-replace-364 = screevin’
+accent-goblin-words-replace-365 = screeved
+accent-goblin-words-replace-366 = screeved
diff --git a/Resources/Locale/en-US/_NF/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/_NF/chat/managers/chat_manager.ftl
index ddc0bde87c5..897a4cb0375 100644
--- a/Resources/Locale/en-US/_NF/chat/managers/chat_manager.ftl
+++ b/Resources/Locale/en-US/_NF/chat/managers/chat_manager.ftl
@@ -16,3 +16,10 @@ chat-speech-verb-harpy-1 = chirps
 chat-speech-verb-harpy-2 = tweets
 chat-speech-verb-harpy-3 = caws
 chat-speech-verb-harpy-4 = trills
+
+chat-speech-verb-name-goblin = Goblin
+chat-speech-verb-goblin-1 = jabbers
+chat-speech-verb-goblin-2 = vokers
+chat-speech-verb-goblin-3 = blurts out
+chat-speech-verb-goblin-4 = patters
+chat-speech-verb-goblin-5 = cuts
diff --git a/Resources/Locale/en-US/_NF/reagents/foods.ftl b/Resources/Locale/en-US/_NF/reagents/foods.ftl
index c4e85782ce8..5cb08e3134b 100644
--- a/Resources/Locale/en-US/_NF/reagents/foods.ftl
+++ b/Resources/Locale/en-US/_NF/reagents/foods.ftl
@@ -1 +1 @@
-reagent-name-flaverol = Flaverol
\ No newline at end of file
+reagent-name-flaverol = Flaverol
diff --git a/Resources/Locale/en-US/_NF/species/species.ftl b/Resources/Locale/en-US/_NF/species/species.ftl
index d0343e3239c..534b88ec465 100644
--- a/Resources/Locale/en-US/_NF/species/species.ftl
+++ b/Resources/Locale/en-US/_NF/species/species.ftl
@@ -1,3 +1,4 @@
 ## Species Names
 
 species-name-vulpkanin = Vulpkanin
+species-name-goblin = Goblin
diff --git a/Resources/Locale/en-US/_NF/traits/traits.ftl b/Resources/Locale/en-US/_NF/traits/traits.ftl
index 5e645760129..569153d67fc 100644
--- a/Resources/Locale/en-US/_NF/traits/traits.ftl
+++ b/Resources/Locale/en-US/_NF/traits/traits.ftl
@@ -5,3 +5,6 @@ trait-stinky-examined = [color=lightblue]{CAPITALIZE(SUBJECT($target))} smells f
 
 trait-stinky-in-range-others = {$target} smells foul!
 trait-stinky-in-range-self = Something smells foul!
+
+trait-goblin-accent-name = Goblin Cant
+trait-goblin-accent-desc = You speak in secret language many find annoying and not that secretive.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/markings/goblin_markings.ftl b/Resources/Locale/en-US/markings/goblin_markings.ftl
new file mode 100644
index 00000000000..3f5c96da32b
--- /dev/null
+++ b/Resources/Locale/en-US/markings/goblin_markings.ftl
@@ -0,0 +1,15 @@
+# goblin ears
+marking-GoblinEarsBasic = Basic Ears
+marking-GoblinEarsBasicAlt = Basic Ears (Alt)
+marking-GoblinEarsLong01 = Long Ears (tips down)
+marking-GoblinEarsLong02 = Long Ears (tips up)
+
+# goblin noses
+marking-GoblinNoseBasic = Basic Nose
+marking-GoblinNoseLong = Long Nose
+marking-GoblinNoseCrooked = Crooked Nose
+
+# goblin tusks
+marking-GoblinTusksBasic = No Tusks
+marking-GoblinTusksSmall = Small Tusks
+marking-GoblinTusksBig = Long Tusks
diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
index 1a4c6e691b5..5e0fa8b70ab 100644
--- a/Resources/Maps/_NF/Outpost/frontier.yml
+++ b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -192,39 +192,39 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            2085: 3,40
-            2086: 4,40
+            2075: 3,40
+            2076: 4,40
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            2087: 3,37
-            2088: 4,37
+            2077: 3,37
+            2078: 4,37
         - node:
             color: '#334E6DC8'
             id: ArrowsGreyscale
           decals:
-            2010: 0,9
-            2011: 0,9
-            2012: 0,9
-            2013: 0,9
-            2045: -2,9
-            2046: -2,9
-            2047: -2,9
-            2048: -2,9
-            2049: -2,9
+            2000: 0,9
+            2001: 0,9
+            2002: 0,9
+            2003: 0,9
+            2035: -2,9
+            2036: -2,9
+            2037: -2,9
+            2038: -2,9
+            2039: -2,9
         - node:
             angle: 3.141592653589793 rad
             color: '#334E6DC8'
             id: ArrowsGreyscale
           decals:
-            2004: -2,12
-            2005: -2,12
-            2006: -2,12
-            2007: 0,12
-            2008: 0,12
-            2009: 0,12
+            1994: -2,12
+            1995: -2,12
+            1996: -2,12
+            1997: 0,12
+            1998: 0,12
+            1999: 0,12
         - node:
             color: '#52B4E9FF'
             id: ArrowsGreyscale
@@ -238,52 +238,52 @@ entities:
             color: '#52B4F3AD'
             id: ArrowsGreyscale
           decals:
-            1555: 23,21
-            1556: 23,21
-            1557: 23,21
-            1558: 23,21
-            1559: 23,21
-            1560: 23,21
-            1561: 23,21
-            1562: 23,21
-            1563: 23,21
-            1564: 23,21
-            1567: 21,21
-            1568: 21,21
-            1569: 21,21
-            1570: 21,21
+            1545: 23,21
+            1546: 23,21
+            1547: 23,21
+            1548: 23,21
+            1549: 23,21
+            1550: 23,21
+            1551: 23,21
+            1552: 23,21
+            1553: 23,21
+            1554: 23,21
+            1557: 21,21
+            1558: 21,21
+            1559: 21,21
+            1560: 21,21
         - node:
             zIndex: 180
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            2113: -1,45
-            2114: -1,44
-            2115: -1,43
-            2116: 5,43
-            2117: 5,44
-            2118: 5,45
-            2119: 2,48
+            2103: -1,45
+            2104: -1,44
+            2105: -1,43
+            2106: 5,43
+            2107: 5,44
+            2108: 5,45
+            2109: 2,48
         - node:
             color: '#2E9935FF'
             id: BotLeftGreyscale
           decals:
-            2821: 8,25
-            2822: 7,25
-            2823: 6,25
-            2824: 5,25
-            2825: 4,25
+            2777: 8,25
+            2778: 7,25
+            2779: 6,25
+            2780: 5,25
+            2781: 4,25
         - node:
             color: '#52B4E996'
             id: BotLeftGreyscale
           decals:
-            2480: 26,20
+            2470: 26,20
         - node:
             color: '#52B4E9AE'
             id: BotLeftGreyscale
           decals:
-            1554: 24,20
+            1544: 24,20
         - node:
             color: '#52B4E9FF'
             id: BotLeftGreyscale
@@ -311,120 +311,120 @@ entities:
             332: 3,14
             333: 3,12
             334: 3,10
-            2452: -5,10
-            2453: -5,12
-            2454: -5,14
-            2455: -5,17
+            2442: -5,10
+            2443: -5,12
+            2444: -5,14
+            2445: -5,17
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BrickTileDarkBox
           decals:
-            1349: -5,17
-            1350: -5,14
-            1351: -5,12
-            1352: -5,10
+            1348: -5,17
+            1349: -5,14
+            1350: -5,12
+            1351: -5,10
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
           decals:
             335: -4,28
-            1993: 1,9
-            2489: 22,12
+            1983: 1,9
+            2479: 22,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
           decals:
             338: -6,28
-            2042: -3,9
-            2492: 19,12
+            2032: -3,9
+            2482: 19,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
           decals:
             337: -4,26
             345: 22,9
-            1354: 1,12
+            1353: 1,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
           decals:
             336: -6,26
             346: 19,9
-            1353: -3,12
+            1352: -3,12
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkInnerNe
           decals:
-            1969: -3,12
-            1970: -3,12
-            1979: -1,12
-            1980: -1,12
+            1959: -3,12
+            1960: -3,12
+            1969: -1,12
+            1970: -1,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
           decals:
             160: 4,14
             283: 11,12
-            1995: 0,9
+            1985: 0,9
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkInnerNw
           decals:
-            1973: -1,12
-            1974: -1,12
-            1981: 1,12
-            1982: 1,12
+            1963: -1,12
+            1964: -1,12
+            1971: 1,12
+            1972: 1,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
           decals:
             284: 16,12
-            2044: -2,9
+            2034: -2,9
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkInnerSe
           decals:
-            2030: -1,9
-            2031: -1,9
-            2032: -3,9
-            2033: -3,9
+            2020: -1,9
+            2021: -1,9
+            2022: -3,9
+            2023: -3,9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
           decals:
             159: 4,17
-            1358: 0,12
+            1357: 0,12
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkInnerSw
           decals:
-            2000: 1,9
-            2001: 1,9
-            2036: -1,9
-            2037: -1,9
+            1990: 1,9
+            1991: 1,9
+            2026: -1,9
+            2027: -1,9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
           decals:
-            1357: -2,12
+            1356: -2,12
         - node:
             color: '#52B4E996'
             id: BrickTileDarkLineE
           decals:
-            2460: -48,2
+            2450: -48,2
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkLineE
           decals:
-            1967: -3,13
-            1968: -3,13
-            1977: -1,13
-            1978: -1,13
-            2024: -3,8
-            2025: -3,8
-            2026: -1,8
-            2027: -1,8
+            1957: -3,13
+            1958: -3,13
+            1967: -1,13
+            1968: -1,13
+            2014: -3,8
+            2015: -3,8
+            2016: -1,8
+            2017: -1,8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
@@ -434,28 +434,28 @@ entities:
             287: 11,13
             288: 11,14
             341: -4,27
-            1355: 1,13
-            1994: 1,8
-            2017: -3,11
-            2018: -3,10
-            2458: -48,2
-            2459: -48,1
-            2487: 22,10
-            2488: 22,11
+            1354: 1,13
+            1984: 1,8
+            2007: -3,11
+            2008: -3,10
+            2448: -48,2
+            2449: -48,1
+            2477: 22,10
+            2478: 22,11
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkLineN
           decals:
-            1971: -2,12
-            1972: -2,12
-            1985: 0,12
-            1986: 0,12
-            1996: 0,9
-            1997: 0,9
-            2038: -1,9
-            2039: -1,9
-            2040: -2,9
-            2041: -2,9
+            1961: -2,12
+            1962: -2,12
+            1975: 0,12
+            1976: 0,12
+            1986: 0,9
+            1987: 0,9
+            2028: -1,9
+            2029: -1,9
+            2030: -2,9
+            2031: -2,9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -476,22 +476,22 @@ entities:
             282: 15,12
             313: 7,16
             339: -5,28
-            2490: 21,12
-            2491: 20,12
+            2480: 21,12
+            2481: 20,12
         - node:
             color: '#FFFFFF81'
             id: BrickTileDarkLineS
           decals:
-            1987: -2,12
-            1988: -2,12
-            1989: 0,12
-            1990: 0,12
-            1991: -1,12
-            1992: -1,12
-            2002: 0,9
-            2003: 0,9
-            2034: -2,9
-            2035: -2,9
+            1977: -2,12
+            1978: -2,12
+            1979: 0,12
+            1980: 0,12
+            1981: -1,12
+            1982: -1,12
+            1992: 0,9
+            1993: 0,9
+            2024: -2,9
+            2025: -2,9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -515,14 +515,14 @@ entities:
             color: '#FFFFFF81'
             id: BrickTileDarkLineW
           decals:
-            1975: -1,13
-            1976: -1,13
-            1983: 1,13
-            1984: 1,13
-            1998: 1,8
-            1999: 1,8
-            2028: -1,8
-            2029: -1,8
+            1965: -1,13
+            1966: -1,13
+            1973: 1,13
+            1974: 1,13
+            1988: 1,8
+            1989: 1,8
+            2018: -1,8
+            2019: -1,8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
@@ -536,12 +536,12 @@ entities:
             285: 16,13
             286: 16,14
             342: -6,27
-            1356: -3,13
-            2015: 1,11
-            2016: 1,10
-            2043: -3,8
-            2493: 19,11
-            2494: 19,10
+            1355: -3,13
+            2005: 1,11
+            2006: 1,10
+            2033: -3,8
+            2483: 19,11
+            2484: 19,10
         - node:
             color: '#52B4E9FF'
             id: BrickTileSteelCornerNe
@@ -551,23 +551,23 @@ entities:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNe
           decals:
-            2630: 32,18
+            2620: 32,18
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNw
           decals:
-            2607: 27,18
+            2597: 27,18
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerSe
           decals:
-            2643: 32,15
+            2633: 32,15
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerSw
           decals:
-            2608: 27,16
-            2644: 31,15
+            2598: 27,16
+            2634: 31,15
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndN
@@ -577,19 +577,19 @@ entities:
             383: 19,21
             384: 25,21
             385: 27,21
-            1565: 23,21
-            1566: 21,21
+            1555: 23,21
+            1556: 21,21
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSw
           decals:
-            2645: 31,16
+            2635: 31,16
         - node:
             color: '#52B4E996'
             id: BrickTileSteelLineE
           decals:
-            2461: -48,2
-            2462: -48,1
+            2451: -48,2
+            2452: -48,1
         - node:
             color: '#52B4E9FF'
             id: BrickTileSteelLineE
@@ -603,10 +603,10 @@ entities:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineE
           decals:
-            2022: 0,11
-            2023: 0,10
-            2631: 32,17
-            2642: 32,16
+            2012: 0,11
+            2013: 0,10
+            2621: 32,17
+            2632: 32,16
         - node:
             color: '#52B4E9FF'
             id: BrickTileSteelLineN
@@ -626,29 +626,29 @@ entities:
             color: '#FF5C5CFF'
             id: BrickTileSteelLineN
           decals:
-            2699: 37,20
-            2700: 36,20
+            2655: 37,20
+            2656: 36,20
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineN
           decals:
-            2610: 28,18
-            2611: 29,18
-            2612: 30,18
-            2632: 31,18
+            2600: 28,18
+            2601: 29,18
+            2602: 30,18
+            2622: 31,18
         - node:
             color: '#FF5C5CFF'
             id: BrickTileSteelLineS
           decals:
-            2701: 37,20
-            2702: 36,20
+            2657: 37,20
+            2658: 36,20
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineS
           decals:
-            2613: 28,16
-            2614: 29,16
-            2615: 30,16
+            2603: 28,16
+            2604: 29,16
+            2605: 30,16
         - node:
             color: '#52B4E9FF'
             id: BrickTileSteelLineW
@@ -667,42 +667,42 @@ entities:
             id: BrickTileSteelLineW
           decals:
             155: -3,42
-            2014: -2,10
-            2021: -2,11
-            2609: 27,17
+            2004: -2,10
+            2011: -2,11
+            2599: 27,17
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerNe
           decals:
             189: -48,18
             686: -44,11
-            2838: 5,23
+            2794: 5,23
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerNw
           decals:
             187: -50,18
             684: -46,11
-            2839: 3,23
+            2795: 3,23
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerSe
           decals:
             186: -48,17
             679: -44,8
-            2846: 5,20
+            2802: 5,20
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSw
           decals:
-            2077: -3,36
+            2067: -3,36
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteCornerSw
           decals:
             188: -50,17
             681: -46,8
-            2847: 3,20
+            2803: 3,20
         - node:
             color: '#52DFC4DB'
             id: BrickTileWhiteInnerNe
@@ -749,20 +749,20 @@ entities:
             color: '#A4610696'
             id: BrickTileWhiteLineE
           decals:
-            2090: 8,52
-            2091: 8,51
-            2092: 8,50
-            2093: 8,49
-            2094: 8,48
-            2095: 8,47
-            2096: 8,46
-            2097: 8,45
-            2098: 8,44
-            2099: 8,43
-            2100: 8,42
-            2101: 8,41
-            2102: 8,56
-            2103: 8,57
+            2080: 8,52
+            2081: 8,51
+            2082: 8,50
+            2083: 8,49
+            2084: 8,48
+            2085: 8,47
+            2086: 8,46
+            2087: 8,45
+            2088: 8,44
+            2089: 8,43
+            2090: 8,42
+            2091: 8,41
+            2092: 8,56
+            2093: 8,57
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineE
@@ -778,8 +778,8 @@ entities:
           decals:
             687: -44,10
             688: -44,9
-            2841: 5,22
-            2842: 5,21
+            2797: 5,22
+            2798: 5,21
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineN
@@ -825,7 +825,7 @@ entities:
           decals:
             191: -49,18
             685: -45,11
-            2840: 4,23
+            2796: 4,23
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineS
@@ -846,13 +846,13 @@ entities:
             color: '#A4610696'
             id: BrickTileWhiteLineS
           decals:
-            2078: -2,36
-            2079: -1,36
-            2080: 0,36
-            2081: 1,36
-            2082: 2,36
-            2083: 3,36
-            2084: 4,36
+            2068: -2,36
+            2069: -1,36
+            2070: 0,36
+            2071: 1,36
+            2072: 2,36
+            2073: 3,36
+            2074: 4,36
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
@@ -876,7 +876,7 @@ entities:
           decals:
             190: -49,17
             680: -45,8
-            2845: 4,20
+            2801: 4,20
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
@@ -894,18 +894,18 @@ entities:
             id: BrickTileWhiteLineW
           decals:
             156: -3,42
-            2072: -3,41
-            2073: -3,40
-            2074: -3,39
-            2075: -3,38
-            2076: -3,37
+            2062: -3,41
+            2063: -3,40
+            2064: -3,39
+            2065: -3,38
+            2066: -3,37
         - node:
             zIndex: 180
             color: '#A4610696'
             id: BrickTileWhiteLineW
           decals:
-            2104: -3,47
-            2105: -3,46
+            2094: -3,47
+            2095: -3,46
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineW
@@ -924,8 +924,8 @@ entities:
           decals:
             682: -46,9
             683: -46,10
-            2843: 3,21
-            2844: 3,22
+            2799: 3,21
+            2800: 3,22
         - node:
             color: '#9FED580F'
             id: CheckerNESW
@@ -962,8 +962,8 @@ entities:
             color: '#FFFFFFFF'
             id: Delivery
           decals:
-            2120: 1,48
-            2121: 3,48
+            2110: 1,48
+            2111: 3,48
         - node:
             cleanable: True
             color: '#A4610696'
@@ -1114,45 +1114,45 @@ entities:
             537: -50,18
             538: -48,18
             539: -48,18
-            2408: 5,3
-            2409: 6,3
-            2410: 9,3
-            2411: 8,2
-            2412: 10,3
-            2413: 9,2
-            2414: 8,3
-            2415: 7,3
-            2416: 6,3
-            2417: 7,4
-            2418: 8,4
-            2419: 11,3
-            2420: 5,3
-            2421: -13,3
-            2422: -13,3
-            2423: -12,3
-            2424: -11,3
-            2425: -11,3
-            2426: -11,4
-            2427: -10,2
-            2428: -9,2
-            2429: -9,3
-            2430: -10,3
-            2431: -8,3
-            2432: -7,3
-            2433: -8,3
+            2398: 5,3
+            2399: 6,3
+            2400: 9,3
+            2401: 8,2
+            2402: 10,3
+            2403: 9,2
+            2404: 8,3
+            2405: 7,3
+            2406: 6,3
+            2407: 7,4
+            2408: 8,4
+            2409: 11,3
+            2410: 5,3
+            2411: -13,3
+            2412: -13,3
+            2413: -12,3
+            2414: -11,3
+            2415: -11,3
+            2416: -11,4
+            2417: -10,2
+            2418: -9,2
+            2419: -9,3
+            2420: -10,3
+            2421: -8,3
+            2422: -7,3
+            2423: -8,3
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            2538: 35,7
-            2717: 43,18
+            2528: 35,7
+            2673: 43,18
         - node:
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
             571: -60,3
-            2020: -3,10
+            2010: -3,10
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -1353,310 +1353,310 @@ entities:
             1314: 1,21
             1331: -1,26
             1332: -1,25
-            1344: -19,11
-            1381: -2,15
-            1382: -2,16
+            1343: -19,11
+            1380: -2,15
+            1381: -2,16
+            1382: -2,17
             1383: -2,17
             1384: -2,17
-            1385: -2,17
-            1386: 0,18
+            1385: 0,18
+            1394: -2,18
             1395: -2,18
-            1396: -2,18
+            1402: -3,18
             1403: -3,18
-            1404: -3,18
-            1424: -4,15
-            1425: -4,14
-            1432: -4,12
+            1423: -4,15
+            1424: -4,14
+            1431: -4,12
+            1432: -6,11
             1433: -6,11
             1434: -6,11
-            1435: -6,11
+            1455: -5,8
             1456: -5,8
             1457: -5,8
-            1458: -5,8
-            1459: 2,10
-            1460: 2,9
-            1461: 3,8
-            1507: 3,28
-            1508: 4,26
-            1509: 8,28
-            1510: 6,28
-            1511: 9,26
-            1512: 10,26
-            1513: 10,24
-            1514: 10,23
-            1515: 11,24
-            1516: 11,25
-            1517: 11,28
-            1552: 11,26
-            1571: 12,26
-            1572: 13,26
-            1573: 13,24
-            1574: 13,22
-            1575: 16,23
-            1576: 14,21
-            1577: 13,20
-            1578: 14,20
-            1579: 15,23
-            1580: 18,25
-            1581: 15,26
-            1582: 14,26
-            1583: 16,25
-            1584: 17,22
-            1585: 18,25
-            1586: 19,25
-            1587: 17,25
-            1588: 18,22
-            1589: 19,23
-            1590: 22,22
-            1591: 18,23
-            1592: 19,25
-            1593: 17,24
-            1594: 19,23
-            1595: 23,25
-            1596: 21,26
-            1597: 20,25
-            1598: 23,21
-            1599: 21,22
-            1600: 25,22
-            1601: 25,24
-            1602: 25,23
-            1603: 25,25
-            1604: 24,25
-            1605: 28,24
-            1606: 30,23
-            1607: 26,24
-            1608: 27,25
-            1609: 27,24
-            1610: 27,23
-            1611: 29,22
-            1612: 30,22
-            1613: 30,21
-            1614: 29,20
-            1615: 29,20
-            1616: 30,19
-            1617: 33,25
-            1618: 33,25
-            1619: 31,26
-            1743: 16,21
-            1744: 24,21
-            1745: 24,21
-            1746: 30,19
-            1758: 36,26
-            1759: 37,24
-            1760: 37,24
-            1788: 48,24
-            1789: 47,24
-            1790: 47,23
-            1791: 48,23
-            1792: 49,23
-            1793: 52,24
-            1794: 51,25
-            1795: 50,26
-            1796: 49,25
-            1797: 51,25
-            1798: 52,26
-            1799: 52,26
-            1800: 50,26
-            1801: 53,26
-            1802: 53,26
-            1803: 54,26
-            1856: 53,24
-            1888: 14,15
-            1889: 12,16
-            1890: 11,16
-            1891: 10,15
-            1892: 12,15
-            1893: 14,15
-            1894: 15,16
-            1895: 16,16
-            1896: 16,15
-            1897: 16,14
-            1898: 16,13
-            1899: 17,14
-            1900: 16,13
-            1901: 16,11
-            1902: 15,10
-            1903: 15,10
-            1904: 15,12
-            1905: 15,12
-            1906: 15,11
-            1907: 16,10
-            1908: 17,11
-            1909: 17,11
-            1910: 16,12
-            1911: 13,12
-            1912: 13,12
-            1945: -3,33
-            1946: -2,33
-            1947: -2,32
-            1948: -2,32
-            1949: -1,31
-            1950: 0,31
-            1951: 0,31
-            2390: 7,2
-            2391: 6,4
-            2392: 4,3
-            2393: 5,4
-            2394: 11,3
-            2395: 10,2
-            2434: -8,4
-            2435: -7,4
-            2464: -50,3
-            2465: -50,3
-            2466: -53,6
-            2467: -52,6
-            2520: 36,23
-            2521: 37,21
-            2522: 36,20
-            2529: 40,17
-            2530: 41,16
-            2531: 40,16
-            2532: 43,16
-            2533: 44,16
-            2534: 45,17
-            2535: 44,17
-            2536: 44,16
-            2539: 36,9
-            2545: 45,7
-            2546: 44,9
-            2547: 45,8
-            2548: 46,9
-            2549: 47,8
-            2550: 42,9
-            2551: 43,8
-            2552: 47,10
-            2553: 48,8
-            2554: 26,9
-            2562: 34,21
-            2563: 34,22
-            2564: 32,23
-            2565: 34,23
-            2566: 40,23
-            2567: 39,23
-            2568: 40,22
-            2569: 45,22
-            2570: 47,22
-            2571: 41,22
-            2572: 42,22
-            2573: 49,22
-            2574: 52,22
-            2575: 53,23
-            2576: 52,23
-            2577: 43,6
-            2578: 46,6
-            2579: 46,6
-            2580: 48,6
-            2581: 47,6
-            2582: 42,6
-            2583: 50,3
-            2584: 51,3
-            2585: 53,3
-            2586: 54,3
-            2587: 56,3
-            2588: 57,3
-            2589: 46,4
-            2590: 47,3
-            2591: 45,6
-            2592: 20,22
-            2616: 27,18
-            2617: 28,18
-            2618: 29,18
-            2619: 29,17
-            2620: 28,16
-            2621: 30,16
-            2622: 30,18
-            2648: 32,16
-            2649: 31,16
-            2650: 28,18
-            2651: 28,18
-            2718: 43,17
-            2719: 38,17
-            2738: 38,5
-            2739: 40,5
-            2775: 45,15
-            2776: 42,15
-            2777: 41,15
-            2778: 44,15
-            2779: 43,15
-            2780: 45,15
-            2781: 45,16
-            2782: 37,17
-            2783: 36,18
-            2784: 37,18
+            1458: 2,10
+            1459: 2,9
+            1460: 3,8
+            1502: 3,28
+            1503: 4,26
+            1504: 8,28
+            1505: 6,28
+            1506: 9,26
+            1507: 10,26
+            1508: 10,24
+            1509: 10,23
+            1510: 11,24
+            1511: 11,25
+            1512: 11,28
+            1543: 11,26
+            1561: 12,26
+            1562: 13,26
+            1563: 13,24
+            1564: 13,22
+            1565: 16,23
+            1566: 14,21
+            1567: 13,20
+            1568: 14,20
+            1569: 15,23
+            1570: 18,25
+            1571: 15,26
+            1572: 14,26
+            1573: 16,25
+            1574: 17,22
+            1575: 18,25
+            1576: 19,25
+            1577: 17,25
+            1578: 18,22
+            1579: 19,23
+            1580: 22,22
+            1581: 18,23
+            1582: 19,25
+            1583: 17,24
+            1584: 19,23
+            1585: 23,25
+            1586: 21,26
+            1587: 20,25
+            1588: 23,21
+            1589: 21,22
+            1590: 25,22
+            1591: 25,24
+            1592: 25,23
+            1593: 25,25
+            1594: 24,25
+            1595: 28,24
+            1596: 30,23
+            1597: 26,24
+            1598: 27,25
+            1599: 27,24
+            1600: 27,23
+            1601: 29,22
+            1602: 30,22
+            1603: 30,21
+            1604: 29,20
+            1605: 29,20
+            1606: 30,19
+            1607: 33,25
+            1608: 33,25
+            1609: 31,26
+            1733: 16,21
+            1734: 24,21
+            1735: 24,21
+            1736: 30,19
+            1748: 36,26
+            1749: 37,24
+            1750: 37,24
+            1778: 48,24
+            1779: 47,24
+            1780: 47,23
+            1781: 48,23
+            1782: 49,23
+            1783: 52,24
+            1784: 51,25
+            1785: 50,26
+            1786: 49,25
+            1787: 51,25
+            1788: 52,26
+            1789: 52,26
+            1790: 50,26
+            1791: 53,26
+            1792: 53,26
+            1793: 54,26
+            1846: 53,24
+            1878: 14,15
+            1879: 12,16
+            1880: 11,16
+            1881: 10,15
+            1882: 12,15
+            1883: 14,15
+            1884: 15,16
+            1885: 16,16
+            1886: 16,15
+            1887: 16,14
+            1888: 16,13
+            1889: 17,14
+            1890: 16,13
+            1891: 16,11
+            1892: 15,10
+            1893: 15,10
+            1894: 15,12
+            1895: 15,12
+            1896: 15,11
+            1897: 16,10
+            1898: 17,11
+            1899: 17,11
+            1900: 16,12
+            1901: 13,12
+            1902: 13,12
+            1935: -3,33
+            1936: -2,33
+            1937: -2,32
+            1938: -2,32
+            1939: -1,31
+            1940: 0,31
+            1941: 0,31
+            2380: 7,2
+            2381: 6,4
+            2382: 4,3
+            2383: 5,4
+            2384: 11,3
+            2385: 10,2
+            2424: -8,4
+            2425: -7,4
+            2454: -50,3
+            2455: -50,3
+            2456: -53,6
+            2457: -52,6
+            2510: 36,23
+            2511: 37,21
+            2512: 36,20
+            2519: 40,17
+            2520: 41,16
+            2521: 40,16
+            2522: 43,16
+            2523: 44,16
+            2524: 45,17
+            2525: 44,17
+            2526: 44,16
+            2529: 36,9
+            2535: 45,7
+            2536: 44,9
+            2537: 45,8
+            2538: 46,9
+            2539: 47,8
+            2540: 42,9
+            2541: 43,8
+            2542: 47,10
+            2543: 48,8
+            2544: 26,9
+            2552: 34,21
+            2553: 34,22
+            2554: 32,23
+            2555: 34,23
+            2556: 40,23
+            2557: 39,23
+            2558: 40,22
+            2559: 45,22
+            2560: 47,22
+            2561: 41,22
+            2562: 42,22
+            2563: 49,22
+            2564: 52,22
+            2565: 53,23
+            2566: 52,23
+            2567: 43,6
+            2568: 46,6
+            2569: 46,6
+            2570: 48,6
+            2571: 47,6
+            2572: 42,6
+            2573: 50,3
+            2574: 51,3
+            2575: 53,3
+            2576: 54,3
+            2577: 56,3
+            2578: 57,3
+            2579: 46,4
+            2580: 47,3
+            2581: 45,6
+            2582: 20,22
+            2606: 27,18
+            2607: 28,18
+            2608: 29,18
+            2609: 29,17
+            2610: 28,16
+            2611: 30,16
+            2612: 30,18
+            2638: 32,16
+            2639: 31,16
+            2640: 28,18
+            2641: 28,18
+            2674: 43,17
+            2675: 38,17
+            2694: 38,5
+            2695: 40,5
+            2731: 45,15
+            2732: 42,15
+            2733: 41,15
+            2734: 44,15
+            2735: 43,15
+            2736: 45,15
+            2737: 45,16
+            2738: 37,17
+            2739: 36,18
+            2740: 37,18
         - node:
             cleanable: True
             zIndex: 180
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            2203: 5,48
-            2204: 5,49
-            2205: 4,49
-            2206: 5,51
-            2207: 5,53
-            2208: 5,54
-            2209: 5,55
-            2210: 6,55
-            2211: 7,57
-            2212: 6,54
-            2213: 6,54
-            2214: 8,55
-            2215: 7,50
-            2216: 8,50
-            2217: 3,50
-            2218: 2,47
-            2219: -2,45
-            2220: 4,47
-            2221: 8,45
-            2222: 7,46
-            2223: 7,43
-            2224: 8,42
-            2225: 4,41
-            2226: 2,39
-            2227: 0,39
-            2228: -1,39
-            2229: -1,38
-            2277: 8,51
-            2291: 10,53
-            2292: 10,53
-            2293: 11,55
-            2294: 11,55
-            2295: -6,44
-            2296: -6,45
-            2297: -5,44
-            2298: -6,43
-            2299: -5,43
-            2300: -5,43
-            2301: 0,40
-            2302: 4,40
-            2303: -34,8
-            2304: -33,7
-            2305: -32,8
-            2306: -33,10
-            2307: -33,10
-            2308: -34,10
-            2309: -32,11
-            2310: -36,12
-            2311: -35,11
-            2312: -39,11
-            2313: -40,12
-            2340: -53,18
-            2341: -53,16
-            2342: -52,15
-            2343: -52,14
-            2344: -51,15
-            2361: -49,5
-            2362: -49,5
-            2363: -56,2
-            2364: -46,4
-            2365: -42,3
-            2366: -42,3
+            2193: 5,48
+            2194: 5,49
+            2195: 4,49
+            2196: 5,51
+            2197: 5,53
+            2198: 5,54
+            2199: 5,55
+            2200: 6,55
+            2201: 7,57
+            2202: 6,54
+            2203: 6,54
+            2204: 8,55
+            2205: 7,50
+            2206: 8,50
+            2207: 3,50
+            2208: 2,47
+            2209: -2,45
+            2210: 4,47
+            2211: 8,45
+            2212: 7,46
+            2213: 7,43
+            2214: 8,42
+            2215: 4,41
+            2216: 2,39
+            2217: 0,39
+            2218: -1,39
+            2219: -1,38
+            2267: 8,51
+            2281: 10,53
+            2282: 10,53
+            2283: 11,55
+            2284: 11,55
+            2285: -6,44
+            2286: -6,45
+            2287: -5,44
+            2288: -6,43
+            2289: -5,43
+            2290: -5,43
+            2291: 0,40
+            2292: 4,40
+            2293: -34,8
+            2294: -33,7
+            2295: -32,8
+            2296: -33,10
+            2297: -33,10
+            2298: -34,10
+            2299: -32,11
+            2300: -36,12
+            2301: -35,11
+            2302: -39,11
+            2303: -40,12
+            2330: -53,18
+            2331: -53,16
+            2332: -52,15
+            2333: -52,14
+            2334: -51,15
+            2351: -49,5
+            2352: -49,5
+            2353: -56,2
+            2354: -46,4
+            2355: -42,3
+            2356: -42,3
         - node:
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
             654: -46,7
-            2019: -3,11
+            2009: -3,11
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -1761,367 +1761,367 @@ entities:
             1177: 32,1
             1178: 33,1
             1335: -1,21
-            1337: 0,25
+            1336: 0,25
+            1337: 0,27
             1338: 0,27
-            1339: 0,27
-            1340: -1,28
-            1341: 1,26
-            1342: -2,22
-            1343: -1,22
-            1348: -18,11
-            1387: -1,18
-            1388: 0,17
-            1397: -1,18
-            1398: -1,17
+            1339: -1,28
+            1340: 1,26
+            1341: -2,22
+            1342: -1,22
+            1347: -18,11
+            1386: -1,18
+            1387: 0,17
+            1396: -1,18
+            1397: -1,17
+            1404: -3,16
             1405: -3,16
             1406: -3,16
-            1407: -3,16
+            1407: -4,17
             1408: -4,17
-            1409: -4,17
+            1409: -4,18
             1410: -4,18
-            1411: -4,18
-            1417: -5,17
-            1418: -4,16
-            1426: -6,14
-            1427: -6,13
-            1428: -6,15
-            1429: -5,16
+            1416: -5,17
+            1417: -4,16
+            1425: -6,14
+            1426: -6,13
+            1427: -6,15
+            1428: -5,16
+            1429: -4,11
             1430: -4,11
-            1431: -4,11
-            1443: -4,9
+            1442: -4,9
+            1443: -6,10
             1444: -6,10
-            1445: -6,10
-            1446: -3,11
+            1445: -3,11
+            1446: -6,13
             1447: -6,13
-            1448: -6,13
-            1462: 4,9
-            1463: 3,12
+            1461: 4,9
+            1462: 3,12
+            1463: 3,13
             1464: 3,13
-            1465: 3,13
+            1465: 2,12
             1466: 2,12
-            1467: 2,12
-            1468: 3,11
-            1469: 3,10
-            1470: 3,14
+            1467: 3,11
+            1468: 3,10
+            1469: 3,14
+            1470: 3,17
             1471: 3,17
-            1472: 3,17
-            1518: 3,28
-            1519: 3,27
-            1520: 3,26
-            1521: 3,25
-            1522: 7,26
-            1523: 7,27
-            1524: 6,27
-            1620: 14,25
-            1621: 13,25
-            1622: 14,23
-            1623: 14,23
-            1624: 13,23
-            1625: 15,24
-            1626: 15,24
-            1627: 16,24
-            1628: 17,23
-            1629: 16,22
-            1630: 15,22
-            1631: 18,24
-            1632: 19,25
-            1633: 19,24
-            1634: 20,24
-            1635: 20,24
-            1636: 20,23
-            1637: 20,23
-            1638: 19,26
-            1639: 19,26
-            1640: 18,26
-            1641: 17,26
-            1642: 16,26
-            1643: 21,24
-            1644: 21,24
-            1645: 21,22
-            1646: 23,22
-            1647: 21,23
-            1648: 21,23
-            1649: 22,23
-            1650: 23,24
-            1651: 22,25
-            1652: 21,24
-            1653: 22,24
-            1654: 23,24
-            1655: 24,24
-            1656: 26,25
-            1657: 26,25
-            1658: 24,24
-            1659: 24,23
-            1660: 27,22
-            1661: 27,22
-            1662: 26,22
-            1663: 26,23
-            1664: 28,23
-            1665: 28,23
-            1666: 28,24
-            1667: 29,24
-            1668: 29,24
-            1669: 31,24
-            1670: 31,25
-            1671: 29,25
-            1672: 30,24
-            1673: 29,22
-            1674: 31,23
-            1675: 31,23
-            1676: 31,22
-            1677: 30,23
-            1678: 29,23
-            1679: 29,21
-            1680: 28,22
-            1681: 30,20
-            1682: 31,21
-            1683: 31,21
-            1684: 33,24
-            1685: 33,24
-            1686: 32,24
-            1687: 32,25
-            1688: 32,26
-            1747: 34,25
-            1748: 34,26
-            1761: 41,25
-            1762: 40,26
-            1763: 40,26
-            1764: 39,25
-            1765: 40,24
-            1766: 41,23
-            1767: 44,24
-            1768: 44,25
-            1769: 43,25
-            1770: 42,25
-            1771: 43,25
-            1772: 44,26
-            1773: 44,26
-            1774: 46,25
-            1775: 47,26
-            1776: 49,26
-            1777: 48,26
-            1778: 49,25
-            1779: 49,26
-            1780: 50,25
-            1781: 50,24
-            1782: 50,23
-            1783: 49,24
-            1784: 48,24
-            1785: 46,23
-            1786: 46,23
-            1787: 46,24
-            1850: 50,26
-            1851: 51,23
-            1852: 51,24
-            1853: 45,23
-            1854: 44,23
-            1855: 42,23
-            1858: 14,11
-            1859: 14,11
-            1860: 14,11
-            1861: 14,10
-            1862: 13,10
-            1863: 13,11
-            1864: 11,11
-            1865: 10,11
-            1866: 9,11
-            1867: 9,11
-            1868: 9,10
-            1869: 9,13
-            1870: 9,13
-            1871: 9,13
-            1872: 9,13
-            1873: 11,14
-            1874: 11,15
-            1875: 12,16
-            1876: 11,16
-            1877: 10,15
-            1878: 11,15
-            1879: 15,16
-            1880: 13,14
-            1881: 15,15
-            1882: 16,16
-            1883: 17,16
-            1884: 17,15
-            1885: 17,13
-            1886: 17,13
-            1887: 17,12
-            1913: 10,12
-            1914: 11,12
-            1915: 11,13
-            1916: 11,13
-            1917: 9,12
-            1918: 8,12
-            1919: 8,12
-            1920: 10,14
-            1952: -3,32
-            1953: -2,32
-            1954: -2,31
-            1955: -2,31
-            1956: 0,33
-            1957: 0,33
-            2052: -3,13
-            2053: -2,10
-            2054: -3,9
-            2055: -1,8
-            2056: -1,9
-            2057: 0,10
-            2061: -1,12
-            2062: -1,13
-            2063: -3,12
-            2064: 0,11
-            2065: 1,13
-            2066: 3,16
-            2067: 3,16
-            2068: 3,18
-            2069: 3,18
-            2070: 3,18
-            2071: 2,18
-            2396: 8,2
-            2397: 7,4
-            2398: 11,4
-            2399: 6,5
-            2436: -14,2
-            2437: -14,4
-            2438: -13,2
-            2634: 31,17
-            2635: 32,18
-            2646: 32,15
-            2647: 31,15
-            2720: 39,17
-            2721: 38,18
-            2722: 36,17
-            2735: 33,5
-            2736: 35,5
-            2737: 37,5
-            2785: 38,18
-            2786: 36,17
-            2787: 37,17
-            2788: 37,22
-            2789: 36,22
-            2848: 4,25
-            2849: 5,25
-            2850: 6,25
-            2851: 7,25
-            2852: 8,25
-            2853: 7,25
-            2854: 0,21
-            2855: 0,21
+            1513: 3,28
+            1514: 3,27
+            1515: 3,26
+            1516: 3,25
+            1517: 7,26
+            1518: 7,27
+            1519: 6,27
+            1610: 14,25
+            1611: 13,25
+            1612: 14,23
+            1613: 14,23
+            1614: 13,23
+            1615: 15,24
+            1616: 15,24
+            1617: 16,24
+            1618: 17,23
+            1619: 16,22
+            1620: 15,22
+            1621: 18,24
+            1622: 19,25
+            1623: 19,24
+            1624: 20,24
+            1625: 20,24
+            1626: 20,23
+            1627: 20,23
+            1628: 19,26
+            1629: 19,26
+            1630: 18,26
+            1631: 17,26
+            1632: 16,26
+            1633: 21,24
+            1634: 21,24
+            1635: 21,22
+            1636: 23,22
+            1637: 21,23
+            1638: 21,23
+            1639: 22,23
+            1640: 23,24
+            1641: 22,25
+            1642: 21,24
+            1643: 22,24
+            1644: 23,24
+            1645: 24,24
+            1646: 26,25
+            1647: 26,25
+            1648: 24,24
+            1649: 24,23
+            1650: 27,22
+            1651: 27,22
+            1652: 26,22
+            1653: 26,23
+            1654: 28,23
+            1655: 28,23
+            1656: 28,24
+            1657: 29,24
+            1658: 29,24
+            1659: 31,24
+            1660: 31,25
+            1661: 29,25
+            1662: 30,24
+            1663: 29,22
+            1664: 31,23
+            1665: 31,23
+            1666: 31,22
+            1667: 30,23
+            1668: 29,23
+            1669: 29,21
+            1670: 28,22
+            1671: 30,20
+            1672: 31,21
+            1673: 31,21
+            1674: 33,24
+            1675: 33,24
+            1676: 32,24
+            1677: 32,25
+            1678: 32,26
+            1737: 34,25
+            1738: 34,26
+            1751: 41,25
+            1752: 40,26
+            1753: 40,26
+            1754: 39,25
+            1755: 40,24
+            1756: 41,23
+            1757: 44,24
+            1758: 44,25
+            1759: 43,25
+            1760: 42,25
+            1761: 43,25
+            1762: 44,26
+            1763: 44,26
+            1764: 46,25
+            1765: 47,26
+            1766: 49,26
+            1767: 48,26
+            1768: 49,25
+            1769: 49,26
+            1770: 50,25
+            1771: 50,24
+            1772: 50,23
+            1773: 49,24
+            1774: 48,24
+            1775: 46,23
+            1776: 46,23
+            1777: 46,24
+            1840: 50,26
+            1841: 51,23
+            1842: 51,24
+            1843: 45,23
+            1844: 44,23
+            1845: 42,23
+            1848: 14,11
+            1849: 14,11
+            1850: 14,11
+            1851: 14,10
+            1852: 13,10
+            1853: 13,11
+            1854: 11,11
+            1855: 10,11
+            1856: 9,11
+            1857: 9,11
+            1858: 9,10
+            1859: 9,13
+            1860: 9,13
+            1861: 9,13
+            1862: 9,13
+            1863: 11,14
+            1864: 11,15
+            1865: 12,16
+            1866: 11,16
+            1867: 10,15
+            1868: 11,15
+            1869: 15,16
+            1870: 13,14
+            1871: 15,15
+            1872: 16,16
+            1873: 17,16
+            1874: 17,15
+            1875: 17,13
+            1876: 17,13
+            1877: 17,12
+            1903: 10,12
+            1904: 11,12
+            1905: 11,13
+            1906: 11,13
+            1907: 9,12
+            1908: 8,12
+            1909: 8,12
+            1910: 10,14
+            1942: -3,32
+            1943: -2,32
+            1944: -2,31
+            1945: -2,31
+            1946: 0,33
+            1947: 0,33
+            2042: -3,13
+            2043: -2,10
+            2044: -3,9
+            2045: -1,8
+            2046: -1,9
+            2047: 0,10
+            2051: -1,12
+            2052: -1,13
+            2053: -3,12
+            2054: 0,11
+            2055: 1,13
+            2056: 3,16
+            2057: 3,16
+            2058: 3,18
+            2059: 3,18
+            2060: 3,18
+            2061: 2,18
+            2386: 8,2
+            2387: 7,4
+            2388: 11,4
+            2389: 6,5
+            2426: -14,2
+            2427: -14,4
+            2428: -13,2
+            2624: 31,17
+            2625: 32,18
+            2636: 32,15
+            2637: 31,15
+            2676: 39,17
+            2677: 38,18
+            2678: 36,17
+            2691: 33,5
+            2692: 35,5
+            2693: 37,5
+            2741: 38,18
+            2742: 36,17
+            2743: 37,17
+            2744: 37,22
+            2745: 36,22
+            2804: 4,25
+            2805: 5,25
+            2806: 6,25
+            2807: 7,25
+            2808: 8,25
+            2809: 7,25
+            2810: 0,21
+            2811: 0,21
         - node:
             cleanable: True
             zIndex: 180
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            2125: 6,57
-            2126: 5,57
-            2127: 5,56
-            2128: 5,54
-            2129: 7,54
-            2130: 7,54
-            2131: 6,54
-            2132: 6,53
-            2133: 5,53
-            2134: 7,53
-            2135: 8,51
-            2136: 8,49
-            2137: 7,48
-            2138: 7,50
-            2139: 7,50
-            2140: 5,50
-            2141: 4,48
-            2142: 5,47
-            2143: 4,50
-            2144: 2,50
-            2145: 2,50
-            2146: 1,51
-            2147: 1,51
-            2148: 0,50
-            2149: 1,49
-            2150: 0,48
-            2151: 1,48
-            2152: 0,47
-            2153: 0,47
-            2154: 0,47
-            2155: -1,47
-            2156: -1,46
-            2157: -2,47
-            2158: -2,47
-            2159: -2,46
-            2160: -2,45
-            2161: -3,45
-            2162: -3,44
-            2163: -3,44
-            2164: -1,44
-            2165: -1,44
-            2166: -3,43
-            2167: -2,43
-            2168: -1,43
-            2169: -1,42
-            2170: -2,42
-            2171: 0,41
-            2172: -1,41
-            2173: -2,40
-            2174: -2,40
-            2175: -3,40
-            2176: -3,39
-            2177: -2,38
-            2178: -3,38
-            2179: -2,38
-            2180: -3,37
-            2181: -3,36
-            2182: -2,36
-            2183: 0,36
-            2184: 0,38
-            2185: 1,38
-            2186: 3,38
-            2187: 1,40
-            2188: 3,41
-            2189: 5,41
-            2190: 2,41
-            2191: 3,36
-            2192: 4,36
-            2193: 4,37
-            2194: 6,41
-            2195: 7,41
-            2196: 7,42
-            2197: 8,43
-            2198: 8,43
-            2199: 7,45
-            2200: 7,47
-            2201: 8,47
-            2202: 5,48
-            2278: 6,52
-            2279: 5,52
-            2280: 6,51
-            2281: 6,51
-            2282: 1,41
-            2283: 1,41
-            2284: 11,53
-            2285: 11,53
-            2286: 11,53
-            2287: 10,55
-            2288: 10,55
-            2289: 10,54
-            2290: 11,54
-            2314: -40,11
-            2315: -41,12
-            2316: -38,12
-            2317: -37,11
-            2318: -36,11
-            2319: -36,11
-            2320: -35,12
-            2321: -32,12
-            2322: -29,12
-            2323: -28,12
-            2324: -27,12
-            2345: -53,15
-            2346: -51,14
-            2347: -51,14
-            2348: -53,12
-            2349: -53,12
-            2350: -53,13
-            2351: -52,12
+            2115: 6,57
+            2116: 5,57
+            2117: 5,56
+            2118: 5,54
+            2119: 7,54
+            2120: 7,54
+            2121: 6,54
+            2122: 6,53
+            2123: 5,53
+            2124: 7,53
+            2125: 8,51
+            2126: 8,49
+            2127: 7,48
+            2128: 7,50
+            2129: 7,50
+            2130: 5,50
+            2131: 4,48
+            2132: 5,47
+            2133: 4,50
+            2134: 2,50
+            2135: 2,50
+            2136: 1,51
+            2137: 1,51
+            2138: 0,50
+            2139: 1,49
+            2140: 0,48
+            2141: 1,48
+            2142: 0,47
+            2143: 0,47
+            2144: 0,47
+            2145: -1,47
+            2146: -1,46
+            2147: -2,47
+            2148: -2,47
+            2149: -2,46
+            2150: -2,45
+            2151: -3,45
+            2152: -3,44
+            2153: -3,44
+            2154: -1,44
+            2155: -1,44
+            2156: -3,43
+            2157: -2,43
+            2158: -1,43
+            2159: -1,42
+            2160: -2,42
+            2161: 0,41
+            2162: -1,41
+            2163: -2,40
+            2164: -2,40
+            2165: -3,40
+            2166: -3,39
+            2167: -2,38
+            2168: -3,38
+            2169: -2,38
+            2170: -3,37
+            2171: -3,36
+            2172: -2,36
+            2173: 0,36
+            2174: 0,38
+            2175: 1,38
+            2176: 3,38
+            2177: 1,40
+            2178: 3,41
+            2179: 5,41
+            2180: 2,41
+            2181: 3,36
+            2182: 4,36
+            2183: 4,37
+            2184: 6,41
+            2185: 7,41
+            2186: 7,42
+            2187: 8,43
+            2188: 8,43
+            2189: 7,45
+            2190: 7,47
+            2191: 8,47
+            2192: 5,48
+            2268: 6,52
+            2269: 5,52
+            2270: 6,51
+            2271: 6,51
+            2272: 1,41
+            2273: 1,41
+            2274: 11,53
+            2275: 11,53
+            2276: 11,53
+            2277: 10,55
+            2278: 10,55
+            2279: 10,54
+            2280: 11,54
+            2304: -40,11
+            2305: -41,12
+            2306: -38,12
+            2307: -37,11
+            2308: -36,11
+            2309: -36,11
+            2310: -35,12
+            2311: -32,12
+            2312: -29,12
+            2313: -28,12
+            2314: -27,12
+            2335: -53,15
+            2336: -51,14
+            2337: -51,14
+            2338: -53,12
+            2339: -53,12
+            2340: -53,13
+            2341: -52,12
         - node:
             color: '#FFFFFFFF'
             id: DirtLight
@@ -2361,309 +2361,309 @@ entities:
             1328: -1,29
             1329: 0,29
             1330: 0,29
-            1375: -2,18
+            1374: -2,18
+            1375: -1,17
             1376: -1,17
-            1377: -1,17
+            1377: -1,15
             1378: -1,15
-            1379: -1,15
-            1380: 0,15
-            1389: -1,17
+            1379: 0,15
+            1388: -1,17
+            1389: 0,16
             1390: 0,16
             1391: 0,16
-            1392: 0,16
-            1393: -1,16
-            1394: -1,18
+            1392: -1,16
+            1393: -1,18
+            1398: -1,16
             1399: -1,16
-            1400: -1,16
+            1400: -3,17
             1401: -3,17
-            1402: -3,17
-            1436: -6,9
+            1435: -6,9
+            1436: -4,8
             1437: -4,8
             1438: -4,8
             1439: -4,8
-            1440: -4,8
-            1449: -6,17
-            1450: -4,16
+            1448: -6,17
+            1449: -4,16
+            1450: -6,8
             1451: -6,8
             1452: -6,8
             1453: -6,8
-            1454: -6,8
-            1455: -6,9
-            1473: 2,17
-            1474: 2,18
+            1454: -6,9
+            1472: 2,17
+            1473: 2,18
+            1474: 4,18
             1475: 4,18
-            1476: 4,18
+            1476: 4,17
             1477: 4,17
-            1478: 4,17
-            1479: 4,16
-            1480: 4,14
+            1478: 4,16
+            1479: 4,14
+            1480: 4,13
             1481: 4,13
-            1482: 4,13
+            1482: 4,14
             1483: 4,14
-            1484: 4,14
+            1484: 2,16
             1485: 2,16
             1486: 2,16
             1487: 2,16
-            1488: 2,16
-            1489: 2,11
-            1490: 2,10
-            1491: 2,9
-            1492: 3,8
-            1493: 2,8
-            1525: 4,27
-            1526: 4,27
-            1527: 5,28
-            1528: 5,28
-            1529: 5,27
-            1530: 10,27
-            1531: 10,27
-            1532: 9,27
-            1533: 11,27
-            1534: 11,26
-            1550: 9,25
-            1551: 6,26
-            1689: 33,26
-            1690: 34,26
-            1691: 34,25
-            1692: 34,24
-            1693: 31,24
-            1694: 32,24
-            1695: 33,24
-            1696: 33,24
-            1697: 30,21
-            1698: 30,22
-            1699: 29,21
-            1700: 28,21
-            1701: 28,23
-            1702: 27,22
-            1703: 26,22
-            1704: 28,21
-            1705: 28,22
-            1706: 25,23
-            1707: 26,23
-            1708: 26,23
-            1709: 25,21
-            1710: 24,23
-            1711: 23,24
-            1712: 24,23
-            1713: 23,23
-            1714: 23,23
-            1715: 24,22
-            1716: 24,24
-            1717: 23,25
-            1718: 22,24
-            1719: 22,25
-            1720: 22,26
-            1721: 25,26
-            1722: 25,26
-            1723: 20,26
-            1724: 19,26
-            1725: 20,26
-            1726: 17,26
-            1727: 18,26
-            1728: 15,26
-            1729: 15,26
-            1730: 15,25
-            1731: 15,25
-            1732: 17,24
-            1733: 16,24
-            1734: 13,24
-            1735: 14,23
-            1736: 14,22
-            1737: 15,22
-            1738: 17,23
-            1739: 19,22
-            1740: 20,21
-            1741: 20,21
-            1742: 18,21
-            1749: 37,26
-            1750: 37,26
-            1751: 36,25
-            1752: 36,25
-            1753: 34,26
-            1754: 33,26
-            1755: 32,26
-            1756: 31,25
-            1757: 29,25
-            1821: 39,25
-            1822: 39,24
-            1823: 39,24
-            1824: 41,23
-            1825: 44,24
-            1826: 44,24
-            1827: 43,24
-            1828: 43,24
-            1829: 42,23
-            1830: 43,23
-            1831: 44,23
-            1832: 45,24
-            1833: 45,25
-            1834: 45,25
-            1835: 47,26
-            1836: 47,26
-            1837: 50,25
-            1838: 50,25
-            1839: 49,24
-            1840: 51,25
-            1841: 52,25
-            1842: 51,25
-            1843: 51,25
-            1844: 53,26
-            1845: 54,26
-            1846: 53,25
-            1847: 53,25
-            1848: 54,25
-            1849: 51,26
-            1857: 29,8
-            1921: 10,14
-            1922: 10,14
-            1923: 10,13
-            1924: 10,13
-            1925: 14,16
-            1926: 13,16
-            1927: 13,16
-            1928: 17,15
-            1929: 17,14
-            1930: 17,15
-            1931: 17,16
-            1932: 17,13
-            1933: 15,11
-            1934: 15,10
-            1935: 14,10
-            1936: 14,12
-            1937: 14,12
-            1938: 7,15
-            1939: 8,16
-            1940: 8,16
-            1941: 7,16
-            1942: 13,21
-            1943: 13,21
-            1944: 13,21
-            1958: -3,32
-            1959: -1,33
-            1960: -1,33
-            1961: -1,32
-            1962: 0,32
-            1963: 0,32
-            1964: 0,32
-            1965: 0,32
-            2050: -1,11
-            2051: -1,13
-            2058: -2,11
-            2059: 1,11
-            2060: -5,12
-            2400: 5,4
-            2401: 5,3
-            2402: 6,2
-            2403: 4,2
-            2404: 10,2
-            2439: -13,2
-            2440: -13,4
-            2441: -11,2
-            2442: -12,2
-            2523: 36,21
-            2524: 37,20
-            2525: 36,19
-            2526: 37,19
-            2527: 37,18
-            2528: 37,17
-            2537: 40,17
-            2543: 39,10
-            2544: 39,9
-            2555: 24,9
-            2556: 7,20
-            2557: 31,20
-            2558: 32,21
-            2559: 32,22
-            2560: 33,23
-            2561: 33,22
-            2623: 28,17
-            2624: 28,17
-            2625: 27,16
-            2633: 32,17
-            2723: 36,18
-            2725: 45,16
-            2726: 37,25
-            2727: 46,25
-            2728: 43,22
-            2729: 41,5
-            2730: 39,5
-            2731: 36,5
-            2732: 34,5
-            2733: 32,5
-            2734: 28,5
-            2790: 39,22
-            2791: 40,22
-            2792: 42,22
-            2793: 43,22
-            2794: 37,22
-            2795: 36,22
-            2796: 38,23
-            2797: 38,25
-            2798: 38,26
-            2799: 40,8
-            2800: 38,8
-            2801: 39,8
-            2802: 40,8
-            2803: 40,11
-            2804: 40,10
-            2805: 37,11
+            1488: 2,11
+            1489: 2,10
+            1490: 2,9
+            1491: 3,8
+            1492: 2,8
+            1520: 4,27
+            1521: 4,27
+            1522: 5,28
+            1523: 5,28
+            1524: 5,27
+            1525: 10,27
+            1526: 10,27
+            1527: 9,27
+            1528: 11,27
+            1529: 11,26
+            1541: 9,25
+            1542: 6,26
+            1679: 33,26
+            1680: 34,26
+            1681: 34,25
+            1682: 34,24
+            1683: 31,24
+            1684: 32,24
+            1685: 33,24
+            1686: 33,24
+            1687: 30,21
+            1688: 30,22
+            1689: 29,21
+            1690: 28,21
+            1691: 28,23
+            1692: 27,22
+            1693: 26,22
+            1694: 28,21
+            1695: 28,22
+            1696: 25,23
+            1697: 26,23
+            1698: 26,23
+            1699: 25,21
+            1700: 24,23
+            1701: 23,24
+            1702: 24,23
+            1703: 23,23
+            1704: 23,23
+            1705: 24,22
+            1706: 24,24
+            1707: 23,25
+            1708: 22,24
+            1709: 22,25
+            1710: 22,26
+            1711: 25,26
+            1712: 25,26
+            1713: 20,26
+            1714: 19,26
+            1715: 20,26
+            1716: 17,26
+            1717: 18,26
+            1718: 15,26
+            1719: 15,26
+            1720: 15,25
+            1721: 15,25
+            1722: 17,24
+            1723: 16,24
+            1724: 13,24
+            1725: 14,23
+            1726: 14,22
+            1727: 15,22
+            1728: 17,23
+            1729: 19,22
+            1730: 20,21
+            1731: 20,21
+            1732: 18,21
+            1739: 37,26
+            1740: 37,26
+            1741: 36,25
+            1742: 36,25
+            1743: 34,26
+            1744: 33,26
+            1745: 32,26
+            1746: 31,25
+            1747: 29,25
+            1811: 39,25
+            1812: 39,24
+            1813: 39,24
+            1814: 41,23
+            1815: 44,24
+            1816: 44,24
+            1817: 43,24
+            1818: 43,24
+            1819: 42,23
+            1820: 43,23
+            1821: 44,23
+            1822: 45,24
+            1823: 45,25
+            1824: 45,25
+            1825: 47,26
+            1826: 47,26
+            1827: 50,25
+            1828: 50,25
+            1829: 49,24
+            1830: 51,25
+            1831: 52,25
+            1832: 51,25
+            1833: 51,25
+            1834: 53,26
+            1835: 54,26
+            1836: 53,25
+            1837: 53,25
+            1838: 54,25
+            1839: 51,26
+            1847: 29,8
+            1911: 10,14
+            1912: 10,14
+            1913: 10,13
+            1914: 10,13
+            1915: 14,16
+            1916: 13,16
+            1917: 13,16
+            1918: 17,15
+            1919: 17,14
+            1920: 17,15
+            1921: 17,16
+            1922: 17,13
+            1923: 15,11
+            1924: 15,10
+            1925: 14,10
+            1926: 14,12
+            1927: 14,12
+            1928: 7,15
+            1929: 8,16
+            1930: 8,16
+            1931: 7,16
+            1932: 13,21
+            1933: 13,21
+            1934: 13,21
+            1948: -3,32
+            1949: -1,33
+            1950: -1,33
+            1951: -1,32
+            1952: 0,32
+            1953: 0,32
+            1954: 0,32
+            1955: 0,32
+            2040: -1,11
+            2041: -1,13
+            2048: -2,11
+            2049: 1,11
+            2050: -5,12
+            2390: 5,4
+            2391: 5,3
+            2392: 6,2
+            2393: 4,2
+            2394: 10,2
+            2429: -13,2
+            2430: -13,4
+            2431: -11,2
+            2432: -12,2
+            2513: 36,21
+            2514: 37,20
+            2515: 36,19
+            2516: 37,19
+            2517: 37,18
+            2518: 37,17
+            2527: 40,17
+            2533: 39,10
+            2534: 39,9
+            2545: 24,9
+            2546: 7,20
+            2547: 31,20
+            2548: 32,21
+            2549: 32,22
+            2550: 33,23
+            2551: 33,22
+            2613: 28,17
+            2614: 28,17
+            2615: 27,16
+            2623: 32,17
+            2679: 36,18
+            2681: 45,16
+            2682: 37,25
+            2683: 46,25
+            2684: 43,22
+            2685: 41,5
+            2686: 39,5
+            2687: 36,5
+            2688: 34,5
+            2689: 32,5
+            2690: 28,5
+            2746: 39,22
+            2747: 40,22
+            2748: 42,22
+            2749: 43,22
+            2750: 37,22
+            2751: 36,22
+            2752: 38,23
+            2753: 38,25
+            2754: 38,26
+            2755: 40,8
+            2756: 38,8
+            2757: 39,8
+            2758: 40,8
+            2759: 40,11
+            2760: 40,10
+            2761: 37,11
         - node:
             cleanable: True
             zIndex: 180
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            2230: -2,39
-            2231: -2,39
-            2232: 1,37
-            2233: 1,37
-            2234: -1,37
-            2235: -1,37
-            2236: -2,37
-            2237: -2,37
-            2238: -1,41
-            2239: -1,40
-            2240: 0,40
-            2241: -2,44
-            2242: 0,48
-            2243: 0,49
-            2244: 0,49
-            2245: 0,51
-            2246: 3,51
-            2247: 6,53
-            2248: 7,53
-            2249: 8,53
-            2250: 8,54
-            2251: 8,54
-            2252: 7,55
-            2274: 1,50
-            2275: 1,50
-            2276: 7,51
-            2325: -38,11
-            2326: -38,11
-            2327: -39,12
-            2328: -39,12
-            2329: -41,10
-            2330: -38,12
-            2331: -32,12
-            2332: -34,12
-            2333: -33,11
-            2334: -34,8
-            2335: -33,8
-            2336: -29,11
-            2337: -31,12
-            2338: -30,12
-            2339: -30,12
-            2352: -52,11
-            2353: -53,10
-            2354: -49,14
-            2355: -48,14
-            2356: -48,14
-            2357: -50,5
-            2358: -51,5
-            2359: -51,6
-            2360: -51,5
+            2220: -2,39
+            2221: -2,39
+            2222: 1,37
+            2223: 1,37
+            2224: -1,37
+            2225: -1,37
+            2226: -2,37
+            2227: -2,37
+            2228: -1,41
+            2229: -1,40
+            2230: 0,40
+            2231: -2,44
+            2232: 0,48
+            2233: 0,49
+            2234: 0,49
+            2235: 0,51
+            2236: 3,51
+            2237: 6,53
+            2238: 7,53
+            2239: 8,53
+            2240: 8,54
+            2241: 8,54
+            2242: 7,55
+            2264: 1,50
+            2265: 1,50
+            2266: 7,51
+            2315: -38,11
+            2316: -38,11
+            2317: -39,12
+            2318: -39,12
+            2319: -41,10
+            2320: -38,12
+            2321: -32,12
+            2322: -34,12
+            2323: -33,11
+            2324: -34,8
+            2325: -33,8
+            2326: -29,11
+            2327: -31,12
+            2328: -30,12
+            2329: -30,12
+            2342: -52,11
+            2343: -53,10
+            2344: -49,14
+            2345: -48,14
+            2346: -48,14
+            2347: -50,5
+            2348: -51,5
+            2349: -51,6
+            2350: -51,5
         - node:
             color: '#FFFFFFFF'
             id: DirtMedium
@@ -2824,109 +2824,109 @@ entities:
             1301: 27,-19
             1333: 0,23
             1334: 1,23
-            1345: -9,17
-            1346: -8,15
-            1347: -9,15
+            1344: -9,17
+            1345: -8,15
+            1346: -9,15
+            1411: -5,18
             1412: -5,18
-            1413: -5,18
-            1414: -5,17
-            1415: -6,17
-            1416: -6,16
-            1419: -6,16
-            1420: -5,15
+            1413: -5,17
+            1414: -6,17
+            1415: -6,16
+            1418: -6,16
+            1419: -5,15
+            1420: -5,13
             1421: -5,13
-            1422: -5,13
-            1423: -4,13
-            1441: -5,9
-            1442: -4,10
-            1494: 2,8
-            1495: 4,9
-            1496: 4,10
-            1497: 3,9
-            1498: 4,12
-            1499: 4,13
-            1500: 2,15
-            1501: 2,14
-            1502: 4,15
-            1535: 3,28
-            1536: 4,28
-            1537: 5,28
-            1538: 7,28
-            1539: 7,28
-            1540: 6,27
-            1541: 5,26
-            1542: 5,26
-            1543: 8,27
-            1548: 10,23
-            1549: 11,23
-            1804: 48,26
-            1805: 49,26
-            1806: 48,25
-            1807: 47,25
-            1808: 46,26
-            1809: 45,26
-            1810: 45,26
-            1811: 40,26
-            1812: 43,26
-            1813: 43,26
-            1814: 42,24
-            1815: 41,24
-            1816: 42,25
-            1817: 42,26
-            1818: 41,26
-            1819: 40,25
-            1820: 39,26
-            1966: -1,32
-            2405: 4,3
-            2406: 6,4
-            2407: 11,2
-            2443: -9,4
-            2444: -10,4
-            2445: -8,2
-            2446: -12,4
-            2447: -11,2
-            2448: -12,2
-            2449: -12,1
-            2450: -13,4
-            2451: -13,5
-            2540: 37,10
-            2541: 38,9
-            2542: 38,10
-            2636: 31,18
-            2637: 32,17
-            2724: 42,16
+            1422: -4,13
+            1440: -5,9
+            1441: -4,10
+            1493: 2,8
+            1494: 4,9
+            1495: 4,10
+            1496: 3,9
+            1497: 4,12
+            1498: 4,13
+            1499: 2,15
+            1500: 2,14
+            1501: 4,15
+            1530: 3,28
+            1531: 4,28
+            1532: 5,28
+            1533: 7,28
+            1534: 7,28
+            1535: 6,27
+            1536: 5,26
+            1537: 5,26
+            1538: 8,27
+            1539: 10,23
+            1540: 11,23
+            1794: 48,26
+            1795: 49,26
+            1796: 48,25
+            1797: 47,25
+            1798: 46,26
+            1799: 45,26
+            1800: 45,26
+            1801: 40,26
+            1802: 43,26
+            1803: 43,26
+            1804: 42,24
+            1805: 41,24
+            1806: 42,25
+            1807: 42,26
+            1808: 41,26
+            1809: 40,25
+            1810: 39,26
+            1956: -1,32
+            2395: 4,3
+            2396: 6,4
+            2397: 11,2
+            2433: -9,4
+            2434: -10,4
+            2435: -8,2
+            2436: -12,4
+            2437: -11,2
+            2438: -12,2
+            2439: -12,1
+            2440: -13,4
+            2441: -13,5
+            2530: 37,10
+            2531: 38,9
+            2532: 38,10
+            2626: 31,18
+            2627: 32,17
+            2680: 42,16
         - node:
             cleanable: True
             zIndex: 180
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            2253: 7,55
-            2254: 5,56
-            2255: 5,57
-            2256: 4,50
-            2257: 7,49
-            2258: 8,48
-            2259: 8,45
-            2260: 8,44
-            2261: 7,44
-            2262: 8,41
-            2263: 5,41
-            2264: 3,41
-            2265: 3,40
-            2266: 2,40
-            2267: 1,39
-            2268: -1,36
-            2269: 0,37
-            2270: 2,37
-            2271: 2,37
-            2272: -1,40
-            2273: -3,47
+            2243: 7,55
+            2244: 5,56
+            2245: 5,57
+            2246: 4,50
+            2247: 7,49
+            2248: 8,48
+            2249: 8,45
+            2250: 8,44
+            2251: 7,44
+            2252: 8,41
+            2253: 5,41
+            2254: 3,41
+            2255: 3,40
+            2256: 2,40
+            2257: 1,39
+            2258: -1,36
+            2259: 0,37
+            2260: 2,37
+            2261: 2,37
+            2262: -1,40
+            2263: -3,47
         - node:
             color: '#334E6DC8'
             id: FullTileOverlayGreyscale
           decals:
-            2463: -50,3
+            2453: -50,3
         - node:
             color: '#35526FFF'
             id: FullTileOverlayGreyscale
@@ -3005,8 +3005,8 @@ entities:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            2109: -1,42
-            2110: -1,46
+            2099: -1,42
+            2100: -1,46
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -3020,48 +3020,48 @@ entities:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            2111: 5,42
-            2112: 5,46
+            2101: 5,42
+            2102: 5,46
         - node:
             color: '#1F6626FF'
             id: MiniTileCheckerAOverlay
           decals:
-            2826: 3,23
-            2827: 4,23
-            2828: 5,23
-            2829: 5,22
-            2830: 4,22
-            2831: 3,22
-            2832: 3,21
-            2833: 4,21
-            2834: 5,21
-            2835: 5,20
-            2836: 4,20
-            2837: 3,20
+            2782: 3,23
+            2783: 4,23
+            2784: 5,23
+            2785: 5,22
+            2786: 4,22
+            2787: 3,22
+            2788: 3,21
+            2789: 4,21
+            2790: 5,21
+            2791: 5,20
+            2792: 4,20
+            2793: 3,20
         - node:
             color: '#9FED5896'
             id: MiniTileCheckerAOverlay
           decals:
-            2595: 27,18
-            2596: 27,17
-            2597: 27,16
-            2598: 28,16
-            2599: 28,17
-            2600: 28,18
-            2601: 29,18
-            2602: 29,17
-            2603: 29,16
-            2604: 30,16
-            2605: 30,17
-            2606: 30,18
-            2626: 31,17
-            2627: 31,18
-            2628: 32,18
-            2629: 32,17
-            2638: 31,16
-            2639: 32,16
-            2640: 32,15
-            2641: 31,15
+            2585: 27,18
+            2586: 27,17
+            2587: 27,16
+            2588: 28,16
+            2589: 28,17
+            2590: 28,18
+            2591: 29,18
+            2592: 29,17
+            2593: 29,16
+            2594: 30,16
+            2595: 30,17
+            2596: 30,18
+            2616: 31,17
+            2617: 31,18
+            2618: 32,18
+            2619: 32,17
+            2628: 31,16
+            2629: 32,16
+            2630: 32,15
+            2631: 31,15
         - node:
             color: '#FFFFFFFF'
             id: MiniTileCheckerAOverlay
@@ -3103,8 +3103,8 @@ entities:
             color: '#DE3A3A96'
             id: MiniTileLineOverlayW
           decals:
-            2768: 46,16
-            2769: 46,15
+            2724: 46,16
+            2725: 46,15
         - node:
             color: '#FFFFFFFF'
             id: MiniTileOverlay
@@ -3125,66 +3125,66 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileSteelCornerNe
           decals:
-            2749: 40,11
+            2705: 40,11
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelCornerNw
           decals:
-            2756: 37,11
+            2712: 37,11
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelCornerSe
           decals:
-            2748: 40,8
+            2704: 40,8
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelCornerSw
           decals:
-            2745: 37,8
+            2701: 37,8
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineE
           decals:
-            2754: 40,9
-            2755: 40,10
+            2710: 40,9
+            2711: 40,10
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineN
           decals:
-            2750: 39,11
-            2751: 38,11
+            2706: 39,11
+            2707: 38,11
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineS
           decals:
-            2752: 39,8
-            2753: 38,8
+            2708: 39,8
+            2709: 38,8
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineW
           decals:
-            2746: 37,9
-            2747: 37,10
+            2702: 37,9
+            2703: 37,10
         - node:
             color: '#4C2A5EFF'
             id: QuarterTileOverlayGreyscale
           decals:
-            2813: -6,18
-            2814: -5,18
-            2815: -4,18
+            2769: -6,18
+            2770: -5,18
+            2771: -4,18
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale
           decals:
             212: -31,-28
             221: -29,-26
-            2501: 42,6
-            2502: 44,6
-            2503: 43,6
-            2504: 45,6
-            2505: 46,6
-            2506: 47,6
-            2507: 48,6
+            2491: 42,6
+            2492: 44,6
+            2493: 43,6
+            2494: 45,6
+            2495: 46,6
+            2496: 47,6
+            2497: 48,6
         - node:
             color: '#D381C996'
             id: QuarterTileOverlayGreyscale
@@ -3230,11 +3230,11 @@ entities:
             color: '#774194FF'
             id: QuarterTileOverlayGreyscale270
           decals:
-            2816: -2,26
-            2817: -2,26
-            2818: -2,27
-            2819: -2,28
-            2820: -2,29
+            2772: -2,26
+            2773: -2,26
+            2774: -2,27
+            2775: -2,28
+            2776: -2,29
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale270
@@ -3251,31 +3251,31 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
           decals:
-            2703: 40,22
-            2704: 41,22
-            2705: 42,22
-            2706: 43,22
-            2707: 44,22
-            2708: 45,22
-            2709: 46,22
-            2710: 47,22
-            2711: 36,18
-            2712: 36,17
-            2713: 36,16
-            2714: 36,15
-            2715: 37,15
-            2716: 38,15
-            2757: 40,15
-            2758: 39,15
-            2759: 45,15
-            2760: 44,15
-            2761: 43,15
-            2762: 42,15
-            2763: 41,15
-            2764: 36,22
-            2765: 37,22
-            2766: 38,22
-            2767: 39,22
+            2659: 40,22
+            2660: 41,22
+            2661: 42,22
+            2662: 43,22
+            2663: 44,22
+            2664: 45,22
+            2665: 46,22
+            2666: 47,22
+            2667: 36,18
+            2668: 36,17
+            2669: 36,16
+            2670: 36,15
+            2671: 37,15
+            2672: 38,15
+            2713: 40,15
+            2714: 39,15
+            2715: 45,15
+            2716: 44,15
+            2717: 43,15
+            2718: 42,15
+            2719: 41,15
+            2720: 36,22
+            2721: 37,22
+            2722: 38,22
+            2723: 39,22
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale90
@@ -3298,11 +3298,11 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale90
           decals:
-            2770: 41,18
-            2771: 40,18
-            2772: 39,18
-            2773: 38,18
-            2774: 41,17
+            2726: 41,18
+            2727: 40,18
+            2728: 39,18
+            2729: 38,18
+            2730: 41,17
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale90
@@ -3320,74 +3320,74 @@ entities:
             color: '#FFFFFFFF'
             id: SpaceStationSign1
           decals:
-            2371: -11,4
-            2386: 7,4
+            2361: -11,4
+            2376: 7,4
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign10
           decals:
-            2376: -10,2
-            2387: 8,2
+            2366: -10,2
+            2377: 8,2
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign11
           decals:
-            2377: -9,2
-            2388: 9,2
+            2367: -9,2
+            2378: 9,2
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign2
           decals:
-            2378: -10,4
-            2389: 8,4
+            2368: -10,4
+            2379: 8,4
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign3
           decals:
-            2368: -13,3
-            2385: 5,3
+            2358: -13,3
+            2375: 5,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign4
           decals:
-            2369: -12,3
-            2384: 6,3
+            2359: -12,3
+            2374: 6,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign5
           decals:
-            2370: -11,3
-            2383: 7,3
+            2360: -11,3
+            2373: 7,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign6
           decals:
-            2372: -10,3
-            2382: 8,3
+            2362: -10,3
+            2372: 8,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign7
           decals:
-            2373: -9,3
-            2381: 9,3
+            2363: -9,3
+            2371: 9,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign8
           decals:
-            2374: -8,3
-            2380: 10,3
+            2364: -8,3
+            2370: 10,3
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign9
           decals:
-            2375: -7,3
-            2379: 11,3
+            2365: -7,3
+            2369: 11,3
         - node:
             color: '#FF5C5CFF'
             id: StandClearGreyscale
           decals:
-            2697: 37,20
-            2698: 36,20
+            2653: 37,20
+            2654: 36,20
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale
@@ -3475,28 +3475,28 @@ entities:
             366: 12,24
             367: 12,25
             368: 12,26
-            1359: 1,18
-            1360: 1,17
-            1361: 1,16
-            1362: 1,15
-            1367: -3,15
-            1368: -3,16
-            1369: -3,17
-            1370: -3,18
-            2456: -28,1
-            2495: 35,26
-            2496: 35,25
-            2497: 35,24
-            2811: 35,22
-            2812: 35,23
+            1358: 1,18
+            1359: 1,17
+            1360: 1,16
+            1361: 1,15
+            1366: -3,15
+            1367: -3,16
+            1368: -3,17
+            1369: -3,18
+            2446: -28,1
+            2485: 35,26
+            2486: 35,25
+            2487: 35,24
+            2767: 35,22
+            2768: 35,23
         - node:
             zIndex: 180
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            2122: 8,53
-            2123: 8,54
-            2124: 8,55
+            2112: 8,53
+            2113: 8,54
+            2114: 8,55
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -3542,25 +3542,25 @@ entities:
             370: 48,21
             716: -41,8
             717: -40,8
-            2471: -31,0
-            2472: -30,0
-            2473: -29,0
-            2474: -31,-11
-            2475: -29,-11
-            2479: 29,-11
-            2686: 43,17
-            2687: 44,17
-            2688: 45,17
-            2689: 36,19
-            2690: 37,19
-            2691: 36,21
-            2692: 37,21
+            2461: -31,0
+            2462: -30,0
+            2463: -29,0
+            2464: -31,-11
+            2465: -29,-11
+            2469: 29,-11
+            2642: 43,17
+            2643: 44,17
+            2644: 45,17
+            2645: 36,19
+            2646: 37,19
+            2647: 36,21
+            2648: 37,21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
-            2594: 29,19
+            2584: 29,19
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -3611,28 +3611,28 @@ entities:
             359: 55,24
             360: 55,25
             361: 55,26
-            1363: -3,18
-            1364: -3,17
-            1365: -3,16
-            1366: -3,15
-            1371: 1,15
-            1372: 1,16
-            1373: 1,17
-            1374: 1,18
-            2457: -28,1
-            2498: 35,26
-            2499: 35,25
-            2500: 35,24
-            2809: 35,22
-            2810: 35,23
+            1362: -3,18
+            1363: -3,17
+            1364: -3,16
+            1365: -3,15
+            1370: 1,15
+            1371: 1,16
+            1372: 1,17
+            1373: 1,18
+            2447: -28,1
+            2488: 35,26
+            2489: 35,25
+            2490: 35,24
+            2765: 35,22
+            2766: 35,23
         - node:
             zIndex: 180
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            2106: -3,43
-            2107: -3,44
-            2108: -3,45
+            2096: -3,43
+            2097: -3,44
+            2098: -3,45
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -3683,110 +3683,110 @@ entities:
             713: -41,6
             714: -41,9
             715: -40,9
-            2468: -31,0
-            2469: -30,0
-            2470: -29,0
-            2476: -31,-11
-            2477: -29,-11
-            2478: 29,-11
-            2693: 36,19
-            2694: 37,19
-            2695: 37,21
-            2696: 36,21
+            2458: -31,0
+            2459: -30,0
+            2460: -29,0
+            2466: -31,-11
+            2467: -29,-11
+            2468: 29,-11
+            2649: 36,19
+            2650: 37,19
+            2651: 37,21
+            2652: 36,21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            2593: 29,19
+            2583: 29,19
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinCornerNe
           decals:
-            2484: 26,12
-            2510: 46,10
+            2474: 26,12
+            2500: 46,10
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
           decals:
-            2741: 36,11
+            2697: 36,11
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinCornerNw
           decals:
-            2481: 24,12
-            2509: 42,10
+            2471: 24,12
+            2499: 42,10
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNw
           decals:
-            2740: 35,11
+            2696: 35,11
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinCornerSe
           decals:
-            2482: 26,11
-            2511: 46,8
+            2472: 26,11
+            2501: 46,8
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSe
           decals:
-            2807: 36,8
+            2763: 36,8
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinCornerSw
           decals:
-            2483: 24,11
-            2508: 42,8
+            2473: 24,11
+            2498: 42,8
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSw
           decals:
-            2806: 35,8
+            2762: 35,8
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinLineE
           decals:
-            2519: 46,9
+            2509: 46,9
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineE
           decals:
-            2742: 36,9
-            2743: 36,10
+            2698: 36,9
+            2699: 36,10
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinLineN
           decals:
-            2485: 25,12
-            2516: 43,10
-            2517: 44,10
-            2518: 45,10
+            2475: 25,12
+            2506: 43,10
+            2507: 44,10
+            2508: 45,10
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinLineS
           decals:
-            2486: 25,11
-            2513: 43,8
-            2514: 44,8
-            2515: 45,8
+            2476: 25,11
+            2503: 43,8
+            2504: 44,8
+            2505: 45,8
         - node:
             color: '#C8C8C8FF'
             id: WoodTrimThinLineW
           decals:
-            2512: 42,9
+            2502: 42,9
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
           decals:
-            2744: 35,10
-            2808: 35,9
+            2700: 35,10
+            2764: 35,9
         - node:
             zIndex: 180
             color: '#FF00FFFF'
             id: clown
           decals:
-            2367: 6.027291,42.00365
+            2357: 6.027291,42.00365
         - node:
             color: '#9BC516FF'
             id: shop
@@ -3798,7 +3798,7 @@ entities:
             color: '#FFFF00FF'
             id: trade
           decals:
-            2089: 2,38
+            2079: 2,38
     - type: GridAtmosphere
       version: 2
       data:
@@ -15649,12 +15649,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,45.5
       parent: 2173
-  - uid: 756
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 37.5,13.5
-      parent: 2173
   - uid: 757
     components:
     - type: Transform
@@ -16070,6 +16064,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,14.5
       parent: 2173
+  - uid: 4404
+    components:
+    - type: Transform
+      pos: 37.5,13.5
+      parent: 2173
   - uid: 4416
     components:
     - type: Transform
@@ -17882,6 +17881,11 @@ entities:
       parent: 2173
 - proto: DisposalPipe
   entities:
+  - uid: 756
+    components:
+    - type: Transform
+      pos: 39.5,14.5
+      parent: 2173
   - uid: 830
     components:
     - type: Transform
@@ -40561,12 +40565,6 @@ entities:
     - type: Transform
       pos: 23.5,13.5
       parent: 2173
-  - uid: 4404
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 39.5,14.5
-      parent: 2173
   - uid: 4409
     components:
     - type: Transform
@@ -40719,6 +40717,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,26.5
       parent: 2173
+  - uid: 6165
+    components:
+    - type: Transform
+      pos: 39.5,14.5
+      parent: 2173
 - proto: WallSolid
   entities:
   - uid: 256
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index b8d245b332d..89acef82927 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -5,6 +5,7 @@
   components:
   - type: Organ
   - type: Food
+#    quality: Nasty # Frontier
   - type: Sprite
     sprite: Mobs/Species/Human/organs.rsi
   - type: StaticPrice
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index 69081020ce0..6cd4996926a 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -7,6 +7,7 @@
     sprite: Mobs/Species/Human/organs.rsi
   - type: Organ
   - type: Food
+#    quality: Nasty # Frontier
   - type: Extractable
     grindableSolutionName: organ
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml b/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml
index 1ee85a69132..63458928cc8 100644
--- a/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml
@@ -1,22 +1,33 @@
+- type: soundCollection
+  id: VulpkaninBarks
+  files:
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_bark2.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_bark3.ogg
+
 - type: soundCollection
   id: VulpkaninGrowls
   files:
-  - /Audio/_NF/Vulpikanin/growl1.ogg
-  - /Audio/_NF/Vulpikanin/growl2.ogg
-  - /Audio/_NF/Vulpikanin/growl3.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg
 
 - type: soundCollection
-  id: VulpkaninBark
+  id: VulpkaninSnarls
   files:
-  - /Audio/_NF/Vulpikanin/bark.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_snarl1.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_snarl2.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_snarl3.ogg
 
 - type: soundCollection
-  id: VulpkaninHowl
+  id: VulpkaninWhines
   files:
-  - /Audio/_NF/Vulpikanin/howl.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_whine.ogg
 
 - type: soundCollection
-  id: VulpkaninScreams
+  id: VulpkaninHowls
   files:
-  - /Audio/_NF/Vulpikanin/scream1.ogg
-  - /Audio/_NF/Vulpikanin/scream2.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/howl.ogg
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index 2c6be760c15..cef61c20bb3 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -1,55 +1,4 @@
-- type: emoteSounds
-  id: MaleVulpkanin
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: VulpkaninScreams
-    Laugh:
-      collection: MaleLaugh
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    Crying:
-      collection: MaleCry
-    Whistle:
-      collection: Whistles
-    Sigh:
-      collection: MaleSigh
-    Growl:
-      collection: VulpkaninGrowls
-    Howl:
-      collection: VulpkaninHowl
-    Bark:
-      collection: VulpkaninBark
-
-- type: emoteSounds
-  id: FemaleVulpkanin
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: VulpkaninScreams
-    Laugh:
-      collection: FemaleLaugh
-    Sneeze:
-      collection: FemaleSneezes
-    Cough:
-      collection: FemaleCoughs
-    Crying:
-      collection: FemaleCry
-    Whistle:
-      collection: Whistles
-    Sigh:
-      collection: FemaleSigh
-    Growl:
-      collection: VulpkaninGrowls
-    Howl:
-      collection: VulpkaninHowl
-    Bark:
-      collection: VulpkaninBark
-
+# species
 - type: emoteSounds
   id: SoundsHarpy
   params:
@@ -81,8 +30,6 @@
       collection: HarpyPurrs
     Ring:
       collection: HarpyRings
-    Honk:
-      collection: HarpyHonks
     Pew:
       collection: HarpyPews
     Bang:
@@ -101,7 +48,97 @@
       collection: HarpyCaws
     Chirp:
       collection: HarpyChirps
+    Snarl:
+      collection: VulpkaninSnarls
+    Bark:
+      collection: VulpkaninBarks
+    Whine:
+      collection: VulpkaninWhines
     Howl:
-      collection: VulpkaninHowl
+      collection: VulpkaninHowls
+    Awoo:
+      collection: VulpkaninHowls
+    Honk:
+      collection: HarpyHonks
+    Weh:
+      collection: Weh
+
+- type: emoteSounds
+  id: MaleVulpkanin
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: MaleScreams
+    Laugh:
+      collection: MaleLaugh
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
+    Weh:
+      collection: Weh
+    Growl:
+      collection: VulpkaninGrowls
+    Snarl:
+      collection: VulpkaninSnarls
     Bark:
-      collection: VulpkaninBark
+      collection: VulpkaninBarks
+    Whine:
+      collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
+    Awoo:
+      collection: VulpkaninHowls
+
+- type: emoteSounds
+  id: FemaleVulpkanin
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: FemaleScreams
+    Laugh:
+      collection: FemaleLaugh
+    Sneeze:
+      collection: FemaleSneezes
+    Cough:
+      collection: FemaleCoughs
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
+    Crying:
+      collection: FemaleCry
+    Whistle:
+      collection: Whistles
+    Weh:
+      collection: Weh
+    Growl:
+      collection: VulpkaninGrowls
+    Snarl:
+      collection: VulpkaninSnarls
+    Bark:
+      collection: VulpkaninBarks
+    Whine:
+      collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
+    Awoo:
+      collection: VulpkaninHowls
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
index 7a4b97f55e8..70058673232 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
@@ -30,7 +30,6 @@
     - banging.
     - banged.
 
-# Frontier - duplicate, using upstream variant
 #- type: emote
 #  id: Beep
 #  category: Vocal
@@ -126,3 +125,15 @@
     - howls!
     - howling.
     - howled.
+
+- type: emote
+  id: Awoo
+  category: Vocal
+  chatMessages: [awoos.]
+  chatTriggers:
+    - awoo.
+    - awoo!
+    - awoos.
+    - awoos!
+    - awooing.
+    - awooed.
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index f02b1262489..7c3923557de 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -36,12 +36,13 @@
     noUI: true
     blacklist:
       components:
-      - HumanoidAppearance
+#      - HumanoidAppearance # Frontier - Allow goblins to jump inside.
       - Plunger
       - SolutionTransfer
     whitelist:
       components:
       - Item
+      - Goblin # Frontier - Only goblins.
     soundFlush: /Audio/Effects/Fluids/flush.ogg
     soundInsert: /Audio/Effects/Fluids/splash.ogg
   - type: Toilet
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 48af1e2ca49..537f2658e96 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -119,6 +119,7 @@
     whitelist:
       components:
       - Item
+      - Goblin
   - type: MailingUnit
   - type: DeviceNetwork
     deviceNetId: Wired
diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
index f521459327e..ee0de4b4723 100644
--- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
@@ -1,6 +1,76 @@
+# species
 - type: emoteSounds
-  id: Mothroach
-  sound:
-    path: /Audio/Voice/Moth/squeak_moth.ogg
-    params:
-      variation: 0.125
+  id: MaleFelinid
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: FelinidScreams
+    Laugh:
+      collection: MaleLaugh
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
+    Weh:
+      collection: Weh
+    Hiss:
+      collection: FelinidHisses
+    Meow:
+      collection: FelinidMeows
+    Mew:
+      collection: FelinidMews
+    Growl:
+      collection: FelinidGrowls
+    Purr:
+      collection: FelinidPurrs
+
+- type: emoteSounds
+  id: FemaleFelinid
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: FelinidScreams
+    Laugh:
+      collection: FemaleLaugh
+    Sneeze:
+      collection: FemaleSneezes
+    Cough:
+      collection: FemaleCoughs
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
+    Crying:
+      collection: FemaleCry
+    Whistle:
+      collection: Whistles
+    Weh:
+      collection: Weh
+    Hiss:
+      collection: FelinidHisses
+    Meow:
+      collection: FelinidMeows
+    Mew:
+      collection: FelinidMews
+    Growl:
+      collection: FelinidGrowls
+    Purr:
+      collection: FelinidPurrs
\ No newline at end of file
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 11a9fd00aed..24d0e4d8744 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -111,6 +111,9 @@
     Poison:
       effects:
       - !type:HealthChange
+        conditions:
+        - !type:OrganType
+          type: Human
         damage:
           types:
             Poison: 1
@@ -507,6 +510,12 @@
           shouldHave: true
         reagent: Protein
         amount: 0.5
+      - !type:AdjustReagent # Frontier: Goblin
+        conditions: # Frontier: Goblin
+        - !type:OrganType # Frontier: Goblin
+          type: Goblin # Frontier: Goblin
+        reagent: Protein # Frontier: Goblin
+        amount: 0.5 # Frontier: Goblin
 
 - type: reagent
   id: Allicin
diff --git a/Resources/Prototypes/_NF/Accents/word_replacements.yml b/Resources/Prototypes/_NF/Accents/word_replacements.yml
new file mode 100644
index 00000000000..ef140c2ee26
--- /dev/null
+++ b/Resources/Prototypes/_NF/Accents/word_replacements.yml
@@ -0,0 +1,369 @@
+- type: accent
+  id: goblin_accent
+  wordReplacements:
+    accent-goblin-words-1: accent-goblin-words-replace-1
+    accent-goblin-words-2: accent-goblin-words-replace-2
+    accent-goblin-words-3: accent-goblin-words-replace-3
+    accent-goblin-words-4: accent-goblin-words-replace-4
+    accent-goblin-words-5: accent-goblin-words-replace-5
+    accent-goblin-words-6: accent-goblin-words-replace-6
+    accent-goblin-words-7: accent-goblin-words-replace-7
+    accent-goblin-words-8: accent-goblin-words-replace-8
+    accent-goblin-words-9: accent-goblin-words-replace-9
+    accent-goblin-words-10: accent-goblin-words-replace-10
+    accent-goblin-words-11: accent-goblin-words-replace-11
+    accent-goblin-words-12: accent-goblin-words-replace-12
+    accent-goblin-words-13: accent-goblin-words-replace-13
+    accent-goblin-words-14: accent-goblin-words-replace-14
+    accent-goblin-words-15: accent-goblin-words-replace-15
+    accent-goblin-words-16: accent-goblin-words-replace-16
+    accent-goblin-words-17: accent-goblin-words-replace-17
+    accent-goblin-words-18: accent-goblin-words-replace-18
+    accent-goblin-words-19: accent-goblin-words-replace-19
+    accent-goblin-words-20: accent-goblin-words-replace-20
+    accent-goblin-words-21: accent-goblin-words-replace-21
+    accent-goblin-words-22: accent-goblin-words-replace-22
+    accent-goblin-words-23: accent-goblin-words-replace-23
+    accent-goblin-words-24: accent-goblin-words-replace-24
+    accent-goblin-words-25: accent-goblin-words-replace-25
+    accent-goblin-words-26: accent-goblin-words-replace-26
+    accent-goblin-words-27: accent-goblin-words-replace-27
+    accent-goblin-words-28: accent-goblin-words-replace-28
+    accent-goblin-words-29: accent-goblin-words-replace-29
+    accent-goblin-words-30: accent-goblin-words-replace-30
+    accent-goblin-words-31: accent-goblin-words-replace-31
+    accent-goblin-words-32: accent-goblin-words-replace-32
+    accent-goblin-words-33: accent-goblin-words-replace-33
+    accent-goblin-words-34: accent-goblin-words-replace-34
+    accent-goblin-words-35: accent-goblin-words-replace-35
+    accent-goblin-words-36: accent-goblin-words-replace-36
+    accent-goblin-words-37: accent-goblin-words-replace-37
+    accent-goblin-words-38: accent-goblin-words-replace-38
+    accent-goblin-words-39: accent-goblin-words-replace-39
+    accent-goblin-words-40: accent-goblin-words-replace-40
+    accent-goblin-words-41: accent-goblin-words-replace-41
+    accent-goblin-words-42: accent-goblin-words-replace-42
+    accent-goblin-words-43: accent-goblin-words-replace-43
+    accent-goblin-words-44: accent-goblin-words-replace-44
+    accent-goblin-words-45: accent-goblin-words-replace-45
+    accent-goblin-words-46: accent-goblin-words-replace-46
+    accent-goblin-words-47: accent-goblin-words-replace-47
+    accent-goblin-words-48: accent-goblin-words-replace-48
+    accent-goblin-words-49: accent-goblin-words-replace-49
+    accent-goblin-words-50: accent-goblin-words-replace-50
+    accent-goblin-words-51: accent-goblin-words-replace-51
+    accent-goblin-words-52: accent-goblin-words-replace-52
+    accent-goblin-words-53: accent-goblin-words-replace-53
+    accent-goblin-words-54: accent-goblin-words-replace-54
+    accent-goblin-words-55: accent-goblin-words-replace-55
+    accent-goblin-words-56: accent-goblin-words-replace-56
+    accent-goblin-words-57: accent-goblin-words-replace-57
+    accent-goblin-words-58: accent-goblin-words-replace-58
+    accent-goblin-words-59: accent-goblin-words-replace-59
+    accent-goblin-words-60: accent-goblin-words-replace-60
+    accent-goblin-words-61: accent-goblin-words-replace-61
+    accent-goblin-words-62: accent-goblin-words-replace-62
+    accent-goblin-words-63: accent-goblin-words-replace-63
+    accent-goblin-words-64: accent-goblin-words-replace-64
+    accent-goblin-words-65: accent-goblin-words-replace-65
+    accent-goblin-words-66: accent-goblin-words-replace-66
+    accent-goblin-words-67: accent-goblin-words-replace-67
+    accent-goblin-words-68: accent-goblin-words-replace-68
+    accent-goblin-words-69: accent-goblin-words-replace-69
+    accent-goblin-words-70: accent-goblin-words-replace-70
+    accent-goblin-words-71: accent-goblin-words-replace-71
+    accent-goblin-words-72: accent-goblin-words-replace-72
+    accent-goblin-words-73: accent-goblin-words-replace-73
+    accent-goblin-words-74: accent-goblin-words-replace-74
+    accent-goblin-words-75: accent-goblin-words-replace-75
+    accent-goblin-words-76: accent-goblin-words-replace-76
+    accent-goblin-words-77: accent-goblin-words-replace-77
+    accent-goblin-words-78: accent-goblin-words-replace-78
+    accent-goblin-words-79: accent-goblin-words-replace-79
+    accent-goblin-words-80: accent-goblin-words-replace-80
+    accent-goblin-words-81: accent-goblin-words-replace-81
+    accent-goblin-words-82: accent-goblin-words-replace-82
+    accent-goblin-words-83: accent-goblin-words-replace-83
+    accent-goblin-words-84: accent-goblin-words-replace-84
+    accent-goblin-words-85: accent-goblin-words-replace-85
+    accent-goblin-words-86: accent-goblin-words-replace-86
+    accent-goblin-words-87: accent-goblin-words-replace-87
+    accent-goblin-words-88: accent-goblin-words-replace-88
+    accent-goblin-words-89: accent-goblin-words-replace-89
+    accent-goblin-words-90: accent-goblin-words-replace-90
+    accent-goblin-words-91: accent-goblin-words-replace-91
+    accent-goblin-words-92: accent-goblin-words-replace-92
+    accent-goblin-words-93: accent-goblin-words-replace-93
+    accent-goblin-words-94: accent-goblin-words-replace-94
+    accent-goblin-words-95: accent-goblin-words-replace-95
+    accent-goblin-words-96: accent-goblin-words-replace-96
+    accent-goblin-words-97: accent-goblin-words-replace-97
+    accent-goblin-words-98: accent-goblin-words-replace-98
+    accent-goblin-words-99: accent-goblin-words-replace-99
+    accent-goblin-words-100: accent-goblin-words-replace-100
+    accent-goblin-words-101: accent-goblin-words-replace-101
+    accent-goblin-words-102: accent-goblin-words-replace-102
+    accent-goblin-words-103: accent-goblin-words-replace-103
+    accent-goblin-words-104: accent-goblin-words-replace-104
+    accent-goblin-words-105: accent-goblin-words-replace-105
+    accent-goblin-words-106: accent-goblin-words-replace-106
+    accent-goblin-words-107: accent-goblin-words-replace-107
+    accent-goblin-words-108: accent-goblin-words-replace-108
+    accent-goblin-words-109: accent-goblin-words-replace-109
+    accent-goblin-words-110: accent-goblin-words-replace-110
+    accent-goblin-words-111: accent-goblin-words-replace-111
+    accent-goblin-words-112: accent-goblin-words-replace-112
+    accent-goblin-words-113: accent-goblin-words-replace-113
+    accent-goblin-words-114: accent-goblin-words-replace-114
+    accent-goblin-words-115: accent-goblin-words-replace-115
+    accent-goblin-words-116: accent-goblin-words-replace-116
+    accent-goblin-words-117: accent-goblin-words-replace-117
+    accent-goblin-words-118: accent-goblin-words-replace-118
+    accent-goblin-words-119: accent-goblin-words-replace-119
+    accent-goblin-words-120: accent-goblin-words-replace-120
+    accent-goblin-words-121: accent-goblin-words-replace-121
+    accent-goblin-words-122: accent-goblin-words-replace-122
+    accent-goblin-words-123: accent-goblin-words-replace-123
+    accent-goblin-words-124: accent-goblin-words-replace-124
+    accent-goblin-words-125: accent-goblin-words-replace-125
+    accent-goblin-words-126: accent-goblin-words-replace-126
+    accent-goblin-words-127: accent-goblin-words-replace-127
+    accent-goblin-words-128: accent-goblin-words-replace-128
+    accent-goblin-words-129: accent-goblin-words-replace-129
+    accent-goblin-words-130: accent-goblin-words-replace-130
+    accent-goblin-words-131: accent-goblin-words-replace-131
+    accent-goblin-words-132: accent-goblin-words-replace-132
+    accent-goblin-words-133: accent-goblin-words-replace-133
+    accent-goblin-words-134: accent-goblin-words-replace-134
+    accent-goblin-words-135: accent-goblin-words-replace-135
+    accent-goblin-words-136: accent-goblin-words-replace-136
+    accent-goblin-words-137: accent-goblin-words-replace-137
+    accent-goblin-words-138: accent-goblin-words-replace-138
+    accent-goblin-words-139: accent-goblin-words-replace-139
+    accent-goblin-words-140: accent-goblin-words-replace-140
+    accent-goblin-words-141: accent-goblin-words-replace-141
+    accent-goblin-words-142: accent-goblin-words-replace-142
+    accent-goblin-words-143: accent-goblin-words-replace-143
+    accent-goblin-words-144: accent-goblin-words-replace-144
+    accent-goblin-words-145: accent-goblin-words-replace-145
+    accent-goblin-words-146: accent-goblin-words-replace-146
+    accent-goblin-words-147: accent-goblin-words-replace-147
+    accent-goblin-words-148: accent-goblin-words-replace-148
+    accent-goblin-words-149: accent-goblin-words-replace-149
+    accent-goblin-words-150: accent-goblin-words-replace-150
+    accent-goblin-words-151: accent-goblin-words-replace-151
+    accent-goblin-words-152: accent-goblin-words-replace-152
+    accent-goblin-words-153: accent-goblin-words-replace-153
+    accent-goblin-words-154: accent-goblin-words-replace-154
+    accent-goblin-words-155: accent-goblin-words-replace-155
+    accent-goblin-words-156: accent-goblin-words-replace-156
+    accent-goblin-words-157: accent-goblin-words-replace-157
+    accent-goblin-words-158: accent-goblin-words-replace-158
+    accent-goblin-words-159: accent-goblin-words-replace-159
+    accent-goblin-words-160: accent-goblin-words-replace-160
+    accent-goblin-words-161: accent-goblin-words-replace-161
+    accent-goblin-words-162: accent-goblin-words-replace-162
+    accent-goblin-words-163: accent-goblin-words-replace-163
+    accent-goblin-words-164: accent-goblin-words-replace-164
+    accent-goblin-words-165: accent-goblin-words-replace-165
+    accent-goblin-words-166: accent-goblin-words-replace-166
+    accent-goblin-words-167: accent-goblin-words-replace-167
+    accent-goblin-words-168: accent-goblin-words-replace-168
+    accent-goblin-words-169: accent-goblin-words-replace-169
+    accent-goblin-words-170: accent-goblin-words-replace-170
+    accent-goblin-words-171: accent-goblin-words-replace-171
+    accent-goblin-words-172: accent-goblin-words-replace-172
+    accent-goblin-words-173: accent-goblin-words-replace-173
+    accent-goblin-words-174: accent-goblin-words-replace-174
+    accent-goblin-words-175: accent-goblin-words-replace-175
+    accent-goblin-words-176: accent-goblin-words-replace-176
+    accent-goblin-words-177: accent-goblin-words-replace-177
+    accent-goblin-words-178: accent-goblin-words-replace-178
+    accent-goblin-words-179: accent-goblin-words-replace-179
+    accent-goblin-words-180: accent-goblin-words-replace-180
+    accent-goblin-words-181: accent-goblin-words-replace-181
+    accent-goblin-words-182: accent-goblin-words-replace-182
+    accent-goblin-words-183: accent-goblin-words-replace-183
+    accent-goblin-words-184: accent-goblin-words-replace-184
+    accent-goblin-words-185: accent-goblin-words-replace-185
+    accent-goblin-words-186: accent-goblin-words-replace-186
+    accent-goblin-words-187: accent-goblin-words-replace-187
+    accent-goblin-words-188: accent-goblin-words-replace-188
+    accent-goblin-words-189: accent-goblin-words-replace-189
+    accent-goblin-words-190: accent-goblin-words-replace-190
+    accent-goblin-words-191: accent-goblin-words-replace-191
+    accent-goblin-words-192: accent-goblin-words-replace-192
+    accent-goblin-words-193: accent-goblin-words-replace-193
+    accent-goblin-words-194: accent-goblin-words-replace-194
+    accent-goblin-words-195: accent-goblin-words-replace-195
+    accent-goblin-words-196: accent-goblin-words-replace-196
+    accent-goblin-words-197: accent-goblin-words-replace-197
+    accent-goblin-words-198: accent-goblin-words-replace-198
+    accent-goblin-words-199: accent-goblin-words-replace-199
+    accent-goblin-words-200: accent-goblin-words-replace-200
+    accent-goblin-words-201: accent-goblin-words-replace-201
+    accent-goblin-words-202: accent-goblin-words-replace-202
+    accent-goblin-words-203: accent-goblin-words-replace-203
+    accent-goblin-words-204: accent-goblin-words-replace-204
+    accent-goblin-words-205: accent-goblin-words-replace-205
+    accent-goblin-words-206: accent-goblin-words-replace-206
+    accent-goblin-words-207: accent-goblin-words-replace-207
+    accent-goblin-words-208: accent-goblin-words-replace-208
+    accent-goblin-words-209: accent-goblin-words-replace-209
+    accent-goblin-words-210: accent-goblin-words-replace-210
+    accent-goblin-words-211: accent-goblin-words-replace-211
+    accent-goblin-words-212: accent-goblin-words-replace-212
+    accent-goblin-words-213: accent-goblin-words-replace-213
+    accent-goblin-words-214: accent-goblin-words-replace-214
+    accent-goblin-words-215: accent-goblin-words-replace-215
+    accent-goblin-words-216: accent-goblin-words-replace-216
+    accent-goblin-words-217: accent-goblin-words-replace-217
+    accent-goblin-words-218: accent-goblin-words-replace-218
+    accent-goblin-words-219: accent-goblin-words-replace-219
+    accent-goblin-words-220: accent-goblin-words-replace-220
+    accent-goblin-words-221: accent-goblin-words-replace-221
+    accent-goblin-words-222: accent-goblin-words-replace-222
+    accent-goblin-words-223: accent-goblin-words-replace-223
+    accent-goblin-words-224: accent-goblin-words-replace-224
+    accent-goblin-words-225: accent-goblin-words-replace-225
+    accent-goblin-words-226: accent-goblin-words-replace-226
+    accent-goblin-words-227: accent-goblin-words-replace-227
+    accent-goblin-words-228: accent-goblin-words-replace-228
+    accent-goblin-words-229: accent-goblin-words-replace-229
+    accent-goblin-words-230: accent-goblin-words-replace-230
+    accent-goblin-words-231: accent-goblin-words-replace-231
+    accent-goblin-words-232: accent-goblin-words-replace-232
+    accent-goblin-words-233: accent-goblin-words-replace-233
+    accent-goblin-words-234: accent-goblin-words-replace-234
+    accent-goblin-words-235: accent-goblin-words-replace-235
+    accent-goblin-words-236: accent-goblin-words-replace-236
+    accent-goblin-words-237: accent-goblin-words-replace-237
+    accent-goblin-words-238: accent-goblin-words-replace-238
+    accent-goblin-words-239: accent-goblin-words-replace-239
+    accent-goblin-words-240: accent-goblin-words-replace-240
+    accent-goblin-words-241: accent-goblin-words-replace-241
+    accent-goblin-words-242: accent-goblin-words-replace-242
+    accent-goblin-words-243: accent-goblin-words-replace-243
+    accent-goblin-words-244: accent-goblin-words-replace-244
+    accent-goblin-words-245: accent-goblin-words-replace-245
+    accent-goblin-words-246: accent-goblin-words-replace-246
+    accent-goblin-words-247: accent-goblin-words-replace-247
+    accent-goblin-words-248: accent-goblin-words-replace-248
+    accent-goblin-words-249: accent-goblin-words-replace-249
+    accent-goblin-words-250: accent-goblin-words-replace-250
+    accent-goblin-words-251: accent-goblin-words-replace-251
+    accent-goblin-words-252: accent-goblin-words-replace-252
+    accent-goblin-words-253: accent-goblin-words-replace-253
+    accent-goblin-words-254: accent-goblin-words-replace-254
+    accent-goblin-words-255: accent-goblin-words-replace-255
+    accent-goblin-words-256: accent-goblin-words-replace-256
+    accent-goblin-words-257: accent-goblin-words-replace-257
+    accent-goblin-words-258: accent-goblin-words-replace-258
+    accent-goblin-words-259: accent-goblin-words-replace-259
+    accent-goblin-words-260: accent-goblin-words-replace-260
+    accent-goblin-words-261: accent-goblin-words-replace-261
+    accent-goblin-words-262: accent-goblin-words-replace-262
+    accent-goblin-words-263: accent-goblin-words-replace-263
+    accent-goblin-words-264: accent-goblin-words-replace-264
+    accent-goblin-words-265: accent-goblin-words-replace-265
+    accent-goblin-words-266: accent-goblin-words-replace-266
+    accent-goblin-words-267: accent-goblin-words-replace-267
+    accent-goblin-words-268: accent-goblin-words-replace-268
+    accent-goblin-words-269: accent-goblin-words-replace-269
+    accent-goblin-words-270: accent-goblin-words-replace-270
+    accent-goblin-words-271: accent-goblin-words-replace-271
+    accent-goblin-words-272: accent-goblin-words-replace-272
+    accent-goblin-words-273: accent-goblin-words-replace-273
+    accent-goblin-words-274: accent-goblin-words-replace-274
+    accent-goblin-words-275: accent-goblin-words-replace-275
+    accent-goblin-words-276: accent-goblin-words-replace-276
+    accent-goblin-words-277: accent-goblin-words-replace-277
+    accent-goblin-words-278: accent-goblin-words-replace-278
+    accent-goblin-words-279: accent-goblin-words-replace-279
+    accent-goblin-words-280: accent-goblin-words-replace-280
+    accent-goblin-words-281: accent-goblin-words-replace-281
+    accent-goblin-words-282: accent-goblin-words-replace-282
+    accent-goblin-words-283: accent-goblin-words-replace-283
+    accent-goblin-words-284: accent-goblin-words-replace-284
+    accent-goblin-words-285: accent-goblin-words-replace-285
+    accent-goblin-words-286: accent-goblin-words-replace-286
+    accent-goblin-words-287: accent-goblin-words-replace-287
+    accent-goblin-words-288: accent-goblin-words-replace-288
+    accent-goblin-words-289: accent-goblin-words-replace-289
+    accent-goblin-words-290: accent-goblin-words-replace-290
+    accent-goblin-words-291: accent-goblin-words-replace-291
+    accent-goblin-words-292: accent-goblin-words-replace-292
+    accent-goblin-words-293: accent-goblin-words-replace-293
+    accent-goblin-words-294: accent-goblin-words-replace-294
+    accent-goblin-words-295: accent-goblin-words-replace-295
+    accent-goblin-words-296: accent-goblin-words-replace-296
+    accent-goblin-words-297: accent-goblin-words-replace-297
+    accent-goblin-words-298: accent-goblin-words-replace-298
+    accent-goblin-words-299: accent-goblin-words-replace-299
+    accent-goblin-words-300: accent-goblin-words-replace-300
+    accent-goblin-words-301: accent-goblin-words-replace-301
+    accent-goblin-words-302: accent-goblin-words-replace-302
+    accent-goblin-words-303: accent-goblin-words-replace-303
+    accent-goblin-words-304: accent-goblin-words-replace-304
+    accent-goblin-words-305: accent-goblin-words-replace-305
+    accent-goblin-words-306: accent-goblin-words-replace-306
+    accent-goblin-words-307: accent-goblin-words-replace-307
+    accent-goblin-words-308: accent-goblin-words-replace-308
+    accent-goblin-words-309: accent-goblin-words-replace-309
+    accent-goblin-words-310: accent-goblin-words-replace-310
+    accent-goblin-words-311: accent-goblin-words-replace-311
+    accent-goblin-words-312: accent-goblin-words-replace-312
+    accent-goblin-words-313: accent-goblin-words-replace-313
+    accent-goblin-words-314: accent-goblin-words-replace-314
+    accent-goblin-words-315: accent-goblin-words-replace-315
+    accent-goblin-words-316: accent-goblin-words-replace-316
+    accent-goblin-words-317: accent-goblin-words-replace-317
+    accent-goblin-words-318: accent-goblin-words-replace-318
+    accent-goblin-words-319: accent-goblin-words-replace-319
+    accent-goblin-words-320: accent-goblin-words-replace-320
+    accent-goblin-words-321: accent-goblin-words-replace-321
+    accent-goblin-words-322: accent-goblin-words-replace-322
+    accent-goblin-words-323: accent-goblin-words-replace-323
+    accent-goblin-words-324: accent-goblin-words-replace-324
+    accent-goblin-words-325: accent-goblin-words-replace-325
+    accent-goblin-words-326: accent-goblin-words-replace-326
+    accent-goblin-words-327: accent-goblin-words-replace-327
+    accent-goblin-words-328: accent-goblin-words-replace-328
+    accent-goblin-words-329: accent-goblin-words-replace-329
+    accent-goblin-words-330: accent-goblin-words-replace-330
+    accent-goblin-words-331: accent-goblin-words-replace-331
+    accent-goblin-words-332: accent-goblin-words-replace-332
+    accent-goblin-words-333: accent-goblin-words-replace-333
+    accent-goblin-words-334: accent-goblin-words-replace-334
+    accent-goblin-words-335: accent-goblin-words-replace-335
+    accent-goblin-words-336: accent-goblin-words-replace-336
+    accent-goblin-words-337: accent-goblin-words-replace-337
+    accent-goblin-words-338: accent-goblin-words-replace-338
+    accent-goblin-words-339: accent-goblin-words-replace-339
+    accent-goblin-words-340: accent-goblin-words-replace-340
+    accent-goblin-words-341: accent-goblin-words-replace-341
+    accent-goblin-words-342: accent-goblin-words-replace-342
+    accent-goblin-words-343: accent-goblin-words-replace-343
+    accent-goblin-words-344: accent-goblin-words-replace-344
+    accent-goblin-words-345: accent-goblin-words-replace-345
+    accent-goblin-words-346: accent-goblin-words-replace-346
+    accent-goblin-words-347: accent-goblin-words-replace-347
+    accent-goblin-words-348: accent-goblin-words-replace-348
+    accent-goblin-words-349: accent-goblin-words-replace-349
+    accent-goblin-words-350: accent-goblin-words-replace-350
+    accent-goblin-words-351: accent-goblin-words-replace-351
+    accent-goblin-words-352: accent-goblin-words-replace-352
+    accent-goblin-words-353: accent-goblin-words-replace-353
+    accent-goblin-words-354: accent-goblin-words-replace-354
+    accent-goblin-words-355: accent-goblin-words-replace-355
+    accent-goblin-words-356: accent-goblin-words-replace-356
+    accent-goblin-words-357: accent-goblin-words-replace-357
+    accent-goblin-words-358: accent-goblin-words-replace-358
+    accent-goblin-words-359: accent-goblin-words-replace-359
+    accent-goblin-words-360: accent-goblin-words-replace-360
+    accent-goblin-words-361: accent-goblin-words-replace-361
+    accent-goblin-words-362: accent-goblin-words-replace-362
+    accent-goblin-words-363: accent-goblin-words-replace-363
+    accent-goblin-words-364: accent-goblin-words-replace-364
+    accent-goblin-words-365: accent-goblin-words-replace-365
+    accent-goblin-words-366: accent-goblin-words-replace-366
diff --git a/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml b/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml
new file mode 100644
index 00000000000..4e0c6175c12
--- /dev/null
+++ b/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml
@@ -0,0 +1,200 @@
+- type: entity
+  parent: OrganHumanBrain
+  id: OrganGoblinBrain
+  name: brain
+  suffix: Goblin
+  description: "The source of your woes."
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+    state: brain
+  - type: Organ
+  - type: Input
+    context: "ghost"
+  - type: Brain
+  - type: InputMover
+  - type: Examiner
+  - type: BlockMovement
+  - type: BadFood
+  - type: Tag
+    tags:
+      - Meat
+
+- type: entity
+  parent: OrganHumanEyes
+  id: OrganGoblinEyes
+  name: eyes
+  suffix: Goblin
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+    layers:
+      - state: eyeball-l
+      - state: eyeball-r
+
+- type: entity
+  parent: OrganHumanTongue
+  id: OrganGoblinTongue
+  name: tongue
+  suffix: Goblin
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+    state: tongue
+
+- type: entity
+  parent: OrganHumanAppendix
+  id: OrganGoblinAppendix
+  name: appendix
+  suffix: Goblin
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+    layers:
+    - state: appendix
+    - state: appendix-inflamed
+      visible: false
+
+- type: entity
+  parent: OrganHumanEars
+  id: OrganGoblinEars
+  name: ears
+  suffix: Goblin
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+    state: ears
+
+- type: entity
+  parent: BaseHumanOrgan
+  id: OrganGoblinLungs
+  name: lungs
+  suffix: Goblin
+  description: "They breathe business."
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+    layers:
+      - state: lung-l
+      - state: lung-r
+  - type: Lung
+  - type: Metabolizer
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Animal ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      Lung:
+        maxVol: 100.0
+        canReact: false
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+
+- type: entity
+  parent: OrganHumanHeart
+  id: OrganGoblinHeart
+  name: heart
+  suffix: Goblin
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+    state: heart-on
+  - type: Metabolizer
+    metabolizerTypes: [ Goblin ]
+
+- type: entity
+  parent: [OrganAnimalStomach, OrganHumanStomach]
+  id: OrganGoblinStomach
+  name: stomach
+  suffix: Goblin
+  description: "Shrooms go in here."
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+    state: stomach
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Stomach
+#    reverseFoodQuality: true
+#    trashDigestion: true
+#    specialDigestible:
+#      tags:
+#      - Raw
+#      - Meat
+#      - Fruit
+#      - Pill
+#      - Crayon
+#      - Egg
+#      - Trash
+#      - FoodSnack
+#      - Soup
+#      - Bread
+#      - DonkPocket
+#      - Donut
+#      - Nugget
+#      - Pancake
+#      - Pie
+#      - Pizza
+  - type: Metabolizer
+    maxReagents: 3
+    metabolizerTypes: [ Goblin ]
+    removeEmpty: true
+    groups:
+    - id: Food
+    - id: Drink
+    - id: Medicine
+    - id: Poison
+    - id: Narcotic
+    - id: Alcohol
+
+- type: entity
+  parent: OrganHumanLiver
+  id: OrganGoblinLiver
+  name: liver
+  suffix: Goblin
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+    state: liver
+  - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
+    maxReagents: 1
+    metabolizerTypes: [ Goblin ]
+    groups:
+    - id: Alcohol
+      rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
+
+- type: entity
+  parent: OrganHumanKidneys
+  id: OrganGoblinKidneys
+  name: kidneys
+  suffix: Goblin
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/organs.rsi
+    layers:
+      - state: kidney-l
+      - state: kidney-r
+  # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
+  - type: Metabolizer
+    maxReagents: 5
+    metabolizerTypes: [ Animal ]
+    removeEmpty: true
diff --git a/Resources/Prototypes/_NF/Body/Parts/goblin_parts.yml b/Resources/Prototypes/_NF/Body/Parts/goblin_parts.yml
new file mode 100644
index 00000000000..19f4f5b15a2
--- /dev/null
+++ b/Resources/Prototypes/_NF/Body/Parts/goblin_parts.yml
@@ -0,0 +1,117 @@
+- type: entity
+  id: PartGoblin
+  parent: [BaseItem, BasePart]
+  name: "goblin body part"
+  abstract: true
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+- type: entity
+  id: TorsoGoblin
+  name: "Goblin torso"
+  parent: [PartGoblin, BaseTorso]
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: "torso_m"
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+- type: entity
+  id: HeadGoblin
+  name: "Goblin head"
+  parent: [PartGoblin, BaseHead]
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: "head_m"
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+- type: entity
+  id: LeftArmGoblin
+  name: "left Goblin arm"
+  parent: [PartGoblin, BaseLeftArm]
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: "l_arm"
+
+- type: entity
+  id: RightArmGoblin
+  name: "right Goblin arm"
+  parent: [PartGoblin, BaseRightArm]
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: "r_arm"
+
+- type: entity
+  id: LeftHandGoblin
+  name: "left Goblin hand"
+  parent: [PartGoblin, BaseLeftHand]
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: "l_hand"
+
+- type: entity
+  id: RightHandGoblin
+  name: "right Goblin hand"
+  parent: [PartGoblin, BaseRightHand]
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: "r_hand"
+
+- type: entity
+  id: LeftLegGoblin
+  name: "left Goblin leg"
+  parent: [PartGoblin, BaseLeftLeg]
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: "l_leg"
+
+- type: entity
+  id: RightLegGoblin
+  name: "right Goblin leg"
+  parent: [PartGoblin, BaseRightLeg]
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: "r_leg"
+
+- type: entity
+  id: LeftFootGoblin
+  name: "left Goblin foot"
+  parent: [PartGoblin, BaseLeftFoot]
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: "l_foot"
+
+- type: entity
+  id: RightFootGoblin
+  name: "right Goblin foot"
+  parent: [PartGoblin, BaseRightFoot]
+  components:
+  - type: Sprite
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: "r_foot"
diff --git a/Resources/Prototypes/_NF/Body/Prototypes/goblin_prototypes.yml b/Resources/Prototypes/_NF/Body/Prototypes/goblin_prototypes.yml
new file mode 100644
index 00000000000..a8cacb9ce89
--- /dev/null
+++ b/Resources/Prototypes/_NF/Body/Prototypes/goblin_prototypes.yml
@@ -0,0 +1,49 @@
+- type: body
+  id: Goblin
+  name: "goblin"
+  root: torso
+  slots:
+    head:
+      part: HeadGoblin
+      connections:
+      - torso
+      organs:
+        brain: OrganGoblinBrain
+        eyes: OrganGoblinEyes
+    torso:
+      part: TorsoGoblin
+      connections:
+      - left arm
+      - right arm
+      - left leg
+      - right leg
+      organs:
+        heart: OrganGoblinHeart
+        lungs: OrganGoblinLungs
+        stomach: OrganGoblinStomach
+        liver: OrganGoblinLiver
+        kidneys: OrganGoblinKidneys
+    right arm:
+      part: RightArmGoblin
+      connections:
+      - right hand
+    left arm:
+      part: LeftArmGoblin
+      connections:
+      - left hand
+    right hand:
+      part: RightHandGoblin
+    left hand:
+      part: LeftHandGoblin
+    right leg:
+      part: RightLegGoblin
+      connections:
+      - right foot
+    left leg:
+      part: LeftLegGoblin
+      connections:
+      - left foot
+    right foot:
+      part: RightFootGoblin
+    left foot:
+      part: LeftFootGoblin
diff --git a/Resources/Prototypes/_NF/Chemistry/metabolizer_types.yml b/Resources/Prototypes/_NF/Chemistry/metabolizer_types.yml
new file mode 100644
index 00000000000..f732c84cf94
--- /dev/null
+++ b/Resources/Prototypes/_NF/Chemistry/metabolizer_types.yml
@@ -0,0 +1,6 @@
+# If your species wants to metabolize stuff differently,
+# you'll likely have to tag its metabolizers with something other than Human.
+
+- type: metabolizerType #Frontier
+  id: Goblin #Frontier
+  name: goblin #Frontier
diff --git a/Resources/Prototypes/_NF/Damage/modifier_sets.yml b/Resources/Prototypes/_NF/Damage/modifier_sets.yml
new file mode 100644
index 00000000000..988185dc29c
--- /dev/null
+++ b/Resources/Prototypes/_NF/Damage/modifier_sets.yml
@@ -0,0 +1,7 @@
+- type: damageModifierSet
+  id: Goblin
+  coefficients:
+    Blunt: 1.1
+    Slash: 1.1
+    Piercing: 1.1
+    Poison: 0.8
diff --git a/Resources/Prototypes/_NF/Datasets/Names/goblin_names_female.yml b/Resources/Prototypes/_NF/Datasets/Names/goblin_names_female.yml
new file mode 100644
index 00000000000..bbbab4f90f9
--- /dev/null
+++ b/Resources/Prototypes/_NF/Datasets/Names/goblin_names_female.yml
@@ -0,0 +1,212 @@
+# used this tool: https://www.fantasynamegenerators.com/goblin-names.php
+- type: dataset
+  id: names_goblin_female
+  values:
+  -	Milm
+  -	Tulxe
+  -	Choisz
+  -	Sogs
+  -	Igsa
+  -	Phupaangai
+  -	Iemolk
+  -	Rahuxee
+  -	Sterzirtea
+  -	Liablule
+  -	Guirx
+  -	Sluigs
+  -	Qil
+  -	Prilx
+  -	Sroifs
+  -	Klelrusha
+  -	Phoshaxia
+  -	Stulzoix
+  -	Wrivuish
+  -	Fiorift
+  -	Vraft
+  -	Preafse
+  -	Pash
+  -	Swosx
+  -	Ilia
+  -	Otvold
+  -	Bheaneaszai
+  -	Ykift
+  -	Qugogsai
+  -	Kiafezz
+  -	Ben
+  -	Grynx
+  -	Chilea
+  -	Glink
+  -	Vriaf
+  -	Blirmynqai
+  -	Gnalzess
+  -	Hahzufz
+  -	Tumafz
+  -	Khopsiex
+  -	Ohx
+  -	Yhxee
+  -	Teefea
+  -	Vrolt
+  -	Eeq
+  -	Sinuzzee
+  -	Srohbesze
+  -	Crosazi
+  -	Flolgelda
+  -	Cheeskoisx
+  -	Gefz
+  -	Srehea
+  -	Phyx
+  -	Slift
+  -	Praq
+  -	Truigeanx
+  -	Riepienq
+  -	Cheasseeng
+  -	Prusdert
+  -	Roivlulka
+  -	Gnuix
+  -	Gnuz
+  -	Urx
+  -	Chufsia
+  -	Lulk
+  -	Vobdelk
+  -	Viosmoltai
+  -	Rategs
+  -	Prilralx
+  -	Ciebalt
+  -	Miesz
+  -	Raafs
+  -	Gnolt
+  -	Shoildai
+  -	Pieprean
+  -	Aaftinxea
+  -	Wrabaalk
+  -	Wrioshaas
+  -	Shopfeelde
+  -	Fanx
+  -	Lath
+  -	Cult
+  -	Prugs
+  -	Crolma
+  -	Mokzux
+  -	Threekkozza
+  -	Cloirsart
+  -	Cegzexai
+  -	Wreetzold
+  -	Luns
+  -	Mengee
+  -	Glesxa
+  -	Fliolm
+  -	Jalk
+  -	Blohkuszee
+  -	Sletef
+  -	Vornelt
+  -	Gnaklixea
+  -	Ielild
+  -	Panx
+  -	Thele
+  -	Swylk
+  -	Olx
+  -	Sruimiangea
+  -	Blaagzilk
+  -	Gluilalt
+  -	Nahdathai
+  -	Ybniefsai
+  -	Thresea
+  -	Pialkai
+  -	Trold
+  -	Toisi
+  -	Chigia
+  -	Tigsinx
+  -	Ieveq
+  -	Wrersungea
+  -	Tiltang
+  -	Uhux
+  -	Gnofs
+  -	Grigs
+  -	Fruiq
+  -	Qofz
+  -	Healxea
+  -	Uimtuhx
+  -	Fliebzols
+  -	Boiplufta
+  -	Veruni
+  -	Vrumuingi
+  -	Trig
+  -	Swolm
+  -	Braas
+  -	Oshea
+  -	Throinq
+  -	Okin
+  -	Cleruzee
+  -	Pynoif
+  -	Fentash
+  -	Desriesh
+  -	Sags
+  -	Kluzea
+  -	Ig
+  -	Brolk
+  -	Conga
+  -	Phioflesx
+  -	Thrumziss
+  -	Vrubloildea
+  -	Ophafz
+  -	Srisburtee
+  -	Chig
+  -	Grurxi
+  -	Frinkea
+  -	Gnanx
+  -	Flols
+  -	Klovleerx
+  -	Chebdielt
+  -	Bliokness
+  -	Bloigkiart
+  -	Swegsoq
+  -	Pragsee
+  -	Shien
+  -	Soinq
+  -	Shielt
+  -	Fesi
+  -	Gnermol
+  -	Qiergufzai
+  -	Khopsiaz
+  -	Ovafsee
+  -	Stegziaft
+  -	Elt
+  -	Blerti
+  -	Dals
+  -	Sliqa
+  -	Paashia
+  -	Ipug
+  -	Mafnifa
+  -	Flaatrush
+  -	Saageqia
+  -	Clumosx
+  -	Cierxia
+  -	Resx
+  -	Phuift
+  -	Vreh
+  -	Frogs
+  -	Gnulbiosx
+  -	Hiemis
+  -	Erraha
+  -	Breavol
+  -	Caakvong
+  -	Prel
+  -	Kleefai
+  -	Eafz
+  -	Eeshi
+  -	Jysx
+  -	Thosseagsia
+  -	Uihboif
+  -	Uibiesz
+  -	Gryplilai
+  -	Clietnon
+  -	Glesx
+  -	Moft
+  -	Gnerte
+  -	Riex
+  -	Eng
+  -	Irraaxai
+  -	Chasizia
+  -	Siogensia
+  -	Thraarliotha
+  -	Weagkeenkea
diff --git a/Resources/Prototypes/_NF/Datasets/Names/goblin_names_last.yml b/Resources/Prototypes/_NF/Datasets/Names/goblin_names_last.yml
new file mode 100644
index 00000000000..0571547116b
--- /dev/null
+++ b/Resources/Prototypes/_NF/Datasets/Names/goblin_names_last.yml
@@ -0,0 +1,214 @@
+# used this tool: https://www.fantasynamegenerators.com/goblin-wow-names.php
+- type: dataset
+  id: names_goblin_last
+  values:
+  -	Cutsnap
+  -	Deadshift
+  -	Smartrocket
+  -	Peddlebeam
+  -	Fiztwist
+  -	Shiftcharge
+  -	Craftsteam
+  -	Vividgleam
+  -	Boltscrew
+  -	Cheaprocket
+  -	Sandcord
+  -	Grimesnap
+  -	Greedbulb
+  -	Fizztale
+  -	Silverbulb
+  -	Steamhead
+  -	Brokenbead
+  -	Madgob
+  -	Ficklegrubber
+  -	Loosefluke
+  -	Greasyblade
+  -	Shadowcoat
+  -	Fastboot
+  -	Fizztongue
+  -	Brisksprocket
+  -	Smartbite
+  -	Shiftfire
+  -	Fartweak
+  -	Grimeslice
+  -	Lazyvolt
+  -	Shortdirt
+  -	Slickwick
+  -	Cutgrubber
+  -	Meanskimmer
+  -	Blandchart
+  -	Bentflame
+  -	Powerbucket
+  -	Fusetweak
+  -	Rocketbeam
+  -	Shrillhead
+  -	Silvercheek
+  -	Madsnap
+  -	Botnozzle
+  -	Agilescrew
+  -	Boltflame
+  -	Plainbuttons
+  -	Niftgrubber
+  -	Mantongue
+  -	Rocketbeast
+  -	Smugbite
+  -	Manbite
+  -	Groundbit
+  -	Niftscrew
+  -	Starkbomb
+  -	Vexboot
+  -	Saltsteam
+  -	Toppocket
+  -	Pickblast
+  -	Looseclamp
+  -	Plainbutton
+  -	Multiwick
+  -	Slysnap
+  -	Slickgift
+  -	Rockettooth
+  -	Grimfault
+  -	Falseclamp
+  -	Leaftwist
+  -	Fizzlemine
+  -	Clearvolt
+  -	Keenshiv
+  -	Wildwick
+  -	Mancoil
+  -	Shiftrocket
+  -	Boltwatts
+  -	Shrillchart
+  -	Glumpocket
+  -	Meanhallow
+  -	Vexspark
+  -	Pickbub
+  -	Slyflame
+  -	Wrenchburst
+  -	Dullbit
+  -	Powertask
+  -	Fizbeast
+  -	Keentale
+  -	Dampslice
+  -	Greasymask
+  -	Blindbrake
+  -	Vexnose
+  -	Boltblast
+  -	Mudgleam
+  -	Lazyfuel
+  -	Goldpot
+  -	Roughgift
+  -	Gigashatter
+  -	Peppergleam
+  -	Steamshift
+  -	Kneebutton
+  -	Shadowpot
+  -	Deadtweak
+  -	Fiercewell
+  -	Peppergrin
+  -	Rashtask
+  -	Meanfang
+  -	Brokencharge
+  -	Farjolt
+  -	Greedmine
+  -	Rustmask
+  -	Moneybelt
+  -	Fastsnipe
+  -	Strongnozzle
+  -	Cogcrook
+  -	Fizzlebeast
+  -	Multihead
+  -	Multitwister
+  -	Loosedrive
+  -	Cheapflare
+  -	Clearbucket
+  -	Hagglewizzle
+  -	Sparksmile
+  -	Slytongue
+  -	Lazyblade
+  -	Multigear
+  -	Kneeclamp
+  -	Grapplerocket
+  -	Falsefuel
+  -	Fastnose
+  -	Smallflame
+  -	Falsegrubber
+  -	Faintdoc
+  -	Hardwrench
+  -	Saltcord
+  -	Greaseflow
+  -	Blindbeam
+  -	Vividhammer
+  -	Meanhold
+  -	Sandgrinder
+  -	Smallbasher
+  -	Moneyhammer
+  -	Madknob
+  -	Grapplecharge
+  -	Silvergob
+  -	Cogbite
+  -	Botfuse
+  -	Glumhammer
+  -	Rashhead
+  -	Sandhire
+  -	Glumtongue
+  -	Agilebit
+  -	Blandbit
+  -	Glumpatch
+  -	Vividbelt
+  -	Fizzbottom
+  -	Cheapfeet
+  -	Agilejolt
+  -	Slickwrench
+  -	Topwell
+  -	Sharpdrive
+  -	Slickfingers
+  -	Greasyfang
+  -	Glumspark
+  -	Cutpinch
+  -	Hardsnipe
+  -	Sandmask
+  -	Hagglebolt
+  -	Wrenchdrive
+  -	Greasykettle
+  -	Silverbolt
+  -	Falsepost
+  -	Falseblaster
+  -	Rustbelt
+  -	Starkburst
+  -	Cheapcharge
+  -	Leafbite
+  -	Hardracket
+  -	Hardclamp
+  -	Fasthold
+  -	Grandblade
+  -	Aridracket
+  -	Multibuttons
+  -	Grimeblade
+  -	Fixbombs
+  -	Fizzlechin
+  -	Meanclamp
+  -	Bentblaster
+  -	Boomhammer
+  -	Hardbuttons
+  -	Megacoil
+  -	Shadownose
+  -	Brokenbomb
+  -	Smartskimmer
+  -	Ficklegrin
+  -	Blinddirt
+  -	Fusepot
+  -	Topbucket
+  -	Rustbomb
+  -	Grimepocket
+  -	Cheaptweak
+  -	Shrillshiv
+  -	Smugpinch
+  -	Grimblade
+  -	Keentongue
+  -	Sandpot
+  -	Meanhook
+  -	Sandgrubber
+  -	Saltblast
+  -	Slyfire
+  -	Foamscrew
+  -	Fizzlebub
+  -	Hardfault
diff --git a/Resources/Prototypes/_NF/Datasets/Names/goblin_names_male.yml b/Resources/Prototypes/_NF/Datasets/Names/goblin_names_male.yml
new file mode 100644
index 00000000000..80c5f98c6e3
--- /dev/null
+++ b/Resources/Prototypes/_NF/Datasets/Names/goblin_names_male.yml
@@ -0,0 +1,213 @@
+# used this tool: https://www.fantasynamegenerators.com/goblin-names.php
+- type: dataset
+  id: names_goblin_male
+  values:
+  - Crirt
+  -	Weq
+  -	Blaq
+  -	Xork
+  -	Jestuirm
+  -	Storuq
+  -	Eantard
+  -	Zratnirt
+  -	Granurd
+  -	Srekz
+  -	Srard
+  -	Drenk
+  -	Klaax
+  -	Strias
+  -	Glonyq
+  -	Tamteard
+  -	Stonieng
+  -	Camard
+  -	Drazdazz
+  -	Fex
+  -	Clonk
+  -	Wriord
+  -	Slac
+  -	Trekt
+  -	Vrulykt
+  -	Pasking
+  -	Crotrisz
+  -	Igrus
+  -	Udard
+  -	Ezz
+  -	Brerd
+  -	Toc
+  -	Weerm
+  -	Waabs
+  -	Srirbet
+  -	Zivnaar
+  -	Straabbeags
+  -	Otaarx
+  -	Xiotbeekz
+  -	Iolb
+  -	Tret
+  -	Eazz
+  -	Gnits
+  -	Slax
+  -	Clokakx
+  -	Ihbird
+  -	Stadsarx
+  -	Slezlylb
+  -	Wrultekx
+  -	Klior
+  -	Oilb
+  -	Rielk
+  -	Lakx
+  -	Plisb
+  -	Gneesits
+  -	Riskuc
+  -	Sredzerx
+  -	Brolsukx
+  -	Gleermiozz
+  -	Bald
+  -	Kralb
+  -	Gnizz
+  -	Jiec
+  -	Vuq
+  -	Zersoikt
+  -	Alerk
+  -	Klagat
+  -	Filteerd
+  -	Kriattialb
+  -	Rort
+  -	Striabs
+  -	Glild
+  -	Plieng
+  -	Zreazz
+  -	Irsucs
+  -	Easox
+  -	Bribsuird
+  -	Crizots
+  -	Oivoits
+  -	Bluits
+  -	Ceakx
+  -	Freank
+  -	Jebs
+  -	Kragz
+  -	Slahees
+  -	Ynzeets
+  -	Wiltik
+  -	Irzarm
+  -	Krieveq
+  -	Ord
+  -	Reect
+  -	Fas
+  -	Ploc
+  -	Glelk
+  -	Iabeasb
+  -	Ytmusb
+  -	Sliozlet
+  -	Oibaakz
+  -	Catbuit
+  -	Fuk
+  -	Bruikx
+  -	Slaq
+  -	Eec
+  -	Liold
+  -	Brodoit
+  -	Zuiggat
+  -	Kloreart
+  -	Huigmeld
+  -	Jumres
+  -	Eegs
+  -	Ig
+  -	Erd
+  -	Zeabs
+  -	Brekx
+  -	Eabeekx
+  -	Bibdaats
+  -	Greztaak
+  -	Kledoilk
+  -	Clidsuil
+  -	Drurd
+  -	Kuis
+  -	Trerx
+  -	Bulk
+  -	Voikz
+  -	Xogbiecs
+  -	Zriostriesz
+  -	Chysix
+  -	Srodreebs
+  -	Isoilx
+  -	Struilx
+  -	Ionk
+  -	Xuiq
+  -	Xukz
+  -	Klats
+  -	Trassabs
+  -	Cliarit
+  -	Plaareec
+  -	Sroitlaact
+  -	Zodnut
+  -	Klield
+  -	Brierx
+  -	Brix
+  -	Zard
+  -	Bylx
+  -	Strugder
+  -	Troviazz
+  -	Razgilb
+  -	Featzags
+  -	Creszord
+  -	Sraal
+  -	Srul
+  -	Purk
+  -	Zyts
+  -	Jeard
+  -	Cartazz
+  -	Igzikx
+  -	Tregmolx
+  -	Striegdikt
+  -	Golkiosz
+  -	Eel
+  -	Trarx
+  -	Pux
+  -	Ex
+  -	Grict
+  -	Ugbuis
+  -	Lusroic
+  -	Fotoigz
+  -	Costract
+  -	Trorzazz
+  -	Gnok
+  -	Kloirm
+  -	Gaart
+  -	Slugs
+  -	Plobs
+  -	Gnuglol
+  -	Wrulkolx
+  -	Branic
+  -	Chusekt
+  -	Plegmunk
+  -	Cyzz
+  -	Zrets
+  -	Ubs
+  -	Peaq
+  -	Cherx
+  -	Ugdurx
+  -	Traakark
+  -	Iehdoilx
+  -	Biaskeas
+  -	Zavzox
+  -	Plialb
+  -	Zaakt
+  -	Stard
+  -	Jaart
+  -	Struld
+  -	Sremakx
+  -	Uvyr
+  -	Xienriot
+  -	Gryvosz
+  -	Wedyr
+  -	Wroirk
+  -	Crigz
+  -	Sraas
+  -	Blox
+  -	Gelb
+  -	Gnolakz
+  -	Abnylb
+  -	Wruzekx
+  -	Liogaz
+  -	Vradseerd
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Customization/Markings/goblin_markings.yml b/Resources/Prototypes/_NF/Entities/Mobs/Customization/Markings/goblin_markings.yml
new file mode 100644
index 00000000000..a1c093feff8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Mobs/Customization/Markings/goblin_markings.yml
@@ -0,0 +1,92 @@
+# Goblin Ears
+- type: marking
+  id: GoblinEarsBasic
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_ears.rsi
+    state: goblin_ears_default
+
+- type: marking
+  id: GoblinEarsBasicAlt
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_ears.rsi
+    state: goblin_ears_default_alt
+
+- type: marking
+  id: GoblinEarsLong01
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_ears.rsi
+    state: goblin_ears_long_01
+
+- type: marking
+  id: GoblinEarsLong02
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_ears.rsi
+    state: goblin_ears_long_02
+
+# Goblin Noses
+- type: marking
+  id: GoblinNoseBasic
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_noses.rsi
+    state: goblin_nose_default
+
+- type: marking
+  id: GoblinNoseLong
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_noses.rsi
+    state: goblin_nose_long
+
+- type: marking
+  id: GoblinNoseCrooked
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_noses.rsi
+    state: goblin_nose_crooked
+
+# Goblin Tusks
+- type: marking
+  id: GoblinTusksBasic
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_tusks.rsi
+    state: goblin_tusks_none
+
+- type: marking
+  id: GoblinTusksSmall
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_tusks.rsi
+    state: goblin_tusks_small
+
+- type: marking
+  id: GoblinTusksBig
+  bodyPart: Snout
+  markingCategory: Snout
+  speciesRestriction: [Goblin]
+  sprites:
+  - sprite: _NF/Mobs/Customization/goblin_tusks.rsi
+    state: goblin_tusks_big
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Player/goblin_player.yml b/Resources/Prototypes/_NF/Entities/Mobs/Player/goblin_player.yml
new file mode 100644
index 00000000000..6f220e4ceaa
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Mobs/Player/goblin_player.yml
@@ -0,0 +1,8 @@
+- type: entity
+  save: false
+  name: Urist McGoblin
+  parent: [MobGoblinBase, BaseMob]
+  id: MobGoblin
+  components:
+  - type: Speech
+    speechVerb: Goblin
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
new file mode 100644
index 00000000000..055a5e6f1d0
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Mobs/Species/goblin.yml
@@ -0,0 +1,73 @@
+- type: entity
+  parent: BaseMobHuman
+  name: Urist McGoblin
+  id: MobGoblinBase
+  abstract: true
+  components:
+  - type: Sprite
+    scale: 0.8, 0.7
+  - type: HumanoidAppearance
+    species: Goblin
+  - type: Fixtures
+    fixtures: # TODO: This needs a second fixture just for mob collisions.
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.28
+        density: 135
+        restitution: 0.0
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Body
+    prototype: Goblin
+  - type: Damageable
+    damageModifierSet: Goblin
+  - type: MeleeWeapon
+    soundHit:
+      collection: Punch
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Slash: 3
+  - type: Speech
+    speechSounds: Alto
+  - type: DamageOnHighSpeedImpact
+    damage:
+      types:
+        Blunt: 1
+  - type: Stamina
+  - type: PseudoItem
+  - type: Vocal
+    wilhelm: "/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg"
+    sounds:
+      Male: MaleGoblin
+      Female: FemaleGoblin
+      Unsexed: MaleGoblin
+  - type: Goblin
+  - type: NpcFactionMember
+    factions:
+    - NanoTrasen
+    - Goblin
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatGoblin
+      amount: 3
+#  - type: SizeAttributeWhitelist # This system need to move to a slider
+#    tall: true
+#    tallscale: 1
+#    tallDensity: 185
+  - type: ReplacementAccent
+    accent: goblin_accent
+
+- type: entity
+  save: false
+  name: Urist McGoblin
+  parent: MobHumanDummy
+  id: MobGoblinDummy
+  noSpawn: true
+  description: A dummy goblin meant to be used in character setup.
+  components:
+  - type: HumanoidAppearance
+    species: Goblin
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
index 04089f8f3d0..0fec5bb01ae 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
@@ -360,16 +360,16 @@
   components:
   - type: EmitSoundOnUse
     sound:
-      path: /Audio/_NF/Vulpikanin/bark.ogg
+      path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg
   - type: EmitSoundOnLand
     sound:
-      path: /Audio/_NF/Vulpikanin/bark.ogg
+      path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg
   - type: EmitSoundOnActivate
     sound:
-      path: /Audio/_NF/Vulpikanin/bark.ogg
+      path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg
   - type: MeleeWeapon
     soundHit:
-      path: /Audio/_NF/Vulpikanin/bark.ogg
+      path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg
 
 - type: entity
   parent: BasePlushieVulp
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml
index d9d4627a942..ba7c040a07c 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml
@@ -23,3 +23,16 @@
   - type: Construction # Frontier
     graph: BannersGraph # Frontier
     node: BannerSecurityNode # Frontier
+
+- type: entity
+  id: BannerGoblin01
+  parent: BannerBase
+  name: goblin banner
+  description: A banner displaying one of goblin clan symbols.
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Decoration/banner.rsi
+    state: banner_goblin
+  - type: Construction
+    graph: BannersGraph
+    node: BannerGoblin01
diff --git a/Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml b/Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml
new file mode 100644
index 00000000000..af27157d276
--- /dev/null
+++ b/Resources/Prototypes/_NF/Objects/Consumable/Food/meat_goblin.yml
@@ -0,0 +1,11 @@
+- type: entity
+  parent: FoodMeatRotten
+  id: FoodMeatGoblin
+  name: raw goblin meat
+  description: Just look at that marbling! Wait, is that microplastic?
+  components:
+  - type: Sprite
+    state: rotten
+    color: lime
+#  - type: Food # Frontier, New Food Quality System
+#    quality: Toxin # Frontier, New Food Quality System
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/banners.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/banners.yml
index 8935d86d9f1..d4aa3a110e2 100644
--- a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/banners.yml
+++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/banners.yml
@@ -126,6 +126,16 @@
             - material: Cloth
               amount: 2
               doAfter: 1
+        - to: BannerGoblin01
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: Steel
+              amount: 2
+              doAfter: 1
+            - material: Cloth
+              amount: 2
+              doAfter: 1
 
     - node: BannerNanotrasenNode
       entity: BannerNanotrasen
@@ -306,3 +316,18 @@
           steps:
             - tool: Screwing
               doAfter: 1
+
+    - node: BannerGoblin01
+      entity: BannerGoblin01
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetSteel1
+              amount: 2
+            - !type:SpawnPrototype
+              prototype: MaterialCloth1
+              amount: 2
+          steps:
+            - tool: Screwing
+              doAfter: 1
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml b/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
index 837a50d8246..b78f57891bf 100644
--- a/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
@@ -683,6 +683,24 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  id: BannerGoblin01
+  name: goblinkind banner
+  description: A banner displaying the ancient goblinkind logo.
+  graph: BannersGraph
+  startNode: start
+  targetNode: BannerGoblin01
+  category: construction-category-furniture
+  icon:
+    sprite: _NF/Structures/Decoration/banner.rsi
+    state: banner_goblin
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+
 # Altars
 - type: construction
   id: AltarToolbox
diff --git a/Resources/Prototypes/_NF/SoundCollections/goblin_soundcollection.yml b/Resources/Prototypes/_NF/SoundCollections/goblin_soundcollection.yml
new file mode 100644
index 00000000000..dad733aaf26
--- /dev/null
+++ b/Resources/Prototypes/_NF/SoundCollections/goblin_soundcollection.yml
@@ -0,0 +1,32 @@
+- type: soundCollection
+  id: GoblinScreams
+  files:
+  - /Audio/_NF/Voice/Goblin/goblin-scream-01.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-scream-02.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-scream-03.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-scream-04.ogg
+
+- type: soundCollection
+  id: GoblinCackle
+  files:
+  - /Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg
+
+- type: soundCollection
+  id: GoblinCry
+  files:
+  - /Audio/_NF/Voice/Goblin/goblin-cry-01.ogg
+  - /Audio/_NF/Voice/Goblin/goblin-cry-02.ogg
+
+- type: soundCollection
+  id: GoblinChatter
+  files:
+  - /Audio/_NF/Voice/Goblin/goblin-chatter-01.ogg
+
+- type: soundCollection
+  id: GoblinHiss
+  files:
+  - /Audio/_NF/Voice/Goblin/goblin-hiss-01.ogg
diff --git a/Resources/Prototypes/_NF/Species/goblin_species.yml b/Resources/Prototypes/_NF/Species/goblin_species.yml
new file mode 100644
index 00000000000..5bff2106d99
--- /dev/null
+++ b/Resources/Prototypes/_NF/Species/goblin_species.yml
@@ -0,0 +1,150 @@
+#  defaultSkinTone: "#486a1b"
+- type: species
+  id: Goblin
+  name: species-name-goblin
+  roundStart: true
+  prototype: MobGoblin
+  sprites: MobGoblinSprites
+  markingLimits: MobGoblinMarkingLimits
+  dollPrototype: MobGoblinDummy
+  skinColoration: HumanToned #Possible values: TintedHues, Hues, HumanToned
+  maleFirstNames: names_goblin_male
+  femaleFirstNames: names_goblin_female
+  lastNames: names_goblin_last
+
+- type: speciesBaseSprites
+  id: MobGoblinSprites
+  sprites:
+    Hair: MobHumanoidAnyMarking
+    Snout: MobHumanoidAnyMarking
+    FacialHair: MobHumanoidAnyMarking
+    Head: MobGoblinHead
+    HeadTop: MobHumanoidAnyMarking
+    HeadSide: MobHumanoidAnyMarking
+    Chest: MobGoblinTorso
+    Eyes: MobGoblinEyes
+    LArm: MobGoblinLArm
+    RArm: MobGoblinRArm
+    LHand: MobGoblinLHand
+    RHand: MobGoblinRHand
+    LLeg: MobGoblinLLeg
+    RLeg: MobGoblinRLeg
+    LFoot: MobGoblinLFoot
+    RFoot: MobGoblinRFoot
+
+- type: markingPoints
+  id: MobGoblinMarkingLimits
+  points:
+    Hair:
+      points: 1
+      required: false
+    FacialHair:
+      points: 1
+      required: false
+    HeadTop:
+      points: 1
+      required: true
+      defaultMarkings: [ GoblinEarsBasic ]
+    Snout:
+      points: 2
+      required: false
+#      defaultMarkings: [ GoblinNoseBasic ]
+    Chest:
+      points: 1
+      required: false
+    Legs:
+      points: 2
+      required: false
+    Arms:
+      points: 2
+      required: false
+
+- type: humanoidBaseSprite
+  id: MobGoblinEyes
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: eyes
+
+- type: humanoidBaseSprite
+  id: MobGoblinHead
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: head_m
+
+- type: humanoidBaseSprite
+  id: MobGoblinHeadMale
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: head_m
+
+- type: humanoidBaseSprite
+  id: MobGoblinHeadFemale
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: head_f
+
+- type: humanoidBaseSprite
+  id: MobGoblinTorso
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: torso_m
+
+- type: humanoidBaseSprite
+  id: MobGoblinTorsoMale
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: torso_m
+
+- type: humanoidBaseSprite
+  id: MobGoblinTorsoFemale
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: torso_f
+
+- type: humanoidBaseSprite
+  id: MobGoblinLLeg
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: l_leg
+
+- type: humanoidBaseSprite
+  id: MobGoblinLArm
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: l_arm
+
+- type: humanoidBaseSprite
+  id: MobGoblinLHand
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: l_hand
+
+- type: humanoidBaseSprite
+  id: MobGoblinLFoot
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: l_foot
+
+- type: humanoidBaseSprite
+  id: MobGoblinRLeg
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: r_leg
+
+- type: humanoidBaseSprite
+  id: MobGoblinRArm
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: r_arm
+
+- type: humanoidBaseSprite
+  id: MobGoblinRHand
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: r_hand
+
+- type: humanoidBaseSprite
+  id: MobGoblinRFoot
+  baseSprite:
+    sprite: _NF/Mobs/Species/Goblin/parts.rsi
+    state: r_foot
diff --git a/Resources/Prototypes/_NF/Traits/neutral.yml b/Resources/Prototypes/_NF/Traits/neutral.yml
new file mode 100644
index 00000000000..14daae5572a
--- /dev/null
+++ b/Resources/Prototypes/_NF/Traits/neutral.yml
@@ -0,0 +1,6 @@
+- type: trait
+  id: GoblinAccent
+  name: trait-goblin-accent-name
+  description: trait-goblin-accent-desc
+  components:
+    - type: GoblinAccent
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml
index 9ad5491ba07..94c593825ba 100644
--- a/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/_NF/Voice/speech_emote_sounds.yml
@@ -1,82 +1,67 @@
+# Goblins
 - type: emoteSounds
-  id: MaleFelinid
+  id: MaleGoblin
   params:
     variation: 0.125
   sounds:
     Scream:
-      collection: FelinidScreams
+      collection: GoblinScreams
     Laugh:
-      collection: MaleLaugh
+      collection: GoblinCackle
     Sneeze:
       collection: MaleSneezes
     Cough:
       collection: MaleCoughs
+    CatHisses:
+      collection: CatHisses
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
     Crying:
-      collection: MaleCry
+      collection: GoblinCry
     Whistle:
       collection: Whistles
-    Hiss:
-      collection: FelinidHisses
-    Meow:
-      collection: FelinidMeows
-    Mew:
-      collection: FelinidMews
-    Growl:
-      collection: FelinidGrowls
-    Purr:
-      collection: FelinidPurrs
-    Sigh:
-      collection: MaleSigh
+    Weh:
+      collection: Weh
 
 - type: emoteSounds
-  id: FemaleFelinid
+  id: FemaleGoblin
   params:
     variation: 0.125
   sounds:
     Scream:
-      collection: FelinidScreams
+      collection: GoblinScreams
     Laugh:
-      collection: FemaleLaugh
+      collection: GoblinCackle
     Sneeze:
       collection: FemaleSneezes
     Cough:
       collection: FemaleCoughs
+    CatHisses:
+      collection: CatHisses
+    MonkeyScreeches:
+      collection: MonkeyScreeches
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
     Crying:
-      collection: FemaleCry
+      collection: GoblinCry
     Whistle:
       collection: Whistles
-    Hiss:
-      collection: FelinidHisses
-    Meow:
-      collection: FelinidMeows
-    Mew:
-      collection: FelinidMews
-    Growl:
-      collection: FelinidGrowls
-    Purr:
-      collection: FelinidPurrs
-    Sigh:
-      collection: FemaleSigh
-
-- type: emoteSounds
-  id: MaleMoth
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      path: /Audio/Voice/Moth/scream_moth.ogg
-    Laugh:
-      path: /Audio/Voice/Moth/laugh_moth.ogg
-
-- type: emoteSounds
-  id: FemaleMoth
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      path: /Audio/Voice/Moth/scream_moth.ogg
-    Laugh:
-      path: /Audio/Voice/Moth/laugh_moth.ogg
+    Weh:
+      collection: Weh
 
 - type: emoteSounds
   id: Cat
diff --git a/Resources/Prototypes/_NF/Voice/speech_verbs.yml b/Resources/Prototypes/_NF/Voice/speech_verbs.yml
new file mode 100644
index 00000000000..1ce605f5a6f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Voice/speech_verbs.yml
@@ -0,0 +1,9 @@
+- type: speechVerb
+  id: Goblin
+  name: chat-speech-verb-name-goblin
+  speechVerbStrings:
+  - chat-speech-verb-goblin-1
+  - chat-speech-verb-goblin-2
+  - chat-speech-verb-goblin-3
+  - chat-speech-verb-goblin-4
+  - chat-speech-verb-goblin-5
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml
index f81972dd77c..0deb46eaae3 100644
--- a/Resources/Prototypes/_NF/ai_factions.yml
+++ b/Resources/Prototypes/_NF/ai_factions.yml
@@ -11,6 +11,7 @@
   - Cat
   - Chicken
   - Monkey
+  - Goblin
 
 - type: npcFaction
   id: Dwarf
@@ -30,6 +31,9 @@
 - type: npcFaction
   id: Monkey
 
+- type: npcFaction
+  id: Goblin
+
 - type: npcFaction
   id: WizFedFaction
   hostile:
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default.png
new file mode 100644
index 00000000000..6853f2191b7
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default_alt.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default_alt.png
new file mode 100644
index 00000000000..a78ad8039df
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default_alt.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_01.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_01.png
new file mode 100644
index 00000000000..f72a92c2a02
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_01.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_02.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_02.png
new file mode 100644
index 00000000000..d5a93bc82d4
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_02.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/meta.json b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/meta.json
new file mode 100644
index 00000000000..5ed9ae60691
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "copyright": "Sprited by erhardsteinhauer (discord)",
+    "license": "CC-BY-SA-4.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "goblin_ears_default",
+            "directions": 4
+        },
+        {
+            "name": "goblin_ears_default_alt",
+            "directions": 4
+        },
+        {
+            "name": "goblin_ears_long_01",
+            "directions": 4
+        },
+        {
+            "name": "goblin_ears_long_02",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_crooked.png b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_crooked.png
new file mode 100644
index 00000000000..57391860376
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_crooked.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_default.png b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_default.png
new file mode 100644
index 00000000000..fdef1887b21
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_default.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_long.png b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_long.png
new file mode 100644
index 00000000000..0403c86463c
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_long.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/meta.json b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/meta.json
new file mode 100644
index 00000000000..4c1b829d8a2
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "copyright": "Sprited by erhardsteinhauer (discord)",
+    "license": "CC-BY-SA-4.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "goblin_nose_default",
+            "directions": 4
+        },
+        {
+            "name": "goblin_nose_crooked",
+            "directions": 4
+        },
+        {
+            "name": "goblin_nose_long",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png
new file mode 100644
index 00000000000..fb706ac649e
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png
new file mode 100644
index 00000000000..c8b755b2283
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png
new file mode 100644
index 00000000000..2b0a11239ad
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png differ
diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/meta.json b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/meta.json
new file mode 100644
index 00000000000..0983b297549
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "copyright": "Sprited by erhardsteinhauer (discord)",
+    "license": "CC-BY-SA-4.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "goblin_tusks_small",
+            "directions": 4
+        },
+        {
+            "name": "goblin_tusks_big",
+            "directions": 4
+        },
+        {
+            "name": "goblin_tusks_none",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix-inflamed.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix-inflamed.png
new file mode 100644
index 00000000000..b3cef608dbd
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix-inflamed.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix.png
new file mode 100644
index 00000000000..6fd813e1874
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/appendix.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-left.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-left.png
new file mode 100644
index 00000000000..d6285608ba1
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-right.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-right.png
new file mode 100644
index 00000000000..ad048dcbc72
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain.png
new file mode 100644
index 00000000000..5c16590df34
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/brain.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/ears.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/ears.png
new file mode 100644
index 00000000000..20f868ee96b
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/ears.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-l.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-l.png
new file mode 100644
index 00000000000..31d52127744
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-l.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-r.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-r.png
new file mode 100644
index 00000000000..2fe98d341b3
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/eyeball-r.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-off.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-off.png
new file mode 100644
index 00000000000..35aedf25554
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-off.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-on.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-on.png
new file mode 100644
index 00000000000..50573941160
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/heart-on.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-l.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-l.png
new file mode 100644
index 00000000000..dd7041783e8
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-l.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-r.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-r.png
new file mode 100644
index 00000000000..c940ca53215
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/kidney-r.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/liver.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/liver.png
new file mode 100644
index 00000000000..eb0f89afb46
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/liver.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-l.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-l.png
new file mode 100644
index 00000000000..6579fea5331
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-l.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-r.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-r.png
new file mode 100644
index 00000000000..c6205816c22
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/lung-r.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/meta.json b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/meta.json
new file mode 100644
index 00000000000..c6774a6ff37
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/meta.json
@@ -0,0 +1,80 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af | modified by erhardsteinhauer (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "appendix"
+    },
+    {
+      "name": "appendix-inflamed"
+    },
+    {
+      "name": "brain"
+    },
+    {
+      "name": "brain-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "brain-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "ears"
+    },
+    {
+      "name": "eyeball-l"
+    },
+    {
+      "name": "eyeball-r"
+    },
+    {
+      "name": "heart-off"
+    },
+    {
+      "name": "heart-on",
+      "delays": [
+        [
+          0.6,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "kidney-l"
+    },
+    {
+      "name": "kidney-r"
+    },
+    {
+      "name": "liver"
+    },
+    {
+      "name": "lung-l"
+    },
+    {
+      "name": "lung-r"
+    },
+    {
+      "name": "stomach"
+    },
+    {
+      "name": "tongue"
+    },
+    {
+      "name": "muscle"
+    },
+    {
+      "name": "nerve"
+    },
+    {
+      "name": "vessel"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/muscle.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/muscle.png
new file mode 100644
index 00000000000..8164e919743
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/muscle.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/nerve.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/nerve.png
new file mode 100644
index 00000000000..9dbc6643e9a
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/nerve.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/stomach.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/stomach.png
new file mode 100644
index 00000000000..3b9d9d57231
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/stomach.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/tongue.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/tongue.png
new file mode 100644
index 00000000000..0bc11733926
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/tongue.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/vessel.png b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/vessel.png
new file mode 100644
index 00000000000..d69df5f6902
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/organs.rsi/vessel.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/eyes.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/eyes.png
new file mode 100644
index 00000000000..6af803f9aae
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/eyes.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/full.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/full.png
new file mode 100644
index 00000000000..cc61ee90dd4
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/full.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_f.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_f.png
new file mode 100644
index 00000000000..f4d5cbf6e04
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_f.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_m.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_m.png
new file mode 100644
index 00000000000..990343a7fd1
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/head_m.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_arm.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_arm.png
new file mode 100644
index 00000000000..9e3dce618f4
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_arm.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_foot.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_foot.png
new file mode 100644
index 00000000000..53240792ff4
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_foot.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_hand.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_hand.png
new file mode 100644
index 00000000000..7481ebdb3bd
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_hand.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_leg.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_leg.png
new file mode 100644
index 00000000000..bbfa717c6b6
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/l_leg.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/meta.json b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/meta.json
new file mode 100644
index 00000000000..67edc25e62f
--- /dev/null
+++ b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/meta.json
@@ -0,0 +1,66 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf | modified by erhardsteinhauer (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "eyes",
+      "directions": 4
+    },
+    {
+      "name": "head_f",
+      "directions": 4
+    },
+    {
+      "name": "head_m",
+      "directions": 4
+    },
+    {
+      "name": "l_arm",
+      "directions": 4
+    },
+    {
+      "name": "l_foot",
+      "directions": 4
+    },
+    {
+      "name": "l_hand",
+      "directions": 4
+    },
+    {
+      "name": "l_leg",
+      "directions": 4
+    },
+    {
+      "name": "r_arm",
+      "directions": 4
+    },
+    {
+      "name": "r_foot",
+      "directions": 4
+    },
+    {
+      "name": "r_hand",
+      "directions": 4
+    },
+    {
+      "name": "r_leg",
+      "directions": 4
+    },
+    {
+      "name": "torso_f",
+      "directions": 4
+    },
+    {
+      "name": "torso_m",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_arm.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_arm.png
new file mode 100644
index 00000000000..52a50ae774f
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_arm.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_foot.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_foot.png
new file mode 100644
index 00000000000..8ce0281786f
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_foot.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_hand.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_hand.png
new file mode 100644
index 00000000000..a3051625ce1
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_hand.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_leg.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_leg.png
new file mode 100644
index 00000000000..ae9a48d7232
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/r_leg.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_f.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_f.png
new file mode 100644
index 00000000000..3c733d38eae
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_f.png differ
diff --git a/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_m.png b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_m.png
new file mode 100644
index 00000000000..4d2302562ee
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Species/Goblin/parts.rsi/torso_m.png differ
diff --git a/Resources/Textures/_NF/Structures/Decoration/banner.rsi/banner_goblin.png b/Resources/Textures/_NF/Structures/Decoration/banner.rsi/banner_goblin.png
new file mode 100644
index 00000000000..29807c1c30f
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Decoration/banner.rsi/banner_goblin.png differ
diff --git a/Resources/Textures/_NF/Structures/Decoration/banner.rsi/meta.json b/Resources/Textures/_NF/Structures/Decoration/banner.rsi/meta.json
index 7fc64c6765c..ee78029976c 100644
--- a/Resources/Textures/_NF/Structures/Decoration/banner.rsi/meta.json
+++ b/Resources/Textures/_NF/Structures/Decoration/banner.rsi/meta.json
@@ -1,13 +1,26 @@
 {
   "version": 1,
   "license": "CC-BY-SA-4.0",
-  "copyright": "Created by Ghost Prince for Frontier Station.",
+  "copyright": "nfsd-banner and nfsd-flag Created by Ghost Prince for Frontier Station; banner_goblin sprited by erhardsteinhauer (discord/github) for Frontier Station, based on https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
+      "name": "banner_goblin",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+	{
       "name": "nfsd-banner"
     },
     {