diff --git a/Content.Server/Speech/Components/GoblinAccentComponent.cs b/Content.Server/Speech/Components/GoblinAccentComponent.cs
deleted file mode 100644
index 2fb98e60a14..00000000000
--- a/Content.Server/Speech/Components/GoblinAccentComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-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/_NF/Speech/Components/GoblinAccentComponent.cs b/Content.Server/_NF/Speech/Components/GoblinAccentComponent.cs
new file mode 100644
index 00000000000..f5232494e92
--- /dev/null
+++ b/Content.Server/_NF/Speech/Components/GoblinAccentComponent.cs
@@ -0,0 +1,8 @@
+using Content.Server._NF.Speech.EntitySystems;
+
+namespace Content.Server._NF.Speech.Components;
+
+[RegisterComponent]
+[Access(typeof(GoblinAccentSystem))]
+public sealed partial class GoblinAccentComponent : Component
+{ }
diff --git a/Content.Server/_NF/Speech/Components/StreetpunkAccentComponent.cs b/Content.Server/_NF/Speech/Components/StreetpunkAccentComponent.cs
new file mode 100644
index 00000000000..b129b523b6d
--- /dev/null
+++ b/Content.Server/_NF/Speech/Components/StreetpunkAccentComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server._NF.Speech.Components
+{
+    [RegisterComponent]
+    public sealed partial class StreetpunkAccentComponent : Component
+    {
+    }
+}
diff --git a/Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs b/Content.Server/_NF/Speech/EntitySystems/GoblinAccentSystem.cs
similarity index 82%
rename from Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs
rename to Content.Server/_NF/Speech/EntitySystems/GoblinAccentSystem.cs
index c86bbe3fbb3..0dd64246814 100644
--- a/Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs
+++ b/Content.Server/_NF/Speech/EntitySystems/GoblinAccentSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.Speech.Components;
-using Robust.Shared.Random;
-using System.Text.RegularExpressions;
+using Content.Server._NF.Speech.Components;
+using Content.Server.Speech;
+using Content.Server.Speech.EntitySystems;
 
-namespace Content.Server.Speech.EntitySystems;
+namespace Content.Server._NF.Speech.EntitySystems;
 
 public sealed class GoblinAccentSystem : EntitySystem
 {
diff --git a/Content.Server/_NF/Speech/EntitySystems/StreetpunkAccentSystem.cs b/Content.Server/_NF/Speech/EntitySystems/StreetpunkAccentSystem.cs
new file mode 100644
index 00000000000..6acbc18dbd7
--- /dev/null
+++ b/Content.Server/_NF/Speech/EntitySystems/StreetpunkAccentSystem.cs
@@ -0,0 +1,42 @@
+using Content.Server._NF.Speech.Components;
+using Content.Server.Speech;
+using Content.Server.Speech.EntitySystems;
+using System.Text.RegularExpressions;
+
+namespace Content.Server._NF.Speech.EntitySystems;
+
+public sealed class StreetpunkAccentSystem : EntitySystem
+{
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+    private static readonly Regex RegexIng = new(@"ing\b");
+    private static readonly Regex RegexAnd = new(@"\band\b");
+    private static readonly Regex RegexDve = new("d've");
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StreetpunkAccentComponent, AccentGetEvent>(OnAccentGet);
+    }
+
+    // converts left word when typed into the right word. For example typing you becomes ye.
+    public string Accentuate(string message, StreetpunkAccentComponent component)
+    {
+        var msg = message;
+
+        //They shoulda started runnin' an' hidin' from me! <- bit from SouthernDrawl Accent
+        msg = RegexIng.Replace(msg, "in'");
+        msg = RegexAnd.Replace(msg, "an'");
+        msg = RegexDve.Replace(msg, "da");
+
+        msg = _replacement.ApplyReplacements(msg, "streetpunk");
+
+
+        return msg;
+    }
+
+    private void OnAccentGet(EntityUid uid, StreetpunkAccentComponent component, AccentGetEvent args)
+    {
+        args.Message = Accentuate(args.Message, component);
+    }
+}
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1a16c39553d..9e510dfd3a3 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5106,3 +5106,18 @@ Entries:
       message: Fixed backrooms on salvage outpost dungeon theme.
   id: 5043
   time: '2024-06-15T18:29:25.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: >-
+        Added more questionable clothing choices for fashion enjoyers:
+        jumpsuits, jackets, armor vests, glasses, gasmasks and belts. Check your
+        loadouts.
+    - type: Add
+      message: Added holograffiti projector.
+    - type: Add
+      message: It is now possible to encounter bands of gangers planetside.
+    - type: Add
+      message: Added new accent - Street Punk.
+  id: 5044
+  time: '2024-06-16T22:16:33.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl b/Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
new file mode 100644
index 00000000000..aff3da013b9
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
@@ -0,0 +1,694 @@
+# mix of slang terms from Cyberpunk 2020 TTRPG, Cyberpunk 2077, Shadowrun 5e TTRPG and Informal Contractions
+# sources:
+# https://cyberpunk.fandom.com/wiki/Streetslang
+# https://www.reddit.com/r/cyberpunkgame/comments/l0avwd/slang_megathread/
+# https://www.englishclub.com/vocabulary/contractions-informal.php
+# https://7esl.com/informal-contractions/
+ 
+accent-streetpunk-replaced-1 = a bit
+accent-streetpunk-replaced-2 = a lot of
+accent-streetpunk-replaced-3 = about
+accent-streetpunk-replaced-4 = according
+accent-streetpunk-replaced-5 = afraid
+accent-streetpunk-replaced-6 = alright
+accent-streetpunk-replaced-7 = am not
+accent-streetpunk-replaced-8 = amidst
+accent-streetpunk-replaced-9 = among
+accent-streetpunk-replaced-10 = and
+accent-streetpunk-replaced-11 = appreciate
+accent-streetpunk-replaced-12 = appreciated
+accent-streetpunk-replaced-13 = are not
+accent-streetpunk-replaced-14 = arrested
+accent-streetpunk-replaced-15 = asshole
+accent-streetpunk-replaced-16 = assholes
+accent-streetpunk-replaced-17 = awesome
+accent-streetpunk-replaced-18 = bastard
+accent-streetpunk-replaced-19 = bastards
+accent-streetpunk-replaced-20 = batting
+accent-streetpunk-replaced-21 = because
+accent-streetpunk-replaced-22 = before
+accent-streetpunk-replaced-23 = beforehand
+accent-streetpunk-replaced-24 = behind
+accent-streetpunk-replaced-25 = best
+accent-streetpunk-replaced-26 = bet you
+accent-streetpunk-replaced-27 = betray
+accent-streetpunk-replaced-28 = betrayed
+accent-streetpunk-replaced-29 = botany
+accent-streetpunk-replaced-30 = boyfriend
+accent-streetpunk-replaced-31 = brah
+accent-streetpunk-replaced-32 = briefing
+accent-streetpunk-replaced-33 = broken
+accent-streetpunk-replaced-34 = bruh
+accent-streetpunk-replaced-35 = business
+accent-streetpunk-replaced-36 = buzzing
+accent-streetpunk-replaced-37 = cache
+accent-streetpunk-replaced-38 = capture
+accent-streetpunk-replaced-39 = cartel
+accent-streetpunk-replaced-40 = cash
+accent-streetpunk-replaced-41 = circuit
+accent-streetpunk-replaced-42 = come on
+accent-streetpunk-replaced-43 = comms
+accent-streetpunk-replaced-44 = computer
+accent-streetpunk-replaced-45 = conversation
+accent-streetpunk-replaced-46 = conversations
+accent-streetpunk-replaced-47 = cool
+accent-streetpunk-replaced-48 = cool guy
+accent-streetpunk-replaced-49 = coolest
+accent-streetpunk-replaced-50 = corporate
+accent-streetpunk-replaced-51 = corporation
+accent-streetpunk-replaced-52 = corpse
+accent-streetpunk-replaced-53 = could have
+accent-streetpunk-replaced-54 = could not have
+accent-streetpunk-replaced-55 = could’ve
+accent-streetpunk-replaced-56 = couldn’t have
+accent-streetpunk-replaced-57 = crawling
+accent-streetpunk-replaced-58 = cretin
+accent-streetpunk-replaced-59 = cretins
+accent-streetpunk-replaced-60 = crew
+accent-streetpunk-replaced-61 = crewmember
+accent-streetpunk-replaced-62 = crewmembers
+accent-streetpunk-replaced-63 = crime
+accent-streetpunk-replaced-64 = cup of
+accent-streetpunk-replaced-65 = cyborg
+accent-streetpunk-replaced-66 = cyborgs
+accent-streetpunk-replaced-67 = dangling
+accent-streetpunk-replaced-68 = dead
+accent-streetpunk-replaced-69 = depart
+accent-streetpunk-replaced-70 = detail
+accent-streetpunk-replaced-71 = details
+accent-streetpunk-replaced-72 = did you
+accent-streetpunk-replaced-73 = didn't you
+accent-streetpunk-replaced-74 = do you
+accent-streetpunk-replaced-75 = doing
+accent-streetpunk-replaced-76 = don’t know
+accent-streetpunk-replaced-77 = don’t you
+accent-streetpunk-replaced-78 = dope
+accent-streetpunk-replaced-79 = dude
+accent-streetpunk-replaced-80 = dumb
+accent-streetpunk-replaced-81 = dumbass
+accent-streetpunk-replaced-82 = dumbasses
+accent-streetpunk-replaced-83 = dying
+accent-streetpunk-replaced-84 = emitter
+accent-streetpunk-replaced-85 = emitters
+accent-streetpunk-replaced-86 = employee
+accent-streetpunk-replaced-87 = ephedrine
+accent-streetpunk-replaced-88 = exact
+accent-streetpunk-replaced-89 = exactly
+accent-streetpunk-replaced-90 = example
+accent-streetpunk-replaced-91 = except
+accent-streetpunk-replaced-92 = executive
+accent-streetpunk-replaced-93 = expensive
+accent-streetpunk-replaced-94 = fantastic
+accent-streetpunk-replaced-95 = fatigued
+accent-streetpunk-replaced-96 = food
+accent-streetpunk-replaced-97 = foodstuff
+accent-streetpunk-replaced-98 = fool
+accent-streetpunk-replaced-99 = fools
+accent-streetpunk-replaced-100 = forget
+accent-streetpunk-replaced-101 = forgets
+accent-streetpunk-replaced-102 = forgetting
+accent-streetpunk-replaced-103 = forgor
+accent-streetpunk-replaced-104 = forgot
+accent-streetpunk-replaced-105 = friend
+accent-streetpunk-replaced-106 = friends
+accent-streetpunk-replaced-107 = fuck off
+accent-streetpunk-replaced-108 = fucker
+accent-streetpunk-replaced-109 = fuckers
+accent-streetpunk-replaced-110 = fucking
+accent-streetpunk-replaced-111 = futureteller
+accent-streetpunk-replaced-112 = gambler
+accent-streetpunk-replaced-113 = get lost
+accent-streetpunk-replaced-114 = get out
+accent-streetpunk-replaced-115 = getting
+accent-streetpunk-replaced-116 = girl
+accent-streetpunk-replaced-117 = girlfriend
+accent-streetpunk-replaced-118 = girls
+accent-streetpunk-replaced-119 = give me
+accent-streetpunk-replaced-120 = going to
+accent-streetpunk-replaced-121 = good
+accent-streetpunk-replaced-122 = got to
+accent-streetpunk-replaced-123 = got you
+accent-streetpunk-replaced-124 = great
+accent-streetpunk-replaced-125 = guessing
+accent-streetpunk-replaced-126 = gun
+accent-streetpunk-replaced-127 = guns
+accent-streetpunk-replaced-128 = guy
+accent-streetpunk-replaced-129 = guys
+accent-streetpunk-replaced-130 = handcuffs
+accent-streetpunk-replaced-131 = has not
+accent-streetpunk-replaced-132 = has to
+accent-streetpunk-replaced-133 = have not
+accent-streetpunk-replaced-134 = have to
+accent-streetpunk-replaced-135 = he would have
+accent-streetpunk-replaced-136 = he would’ve
+accent-streetpunk-replaced-137 = health analyser
+accent-streetpunk-replaced-138 = health scanner
+accent-streetpunk-replaced-139 = helmet
+accent-streetpunk-replaced-140 = hey
+accent-streetpunk-replaced-141 = hitman
+accent-streetpunk-replaced-142 = hitmen
+accent-streetpunk-replaced-143 = I would have
+accent-streetpunk-replaced-144 = I would’ve
+accent-streetpunk-replaced-145 = i’m going to
+accent-streetpunk-replaced-146 = idiot
+accent-streetpunk-replaced-147 = idiots
+accent-streetpunk-replaced-148 = im going to
+accent-streetpunk-replaced-149 = implant
+accent-streetpunk-replaced-150 = implanted
+accent-streetpunk-replaced-151 = implanting
+accent-streetpunk-replaced-152 = implants
+accent-streetpunk-replaced-153 = info
+accent-streetpunk-replaced-154 = information
+accent-streetpunk-replaced-155 = is not
+accent-streetpunk-replaced-156 = isn’t it?
+accent-streetpunk-replaced-157 = it is
+accent-streetpunk-replaced-158 = it’s
+accent-streetpunk-replaced-159 = kidnap
+accent-streetpunk-replaced-160 = kidnapped
+accent-streetpunk-replaced-161 = kidnapping
+accent-streetpunk-replaced-162 = kidnaps
+accent-streetpunk-replaced-163 = kill
+accent-streetpunk-replaced-164 = killed
+accent-streetpunk-replaced-165 = killing
+accent-streetpunk-replaced-166 = kills
+accent-streetpunk-replaced-167 = kind of
+accent-streetpunk-replaced-168 = laser pistol
+accent-streetpunk-replaced-169 = laser rifle
+accent-streetpunk-replaced-170 = laser gun
+accent-streetpunk-replaced-171 = later
+accent-streetpunk-replaced-172 = leave
+accent-streetpunk-replaced-173 = leaves
+accent-streetpunk-replaced-174 = leaving
+accent-streetpunk-replaced-175 = left
+accent-streetpunk-replaced-176 = let me
+accent-streetpunk-replaced-177 = little
+accent-streetpunk-replaced-178 = looking
+accent-streetpunk-replaced-179 = lots of
+accent-streetpunk-replaced-180 = low air
+accent-streetpunk-replaced-181 = low-tech
+accent-streetpunk-replaced-182 = lowtech
+accent-streetpunk-replaced-183 = making
+accent-streetpunk-replaced-184 = man
+accent-streetpunk-replaced-185 = marvelous
+accent-streetpunk-replaced-186 = mate
+accent-streetpunk-replaced-187 = mates
+accent-streetpunk-replaced-188 = mecha
+accent-streetpunk-replaced-189 = medicine
+accent-streetpunk-replaced-190 = meds
+accent-streetpunk-replaced-191 = meeting
+accent-streetpunk-replaced-192 = men
+accent-streetpunk-replaced-193 = meth
+accent-streetpunk-replaced-194 = might have
+accent-streetpunk-replaced-195 = might not have
+accent-streetpunk-replaced-196 = mightn’t have
+accent-streetpunk-replaced-197 = mistake
+accent-streetpunk-replaced-198 = mistakes
+accent-streetpunk-replaced-199 = money
+accent-streetpunk-replaced-200 = much of
+accent-streetpunk-replaced-201 = must have
+accent-streetpunk-replaced-202 = must not have
+accent-streetpunk-replaced-203 = mustn’t have
+accent-streetpunk-replaced-204 = name
+accent-streetpunk-replaced-205 = natural
+accent-streetpunk-replaced-206 = need to
+accent-streetpunk-replaced-207 = news
+accent-streetpunk-replaced-208 = newspaper
+accent-streetpunk-replaced-209 = nfsd
+accent-streetpunk-replaced-210 = nickname
+accent-streetpunk-replaced-211 = nothing
+accent-streetpunk-replaced-212 = nsfd
+accent-streetpunk-replaced-213 = of
+accent-streetpunk-replaced-214 = officer
+accent-streetpunk-replaced-215 = old
+accent-streetpunk-replaced-216 = organic
+accent-streetpunk-replaced-217 = ought to
+accent-streetpunk-replaced-218 = out of
+accent-streetpunk-replaced-219 = packing
+accent-streetpunk-replaced-220 = pal
+accent-streetpunk-replaced-221 = pals
+accent-streetpunk-replaced-222 = passenger
+accent-streetpunk-replaced-223 = passengers
+accent-streetpunk-replaced-224 = planning
+accent-streetpunk-replaced-225 = playing
+accent-streetpunk-replaced-226 = prophet
+accent-streetpunk-replaced-227 = pseudonym
+accent-streetpunk-replaced-228 = psychic
+accent-streetpunk-replaced-229 = radio
+accent-streetpunk-replaced-230 = remember
+accent-streetpunk-replaced-231 = remembering
+accent-streetpunk-replaced-232 = remind
+accent-streetpunk-replaced-233 = reminding
+accent-streetpunk-replaced-234 = reporter
+accent-streetpunk-replaced-235 = reporters
+accent-streetpunk-replaced-236 = ripley
+accent-streetpunk-replaced-237 = ripleys
+accent-streetpunk-replaced-238 = rob
+accent-streetpunk-replaced-239 = robbed
+accent-streetpunk-replaced-240 = robbing
+accent-streetpunk-replaced-241 = roboticist
+accent-streetpunk-replaced-242 = robs
+accent-streetpunk-replaced-243 = robust felinid
+accent-streetpunk-replaced-244 = run away
+accent-streetpunk-replaced-245 = running away
+accent-streetpunk-replaced-246 = runs away
+accent-streetpunk-replaced-247 = safe zone
+accent-streetpunk-replaced-248 = safezone
+accent-streetpunk-replaced-249 = saying
+accent-streetpunk-replaced-250 = schmuck
+accent-streetpunk-replaced-251 = schmucks
+accent-streetpunk-replaced-252 = secoff
+accent-streetpunk-replaced-253 = secoffs
+accent-streetpunk-replaced-254 = see you
+accent-streetpunk-replaced-255 = seeing
+accent-streetpunk-replaced-256 = selling
+accent-streetpunk-replaced-257 = send
+accent-streetpunk-replaced-258 = sending
+accent-streetpunk-replaced-259 = sends
+accent-streetpunk-replaced-260 = she would have
+accent-streetpunk-replaced-261 = she would’ve
+accent-streetpunk-replaced-262 = shithead
+accent-streetpunk-replaced-263 = shitheads
+accent-streetpunk-replaced-264 = shitter
+accent-streetpunk-replaced-265 = shitters
+accent-streetpunk-replaced-266 = shotgun
+accent-streetpunk-replaced-267 = should
+accent-streetpunk-replaced-268 = should have
+accent-streetpunk-replaced-269 = should not have
+accent-streetpunk-replaced-270 = shouldn’t have
+accent-streetpunk-replaced-271 = signature
+accent-streetpunk-replaced-272 = signatures
+accent-streetpunk-replaced-273 = situation
+accent-streetpunk-replaced-274 = smashing
+accent-streetpunk-replaced-275 = smelling
+accent-streetpunk-replaced-276 = smoke
+accent-streetpunk-replaced-277 = smoked
+accent-streetpunk-replaced-278 = smokes
+accent-streetpunk-replaced-279 = smoking
+accent-streetpunk-replaced-280 = smooth operator
+accent-streetpunk-replaced-281 = smuggling
+accent-streetpunk-replaced-282 = snack
+accent-streetpunk-replaced-283 = some more
+accent-streetpunk-replaced-284 = something
+accent-streetpunk-replaced-285 = sort of
+accent-streetpunk-replaced-286 = spesos
+accent-streetpunk-replaced-287 = steal
+accent-streetpunk-replaced-288 = stealing
+accent-streetpunk-replaced-289 = steals
+accent-streetpunk-replaced-290 = stealth
+accent-streetpunk-replaced-291 = stolen
+accent-streetpunk-replaced-292 = stupid
+accent-streetpunk-replaced-293 = stylish
+accent-streetpunk-replaced-294 = suppose
+accent-streetpunk-replaced-295 = supposed to
+accent-streetpunk-replaced-296 = supposedly
+accent-streetpunk-replaced-297 = tell them
+accent-streetpunk-replaced-298 = telling
+accent-streetpunk-replaced-299 = terminal
+accent-streetpunk-replaced-300 = theft
+accent-streetpunk-replaced-301 = them
+accent-streetpunk-replaced-302 = they would have
+accent-streetpunk-replaced-303 = they would’ve
+accent-streetpunk-replaced-304 = thief
+accent-streetpunk-replaced-305 = thieves
+accent-streetpunk-replaced-306 = thieving
+accent-streetpunk-replaced-307 = tired
+accent-streetpunk-replaced-308 = told
+accent-streetpunk-replaced-309 = tough
+accent-streetpunk-replaced-310 = toying
+accent-streetpunk-replaced-311 = understood
+accent-streetpunk-replaced-312 = used to
+accent-streetpunk-replaced-313 = vault
+accent-streetpunk-replaced-314 = vomit
+accent-streetpunk-replaced-315 = vomited
+accent-streetpunk-replaced-316 = vomiting
+accent-streetpunk-replaced-317 = vomits
+accent-streetpunk-replaced-318 = waiting
+accent-streetpunk-replaced-319 = want a
+accent-streetpunk-replaced-320 = want to
+accent-streetpunk-replaced-321 = weapon
+accent-streetpunk-replaced-322 = weapons
+accent-streetpunk-replaced-323 = well,
+accent-streetpunk-replaced-324 = what are you
+accent-streetpunk-replaced-325 = what do you
+accent-streetpunk-replaced-326 = what have you
+accent-streetpunk-replaced-327 = what you
+accent-streetpunk-replaced-328 = what’s going on?
+accent-streetpunk-replaced-329 = without
+accent-streetpunk-replaced-330 = won't you
+accent-streetpunk-replaced-331 = worker
+accent-streetpunk-replaced-332 = workers
+accent-streetpunk-replaced-333 = working
+accent-streetpunk-replaced-334 = would have
+accent-streetpunk-replaced-335 = would not have
+accent-streetpunk-replaced-336 = wouldn’t have
+accent-streetpunk-replaced-337 = you
+accent-streetpunk-replaced-338 = you all
+accent-streetpunk-replaced-339 = you are
+accent-streetpunk-replaced-340 = you know
+accent-streetpunk-replaced-341 = you would have 
+accent-streetpunk-replaced-342 = you would’ve 
+accent-streetpunk-replaced-343 = you’re
+
+accent-streetpunk-replacement-1 = a lick
+accent-streetpunk-replacement-2 = alotta
+accent-streetpunk-replacement-3 = 'bout
+accent-streetpunk-replacement-4 = 'ccordin’
+accent-streetpunk-replacement-5 = 'fraid
+accent-streetpunk-replacement-6 = a’ight
+accent-streetpunk-replacement-7 = ain’t
+accent-streetpunk-replacement-8 = 'midst
+accent-streetpunk-replacement-9 = 'mong
+accent-streetpunk-replacement-10 = an’
+accent-streetpunk-replacement-11 = 'preciate
+accent-streetpunk-replacement-12 = 'preciated
+accent-streetpunk-replacement-13 = ain’t
+accent-streetpunk-replacement-14 = got dirty
+accent-streetpunk-replacement-15 = adam henry
+accent-streetpunk-replacement-16 = adam henries
+accent-streetpunk-replacement-17 = preem
+accent-streetpunk-replacement-18 = gonk
+accent-streetpunk-replacement-19 = gonks
+accent-streetpunk-replacement-20 = battin’
+accent-streetpunk-replacement-21 = 'cose
+accent-streetpunk-replacement-22 = 'fore
+accent-streetpunk-replacement-23 = 'forehand
+accent-streetpunk-replacement-24 = 'hind
+accent-streetpunk-replacement-25 = totally nova
+accent-streetpunk-replacement-26 = betcha
+accent-streetpunk-replacement-27 = haze
+accent-streetpunk-replacement-28 = hazed
+accent-streetpunk-replacement-29 = agriplex
+accent-streetpunk-replacement-30 = input
+accent-streetpunk-replacement-31 = choomba
+accent-streetpunk-replacement-32 = sitch
+accent-streetpunk-replacement-33 = gonked out
+accent-streetpunk-replacement-34 = choom
+accent-streetpunk-replacement-35 = biz
+accent-streetpunk-replacement-36 = buzzin’
+accent-streetpunk-replacement-37 = bonanza
+accent-streetpunk-replacement-38 = roll up
+accent-streetpunk-replacement-39 = BLOC
+accent-streetpunk-replacement-40 = scratch
+accent-streetpunk-replacement-41 = circ
+accent-streetpunk-replacement-42 = c'mon
+accent-streetpunk-replacement-43 = horn
+accent-streetpunk-replacement-44 = term
+accent-streetpunk-replacement-45 = convo
+accent-streetpunk-replacement-46 = convos
+accent-streetpunk-replacement-47 = preem
+accent-streetpunk-replacement-48 = gato
+accent-streetpunk-replacement-49 = preem
+accent-streetpunk-replacement-50 = corpo
+accent-streetpunk-replacement-51 = corp
+accent-streetpunk-replacement-52 = stiff
+accent-streetpunk-replacement-53 = coulda
+accent-streetpunk-replacement-54 = couldna
+accent-streetpunk-replacement-55 = coulda
+accent-streetpunk-replacement-56 = couldna
+accent-streetpunk-replacement-57 = crawlin’
+accent-streetpunk-replacement-58 = gonk
+accent-streetpunk-replacement-59 = gonks
+accent-streetpunk-replacement-60 = proles
+accent-streetpunk-replacement-61 = prole
+accent-streetpunk-replacement-62 = proles
+accent-streetpunk-replacement-63 = biz
+accent-streetpunk-replacement-64 = cuppa
+accent-streetpunk-replacement-65 = 'borg
+accent-streetpunk-replacement-66 = 'borgs
+accent-streetpunk-replacement-67 = danglin’
+accent-streetpunk-replacement-68 = flatlined
+accent-streetpunk-replacement-69 = delta
+accent-streetpunk-replacement-70 = dete
+accent-streetpunk-replacement-71 = detes
+accent-streetpunk-replacement-72 = didja
+accent-streetpunk-replacement-73 = didntcha
+accent-streetpunk-replacement-74 = d’you
+accent-streetpunk-replacement-75 = doin’
+accent-streetpunk-replacement-76 = dunno
+accent-streetpunk-replacement-77 = don’tcha
+accent-streetpunk-replacement-78 = nova
+accent-streetpunk-replacement-79 = choomba
+accent-streetpunk-replacement-80 = leadhead
+accent-streetpunk-replacement-81 = leadhead
+accent-streetpunk-replacement-82 = leadheads
+accent-streetpunk-replacement-83 = flatlining
+accent-streetpunk-replacement-84 = 'mitter
+accent-streetpunk-replacement-85 = 'mitters
+accent-streetpunk-replacement-86 = sarariman
+accent-streetpunk-replacement-87 = 'dorphs
+accent-streetpunk-replacement-88 = 'zact
+accent-streetpunk-replacement-89 = 'zactly
+accent-streetpunk-replacement-90 = 'zample
+accent-streetpunk-replacement-91 = 'cept
+accent-streetpunk-replacement-92 = exec
+accent-streetpunk-replacement-93 = draga
+accent-streetpunk-replacement-94 = totally nova
+accent-streetpunk-replacement-95 = amped out
+accent-streetpunk-replacement-96 = scop
+accent-streetpunk-replacement-97 = scop
+accent-streetpunk-replacement-98 = gonk
+accent-streetpunk-replacement-99 = gonks
+accent-streetpunk-replacement-100 = stuffit
+accent-streetpunk-replacement-101 = stuffits
+accent-streetpunk-replacement-102 = stuffittin’
+accent-streetpunk-replacement-103 = stuffitted
+accent-streetpunk-replacement-104 = stuffitted
+accent-streetpunk-replacement-105 = choom
+accent-streetpunk-replacement-106 = chooms
+accent-streetpunk-replacement-107 = ghost off
+accent-streetpunk-replacement-108 = utter gonk
+accent-streetpunk-replacement-109 = utter gonks
+accent-streetpunk-replacement-110 = fuckin’
+accent-streetpunk-replacement-111 = gibson
+accent-streetpunk-replacement-112 = baruto
+accent-streetpunk-replacement-113 = ghost off
+accent-streetpunk-replacement-114 = delta
+accent-streetpunk-replacement-115 = gettin’
+accent-streetpunk-replacement-116 = choombatta
+accent-streetpunk-replacement-117 = output
+accent-streetpunk-replacement-118 = choombattas
+accent-streetpunk-replacement-119 = gimme
+accent-streetpunk-replacement-120 = gonna
+accent-streetpunk-replacement-121 = preem
+accent-streetpunk-replacement-122 = gotta
+accent-streetpunk-replacement-123 = gotcha
+accent-streetpunk-replacement-124 = nova
+accent-streetpunk-replacement-125 = guessin’
+accent-streetpunk-replacement-126 = iron
+accent-streetpunk-replacement-127 = iron
+accent-streetpunk-replacement-128 = choom
+accent-streetpunk-replacement-129 = chooms
+accent-streetpunk-replacement-130 = silvers
+accent-streetpunk-replacement-131 = ain’t
+accent-streetpunk-replacement-132 = hasta
+accent-streetpunk-replacement-133 = ain’t
+accent-streetpunk-replacement-134 = hafta
+accent-streetpunk-replacement-135 = he'da
+accent-streetpunk-replacement-136 = he'da
+accent-streetpunk-replacement-137 = biomon
+accent-streetpunk-replacement-138 = biomonitor
+accent-streetpunk-replacement-139 = brain bucket
+accent-streetpunk-replacement-140 = 'ey
+accent-streetpunk-replacement-141 = bopper
+accent-streetpunk-replacement-142 = boppers
+accent-streetpunk-replacement-143 = I'da
+accent-streetpunk-replacement-144 = I'da
+accent-streetpunk-replacement-145 = I’mma
+accent-streetpunk-replacement-146 = gonk
+accent-streetpunk-replacement-147 = gonks
+accent-streetpunk-replacement-148 = I’mma
+accent-streetpunk-replacement-149 = chip
+accent-streetpunk-replacement-150 = chipped
+accent-streetpunk-replacement-151 = chippin’
+accent-streetpunk-replacement-152 = chips
+accent-streetpunk-replacement-153 = detes
+accent-streetpunk-replacement-154 = detes
+accent-streetpunk-replacement-155 = ain’t
+accent-streetpunk-replacement-156 = innit
+accent-streetpunk-replacement-157 = 's
+accent-streetpunk-replacement-158 = 's
+accent-streetpunk-replacement-159 = extract
+accent-streetpunk-replacement-160 = extracted
+accent-streetpunk-replacement-161 = extraction
+accent-streetpunk-replacement-162 = extracts
+accent-streetpunk-replacement-163 = zero
+accent-streetpunk-replacement-164 = zeroed
+accent-streetpunk-replacement-165 = zeroing
+accent-streetpunk-replacement-166 = zeros
+accent-streetpunk-replacement-167 = kinda
+accent-streetpunk-replacement-168 = burner
+accent-streetpunk-replacement-169 = burner
+accent-streetpunk-replacement-170 = burner
+accent-streetpunk-replacement-171 = layder
+accent-streetpunk-replacement-172 = delta
+accent-streetpunk-replacement-173 = deltas
+accent-streetpunk-replacement-174 = deltain'
+accent-streetpunk-replacement-175 = delta'd
+accent-streetpunk-replacement-176 = lemme
+accent-streetpunk-replacement-177 = lil’
+accent-streetpunk-replacement-178 = lookin’
+accent-streetpunk-replacement-179 = lotsa
+accent-streetpunk-replacement-180 = breath vac
+accent-streetpunk-replacement-181 = dirty
+accent-streetpunk-replacement-182 = dirty
+accent-streetpunk-replacement-183 = makin’
+accent-streetpunk-replacement-184 = choomba
+accent-streetpunk-replacement-185 = nova
+accent-streetpunk-replacement-186 = choomba
+accent-streetpunk-replacement-187 = choombas
+accent-streetpunk-replacement-188 = tin can
+accent-streetpunk-replacement-189 = stims
+accent-streetpunk-replacement-190 = stims
+accent-streetpunk-replacement-191 = meetin’
+accent-streetpunk-replacement-192 = choombas
+accent-streetpunk-replacement-193 = 'dorphs
+accent-streetpunk-replacement-194 = mighta
+accent-streetpunk-replacement-195 = mightna
+accent-streetpunk-replacement-196 = mightna
+accent-streetpunk-replacement-197 = slipup
+accent-streetpunk-replacement-198 = slipups
+accent-streetpunk-replacement-199 = scratch
+accent-streetpunk-replacement-200 = mucha
+accent-streetpunk-replacement-201 = musta
+accent-streetpunk-replacement-202 = mussna
+accent-streetpunk-replacement-203 = mussna
+accent-streetpunk-replacement-204 = handle
+accent-streetpunk-replacement-205 = 'ganic
+accent-streetpunk-replacement-206 = needa
+accent-streetpunk-replacement-207 = screamsheet
+accent-streetpunk-replacement-208 = screamsheet
+accent-streetpunk-replacement-209 = badges
+accent-streetpunk-replacement-210 = handle
+accent-streetpunk-replacement-211 = nothin’
+accent-streetpunk-replacement-212 = badges
+accent-streetpunk-replacement-213 = o’
+accent-streetpunk-replacement-214 = badge
+accent-streetpunk-replacement-215 = ol’
+accent-streetpunk-replacement-216 = 'ganic
+accent-streetpunk-replacement-217 = oughtta
+accent-streetpunk-replacement-218 = outta
+accent-streetpunk-replacement-219 = packin’
+accent-streetpunk-replacement-220 = choom
+accent-streetpunk-replacement-221 = chooms
+accent-streetpunk-replacement-222 = straphanger
+accent-streetpunk-replacement-223 = straphangers
+accent-streetpunk-replacement-224 = plannin’
+accent-streetpunk-replacement-225 = playin’
+accent-streetpunk-replacement-226 = gibson
+accent-streetpunk-replacement-227 = handle
+accent-streetpunk-replacement-228 = gibson
+accent-streetpunk-replacement-229 = horn
+accent-streetpunk-replacement-230 = 'member
+accent-streetpunk-replacement-231 = 'memberin’
+accent-streetpunk-replacement-232 = 'mind
+accent-streetpunk-replacement-233 = 'mindin’
+accent-streetpunk-replacement-234 = media
+accent-streetpunk-replacement-235 = medias
+accent-streetpunk-replacement-236 = tin can
+accent-streetpunk-replacement-237 = tin cans
+accent-streetpunk-replacement-238 = klep
+accent-streetpunk-replacement-239 = klepped
+accent-streetpunk-replacement-240 = klepping
+accent-streetpunk-replacement-241 = ripperdoc
+accent-streetpunk-replacement-242 = kleps
+accent-streetpunk-replacement-243 = rimbo
+accent-streetpunk-replacement-244 = delta
+accent-streetpunk-replacement-245 = deltain'
+accent-streetpunk-replacement-246 = deltas
+accent-streetpunk-replacement-247 = beaverville
+accent-streetpunk-replacement-248 = beaverville
+accent-streetpunk-replacement-249 = sayin’
+accent-streetpunk-replacement-250 = gonk
+accent-streetpunk-replacement-251 = gonks
+accent-streetpunk-replacement-252 = badge
+accent-streetpunk-replacement-253 = badges
+accent-streetpunk-replacement-254 = see ya
+accent-streetpunk-replacement-255 = seein’
+accent-streetpunk-replacement-256 = sellin’
+accent-streetpunk-replacement-257 = flick
+accent-streetpunk-replacement-258 = flickin’
+accent-streetpunk-replacement-259 = flicks
+accent-streetpunk-replacement-260 = she'da
+accent-streetpunk-replacement-261 = she'da
+accent-streetpunk-replacement-262 = shitbucket
+accent-streetpunk-replacement-263 = shitbuckets
+accent-streetpunk-replacement-264 = shitbucket
+accent-streetpunk-replacement-265 = shitbuckets
+accent-streetpunk-replacement-266 = breakdown
+accent-streetpunk-replacement-267 = oughta
+accent-streetpunk-replacement-268 = shoulda
+accent-streetpunk-replacement-269 = shouldna
+accent-streetpunk-replacement-270 = shouldna
+accent-streetpunk-replacement-271 = sig
+accent-streetpunk-replacement-272 = sigs
+accent-streetpunk-replacement-273 = sitch
+accent-streetpunk-replacement-274 = smashin’
+accent-streetpunk-replacement-275 = smellin’
+accent-streetpunk-replacement-276 = blow
+accent-streetpunk-replacement-277 = blew
+accent-streetpunk-replacement-278 = blows
+accent-streetpunk-replacement-279 = blowin’
+accent-streetpunk-replacement-280 = gato
+accent-streetpunk-replacement-281 = smugglin’
+accent-streetpunk-replacement-282 = kibble
+accent-streetpunk-replacement-283 = s’more
+accent-streetpunk-replacement-284 = somethin’
+accent-streetpunk-replacement-285 = sorta
+accent-streetpunk-replacement-286 = scratch
+accent-streetpunk-replacement-287 = klep
+accent-streetpunk-replacement-288 = klepping
+accent-streetpunk-replacement-289 = kleps
+accent-streetpunk-replacement-290 = ninjutsu
+accent-streetpunk-replacement-291 = klepped
+accent-streetpunk-replacement-292 = gonk
+accent-streetpunk-replacement-293 = boga
+accent-streetpunk-replacement-294 = s’ppose
+accent-streetpunk-replacement-295 = s’pposeta
+accent-streetpunk-replacement-296 = s’pposedly
+accent-streetpunk-replacement-297 = tell’em
+accent-streetpunk-replacement-298 = tellin’
+accent-streetpunk-replacement-299 = term
+accent-streetpunk-replacement-300 = kleppin’
+accent-streetpunk-replacement-301 = 'em
+accent-streetpunk-replacement-302 = they'da
+accent-streetpunk-replacement-303 = they'da
+accent-streetpunk-replacement-304 = kleptoid
+accent-streetpunk-replacement-305 = kleptoids
+accent-streetpunk-replacement-306 = kleppin’
+accent-streetpunk-replacement-307 = amped out
+accent-streetpunk-replacement-308 = tol’
+accent-streetpunk-replacement-309 = hard
+accent-streetpunk-replacement-310 = toyin’
+accent-streetpunk-replacement-311 = crystal
+accent-streetpunk-replacement-312 = useta
+accent-streetpunk-replacement-313 = bonanza
+accent-streetpunk-replacement-314 = barf
+accent-streetpunk-replacement-315 = barfed
+accent-streetpunk-replacement-316 = barfing
+accent-streetpunk-replacement-317 = barfs
+accent-streetpunk-replacement-318 = waitin’
+accent-streetpunk-replacement-319 = wanna
+accent-streetpunk-replacement-320 = wanna
+accent-streetpunk-replacement-321 = iron
+accent-streetpunk-replacement-322 = iron
+accent-streetpunk-replacement-323 = welp,
+accent-streetpunk-replacement-324 = whatcha
+accent-streetpunk-replacement-325 = whatcha
+accent-streetpunk-replacement-326 = whatcha
+accent-streetpunk-replacement-327 = whatcha
+accent-streetpunk-replacement-328 = what’s shakin’?
+accent-streetpunk-replacement-329 = 'thout
+accent-streetpunk-replacement-330 = wontcha
+accent-streetpunk-replacement-331 = proles
+accent-streetpunk-replacement-332 = proles
+accent-streetpunk-replacement-333 = workin’
+accent-streetpunk-replacement-334 = woulda
+accent-streetpunk-replacement-335 = wouldna
+accent-streetpunk-replacement-336 = wouldna
+accent-streetpunk-replacement-337 = ya
+accent-streetpunk-replacement-338 = y’all
+accent-streetpunk-replacement-339 = ya
+accent-streetpunk-replacement-340 = y’know
+accent-streetpunk-replacement-341 = you'da
+accent-streetpunk-replacement-342 = you'da
+accent-streetpunk-replacement-343 = ya
diff --git a/Resources/Locale/en-US/_NF/advertisements/mobchatter/spacepunkhumanoidmob.ftl b/Resources/Locale/en-US/_NF/advertisements/mobchatter/spacepunkhumanoidmob.ftl
new file mode 100644
index 00000000000..41743068e58
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/advertisements/mobchatter/spacepunkhumanoidmob.ftl
@@ -0,0 +1,21 @@
+advertisement-spacepunkhumanoid-1 = Man, I hate it in here!
+advertisement-spacepunkhumanoid-2 = Hey! Got a ciggy?
+advertisement-spacepunkhumanoid-3 = Musta been a rat. Hate those gonks!
+advertisement-spacepunkhumanoid-4 = 'Ey, listen. I don't like your mug, choom!
+advertisement-spacepunkhumanoid-5 = Ha-ha! Nice one, choomba!
+advertisement-spacepunkhumanoid-6 = Yo, check this out!
+advertisement-spacepunkhumanoid-7 = Fuck, that blunt hits hard, I'm trippin'.
+advertisement-spacepunkhumanoid-8 = Hell.. I need to get a dose. And fast.
+advertisement-spacepunkhumanoid-9 = Ah, yes, s'all coming together now!
+advertisement-spacepunkhumanoid-10 = Sometimes I dream about cheese...
+advertisement-spacepunkhumanoid-11 = Stop!
+advertisement-spacepunkhumanoid-12 = Give me ya money! And ya shoes!
+advertisement-spacepunkhumanoid-13 = Best shit ever!!
+advertisement-spacepunkhumanoid-14 = Why'd ya gotta make it harder?
+advertisement-spacepunkhumanoid-15 = Argh!
+advertisement-spacepunkhumanoid-16 = Huh, that's funny.
+advertisement-spacepunkhumanoid-17 = This day's turnin' out a'ight after all!
+advertisement-spacepunkhumanoid-18 = Hah! Skill issue!
+advertisement-spacepunkhumanoid-19 = *whistles*
+advertisement-spacepunkhumanoid-20 = Dibs on that!
+advertisement-spacepunkhumanoid-21 = Should've delta'd while you still had a chance, gonk!
diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/vandalizedbountyvend.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/vandalizedbountyvend.ftl
new file mode 100644
index 00000000000..308eff9f0f4
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/advertisements/vending/vandalizedbountyvend.ftl
@@ -0,0 +1,7 @@
+advertisement-vandalizedbountyvend-1 = Get some iron!
+advertisement-vandalizedbountyvend-2 = Iron! Breakdowns! GUNS BONANZA!
+advertisement-vandalizedbountyvend-3 = You packin', choom?
+advertisement-vandalizedbountyvend-4 = Start zeroin' 'ganic gonks left an' right with this iron!
+advertisement-vandalizedbountyvend-5 = Badges don't have to know the detes.
+advertisement-vandalizedbountyvend-6 = Prep your scratch, choom! Only preem guns here!
+advertisement-vandalizedbountyvend-7 = I only barf nova iron!
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/vandalizedclothesmate.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/vandalizedclothesmate.ftl
new file mode 100644
index 00000000000..39a7c4e41c0
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/advertisements/vending/vandalizedclothesmate.ftl
@@ -0,0 +1,7 @@
+advertisement-vandalizedclothes-1 = I don't dig ya looks, choom! Get preem threads here!
+advertisement-vandalizedclothes-2 = Don'tcha wanna look totally preem?
+advertisement-vandalizedclothes-3 = D'you wanna look preem or what?! Shlep over here!
+advertisement-vandalizedclothes-4 = Ya new look will flatline ya input!
+advertisement-vandalizedclothes-5 = Now with added composite armor plates!
+advertisement-vandalizedclothes-6 = Preem threads! Nova getups! Check 'em out, choom!
+advertisement-vandalizedclothes-7 = Nova outfit you have goin' there! For a GONK!
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_NF/traits/traits.ftl b/Resources/Locale/en-US/_NF/traits/traits.ftl
index f462ee8b97b..7326d1051f4 100644
--- a/Resources/Locale/en-US/_NF/traits/traits.ftl
+++ b/Resources/Locale/en-US/_NF/traits/traits.ftl
@@ -10,4 +10,7 @@ trait-goblin-accent-name = Goblin Cant
 trait-goblin-accent-desc = You speak in secret language many find annoying and not that secretive.
 
 trait-pious-name = Pious
-trait-pious-desc = You are in touch with the gods, but your vows keep you from striking in anger.
\ No newline at end of file
+trait-pious-desc = You are in touch with the gods, but your vows keep you from striking in anger.
+
+trait-streetpunk-accent-name = Streetpunk Accent
+trait-streetpunk-accent-desc = Ya were born in a sprawlin' megacity an' never went to school. An' it shows, choom.
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 04235e7e373..1d82281f231 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -67,6 +67,7 @@
     FoamCutlass: 2
     ClothingHeadSafari: 2 # Frontier
     ClothingUniformJumpsuitSafari: 2 # Frontier
+    ClothingUniformRandomArmlessNoSkirt: 6 # Frontier
     ClothingUniformRandomArmless: 6 # Frontier
     ClothingUniformRandomStandard: 6 # Frontier
     ClothingUniformRandomBra: 6 # Frontier
diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml
index aade0ad9b37..ec5010ad39d 100644
--- a/Resources/Prototypes/Procedural/salvage_factions.yml
+++ b/Resources/Prototypes/Procedural/salvage_factions.yml
@@ -444,3 +444,33 @@
     DefenseStructure: RogueAiNode
     Mining: Silicons
     Megafauna: MobRogueSiliconBoss
+
+- type: salvageFaction
+  id: Gangers
+  cost: 5
+  groups:
+  - entries:
+    - id: SpawnMobPunkMelee
+      amount: 1
+      maxAmount: 3
+    - id: SpawnMobPunkMelee
+      amount: 1
+  - entries:
+    - id: SpawnMobPunkRanged
+      amount: 1
+      maxAmount: 1
+    prob: 0.5
+  - entries:
+    - id: SpawnMobPunkRanged
+      amount: 1
+      maxAmount: 2
+    prob: 0.25
+  - entries:
+    - id: SpawnMobPunkMelee
+      amount: 3
+      maxAmount: 6
+    prob: 0.1
+  configs:
+    DefenseStructure: CybersunDataMiner
+    Mining: Gangers
+    Megafauna: MobPunkGangerArmoredElite
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Accents/word_replacements.yml b/Resources/Prototypes/_NF/Accents/word_replacements.yml
index ef140c2ee26..2094c96268d 100644
--- a/Resources/Prototypes/_NF/Accents/word_replacements.yml
+++ b/Resources/Prototypes/_NF/Accents/word_replacements.yml
@@ -367,3 +367,350 @@
     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
+
+- type: accent
+  id: streetpunk
+  wordReplacements:
+    accent-streetpunk-replaced-1: accent-streetpunk-replacement-1
+    accent-streetpunk-replaced-2: accent-streetpunk-replacement-2
+    accent-streetpunk-replaced-3: accent-streetpunk-replacement-3
+    accent-streetpunk-replaced-4: accent-streetpunk-replacement-4
+    accent-streetpunk-replaced-5: accent-streetpunk-replacement-5
+    accent-streetpunk-replaced-6: accent-streetpunk-replacement-6
+    accent-streetpunk-replaced-7: accent-streetpunk-replacement-7
+    accent-streetpunk-replaced-8: accent-streetpunk-replacement-8
+    accent-streetpunk-replaced-9: accent-streetpunk-replacement-9
+    accent-streetpunk-replaced-10: accent-streetpunk-replacement-10
+    accent-streetpunk-replaced-11: accent-streetpunk-replacement-11
+    accent-streetpunk-replaced-12: accent-streetpunk-replacement-12
+    accent-streetpunk-replaced-13: accent-streetpunk-replacement-13
+    accent-streetpunk-replaced-14: accent-streetpunk-replacement-14
+    accent-streetpunk-replaced-15: accent-streetpunk-replacement-15
+    accent-streetpunk-replaced-16: accent-streetpunk-replacement-16
+    accent-streetpunk-replaced-17: accent-streetpunk-replacement-17
+    accent-streetpunk-replaced-18: accent-streetpunk-replacement-18
+    accent-streetpunk-replaced-19: accent-streetpunk-replacement-19
+    accent-streetpunk-replaced-20: accent-streetpunk-replacement-20
+    accent-streetpunk-replaced-21: accent-streetpunk-replacement-21
+    accent-streetpunk-replaced-22: accent-streetpunk-replacement-22
+    accent-streetpunk-replaced-23: accent-streetpunk-replacement-23
+    accent-streetpunk-replaced-24: accent-streetpunk-replacement-24
+    accent-streetpunk-replaced-25: accent-streetpunk-replacement-25
+    accent-streetpunk-replaced-26: accent-streetpunk-replacement-26
+    accent-streetpunk-replaced-27: accent-streetpunk-replacement-27
+    accent-streetpunk-replaced-28: accent-streetpunk-replacement-28
+    accent-streetpunk-replaced-29: accent-streetpunk-replacement-29
+    accent-streetpunk-replaced-30: accent-streetpunk-replacement-30
+    accent-streetpunk-replaced-31: accent-streetpunk-replacement-31
+    accent-streetpunk-replaced-32: accent-streetpunk-replacement-32
+    accent-streetpunk-replaced-33: accent-streetpunk-replacement-33
+    accent-streetpunk-replaced-34: accent-streetpunk-replacement-34
+    accent-streetpunk-replaced-35: accent-streetpunk-replacement-35
+    accent-streetpunk-replaced-36: accent-streetpunk-replacement-36
+    accent-streetpunk-replaced-37: accent-streetpunk-replacement-37
+    accent-streetpunk-replaced-38: accent-streetpunk-replacement-38
+    accent-streetpunk-replaced-39: accent-streetpunk-replacement-39
+    accent-streetpunk-replaced-40: accent-streetpunk-replacement-40
+    accent-streetpunk-replaced-41: accent-streetpunk-replacement-41
+    accent-streetpunk-replaced-42: accent-streetpunk-replacement-42
+    accent-streetpunk-replaced-43: accent-streetpunk-replacement-43
+    accent-streetpunk-replaced-44: accent-streetpunk-replacement-44
+    accent-streetpunk-replaced-45: accent-streetpunk-replacement-45
+    accent-streetpunk-replaced-46: accent-streetpunk-replacement-46
+    accent-streetpunk-replaced-47: accent-streetpunk-replacement-47
+    accent-streetpunk-replaced-48: accent-streetpunk-replacement-48
+    accent-streetpunk-replaced-49: accent-streetpunk-replacement-49
+    accent-streetpunk-replaced-50: accent-streetpunk-replacement-50
+    accent-streetpunk-replaced-51: accent-streetpunk-replacement-51
+    accent-streetpunk-replaced-52: accent-streetpunk-replacement-52
+    accent-streetpunk-replaced-53: accent-streetpunk-replacement-53
+    accent-streetpunk-replaced-54: accent-streetpunk-replacement-54
+    accent-streetpunk-replaced-55: accent-streetpunk-replacement-55
+    accent-streetpunk-replaced-56: accent-streetpunk-replacement-56
+    accent-streetpunk-replaced-57: accent-streetpunk-replacement-57
+    accent-streetpunk-replaced-58: accent-streetpunk-replacement-58
+    accent-streetpunk-replaced-59: accent-streetpunk-replacement-59
+    accent-streetpunk-replaced-60: accent-streetpunk-replacement-60
+    accent-streetpunk-replaced-61: accent-streetpunk-replacement-61
+    accent-streetpunk-replaced-62: accent-streetpunk-replacement-62
+    accent-streetpunk-replaced-63: accent-streetpunk-replacement-63
+    accent-streetpunk-replaced-64: accent-streetpunk-replacement-64
+    accent-streetpunk-replaced-65: accent-streetpunk-replacement-65
+    accent-streetpunk-replaced-66: accent-streetpunk-replacement-66
+    accent-streetpunk-replaced-67: accent-streetpunk-replacement-67
+    accent-streetpunk-replaced-68: accent-streetpunk-replacement-68
+    accent-streetpunk-replaced-69: accent-streetpunk-replacement-69
+    accent-streetpunk-replaced-70: accent-streetpunk-replacement-70
+    accent-streetpunk-replaced-71: accent-streetpunk-replacement-71
+    accent-streetpunk-replaced-72: accent-streetpunk-replacement-72
+    accent-streetpunk-replaced-73: accent-streetpunk-replacement-73
+    accent-streetpunk-replaced-74: accent-streetpunk-replacement-74
+    accent-streetpunk-replaced-75: accent-streetpunk-replacement-75
+    accent-streetpunk-replaced-76: accent-streetpunk-replacement-76
+    accent-streetpunk-replaced-77: accent-streetpunk-replacement-77
+    accent-streetpunk-replaced-78: accent-streetpunk-replacement-78
+    accent-streetpunk-replaced-79: accent-streetpunk-replacement-79
+    accent-streetpunk-replaced-80: accent-streetpunk-replacement-80
+    accent-streetpunk-replaced-81: accent-streetpunk-replacement-81
+    accent-streetpunk-replaced-82: accent-streetpunk-replacement-82
+    accent-streetpunk-replaced-83: accent-streetpunk-replacement-83
+    accent-streetpunk-replaced-84: accent-streetpunk-replacement-84
+    accent-streetpunk-replaced-85: accent-streetpunk-replacement-85
+    accent-streetpunk-replaced-86: accent-streetpunk-replacement-86
+    accent-streetpunk-replaced-87: accent-streetpunk-replacement-87
+    accent-streetpunk-replaced-88: accent-streetpunk-replacement-88
+    accent-streetpunk-replaced-89: accent-streetpunk-replacement-89
+    accent-streetpunk-replaced-90: accent-streetpunk-replacement-90
+    accent-streetpunk-replaced-91: accent-streetpunk-replacement-91
+    accent-streetpunk-replaced-92: accent-streetpunk-replacement-92
+    accent-streetpunk-replaced-93: accent-streetpunk-replacement-93
+    accent-streetpunk-replaced-94: accent-streetpunk-replacement-94
+    accent-streetpunk-replaced-95: accent-streetpunk-replacement-95
+    accent-streetpunk-replaced-96: accent-streetpunk-replacement-96
+    accent-streetpunk-replaced-97: accent-streetpunk-replacement-97
+    accent-streetpunk-replaced-98: accent-streetpunk-replacement-98
+    accent-streetpunk-replaced-99: accent-streetpunk-replacement-99
+    accent-streetpunk-replaced-100: accent-streetpunk-replacement-100
+    accent-streetpunk-replaced-101: accent-streetpunk-replacement-101
+    accent-streetpunk-replaced-102: accent-streetpunk-replacement-102
+    accent-streetpunk-replaced-103: accent-streetpunk-replacement-103
+    accent-streetpunk-replaced-104: accent-streetpunk-replacement-104
+    accent-streetpunk-replaced-105: accent-streetpunk-replacement-105
+    accent-streetpunk-replaced-106: accent-streetpunk-replacement-106
+    accent-streetpunk-replaced-107: accent-streetpunk-replacement-107
+    accent-streetpunk-replaced-108: accent-streetpunk-replacement-108
+    accent-streetpunk-replaced-109: accent-streetpunk-replacement-109
+    accent-streetpunk-replaced-110: accent-streetpunk-replacement-110
+    accent-streetpunk-replaced-111: accent-streetpunk-replacement-111
+    accent-streetpunk-replaced-112: accent-streetpunk-replacement-112
+    accent-streetpunk-replaced-113: accent-streetpunk-replacement-113
+    accent-streetpunk-replaced-114: accent-streetpunk-replacement-114
+    accent-streetpunk-replaced-115: accent-streetpunk-replacement-115
+    accent-streetpunk-replaced-116: accent-streetpunk-replacement-116
+    accent-streetpunk-replaced-117: accent-streetpunk-replacement-117
+    accent-streetpunk-replaced-118: accent-streetpunk-replacement-118
+    accent-streetpunk-replaced-119: accent-streetpunk-replacement-119
+    accent-streetpunk-replaced-120: accent-streetpunk-replacement-120
+    accent-streetpunk-replaced-121: accent-streetpunk-replacement-121
+    accent-streetpunk-replaced-122: accent-streetpunk-replacement-122
+    accent-streetpunk-replaced-123: accent-streetpunk-replacement-123
+    accent-streetpunk-replaced-124: accent-streetpunk-replacement-124
+    accent-streetpunk-replaced-125: accent-streetpunk-replacement-125
+    accent-streetpunk-replaced-126: accent-streetpunk-replacement-126
+    accent-streetpunk-replaced-127: accent-streetpunk-replacement-127
+    accent-streetpunk-replaced-128: accent-streetpunk-replacement-128
+    accent-streetpunk-replaced-129: accent-streetpunk-replacement-129
+    accent-streetpunk-replaced-130: accent-streetpunk-replacement-130
+    accent-streetpunk-replaced-131: accent-streetpunk-replacement-131
+    accent-streetpunk-replaced-132: accent-streetpunk-replacement-132
+    accent-streetpunk-replaced-133: accent-streetpunk-replacement-133
+    accent-streetpunk-replaced-134: accent-streetpunk-replacement-134
+    accent-streetpunk-replaced-135: accent-streetpunk-replacement-135
+    accent-streetpunk-replaced-136: accent-streetpunk-replacement-136
+    accent-streetpunk-replaced-137: accent-streetpunk-replacement-137
+    accent-streetpunk-replaced-138: accent-streetpunk-replacement-138
+    accent-streetpunk-replaced-139: accent-streetpunk-replacement-139
+    accent-streetpunk-replaced-140: accent-streetpunk-replacement-140
+    accent-streetpunk-replaced-141: accent-streetpunk-replacement-141
+    accent-streetpunk-replaced-142: accent-streetpunk-replacement-142
+    accent-streetpunk-replaced-143: accent-streetpunk-replacement-143
+    accent-streetpunk-replaced-144: accent-streetpunk-replacement-144
+    accent-streetpunk-replaced-145: accent-streetpunk-replacement-145
+    accent-streetpunk-replaced-146: accent-streetpunk-replacement-146
+    accent-streetpunk-replaced-147: accent-streetpunk-replacement-147
+    accent-streetpunk-replaced-148: accent-streetpunk-replacement-148
+    accent-streetpunk-replaced-149: accent-streetpunk-replacement-149
+    accent-streetpunk-replaced-150: accent-streetpunk-replacement-150
+    accent-streetpunk-replaced-151: accent-streetpunk-replacement-151
+    accent-streetpunk-replaced-152: accent-streetpunk-replacement-152
+    accent-streetpunk-replaced-153: accent-streetpunk-replacement-153
+    accent-streetpunk-replaced-154: accent-streetpunk-replacement-154
+    accent-streetpunk-replaced-155: accent-streetpunk-replacement-155
+    accent-streetpunk-replaced-156: accent-streetpunk-replacement-156
+    accent-streetpunk-replaced-157: accent-streetpunk-replacement-157
+    accent-streetpunk-replaced-158: accent-streetpunk-replacement-158
+    accent-streetpunk-replaced-159: accent-streetpunk-replacement-159
+    accent-streetpunk-replaced-160: accent-streetpunk-replacement-160
+    accent-streetpunk-replaced-161: accent-streetpunk-replacement-161
+    accent-streetpunk-replaced-162: accent-streetpunk-replacement-162
+    accent-streetpunk-replaced-163: accent-streetpunk-replacement-163
+    accent-streetpunk-replaced-164: accent-streetpunk-replacement-164
+    accent-streetpunk-replaced-165: accent-streetpunk-replacement-165
+    accent-streetpunk-replaced-166: accent-streetpunk-replacement-166
+    accent-streetpunk-replaced-167: accent-streetpunk-replacement-167
+    accent-streetpunk-replaced-168: accent-streetpunk-replacement-168
+    accent-streetpunk-replaced-169: accent-streetpunk-replacement-169
+    accent-streetpunk-replaced-170: accent-streetpunk-replacement-170
+    accent-streetpunk-replaced-171: accent-streetpunk-replacement-171
+    accent-streetpunk-replaced-172: accent-streetpunk-replacement-172
+    accent-streetpunk-replaced-173: accent-streetpunk-replacement-173
+    accent-streetpunk-replaced-174: accent-streetpunk-replacement-174
+    accent-streetpunk-replaced-175: accent-streetpunk-replacement-175
+    accent-streetpunk-replaced-176: accent-streetpunk-replacement-176
+    accent-streetpunk-replaced-177: accent-streetpunk-replacement-177
+    accent-streetpunk-replaced-178: accent-streetpunk-replacement-178
+    accent-streetpunk-replaced-179: accent-streetpunk-replacement-179
+    accent-streetpunk-replaced-180: accent-streetpunk-replacement-180
+    accent-streetpunk-replaced-181: accent-streetpunk-replacement-181
+    accent-streetpunk-replaced-182: accent-streetpunk-replacement-182
+    accent-streetpunk-replaced-183: accent-streetpunk-replacement-183
+    accent-streetpunk-replaced-184: accent-streetpunk-replacement-184
+    accent-streetpunk-replaced-185: accent-streetpunk-replacement-185
+    accent-streetpunk-replaced-186: accent-streetpunk-replacement-186
+    accent-streetpunk-replaced-187: accent-streetpunk-replacement-187
+    accent-streetpunk-replaced-188: accent-streetpunk-replacement-188
+    accent-streetpunk-replaced-189: accent-streetpunk-replacement-189
+    accent-streetpunk-replaced-190: accent-streetpunk-replacement-190
+    accent-streetpunk-replaced-191: accent-streetpunk-replacement-191
+    accent-streetpunk-replaced-192: accent-streetpunk-replacement-192
+    accent-streetpunk-replaced-193: accent-streetpunk-replacement-193
+    accent-streetpunk-replaced-194: accent-streetpunk-replacement-194
+    accent-streetpunk-replaced-195: accent-streetpunk-replacement-195
+    accent-streetpunk-replaced-196: accent-streetpunk-replacement-196
+    accent-streetpunk-replaced-197: accent-streetpunk-replacement-197
+    accent-streetpunk-replaced-198: accent-streetpunk-replacement-198
+    accent-streetpunk-replaced-199: accent-streetpunk-replacement-199
+    accent-streetpunk-replaced-200: accent-streetpunk-replacement-200
+    accent-streetpunk-replaced-201: accent-streetpunk-replacement-201
+    accent-streetpunk-replaced-202: accent-streetpunk-replacement-202
+    accent-streetpunk-replaced-203: accent-streetpunk-replacement-203
+    accent-streetpunk-replaced-204: accent-streetpunk-replacement-204
+    accent-streetpunk-replaced-205: accent-streetpunk-replacement-205
+    accent-streetpunk-replaced-206: accent-streetpunk-replacement-206
+    accent-streetpunk-replaced-207: accent-streetpunk-replacement-207
+    accent-streetpunk-replaced-208: accent-streetpunk-replacement-208
+    accent-streetpunk-replaced-209: accent-streetpunk-replacement-209
+    accent-streetpunk-replaced-210: accent-streetpunk-replacement-210
+    accent-streetpunk-replaced-211: accent-streetpunk-replacement-211
+    accent-streetpunk-replaced-212: accent-streetpunk-replacement-212
+    accent-streetpunk-replaced-213: accent-streetpunk-replacement-213
+    accent-streetpunk-replaced-214: accent-streetpunk-replacement-214
+    accent-streetpunk-replaced-215: accent-streetpunk-replacement-215
+    accent-streetpunk-replaced-216: accent-streetpunk-replacement-216
+    accent-streetpunk-replaced-217: accent-streetpunk-replacement-217
+    accent-streetpunk-replaced-218: accent-streetpunk-replacement-218
+    accent-streetpunk-replaced-219: accent-streetpunk-replacement-219
+    accent-streetpunk-replaced-220: accent-streetpunk-replacement-220
+    accent-streetpunk-replaced-221: accent-streetpunk-replacement-221
+    accent-streetpunk-replaced-222: accent-streetpunk-replacement-222
+    accent-streetpunk-replaced-223: accent-streetpunk-replacement-223
+    accent-streetpunk-replaced-224: accent-streetpunk-replacement-224
+    accent-streetpunk-replaced-225: accent-streetpunk-replacement-225
+    accent-streetpunk-replaced-226: accent-streetpunk-replacement-226
+    accent-streetpunk-replaced-227: accent-streetpunk-replacement-227
+    accent-streetpunk-replaced-228: accent-streetpunk-replacement-228
+    accent-streetpunk-replaced-229: accent-streetpunk-replacement-229
+    accent-streetpunk-replaced-230: accent-streetpunk-replacement-230
+    accent-streetpunk-replaced-231: accent-streetpunk-replacement-231
+    accent-streetpunk-replaced-232: accent-streetpunk-replacement-232
+    accent-streetpunk-replaced-233: accent-streetpunk-replacement-233
+    accent-streetpunk-replaced-234: accent-streetpunk-replacement-234
+    accent-streetpunk-replaced-235: accent-streetpunk-replacement-235
+    accent-streetpunk-replaced-236: accent-streetpunk-replacement-236
+    accent-streetpunk-replaced-237: accent-streetpunk-replacement-237
+    accent-streetpunk-replaced-238: accent-streetpunk-replacement-238
+    accent-streetpunk-replaced-239: accent-streetpunk-replacement-239
+    accent-streetpunk-replaced-240: accent-streetpunk-replacement-240
+    accent-streetpunk-replaced-241: accent-streetpunk-replacement-241
+    accent-streetpunk-replaced-242: accent-streetpunk-replacement-242
+    accent-streetpunk-replaced-243: accent-streetpunk-replacement-243
+    accent-streetpunk-replaced-244: accent-streetpunk-replacement-244
+    accent-streetpunk-replaced-245: accent-streetpunk-replacement-245
+    accent-streetpunk-replaced-246: accent-streetpunk-replacement-246
+    accent-streetpunk-replaced-247: accent-streetpunk-replacement-247
+    accent-streetpunk-replaced-248: accent-streetpunk-replacement-248
+    accent-streetpunk-replaced-249: accent-streetpunk-replacement-249
+    accent-streetpunk-replaced-250: accent-streetpunk-replacement-250
+    accent-streetpunk-replaced-251: accent-streetpunk-replacement-251
+    accent-streetpunk-replaced-252: accent-streetpunk-replacement-252
+    accent-streetpunk-replaced-253: accent-streetpunk-replacement-253
+    accent-streetpunk-replaced-254: accent-streetpunk-replacement-254
+    accent-streetpunk-replaced-255: accent-streetpunk-replacement-255
+    accent-streetpunk-replaced-256: accent-streetpunk-replacement-256
+    accent-streetpunk-replaced-257: accent-streetpunk-replacement-257
+    accent-streetpunk-replaced-258: accent-streetpunk-replacement-258
+    accent-streetpunk-replaced-259: accent-streetpunk-replacement-259
+    accent-streetpunk-replaced-260: accent-streetpunk-replacement-260
+    accent-streetpunk-replaced-261: accent-streetpunk-replacement-261
+    accent-streetpunk-replaced-262: accent-streetpunk-replacement-262
+    accent-streetpunk-replaced-263: accent-streetpunk-replacement-263
+    accent-streetpunk-replaced-264: accent-streetpunk-replacement-264
+    accent-streetpunk-replaced-265: accent-streetpunk-replacement-265
+    accent-streetpunk-replaced-266: accent-streetpunk-replacement-266
+    accent-streetpunk-replaced-267: accent-streetpunk-replacement-267
+    accent-streetpunk-replaced-268: accent-streetpunk-replacement-268
+    accent-streetpunk-replaced-269: accent-streetpunk-replacement-269
+    accent-streetpunk-replaced-270: accent-streetpunk-replacement-270
+    accent-streetpunk-replaced-271: accent-streetpunk-replacement-271
+    accent-streetpunk-replaced-272: accent-streetpunk-replacement-272
+    accent-streetpunk-replaced-273: accent-streetpunk-replacement-273
+    accent-streetpunk-replaced-274: accent-streetpunk-replacement-274
+    accent-streetpunk-replaced-275: accent-streetpunk-replacement-275
+    accent-streetpunk-replaced-276: accent-streetpunk-replacement-276
+    accent-streetpunk-replaced-277: accent-streetpunk-replacement-277
+    accent-streetpunk-replaced-278: accent-streetpunk-replacement-278
+    accent-streetpunk-replaced-279: accent-streetpunk-replacement-279
+    accent-streetpunk-replaced-280: accent-streetpunk-replacement-280
+    accent-streetpunk-replaced-281: accent-streetpunk-replacement-281
+    accent-streetpunk-replaced-282: accent-streetpunk-replacement-282
+    accent-streetpunk-replaced-283: accent-streetpunk-replacement-283
+    accent-streetpunk-replaced-284: accent-streetpunk-replacement-284
+    accent-streetpunk-replaced-285: accent-streetpunk-replacement-285
+    accent-streetpunk-replaced-286: accent-streetpunk-replacement-286
+    accent-streetpunk-replaced-287: accent-streetpunk-replacement-287
+    accent-streetpunk-replaced-288: accent-streetpunk-replacement-288
+    accent-streetpunk-replaced-289: accent-streetpunk-replacement-289
+    accent-streetpunk-replaced-290: accent-streetpunk-replacement-290
+    accent-streetpunk-replaced-291: accent-streetpunk-replacement-291
+    accent-streetpunk-replaced-292: accent-streetpunk-replacement-292
+    accent-streetpunk-replaced-293: accent-streetpunk-replacement-293
+    accent-streetpunk-replaced-294: accent-streetpunk-replacement-294
+    accent-streetpunk-replaced-295: accent-streetpunk-replacement-295
+    accent-streetpunk-replaced-296: accent-streetpunk-replacement-296
+    accent-streetpunk-replaced-297: accent-streetpunk-replacement-297
+    accent-streetpunk-replaced-298: accent-streetpunk-replacement-298
+    accent-streetpunk-replaced-299: accent-streetpunk-replacement-299
+    accent-streetpunk-replaced-300: accent-streetpunk-replacement-300
+    accent-streetpunk-replaced-301: accent-streetpunk-replacement-301
+    accent-streetpunk-replaced-302: accent-streetpunk-replacement-302
+    accent-streetpunk-replaced-303: accent-streetpunk-replacement-303
+    accent-streetpunk-replaced-304: accent-streetpunk-replacement-304
+    accent-streetpunk-replaced-305: accent-streetpunk-replacement-305
+    accent-streetpunk-replaced-306: accent-streetpunk-replacement-306
+    accent-streetpunk-replaced-307: accent-streetpunk-replacement-307
+    accent-streetpunk-replaced-308: accent-streetpunk-replacement-308
+    accent-streetpunk-replaced-309: accent-streetpunk-replacement-309
+    accent-streetpunk-replaced-310: accent-streetpunk-replacement-310
+    accent-streetpunk-replaced-311: accent-streetpunk-replacement-311
+    accent-streetpunk-replaced-312: accent-streetpunk-replacement-312
+    accent-streetpunk-replaced-313: accent-streetpunk-replacement-313
+    accent-streetpunk-replaced-314: accent-streetpunk-replacement-314
+    accent-streetpunk-replaced-315: accent-streetpunk-replacement-315
+    accent-streetpunk-replaced-316: accent-streetpunk-replacement-316
+    accent-streetpunk-replaced-317: accent-streetpunk-replacement-317
+    accent-streetpunk-replaced-318: accent-streetpunk-replacement-318
+    accent-streetpunk-replaced-319: accent-streetpunk-replacement-319
+    accent-streetpunk-replaced-320: accent-streetpunk-replacement-320
+    accent-streetpunk-replaced-321: accent-streetpunk-replacement-321
+    accent-streetpunk-replaced-322: accent-streetpunk-replacement-322
+    accent-streetpunk-replaced-323: accent-streetpunk-replacement-323
+    accent-streetpunk-replaced-324: accent-streetpunk-replacement-324
+    accent-streetpunk-replaced-325: accent-streetpunk-replacement-325
+    accent-streetpunk-replaced-326: accent-streetpunk-replacement-326
+    accent-streetpunk-replaced-327: accent-streetpunk-replacement-327
+    accent-streetpunk-replaced-328: accent-streetpunk-replacement-328
+    accent-streetpunk-replaced-329: accent-streetpunk-replacement-329
+    accent-streetpunk-replaced-330: accent-streetpunk-replacement-330
+    accent-streetpunk-replaced-331: accent-streetpunk-replacement-331
+    accent-streetpunk-replaced-332: accent-streetpunk-replacement-332
+    accent-streetpunk-replaced-333: accent-streetpunk-replacement-333
+    accent-streetpunk-replaced-334: accent-streetpunk-replacement-334
+    accent-streetpunk-replaced-335: accent-streetpunk-replacement-335
+    accent-streetpunk-replaced-336: accent-streetpunk-replacement-336
+    accent-streetpunk-replaced-337: accent-streetpunk-replacement-337
+    accent-streetpunk-replaced-338: accent-streetpunk-replacement-338
+    accent-streetpunk-replaced-339: accent-streetpunk-replacement-339
+    accent-streetpunk-replaced-340: accent-streetpunk-replacement-340
+    accent-streetpunk-replaced-341: accent-streetpunk-replacement-341
+    accent-streetpunk-replaced-342: accent-streetpunk-replacement-342
+    accent-streetpunk-replaced-343: accent-streetpunk-replacement-343
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml
new file mode 100644
index 00000000000..2c1960d5beb
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_punks.yml
@@ -0,0 +1,176 @@
+# BASE
+- type: entity
+  parent: SyndieMessengerGiftBox
+  id: PunkMessengerGiftBox
+  name: punk bundle
+  description: Loot boxes? Here?
+  abstract: true
+  noSpawn: true
+  suffix: NPC Loot
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#EF8100"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#EF8100"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#EF8100"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#EF8100"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+# Punks: generic rewards
+- type: entity
+  parent: PunkMessengerGiftBox
+  id: ClothingBackpackPunkLootA
+  name: punk gear bundle
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: SpaceCash500
+      prob: 1
+      amount: 1
+    - id: SpaceCash500
+      prob: 0.25
+      amount: 1
+    - id: SpawnDungeonLootCircuitBoard
+      prob: 0.35
+      amount: 2
+    - id: SpawnDungeonLootMaterialsBasicFull
+      prob: 0.75
+      amount: 1
+    - id: SpawnDungeonLootToolsAdvancedEngineering
+      amount: 1
+      prob: 0.1
+    - id: SpawnDungeonLootPartsEngi
+      amount: 3
+      prob: 0.75
+    - id: HoloGraffitiProjectorEmpty
+      amount: 1
+      prob: 0.05
+    sound:
+      path: /Audio/Items/jumpsuit_equip.ogg
+
+- type: entity
+  parent: ClothingBackpackPunkLootA
+  id: ClothingBackpackPunkLootB
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: SpaceCash1000
+      prob: 0.95
+      amount: 1
+    - id: SpaceCash500
+      prob: 0.25
+      amount: 1
+    - id: GroundCannabis
+      prob: 0.25
+      amount: 3
+    - id: SpawnDungeonClutterMedipens
+      prob: 0.65
+      amount: 3
+    - id: SpawnDungeonClutterMedical
+      prob: 0.45
+      amount: 3
+    - id: SpawnDungeonLootPartsEngi
+      amount: 3
+      prob: 0.35
+    - id: WeaponCaseShortMk58Expedition
+      amount: 1
+      prob: 0.55
+    - id: HoloGraffitiProjectorEmpty
+      amount: 1
+      prob: 0.05
+    sound:
+      path: /Audio/Items/jumpsuit_equip.ogg
+
+- type: entity
+  parent: ClothingBackpackPunkLootA
+  id: ClothingBackpackPunkLootC
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: SpaceCash1000
+      prob: 0.95
+      amount: 1
+    - id: SpaceCash1000
+      prob: 0.25
+      amount: 1
+    - id: GroundCannabis
+      prob: 0.25
+      amount: 3
+    - id: DrinkWhiskeyBottleFull
+      prob: 0.15
+      amount: 1
+    - id: WeaponCaseLongKammererExpedition
+      amount: 1
+      prob: 0.55
+    - id: SpawnDungeonLootPartsEngi
+      amount: 3
+      prob: 0.35
+    - id: HoloGraffitiProjectorEmpty
+      amount: 1
+      prob: 0.05
+    sound:
+      path: /Audio/Items/jumpsuit_equip.ogg
+
+- type: entity
+  parent: ClothingBackpackPunkLootA
+  id: ClothingBackpackPunkLootD
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: SpaceCash2500
+      prob: 0.95
+      amount: 1
+    - id: SpaceCash1000
+      prob: 0.35
+      amount: 1
+    - id: GroundCannabis
+      prob: 0.35
+      amount: 3
+    - id: SpawnDungeonClutterSyringe
+      prob: 0.65
+      amount: 4
+    - id: SpawnDungeonLootCircuitBoard
+      prob: 0.35
+      amount: 2
+    - id: SpawnDungeonClutterHypospray
+      prob: 0.35
+      amount: 1
+    - id: DrinkWhiskeyBottleFull
+      prob: 0.35
+      amount: 1
+    - id: WeaponCaseLongDrozdExpedition
+      amount: 1
+      prob: 0.55
+    - id: HoloGraffitiProjector
+      amount: 1
+      prob: 0.45
+    sound:
+      path: /Audio/Items/jumpsuit_equip.ogg
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml
index 2b5d57b11cd..79836b3af05 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml
@@ -74,3 +74,17 @@
       - id: Lantern
       - id: ChaplainHolywaterFlaskFilled
       - id: UrnMortuary
+
+- type: entity
+  id: ClothingBeltPunkRandomizedFilled
+  parent: ClothingBeltPunkRandomized
+  suffix: Filled, Engineering
+  components:
+  - type: StorageFill
+    contents:
+      - id: Crowbar
+      - id: Wrench
+      - id: Screwdriver
+      - id: Wirecutter
+      - id: Welder
+      - id: Multitool
diff --git a/Resources/Prototypes/_NF/Catalog/NPCsChatter/spacepunkhumanoidmob.yml b/Resources/Prototypes/_NF/Catalog/NPCsChatter/spacepunkhumanoidmob.yml
new file mode 100644
index 00000000000..855287bf356
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/NPCsChatter/spacepunkhumanoidmob.yml
@@ -0,0 +1,24 @@
+- type: messagePack
+  id: spacepunkhumanoidchatter
+  messages:
+    - advertisement-spacepunkhumanoid-1
+    - advertisement-spacepunkhumanoid-2
+    - advertisement-spacepunkhumanoid-3
+    - advertisement-spacepunkhumanoid-4
+    - advertisement-spacepunkhumanoid-5
+    - advertisement-spacepunkhumanoid-6
+    - advertisement-spacepunkhumanoid-7
+    - advertisement-spacepunkhumanoid-8
+    - advertisement-spacepunkhumanoid-9
+    - advertisement-spacepunkhumanoid-10
+    - advertisement-spacepunkhumanoid-11
+    - advertisement-spacepunkhumanoid-12
+    - advertisement-spacepunkhumanoid-13
+    - advertisement-spacepunkhumanoid-14
+    - advertisement-spacepunkhumanoid-15
+    - advertisement-spacepunkhumanoid-16
+    - advertisement-spacepunkhumanoid-17
+    - advertisement-spacepunkhumanoid-18
+    - advertisement-spacepunkhumanoid-19
+    - advertisement-spacepunkhumanoid-20
+    - advertisement-spacepunkhumanoid-21
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/vandalizedbountyvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/vandalizedbountyvend.yml
new file mode 100644
index 00000000000..df8a17d6e04
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/vandalizedbountyvend.yml
@@ -0,0 +1,10 @@
+- type: messagePack
+  id: VandalizedBountyVendAds
+  messages:
+    - advertisement-vandalizedbountyvend-1
+    - advertisement-vandalizedbountyvend-2
+    - advertisement-vandalizedbountyvend-3
+    - advertisement-vandalizedbountyvend-4
+    - advertisement-vandalizedbountyvend-5
+    - advertisement-vandalizedbountyvend-6
+    - advertisement-vandalizedbountyvend-7
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/vandalizedclothesmate.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/vandalizedclothesmate.yml
new file mode 100644
index 00000000000..2cea23304a5
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/vandalizedclothesmate.yml
@@ -0,0 +1,10 @@
+- type: messagePack
+  id: VandalizedClothesMateAds
+  messages:
+    - advertisement-vandalizedclothes-1
+    - advertisement-vandalizedclothes-2
+    - advertisement-vandalizedclothes-3
+    - advertisement-vandalizedclothes-4
+    - advertisement-vandalizedclothes-5
+    - advertisement-vandalizedclothes-6
+    - advertisement-vandalizedclothes-7
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/punkbountyvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/punkbountyvend.yml
new file mode 100644
index 00000000000..8bd62b51b6e
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/punkbountyvend.yml
@@ -0,0 +1,16 @@
+- type: vendingMachineInventory
+  id: VendingMachineBountyVendPunkInventory
+  startingInventory:
+    ClothingEyesPunkGoggles: 6
+    ClothingEyesPunkInfoShades: 3
+    ClothingMaskPunkHalf: 6
+    ClothingUniformRandomPunkCroptop: 12
+    ClothingUniformRandomPunkTanktop: 8
+    ClothingUniformRandomArmlessNoSkirt: 6
+    ClothingBeltPunkRandomized: 6
+    ClothingShoesBootsPunkRandomized: 6
+    ClothingOuterArmorPunkRandomized: 4
+    ClothingOuterArmorPunkGreen: 2
+    ClothingOuterArmorPunkOrange: 2
+    ClothingOuterArmorPunkRed: 2
+    HoloGraffitiProjector: 4
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/punkclothesvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/punkclothesvend.yml
new file mode 100644
index 00000000000..2956f0bcf4c
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/punkclothesvend.yml
@@ -0,0 +1,29 @@
+- type: vendingMachineInventory
+  id: VendingMachineClothingPunkInventory
+  startingInventory:
+    ClothingEyesPunkGoggles: 8
+    ClothingEyesPunkInfoShades: 3
+    ClothingMaskPunkHalf: 8
+    ClothingUniformRandomPunkCroptop: 10
+    ClothingUniformRandomPunkTanktop: 10
+    ClothingUniformRandomArmlessNoSkirt: 8
+    ClothingOuterCoatBomberRandomized: 6
+    ClothingOuterCoatLettermanRandomized: 6
+    ClothingBeltPunkRandomized: 8
+    ClothingShoesBootsPunkRandomized: 8
+    ClothingOuterCoatBomberPunkRed: 6
+    ClothingOuterCoatJacketJamrock: 6
+    ClothingOuterCoatBomberAerostatic: 6
+    ClothingOuterCoatJacketLettermanBlue: 6
+    ClothingOuterCoatJacketLettermanBrown: 6
+    ClothingOuterCoatJacketLettermanRed: 6
+    ClothingOuterCoatJacketLettermanMagenta: 6
+    ClothingOuterCoatBomberPinkSleeves: 6
+    ClothingOuterCoatJacketLeather: 6
+    ClothingOuterCoatJacketBiker: 6
+    ClothingOuterCoatAcidRaincoat: 3
+    ClothingOuterCoatAcidRaincoatBlue: 3
+    ClothingOuterCoatAcidRaincoatGreen: 3
+    ClothingOuterCoatAcidRaincoatMagenta: 3
+    ClothingOuterCoatAcidRaincoatYellow: 3
+    HoloGraffitiProjector: 4
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml
new file mode 100644
index 00000000000..5dcaa8b8c85
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml
@@ -0,0 +1,45 @@
+
+- type: entity
+  parent: ClothingBeltStorageBase
+  id: ClothingBeltPunkRandomized
+  name: punk belt
+  description: A webbing with functional pockets.
+  suffix: Random visuals
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Belt/punk.rsi
+    layers:
+    - state: base_belt_01
+      map: [ "belt_main" ]
+      scale: 1.8, 1.8
+      offset: 0,0.1
+    - state: decor_base_belt_01
+      map: [ "belt_decor" ]
+      scale: 1.8, 1.8
+      offset: 0,0.1
+    - state: mask_null
+      map: [ "belt_overlay" ]
+      scale: 1.8, 1.8
+      offset: 0,0.1
+  - type: Clothing
+    sprite: _NF/Clothing/Belt/punk.rsi
+    clothingVisuals:
+      belt:
+      - state: base_belt_01
+        map: [ "belt_main" ]
+      - state: decor_base_belt_01
+        map: [ "belt_decor" ]
+      - state: mask_null
+        map: [ "belt_overlay" ]
+  - type: RandomSprite
+    available:
+      - belt_main:
+          base_belt_01: CyberpunkDark
+        belt_decor:
+          decor_base_belt_01: CyberpunkDark
+        belt_overlay:
+          decor_base_belt_02: CyberpunkDark
+          decor_base_belt_03: CyberpunkDark
+          decor_base_belt_04: CyberpunkDark
+          decor_base_belt_05: CyberpunkDark
+          mask_null: ""
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml
index ff0f55ee59f..cf9e04af3ac 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml
@@ -35,4 +35,4 @@
   - type: Sprite
     sprite: _NF/Clothing/Eyes/Glasses/nfsd_glasses.rsi
   - type: Clothing
-    sprite: _NF/Clothing/Eyes/Glasses/nfsd_glasses.rsi
\ No newline at end of file
+    sprite: _NF/Clothing/Eyes/Glasses/nfsd_glasses.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml
index 4771fe117ca..09e443080d0 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml
@@ -46,4 +46,3 @@
     sprite: _NF/Clothing/Eyes/Hud/nfsd_patch.rsi
   - type: Clothing
     sprite: _NF/Clothing/Eyes/Hud/nfsd_patch.rsi
-
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml
new file mode 100644
index 00000000000..34e58e89040
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml
@@ -0,0 +1,78 @@
+# Glasses
+- type: entity
+  parent: ClothingEyesGlassesMeson
+  id: ClothingEyesPunkGoggles
+  name: punk goggles
+  description: How can you see anything in this with all the lights?
+  components:
+  - type: VisionCorrection
+  - type: Sprite
+    sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi
+    layers:
+    - state: base_glasses_01
+      map: [ "glasses_main" ]
+      scale: 2.5, 2.5
+      offset: 0,-0.6
+    - state: decor_base_glasses_01
+      map: [ "glasses_decor" ]
+      scale: 2.5, 2.5
+      offset: 0,-0.6
+      shader: unshaded
+  - type: Clothing
+    sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi
+    clothingVisuals:
+      eyes:
+      - state: base_glasses_01
+        map: [ "glasses_main" ]
+      - state: decor_base_glasses_01
+        map: [ "glasses_decor" ]
+        shader: unshaded
+  - type: RandomSprite
+    available:
+      - glasses_main:
+          base_glasses_01: CyberpunkDark
+        glasses_decor:
+          decor_base_glasses_01: CyberpunkDark
+
+# HUDs
+- type: entity
+  parent: ClothingEyesHudMedical
+  id: ClothingEyesPunkInfoShades
+  name: punk infoshades
+  description: How can you see anything in this with all the lights?
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi
+    layers:
+    - state: base_glasses_02
+      map: [ "infoshades_main" ]
+      scale: 2.5, 2.5
+      offset: 0,-0.6
+    - state: decor_base_glasses_02
+      map: [ "infoshades_decor" ]
+      scale: 2.5, 2.5
+      offset: 0,-0.6
+      shader: unshaded
+  - type: Clothing
+    sprite: _NF/Clothing/Eyes/Glasses/punk_glasses.rsi
+    clothingVisuals:
+      eyes:
+      - state: base_glasses_02
+        map: [ "infoshades_main" ]
+      - state: decor_base_glasses_02
+        map: [ "infoshades_decor" ]
+        shader: unshaded
+  - type: RandomSprite
+    available:
+      - infoshades_main:
+          base_glasses_02: CyberpunkNeon
+        infoshades_decor:
+          decor_base_glasses_02: CyberpunkNeon
+  - type: ShowHealthBars
+    damageContainers:
+    - Inorganic
+    - Silicon
+    - Biological
+  - type: ShowHealthIcons
+    damageContainers:
+    - Biological
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml
index 18f16acd12c..94230e03201 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml
@@ -9,6 +9,67 @@
   - type: Clothing
     sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi
 
+# Acid raincoat hoods
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHoodAcidRaincoat
+  noSpawn: true
+  name: acid raincoat hood
+  description: Mostly transparent raincoat hood made out of acid resistant polymers.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.9
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingHeadHatHoodAcidRaincoat
+  id: ClothingHeadHatHoodAcidRaincoatBlue
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi
+
+- type: entity
+  parent: ClothingHeadHatHoodAcidRaincoat
+  id: ClothingHeadHatHoodAcidRaincoatGreen
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi
+
+- type: entity
+  parent: ClothingHeadHatHoodAcidRaincoat
+  id: ClothingHeadHatHoodAcidRaincoatMagenta
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi
+
+- type: entity
+  parent: ClothingHeadHatHoodAcidRaincoat
+  id: ClothingHeadHatHoodAcidRaincoatYellow
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi
+
 # Syndicate armored bio suit hood
 - type: entity
   parent: ClothingHeadHatHoodBioGeneral
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml
new file mode 100644
index 00000000000..3b05bbd48c6
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_punk.yml
@@ -0,0 +1,36 @@
+
+- type: entity
+  parent: ClothingMaskPullableBase
+  id: ClothingMaskPunkHalf
+  name: punk halfmask
+  description: A close-fitting breathing mask with gamer lights!
+  suffix: Random visuals
+  components:
+  - type: BreathMask
+  - type: Sprite
+    sprite: _NF/Clothing/Mask/punkhalfmask.rsi
+    layers:
+    - state: base_halfmask_01
+      map: [ "mask_main" ]
+      scale: 2, 2
+      offset: 0,-0.6
+    - state: decor_base_halfmask_01
+      map: [ "mask_decor" ]
+      shader: unshaded
+      scale: 2, 2
+      offset: 0,-0.6
+  - type: Clothing
+    sprite: _NF/Clothing/Mask/punkhalfmask.rsi
+    clothingVisuals:
+      mask:
+      - state: base_halfmask_01
+        map: [ "mask_main" ]
+      - state: decor_base_halfmask_01
+        map: [ "mask_decor" ]
+        shader: unshaded
+  - type: RandomSprite
+    available:
+    - mask_main:
+        base_halfmask_01: CyberpunkDark
+      mask_decor:
+        decor_base_halfmask_01: CyberpunkNeon
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor_punk.yml
new file mode 100644
index 00000000000..c20ccc21e3b
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor_punk.yml
@@ -0,0 +1,120 @@
+
+- type: entity
+  parent: ClothingOuterVestWebMercenary
+  id: ClothingOuterArmorPunkGreen
+  name: punk armor
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi
+
+- type: entity
+  parent: ClothingOuterArmorPunkGreen
+  id: ClothingOuterArmorPunkOrange
+  name: punk armor
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi
+
+- type: entity
+  parent: ClothingOuterArmorPunkGreen
+  id: ClothingOuterArmorPunkRed
+  name: punk armor
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi
+
+- type: entity
+  parent: ClothingOuterArmorPunkGreen
+  id: ClothingOuterArmorPunkRandomized
+  name: punk armor
+  suffix: Random visuals
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi
+    layers:
+    - state: base_OuterClothing_armor_01
+      map: [ "armor_main" ]
+    - state: mask_null
+      map: [ "armor_decor" ]
+    #- state: mask_null
+      #map: [ "armor_overlay" ]
+      #shader: unshaded
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: base_OuterClothing_armor_01
+        map: [ "armor_main" ]
+      - state: mask_null
+        map: [ "armor_decor" ]
+      #- state: mask_null
+        #map: [ "armor_overlay" ]
+        #shader: unshaded
+  - type: RandomSprite
+    available:
+    - armor_main:
+        base_OuterClothing_armor_01: Cyberpunk
+        base_OuterClothing_armor_02: Cyberpunk
+        base_OuterClothing_armor_03: Cyberpunk
+        base_OuterClothing_armor_04: Cyberpunk
+        base_OuterClothing_armor_05: Cyberpunk
+      armor_decor:
+        decor_base_OuterClothing_armor_01: CyberpunkNeon
+        decor_base_OuterClothing_armor_02: CyberpunkNeon
+        decor_base_OuterClothing_armor_03: CyberpunkNeon
+        decor_base_OuterClothing_armor_04: CyberpunkNeon
+        decor_base_OuterClothing_armor_05: CyberpunkNeon
+        decor_base_OuterClothing_armor_06: CyberpunkNeon
+        mask_null: ""
+      #armor_overlay:
+        #overlay_base_OuterClothing_armor_01: CyberpunkNeon
+        #overlay_base_OuterClothing_armor_02: CyberpunkNeon
+        #overlay_base_OuterClothing_armor_03: CyberpunkNeon
+        #overlay_base_OuterClothing_armor_04: CyberpunkNeon
+        #mask_null: ""
+
+- type: entity
+  parent: ClothingOuterArmorBulletproof
+  id: ClothingOuterArmorElitePunkRandomized
+  name: punk heavy armor
+  suffix: Random visuals
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi
+    layers:
+    - state: base_OuterClothing_armor_01
+      map: [ "armor_elite_main" ]
+    - state: mask_null
+      map: [ "armor_elite_decor" ]
+    - state: mask_null
+      map: [ "armor_elite_overlay" ]
+      shader: unshaded
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: base_OuterClothing_armor_01
+        map: [ "armor_elite_main" ]
+      - state: mask_null
+        map: [ "armor_elite_decor" ]
+      - state: mask_null
+        map: [ "armor_elite_overlay" ]
+        shader: unshaded
+  - type: RandomSprite
+    available:
+    - armor_elite_main:
+        base_OuterClothing_armor_01: CyberpunkDark
+      armor_elite_decor:
+        decor_base_OuterClothing_armor_01: CyberpunkDark
+        decor_base_OuterClothing_armor_02: CyberpunkDark
+        decor_base_OuterClothing_armor_03: CyberpunkDark
+        decor_base_OuterClothing_armor_04: CyberpunkDark
+        decor_base_OuterClothing_armor_05: CyberpunkDark
+      armor_elite_overlay:
+        overlay_base_OuterClothing_armor_01: CyberpunkNeon
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml
new file mode 100644
index 00000000000..b8a7038cfad
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml
@@ -0,0 +1,255 @@
+
+# Acid raincoat
+- type: entity
+  parent: ClothingOuterStorageToggleableBase
+  id: ClothingOuterCoatAcidRaincoat
+  name: acid raincoat
+  description: Mostly transparent raincoat made out of acid resistant polymers. Please, for the love of Space God, do wear undergarments.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.4
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodAcidRaincoat
+
+- type: entity
+  parent: ClothingOuterCoatAcidRaincoat
+  id: ClothingOuterCoatAcidRaincoatBlue
+  name: blue acid raincoat
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodAcidRaincoatBlue
+
+- type: entity
+  parent: ClothingOuterCoatAcidRaincoat
+  id: ClothingOuterCoatAcidRaincoatGreen
+  name: green acid raincoat
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodAcidRaincoatGreen
+
+- type: entity
+  parent: ClothingOuterCoatAcidRaincoat
+  id: ClothingOuterCoatAcidRaincoatMagenta
+  name: magenta acid raincoat
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodAcidRaincoatMagenta
+
+- type: entity
+  parent: ClothingOuterCoatAcidRaincoat
+  id: ClothingOuterCoatAcidRaincoatYellow
+  name: yellow acid raincoat
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodAcidRaincoatGreen
+
+# Jackets
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatBomberPunkRed
+  name: red punk bomber
+  description: Ya gotta 'ave style on dem streets.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatJacketLeather
+  name: leather jacket
+  description: Rock'n'roll, babe!
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_leather.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_leather.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatJacketBiker
+  name: biker jacket
+  description: Made out of toughest synthleather for toughest badasses.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_biker.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_biker.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatJacketJamrock
+  name: jamrock blazer
+  description: Welcome to jamrock.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatBomberAerostatic
+  name: aerostatic bomber
+  description: When you wear it, you can always hear the sickest guitar solo in your mind.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatJacketLettermanBlue
+  name: blue letterman jacket
+  description: Where is your lacrosse stick?
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatJacketLettermanBrown
+  name: brown letterman jacket
+  description: Where is your lacrosse stick?
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatJacketLettermanRed
+  name: red letterman jacket
+  description: Where is your lacrosse stick?
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatJacketLettermanMagenta
+  name: magenta letterman jacket
+  description: Where is your holocrosse joystick?
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatBomberPinkSleeves
+  name: bomber jacket
+  description: Oi! Whatcha lookin' at?
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi
+
+# Procedural punk jackets
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatBomberRandomized
+  name: punk jacket
+  description: Oi! Whatcha lookin' at?
+  suffix: Random visuals
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi
+    layers:
+    - state: base_OuterClothing_jacket_01
+      map: [ "jacket_main" ]
+    - state: decor_base_OuterClothing_jacket_01
+      map: [ "jacket_decor" ]
+    - state: mask_null
+      map: [ "jacket_overlay" ]
+      shader: unshaded
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: base_OuterClothing_jacket_01
+        map: [ "jacket_main" ]
+      - state: decor_base_OuterClothing_jacket_01
+        map: [ "jacket_decor" ]
+      - state: mask_null
+        map: [ "jacket_overlay" ]
+        shader: unshaded
+  - type: RandomSprite
+    available:
+    - jacket_main:
+        base_OuterClothing_jacket_01: Cyberpunk
+        base_OuterClothing_jacket_02: Cyberpunk
+        base_OuterClothing_jacket_03: Cyberpunk
+        base_OuterClothing_jacket_04: Cyberpunk
+      jacket_decor:
+        decor_base_OuterClothing_jacket_01: Cyberpunk
+        decor_base_OuterClothing_jacket_02: Cyberpunk
+      jacket_overlay:
+        overlay_base_OuterClothing_jacket_01: CyberpunkNeon
+        overlay_base_OuterClothing_jacket_02: CyberpunkNeon
+        overlay_base_OuterClothing_jacket_03: CyberpunkNeon
+        overlay_base_OuterClothing_jacket_04: CyberpunkNeon
+        overlay_base_OuterClothing_jacket_05: CyberpunkNeon
+        overlay_base_OuterClothing_jacket_06: CyberpunkNeon
+        overlay_base_OuterClothing_jacket_07: CyberpunkNeon
+        mask_null: ""
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatLettermanRandomized
+  name: punk letterman jacket
+  description: Where is your holocrosse joystick?
+  suffix: Random visuals
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi
+    layers:
+    - state: base_OuterClothing_letterman
+      map: [ "jacket_main" ]
+    - state: decor_base_OuterClothing_letterman
+      map: [ "jacket_decor" ]
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: base_OuterClothing_letterman
+        map: [ "jacket_main" ]
+      - state: decor_base_OuterClothing_letterman
+        map: [ "jacket_decor" ]
+  - type: RandomSprite
+    available:
+    - jacket_main:
+        base_OuterClothing_letterman: Cyberpunk
+      jacket_decor:
+        decor_base_OuterClothing_letterman: Cyberpunk
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml
new file mode 100644
index 00000000000..ae33ba162e8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml
@@ -0,0 +1,43 @@
+
+- type: entity
+  parent: ClothingShoesBaseButcherable
+  id: ClothingShoesBootsPunkRandomized
+  name: punk boots
+  description: Deez boots were made for stompin', an' stompin' on ya bucket dey'll do.
+  suffix: Random visuals
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Shoes/Boots/punk.rsi
+    layers:
+    - state: base_boots_01
+      map: [ "boots_main" ]
+      scale: 2, 2
+      offset: 0,0.6
+    - state: decor_base_boots_01
+      map: [ "boots_decor" ]
+      scale: 2, 2
+      offset: 0,0.6
+    - state: mask_null
+      map: [ "boots_overlay" ]
+      scale: 2, 2
+      offset: 0,0.6
+  - type: Clothing
+    sprite: _NF/Clothing/Shoes/Boots/punk.rsi
+    clothingVisuals:
+      shoes:
+      - state: base_boots_01
+        map: [ "boots_main" ]
+      - state: mask_null
+        map: [ "boots_decor" ]
+      - state: mask_null
+        map: [ "boots_overlay" ]
+  - type: RandomSprite
+    available:
+    - boots_main:
+        base_boots_01: Cyberpunk
+      boots_decor:
+        decor_base_boots_01: Cyberpunk
+        mask_null: ""
+      boots_overlay:
+        decor_base_boots_02: Cyberpunk
+        mask_null: ""
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits_punk.yml
new file mode 100644
index 00000000000..235f7d782fa
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits_punk.yml
@@ -0,0 +1,162 @@
+# PANTS
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformRandomPunkCroptop
+  name: punk croptop jumpsuit
+  description: Generated by neural networks based on the latest fashion trends.
+  suffix: Random visuals
+  components:
+  - type: SuitSensor
+  - type: Sprite
+    sprite: _NF/Clothing/Uniforms/punk_procedural.rsi
+    layers:
+    - state: base_torso_armless
+      map: [ "jumpsuit_top" ]
+    - state: base_leg_standard
+      map: [ "jumpsuit_bottom" ]
+    - state: mask_null
+      map: [ "jumpsuit_decor" ]
+  - type: Clothing
+    femaleMask: UniformTop
+    maleMask: UniformTop
+    sprite: _NF/Clothing/Uniforms/punk_procedural.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: base_torso_armless
+        map: [ "jumpsuit_top" ]
+      - state: base_leg_standard
+        map: [ "jumpsuit_bottom" ]
+      - state: mask_null
+        map: [ "jumpsuit_decor" ]
+  - type: RandomSprite
+    available:
+      - jumpsuit_top:
+          base_torso_croptop_armless: Cyberpunk # Alt palettes: ChatNames
+        jumpsuit_bottom:
+          base_leg_standard: Cyberpunk
+        jumpsuit_decor:
+          decor_base_torso_croptop_armless_01: Cyberpunk
+          decor_base_torso_croptop_armless_02: Cyberpunk
+          decor_base_torso_croptop_armless_03: Cyberpunk
+          decor_base_leg_standard_01: Cyberpunk
+          decor_base_leg_standard_02: Cyberpunk
+          decor_base_leg_standard_03: Cyberpunk
+          decor_base_leg_standard_04: Cyberpunk
+          decor_base_leg_standard_05: Cyberpunk
+          mask_null: ""
+
+- type: entity
+  parent: ClothingUniformRandomPunkCroptop
+  id: ClothingUniformRandomPunkTanktop
+  name: punk tanktop jumpsuit
+  components:
+  - type: RandomSprite
+    available:
+      - jumpsuit_top:
+          base_torso_armless: Cyberpunk
+        jumpsuit_bottom:
+          base_leg_standard: Cyberpunk
+        jumpsuit_decor:
+          decor_base_torso_croptop_armless_01: Cyberpunk
+          decor_base_torso_croptop_armless_02: Cyberpunk
+          decor_base_torso_croptop_armless_03: Cyberpunk
+          decor_base_leg_standard_01: Cyberpunk
+          decor_base_leg_standard_02: Cyberpunk
+          decor_base_leg_standard_03: Cyberpunk
+          decor_base_leg_standard_04: Cyberpunk
+          decor_base_leg_standard_05: Cyberpunk
+          mask_null: ""
+
+- type: entity
+  parent: ClothingUniformRandomPunkCroptop
+  id: ClothingUniformRandomArmlessNoSkirt
+  name: colorful armless jumpsuit
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/procedural.rsi
+  - type: Clothing
+    femaleMask: UniformTop
+    maleMask: UniformTop
+    sprite: Clothing/Uniforms/procedural.rsi
+  - type: RandomSprite
+    available:
+      - jumpsuit_top:
+          base_torso_armless: Cyberpunk
+        jumpsuit_bottom:
+          base_leg_standard: Cyberpunk
+        jumpsuit_decor:
+          decor_torso_armless1: Cyberpunk
+          decor_torso_armless2: Cyberpunk
+          decor_torso_armless3: Cyberpunk
+          decor_torso_armless4: Cyberpunk
+          decor_torso_armless5: Cyberpunk
+          decor_torso_armless9: Cyberpunk
+          decor_torso_armless10: Cyberpunk
+          mask_null: ""
+
+# SHORTS
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformRandomPunkCroptopShorts
+  name: punk croptop short jumpsuit
+  description: Generated by neural networks based on the latest fashion trends.
+  suffix: Random visuals
+  components:
+  - type: SuitSensor
+  - type: Sprite
+    sprite: _NF/Clothing/Uniforms/punk_procedural.rsi
+    layers:
+    - state: base_torso_armless
+      map: [ "jumpsuit_top" ]
+    - state: base_leg_short
+      map: [ "jumpsuit_bottom" ]
+    - state: mask_null
+      map: [ "jumpsuit_decor" ]
+  - type: Clothing
+    femaleMask: UniformTop
+    maleMask: UniformTop
+    sprite: _NF/Clothing/Uniforms/punk_procedural.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: base_torso_armless
+        map: [ "jumpsuit_top" ]
+      - state: base_leg_short
+        map: [ "jumpsuit_bottom" ]
+      - state: mask_null
+        map: [ "jumpsuit_decor" ]
+  - type: RandomSprite
+    available:
+      - jumpsuit_top:
+          base_torso_croptop_armless: Cyberpunk # Alt palettes: ChatNames
+        jumpsuit_bottom:
+          base_leg_short: Cyberpunk
+        jumpsuit_decor:
+          decor_base_torso_croptop_armless_01: Cyberpunk
+          decor_base_torso_croptop_armless_02: Cyberpunk
+          decor_base_torso_croptop_armless_03: Cyberpunk
+          decor_base_leg_short_01: Cyberpunk
+          decor_base_leg_short_02: Cyberpunk
+          decor_base_leg_short_03: Cyberpunk
+          decor_base_leg_short_04: Cyberpunk
+          mask_null: ""
+
+- type: entity
+  parent: ClothingUniformRandomPunkCroptopShorts
+  id: ClothingUniformRandomPunkTanktopShorts
+  name: punk tanktop short jumpsuit
+  components:
+  - type: RandomSprite
+    available:
+      - jumpsuit_top:
+          base_torso_armless: Cyberpunk
+        jumpsuit_bottom:
+          base_leg_short: Cyberpunk
+        jumpsuit_decor:
+          decor_base_torso_croptop_armless_01: Cyberpunk
+          decor_base_torso_croptop_armless_02: Cyberpunk
+          decor_base_torso_croptop_armless_03: Cyberpunk
+          decor_base_leg_short_01: Cyberpunk
+          decor_base_leg_short_02: Cyberpunk
+          decor_base_leg_short_03: Cyberpunk
+          decor_base_leg_short_04: Cyberpunk
+          mask_null: ""
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
index 593e431ca65..702d9530ecc 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
@@ -367,11 +367,13 @@
     - VendingMachineRoboDrobe
     - VendingMachineGeneDrobe
     - VendingMachineViroDrobe
+    - VendingMachineClothingPunk
     chance: 1
     offset: 0.0
     rarePrototypes:
     - VendingMachineMagivend
     - VendingMachineArcadia
+    - VendingMachineBountyVendPunk
     # - VendingMachineSyndieDrobe # A bit less Syndicate loot
     # - VendingMachineSyndieContraband # A bit less Syndicate loot
     - SpawnDungeonMachineFrame
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
index 62ed83aa2e8..1af5bb1a8d4 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -1,4 +1,38 @@
 # T1: common
+- type: entity
+  name: random weapon
+  id: SpawnInhandMeleeWeaponPunkGangLow
+  parent: MarkerBase
+  suffix: "Punk, Melee, T1"
+  noSpawn: true
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+        scale: 0.7, 0.7
+      - sprite: Objects/Weapons/Melee/cult_blade.rsi
+        state: icon
+  - type: RandomSpawner
+    prototypes:
+    - BrokenBottle
+    - ButchCleaver
+    - Screwdriver
+    - Crowbar
+    - Shiv
+    - ReinforcedShiv
+    - PlasmaShiv
+    - UraniumShiv
+    - ScalpelShiv
+    - BaseBallBat
+    - Machete
+    - KukriKnife
+    chance: 1.0
+    offset: 0.0
+    rarePrototypes:
+    - Katana
+    - Truncheon
+    rareChance: 0.05
+
 - type: entity
   name: random weapon
   id: SpawnDungeonLootMeleeT1
@@ -26,7 +60,8 @@
     - BaseBallBat
     - Stunprod
     - WhiteCane
-    - Cane
+    - CombatKnife
+    - SurvivalKnife
     chance: 0.95
     offset: 0.0
     rarePrototypes:
@@ -144,9 +179,6 @@
     - WeaponCaseShortDeckardExpedition
     - WeaponCaseShortPython
     - WeaponCaseLongKammererExpedition
-    - WeaponCaseLongWT550Expedition
-    - WeaponCaseLongDrozdExpedition
-    - WeaponCaseLongLecterExpedition
     - WeaponCaseLongEnergyGunExpedition
     - WeaponCaseLongRepeaterExpedition
     chance: 0.95
@@ -228,8 +260,9 @@
       color: red
   - type: RandomSpawner
     prototypes:
-    - WeaponCaseShortN1984Expedition
-    - WeaponCaseLongM90Expedition
+    - WeaponCaseLongWT550Expedition
+    - WeaponCaseLongDrozdExpedition
+    - WeaponCaseLongLecterExpedition
     - WeaponCaseLongLaserCarbineExpedition
     - WeaponCaseLongHristovExpedition
     chance: 0.95
@@ -311,8 +344,9 @@
       color: red
   - type: RandomSpawner
     prototypes:
+    - WeaponCaseShortN1984Expedition
+    - WeaponCaseLongM90Expedition
     - WeaponCaseLongC20r
-    - WeaponCaseLongAtreidesExpedition
     - WeaponCaseLongAkExpedition
     - WeaponCaseShortSvalinnExpedition
     - WeaponCaseShortAdvancedLaserExpedition
@@ -389,6 +423,7 @@
   - type: RandomSpawner
     prototypes:
     - WeaponCaseLongBulldog
+    - WeaponCaseLongAtreidesExpedition
     - WeaponCaseLongLauncherRocketExpedition
     - WeaponCaseLongLauncherChinaLake
     - WeaponCaseLongLightMachineGunL6
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_punkgangers.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_punkgangers.yml
new file mode 100644
index 00000000000..da0aff9722d
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_punkgangers.yml
@@ -0,0 +1,59 @@
+- type: entity
+  name: spawn punk
+  id: SpawnMobPunkMelee
+  parent: MarkerBasePlaceFree
+  suffix: AI, Hostile, Melee
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Weapons/Melee/baseball_bat.rsi
+      state: icon
+    - state: ai
+  - type: RandomSpawner
+    prototypes:
+    - MobPunkGangerMelee
+    chance: 1
+    offset: 0.0
+    rarePrototypes:
+    - MobPunkGangerArmoredMelee
+    rareChance: 0.2
+
+- type: entity
+  name: spawn punk
+  id: SpawnMobPunkRanged
+  parent: MarkerBasePlaceFree
+  suffix: AI, Hostile, Ranged
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Weapons/Melee/baseball_bat.rsi
+      state: icon
+    - state: ai
+  - type: RandomSpawner
+    prototypes:
+    - MobPunkGangerPistol
+    chance: 1
+    offset: 0.0
+    rarePrototypes:
+    - MobPunkGangerShotgun
+    rareChance: 0.1
+
+- type: entity
+  name: spawn punk leader
+  id: SpawnMobPunkLeader
+  parent: MarkerBasePlaceFree
+  suffix: AI, Hostile
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Weapons/Melee/baseball_bat.rsi
+      state: icon
+    - state: ai
+  - type: RandomSpawner
+    prototypes:
+    - MobPunkGangerArmoredElite
+    chance: 1
+    offset: 0.0
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/baby_dragon.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/baby_dragon.yml
index de669d89e6d..a5a4476206a 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/baby_dragon.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/baby_dragon.yml
@@ -60,6 +60,7 @@
   - type: CombatMode
   - type: MobMover
   - type: InputMover
+  - type: Emoting
   - type: MovementSpeedModifier
     baseWalkSpeed: 3
     baseSprintSpeed: 5
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
index 1fb313b450a..95f6d75fd0c 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
@@ -129,8 +129,8 @@
         true
       NavPry: !type:Bool
         true
-#      NavSmash: !type:Bool # They use this option too much for my liking, but I'll keep it here as an option
-#        true
+      NavSmash: !type:Bool # They use this option too much for my liking, but I'll keep it here as an option
+        true
 
 - type: entity
   id: MobHumanoidHostileAISimpleRanged
@@ -146,8 +146,8 @@
         true
       NavPry: !type:Bool
         true
-#      NavSmash: !type:Bool # They use this option too much for my liking, but I'll keep it here as an option
-#        true
+      NavSmash: !type:Bool # They use this option too much for my liking, but I'll keep it here as an option
+        true
 
 - type: entity
   id: MobHumanoidHostileAIComplex
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml
index 056ff0b523d..3c49b26a571 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml
@@ -7,6 +7,9 @@
   description: A shambling mass of flesh, animated through anomalous energy.
   abstract: true
   components:
+  - type: NpcFactionMember
+    factions:
+    - AberrantFleshExpeditionNF
   - type: HTN
     rootTask:
        task: SimpleHostileCompound
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
index 5d29e1ab31a..24375210a15 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
@@ -10,7 +10,7 @@
   components:
   - type: NpcFactionMember
     factions:
-    - SimpleHostile
+    - ExplorersExpeditionNF
   - type: MobThresholds
     thresholds:
       0: Alive
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml
index 989a6b94fe8..a7929b57fbf 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml
@@ -12,7 +12,7 @@
     damageModifierSet: MobMercenaryDamageModifierSet
   - type: NpcFactionMember
     factions:
-    - SimpleHostile
+    - MercenariesExpeditionNF
   - type: MobThresholds
     thresholds:
       0: Alive
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_punkganger.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_punkganger.yml
new file mode 100644
index 00000000000..b3f2a0b9ad5
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_punkganger.yml
@@ -0,0 +1,134 @@
+- type: entity
+  name: punk
+  abstract: true
+  parent:
+  - MobHumanoidHostileBase
+  id: MobPunkBase
+  components:
+  - type: NpcFactionMember
+    factions:
+    - StreetGangNF
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      100: Critical
+      130: Dead
+  - type: Stamina
+    critThreshold: 100
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 1.5
+    rechargeSound:
+      path: /Audio/_NF/Effects/silence.ogg
+  - type: MeleeWeapon
+    attackRate: 1.0
+    altDisarm: false
+    angle: 0
+    animation: WeaponArcPunch
+    damage:
+      types:
+        Slash: 10
+        Structural: 20
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: ReplacementAccent
+    accent: streetpunk
+  - type: Advertise
+    pack: spacepunkhumanoidchatter
+    minimumWait: 30
+    maximumWait: 120
+    nextAdvertisementTime: 10
+  - type: AutoWakeUp
+
+# Humans
+- type: entity
+  parent:
+  - MobPunkBase
+  - MobHumanoidHostileAISimpleMelee
+  id: MobPunkGangerMelee
+  noSpawn: true
+  components:
+  - type: Loadout
+    prototypes:
+    - PunkGangerGearMelee
+
+- type: entity
+  parent:
+  - MobPunkBase
+  - MobHumanoidHostileAISimpleRanged
+  id: MobPunkGangerPistol
+  noSpawn: true
+  components:
+  - type: Loadout
+    prototypes:
+    - PunkGangerGearPistol
+  - type: BasicEntityAmmoProvider
+    proto: BulletPistol
+    capacity: 2
+    count: 2
+  - type: Gun
+    showExamineText: false
+    fireRate: 0.5
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+    soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+
+- type: entity
+  parent:
+  - MobPunkBase
+  - MobHumanoidHostileAISimpleRanged
+  id: MobPunkGangerShotgun
+  noSpawn: true
+  components:
+  - type: Loadout
+    prototypes:
+    - PunkGangerGearShotgun
+  - type: BasicEntityAmmoProvider
+    proto: ShellShotgun
+    capacity: 1
+    count: 1
+  - type: Gun
+    showExamineText: false
+    fireRate: 0.5
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+    soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+
+- type: entity
+  parent:
+  - MobPunkBase
+  - MobHumanoidHostileAISimpleMelee
+  id: MobPunkGangerArmoredMelee
+  noSpawn: true
+  components:
+  - type: Loadout
+    prototypes:
+    - PunkGangerArmoredGearMelee
+
+- type: entity
+  parent:
+  - MobPunkBase
+  - MobHumanoidHostileAISimpleRanged
+  id: MobPunkGangerArmoredElite
+  name: punk gang leader
+  noSpawn: true
+  components:
+  - type: Loadout
+    prototypes:
+    - PunkGangerArmoredEliteGear
+  - type: BasicEntityAmmoProvider
+    proto: BulletPistol
+    capacity: 6
+    count: 6
+  - type: Gun
+    showExamineText: false
+    minAngle: 10
+    maxAngle: 30
+    fireRate: 3
+    angleIncrease: 3
+    angleDecay: 6
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+    soundGunshot: /Audio/Weapons/Guns/Gunshots/smg.ogg
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml
index df0ca45bd89..fae9422578d 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml
@@ -54,7 +54,7 @@
     damageModifierSet: MobRogueSiliconDamageModifierSet
   - type: NpcFactionMember
     factions:
-    - SimpleHostile
+    - SiliconsExpeditionNF
   - type: NameIdentifier
     group: Silicon
   - type: Bloodstream
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml
index cad767c1e5b..6d7b39e7a03 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml
@@ -24,3 +24,31 @@
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default
+
+- type: entity
+  parent: Holoprojector
+  id: HoloGraffitiProjector
+  name: holograffiti projector
+  description: Tag up the sharp end, let 'em know you were here.
+  components:
+  - type: HolosignProjector
+    signProto: SpawnerHoloGraffitiRandom
+    chargeUse: 60
+  - type: Sprite
+    sprite: _NF/Objects/Devices/Holoprojectors/graffiti.rsi
+    state: icon
+  - type: Tag
+    tags:
+    - HolofanProjector
+  - type: StaticPrice
+    price: 80
+
+- type: entity
+  parent: HoloGraffitiProjector
+  id: HoloGraffitiProjectorEmpty
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/umbrella.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/umbrella.yml
new file mode 100644
index 00000000000..643781b2926
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/umbrella.yml
@@ -0,0 +1,68 @@
+- type: entity
+  name: umbrella
+  parent: BaseItem
+  id: FlashlightUmbrella
+  description: Keeps you dry AND stylish.
+  components:
+  - type: Tag
+    tags:
+    - Flashlight
+  - type: HandheldLight
+    addPrefix: false
+    blinkingBehaviourId: blinking
+    radiatingBehaviourId: radiating
+  - type: LightBehaviour
+    behaviours:
+    - !type:FadeBehaviour
+      id: radiating
+      maxDuration: 2.0
+      startValue: 3.0
+      endValue: 2.0
+      isLooped: true
+      reverseWhenFinished: true
+    - !type:PulseBehaviour
+      id: blinking
+      interpolate: Nearest
+      maxDuration: 1.0
+      minValue: 0.1
+      maxValue: 2.0
+      isLooped: true
+  - type: ToggleableLightVisuals
+    spriteLayer: light
+    inhandVisuals:
+      left:
+      - state: inhand-left-light
+        shader: unshaded
+      right:
+      - state: inhand-right-light
+        shader: unshaded
+  - type: PowerCellSlot
+    cellSlotId: cell_slot
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMedium
+  - type: Sprite
+    sprite: _NF/Objects/Tools/umbrella.rsi
+    layers:
+    - state: flashlight
+    - state: flashlight-overlay
+      shader: unshaded
+      visible: false
+      map: [ "light" ]
+  - type: Item
+    sprite: _NF/Objects/Tools/umbrella.rsi
+    storedRotation: -45
+    size: Huge
+  - type: PointLight
+    enabled: false
+    radius: 3
+    energy: 2.5
+    netsync: false
+  - type: Appearance
+  - type: StaticPrice
+    price: 15.5
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Holographic/graffiti.yml b/Resources/Prototypes/_NF/Entities/Structures/Holographic/graffiti.yml
new file mode 100644
index 00000000000..71b958ac768
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Holographic/graffiti.yml
@@ -0,0 +1,1041 @@
+# Random graffiti
+- type: entity
+  name: holograffiti
+  id: SpawnerHoloGraffitiRandom
+  parent: MarkerBase
+  suffix: Random
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+        scale: 0.7, 0.7
+      - sprite: _NF/Structures/Holo/graffiti/simple.rsi
+        state: holograffiti17
+      - sprite: _NF/Markers/general.rsi
+        state: questionmark
+        color: red
+  - type: RandomSpawner
+    prototypes:
+    - HoloGraffitiSimple01
+    - HoloGraffitiSimple02
+    - HoloGraffitiSimple03
+    - HoloGraffitiSimple04
+    - HoloGraffitiSimple05
+    - HoloGraffitiSimple06
+    - HoloGraffitiSimple07
+    - HoloGraffitiSimple08
+    - HoloGraffitiSimple09
+    - HoloGraffitiSimple10
+    - HoloGraffitiSimple11
+    - HoloGraffitiSimple12
+    - HoloGraffitiSimple13
+    - HoloGraffitiSimple14
+    - HoloGraffitiSimple15
+    - HoloGraffitiSimple16
+    - HoloGraffitiSimple17
+    - HoloGraffitiSimple18
+    - HoloGraffitiSimple19
+    - HoloGraffitiSimple20
+    - HoloGraffitiSimple21
+    - HoloGraffitiSimple22
+    - HoloGraffitiHighlighted01
+    - HoloGraffitiHighlighted02
+    - HoloGraffitiHighlighted03
+    - HoloGraffitiHighlighted04
+    - HoloGraffitiHighlighted05
+    - HoloGraffitiHighlighted06
+    - HoloGraffitiHighlighted07
+    - HoloGraffitiHighlighted08
+    - HoloGraffitiHighlighted09
+    - HoloGraffitiHighlighted10
+    - HoloGraffitiHighlighted11
+    - HoloGraffitiHighlighted12
+    - HoloGraffitiHighlighted13
+    - HoloGraffitiHighlighted14
+    - HoloGraffitiHighlighted15
+    - HoloGraffitiHighlighted16
+    - HoloGraffitiHighlighted17
+    - HoloGraffitiHighlighted18
+    - HoloGraffitiHighlighted19
+    - HoloGraffitiHighlighted20
+    - HoloGraffitiHighlighted21
+    chance: 1.0
+    offset: 0.0
+
+# Graffiti base
+- type: entity
+  id: HoloGraffiti
+  #parent: BaseSign
+  name: holograffiti
+  description: A graffiti composed of hard light. Can be easily removed by force.
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: WallMount
+    arc: 360
+  - type: Clickable
+  #- type: InteractionOutline
+  - type: Rotatable
+  - type: Physics
+    bodyType: Static
+    canCollide: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb {}
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  #- type: TimedDespawn
+    #lifetime: 5400 # 1.5 hours
+  - type: StaticPrice
+    price: 0
+
+# Graffiti simple
+- type: entity
+  id: HoloGraffitiSimple01
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti01
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti01: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple02
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti02
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti02: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple03
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti03
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti03: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple04
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti04
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti04: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple05
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti05
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti05: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple06
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti06
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti06: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple07
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti07
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti07: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple08
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti08
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti08: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple09
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti09
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti09: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple10
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti10
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti10: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple11
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti11
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti11: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple12
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti12
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti12: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple13
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti13
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti13: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple14
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti14
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti14: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple15
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti15
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti15: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple16
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti16
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti16: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple17
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti17
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti17: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple18
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti18
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti18: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple19
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti19
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti19: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple20
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti20
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti20: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple21
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti21
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti21: Cyberpunk
+
+- type: entity
+  id: HoloGraffitiSimple22
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/simple.rsi
+    layers:
+    - state: holograffiti22
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti22: Cyberpunk
+
+# Graffiti highlighted
+- type: entity
+  id: HoloGraffitiHighlighted01
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti01
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight01
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti01: Cyberpunk
+      highlight:
+        holograffiti_highlight01: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted02
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti02
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight02
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti02: Cyberpunk
+      highlight:
+        holograffiti_highlight02: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted03
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti03
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight03
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti03: Cyberpunk
+      highlight:
+        holograffiti_highlight03: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted04
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti04
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight04
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti04: Cyberpunk
+      highlight:
+        holograffiti_highlight04: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted05
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti05
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight05
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti05: Cyberpunk
+      highlight:
+        holograffiti_highlight05: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted06
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti06
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight06
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti06: Cyberpunk
+      highlight:
+        holograffiti_highlight06: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted07
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti07
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight07
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti07: Cyberpunk
+      highlight:
+        holograffiti_highlight07: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted08
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti08
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight08
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti08: Cyberpunk
+      highlight:
+        holograffiti_highlight08: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted09
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti09
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight09
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti09: Cyberpunk
+      highlight:
+        holograffiti_highlight09: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted10
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti10
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight10
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti10: Cyberpunk
+      highlight:
+        holograffiti_highlight10: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted11
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti11
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight11
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti11: Cyberpunk
+      highlight:
+        holograffiti_highlight11: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted12
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti12
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight12
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti12: Cyberpunk
+      highlight:
+        holograffiti_highlight12: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted13
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti13
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight13
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti13: Cyberpunk
+      highlight:
+        holograffiti_highlight13: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted14
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti14
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight14
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight14_1
+      map: [ "highlight1" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti14: Cyberpunk
+      highlight:
+        holograffiti_highlight14: CyberpunkNeon
+      highlight1:
+        holograffiti_highlight14_1: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted15
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti15
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight15
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight15_1
+      map: [ "highlight1" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti15: Cyberpunk
+      highlight:
+        holograffiti_highlight15: CyberpunkNeon
+      highlight1:
+        holograffiti_highlight15_1: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted16
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti16
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight16
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti16: Cyberpunk
+      highlight:
+        holograffiti_highlight16: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted17
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti17
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight17
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti17: Cyberpunk
+      highlight:
+        holograffiti_highlight17: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted18
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti18
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight18
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti18: Cyberpunk
+      highlight:
+        holograffiti_highlight18: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted19
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti19
+      map: [ "graffiti" ]
+      scale: 1.2, 1.2
+    - state: holograffiti_highlight19
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 1.2, 1.2
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti19: Cyberpunk
+      highlight:
+        holograffiti_highlight19: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted20
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti20
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight20
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti20: Cyberpunk
+      highlight:
+        holograffiti_highlight20: CyberpunkNeon
+
+- type: entity
+  id: HoloGraffitiHighlighted21
+  parent: HoloGraffiti
+  noSpawn: true
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    snapCardinals: true
+    sprite: _NF/Structures/Holo/graffiti/highlighted.rsi
+    layers:
+    - state: holograffiti21
+      map: [ "graffiti" ]
+      scale: 0.75, 0.75
+    - state: holograffiti_highlight21
+      map: [ "highlight" ]
+      shader: unshaded
+      scale: 0.75, 0.75
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti21: Cyberpunk
+      highlight:
+        holograffiti_highlight21: CyberpunkNeon
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
index 5a5170bc390..2b164036534 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
@@ -453,3 +453,120 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+
+# Punk stuff
+- type: entity
+  parent: VendingMachineClothing
+  id: VendingMachineClothingPunk
+  name: ThreadsChoom
+  description: A vandalized ClothesMate.
+  components:
+  - type: VendingMachine
+    pack: VendingMachineClothingPunkInventory
+    offState: broken
+    brokenState: broken
+    normalState: clothing-vandalized-unshaded
+    denyState: clothing-vandalized-deny-unshaded
+  - type: Advertise
+    pack: VandalizedClothesMateAds
+  - type: SpeakOnUIClosed
+    pack: GenericVendGoodbyes
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/clothing.rsi
+    layers:
+    - state: "broken"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - sprite: _NF/Structures/Machines/VendingMachines/vandalized.rsi
+      state: clothing-vandalized-unshaded
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    - sprite: _NF/Structures/Holo/graffiti/simple.rsi
+      state: holograffiti01
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.7, 0.7
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti01: Cyberpunk
+        holograffiti02: Cyberpunk
+        holograffiti03: Cyberpunk
+        holograffiti04: Cyberpunk
+        holograffiti05: Cyberpunk
+        holograffiti06: Cyberpunk
+        holograffiti07: Cyberpunk
+        holograffiti08: Cyberpunk
+        holograffiti09: Cyberpunk
+        holograffiti10: Cyberpunk
+        holograffiti11: Cyberpunk
+        holograffiti12: Cyberpunk
+        holograffiti13: Cyberpunk
+        holograffiti14: Cyberpunk
+        holograffiti15: Cyberpunk
+        holograffiti16: Cyberpunk
+        holograffiti17: Cyberpunk
+        holograffiti18: Cyberpunk
+        holograffiti19: Cyberpunk
+        holograffiti20: Cyberpunk
+        holograffiti21: Cyberpunk
+        holograffiti22: Cyberpunk
+
+- type: entity
+  parent: VendingMachineBountyVend
+  id: VendingMachineBountyVendPunk
+  name: BonanzaMatic
+  description: A vandalised BountyVend.
+  components:
+  - type: VendingMachine
+    pack: VendingMachineBountyVendPunkInventory
+    offState: broken
+    brokenState: broken
+    normalState: normal-unshaded
+  - type: Advertise
+    pack: VandalizedBountyVendAds
+  - type: Sprite
+    sprite: _NF/Structures/Machines/VendingMachines/bountyvend.rsi
+    layers:
+    - state: "broken"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "broken"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    - sprite: _NF/Structures/Holo/graffiti/simple.rsi
+      state: holograffiti01
+      map: [ "graffiti" ]
+      shader: unshaded
+      scale: 0.7, 0.7
+  - type: RandomSprite
+    available:
+    - graffiti:
+        holograffiti01: Cyberpunk
+        holograffiti02: Cyberpunk
+        holograffiti03: Cyberpunk
+        holograffiti04: Cyberpunk
+        holograffiti05: Cyberpunk
+        holograffiti06: Cyberpunk
+        holograffiti07: Cyberpunk
+        holograffiti08: Cyberpunk
+        holograffiti09: Cyberpunk
+        holograffiti10: Cyberpunk
+        holograffiti11: Cyberpunk
+        holograffiti12: Cyberpunk
+        holograffiti13: Cyberpunk
+        holograffiti14: Cyberpunk
+        holograffiti15: Cyberpunk
+        holograffiti16: Cyberpunk
+        holograffiti17: Cyberpunk
+        holograffiti18: Cyberpunk
+        holograffiti19: Cyberpunk
+        holograffiti20: Cyberpunk
+        holograffiti21: Cyberpunk
+        holograffiti22: Cyberpunk
+  - type: PointLight
+    radius: 1.1
+    energy: 1.2
+    color: "#4b93ad"
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml
index 6eb0bb4ba06..5d5598b280c 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml
@@ -307,6 +307,34 @@
   equipment:
     belt: ClothingBeltMartialBlack
 
+- type: loadout
+  id: ContractorClothingBeltPunkRandomized
+  equipment: ContractorClothingBeltPunkRandomized
+  name: punk belt (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1000
+
+- type: startingGear
+  id: ContractorClothingBeltPunkRandomized
+  equipment:
+    belt: ClothingBeltPunkRandomized
+
+- type: loadout
+  id: ContractorClothingBeltPunkRandomizedFilled
+  equipment: ContractorClothingBeltPunkRandomizedFilled
+  name: punk belt (random, filled)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1500
+
+- type: startingGear
+  id: ContractorClothingBeltPunkRandomizedFilled
+  equipment:
+    belt: ClothingBeltPunkRandomizedFilled
+
 #T3 for lols
 - type: loadout
   id: ContractorClothingBeltChampion
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/eyes.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/eyes.yml
index e605dd48716..d8454dde3e5 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/eyes.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/eyes.yml
@@ -105,6 +105,34 @@
   equipment:
     eyes: ClothingEyesHudMedical
 
+- type: loadout
+  id: ContractorClothingEyesPunkGoggles
+  equipment: ContractorClothingEyesPunkGoggles
+  name: punk goggles (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 750
+
+- type: startingGear
+  id: ContractorClothingEyesPunkGoggles
+  equipment:
+    eyes: ClothingEyesPunkGoggles
+
+- type: loadout
+  id: ContractorClothingEyesPunkInfoShades
+  equipment: ContractorClothingEyesPunkInfoShades
+  name: punk infoshades (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 750
+
+- type: startingGear
+  id: ContractorClothingEyesPunkInfoShades
+  equipment:
+    eyes: ClothingEyesPunkInfoShades
+
 
 #T2
 - type: loadout
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml
index 7a3c8215ae0..8bddecd2947 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml
@@ -45,6 +45,20 @@
   equipment:
     mask: ClothingMaskGas
 
+- type: loadout
+  id: ContractorClothingMaskPunkHalf
+  equipment: ContractorClothingMaskPunkHalf
+  name: punk halfmask (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingMaskPunkHalf
+  equipment:
+    mask: ClothingMaskPunkHalf
+
 #T2
 - type: loadout
   id: ContractorClothingMaskGasExplorer
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml
index 36eb90d0918..71a73a9614b 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml
@@ -199,6 +199,32 @@
   inhand:
     - PlushieRGBee
 
+- type: loadout
+  id: ContractorHoloGraffitiProjector
+  equipment: ContractorHoloGraffitiProjector
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 10000
+
+- type: startingGear
+  id: ContractorHoloGraffitiProjector
+  inhand:
+    - HoloGraffitiProjector
+
+- type: loadout
+  id: ContractorFlashlightUmbrella
+  equipment: ContractorFlashlightUmbrella
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 10000
+
+- type: startingGear
+  id: ContractorFlashlightUmbrella
+  inhand:
+    - FlashlightUmbrella
+
 - type: loadout
   id: ContractorDawInstrumentFlatpack
   equipment: ContractorDawInstrumentFlatpack
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
index e0d21dd331c..a730e371042 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
@@ -980,6 +980,77 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtRoboticist
 
+# Punk stuff
+- type: loadout
+  id: ContractorClothingUniformRandomPunkCroptop
+  equipment: ContractorClothingUniformRandomPunkCroptop  
+  name: punk croptop jumpsuit (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingUniformRandomPunkCroptop
+  equipment:
+    jumpsuit: ClothingUniformRandomPunkCroptop
+
+- type: loadout
+  id: ContractorClothingUniformRandomPunkTanktop
+  equipment: ContractorClothingUniformRandomPunkTanktop
+  name: punk tanktop jumpsuit (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingUniformRandomPunkTanktop
+  equipment:
+    jumpsuit: ClothingUniformRandomPunkTanktop
+
+- type: loadout
+  id: ContractorClothingUniformRandomArmlessNoSkirt
+  equipment: ContractorClothingUniformRandomArmlessNoSkirt
+  name: sleeveless jumpsuit (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingUniformRandomArmlessNoSkirt
+  equipment:
+    jumpsuit: ClothingUniformRandomArmlessNoSkirt
+
+- type: loadout
+  id: ContractorClothingUniformRandomPunkCroptopShorts
+  equipment: ContractorClothingUniformRandomPunkCroptopShorts
+  name: punk croptop with shorts (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingUniformRandomPunkCroptopShorts
+  equipment:
+    jumpsuit: ClothingUniformRandomPunkCroptopShorts
+
+- type: loadout
+  id: ContractorClothingUniformRandomPunkTanktopShorts
+  equipment: ContractorClothingUniformRandomPunkTanktopShorts
+  name: punk tanktop with shorts (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingUniformRandomPunkTanktopShorts
+  equipment:
+    jumpsuit: ClothingUniformRandomPunkTanktopShorts
+
 #T2 Head and Senior drip, theater and elite service drip
 - type: loadout
   id: ContractorClothingUniformJumpsuitMonasticRobeDark
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml
index eeca09fa852..25b71481741 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml
@@ -769,6 +769,19 @@
   equipment:
     outerClothing: ClothingOuterCoatBomber
 
+- type: loadout
+  id: ContractorClothingOuterPlagueSuit
+  equipment: ContractorClothingOuterPlagueSuit
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterPlagueSuit
+  equipment:
+    outerClothing: ClothingOuterPlagueSuit
+
 - type: loadout
   id: ContractorClothingOuterCoatBishop
   equipment: ContractorClothingOuterCoatBishop
@@ -808,18 +821,215 @@
   equipment:
     outerClothing: ClothingOuterCoatCardinal
 
+# Punk stuff
 - type: loadout
-  id: ContractorClothingOuterPlagueSuit
-  equipment: ContractorClothingOuterPlagueSuit
+  id: ContractorClothingOuterCoatBomberPunkRed
+  equipment: ContractorClothingOuterCoatBomberPunkRed
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1200
 
 - type: startingGear
-  id: ContractorClothingOuterPlagueSuit
+  id: ContractorClothingOuterCoatBomberPunkRed
   equipment:
-    outerClothing: ClothingOuterPlagueSuit
+    outerClothing: ClothingOuterCoatBomberPunkRed
+
+- type: loadout
+  id: ContractorClothingOuterCoatJacketLeather
+  equipment: ContractorClothingOuterCoatJacketLeather
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatJacketLeather
+  equipment:
+    outerClothing: ClothingOuterCoatJacketLeather
+
+- type: loadout
+  id: ContractorClothingOuterCoatJacketBiker
+  equipment: ContractorClothingOuterCoatJacketBiker
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+  
+- type: startingGear
+  id: ContractorClothingOuterCoatJacketBiker
+  equipment:
+    outerClothing: ClothingOuterCoatJacketBiker
+
+- type: loadout
+  id: ContractorClothingOuterCoatJacketJamrock
+  equipment: ContractorClothingOuterCoatJacketJamrock
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatJacketJamrock
+  equipment:
+    outerClothing: ClothingOuterCoatJacketJamrock
+
+- type: loadout
+  id: ContractorClothingOuterCoatBomberAerostatic
+  equipment: ContractorClothingOuterCoatBomberAerostatic
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatBomberAerostatic
+  equipment:
+    outerClothing: ClothingOuterCoatBomberAerostatic
+
+- type: loadout
+  id: ContractorClothingOuterCoatJacketLettermanBlue
+  equipment: ContractorClothingOuterCoatJacketLettermanBlue
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatJacketLettermanBlue
+  equipment:
+    outerClothing: ClothingOuterCoatJacketLettermanBlue
+
+- type: loadout
+  id: ContractorClothingOuterCoatJacketLettermanBrown
+  equipment: ContractorClothingOuterCoatJacketLettermanBrown
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatJacketLettermanBrown
+  equipment:
+    outerClothing: ClothingOuterCoatJacketLettermanBrown
+
+- type: loadout
+  id: ContractorClothingOuterCoatJacketLettermanRed
+  equipment: ContractorClothingOuterCoatJacketLettermanRed
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatJacketLettermanRed
+  equipment:
+    outerClothing: ClothingOuterCoatJacketLettermanRed
+
+- type: loadout
+  id: ContractorClothingOuterCoatJacketLettermanMagenta
+  equipment: ContractorClothingOuterCoatJacketLettermanMagenta
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatJacketLettermanMagenta
+  equipment:
+    outerClothing: ClothingOuterCoatJacketLettermanMagenta
+
+- type: loadout
+  id: ContractorClothingOuterCoatBomberPinkSleeves
+  equipment: ContractorClothingOuterCoatBomberPinkSleeves
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatBomberPinkSleeves
+  equipment:
+    outerClothing: ClothingOuterCoatBomberPinkSleeves
+
+- type: loadout
+  id: ContractorClothingOuterCoatBomberRandomized
+  equipment: ContractorClothingOuterCoatBomberRandomized
+  name: punk jacket (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatBomberRandomized
+  equipment:
+    outerClothing: ClothingOuterCoatBomberRandomized
+
+- type: loadout
+  id: ContractorClothingOuterCoatAcidRaincoat
+  equipment: ContractorClothingOuterCoatAcidRaincoat
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatAcidRaincoat
+  equipment:
+    outerClothing: ClothingOuterCoatAcidRaincoat
+
+- type: loadout
+  id: ContractorClothingOuterCoatAcidRaincoatBlue
+  equipment: ContractorClothingOuterCoatAcidRaincoatBlue
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatAcidRaincoatBlue
+  equipment:
+    outerClothing: ClothingOuterCoatAcidRaincoatBlue
+
+- type: loadout
+  id: ContractorClothingOuterCoatAcidRaincoatGreen
+  equipment: ContractorClothingOuterCoatAcidRaincoatGreen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatAcidRaincoatGreen
+  equipment:
+    outerClothing: ClothingOuterCoatAcidRaincoatGreen
+
+- type: loadout
+  id: ContractorClothingOuterCoatAcidRaincoatMagenta
+  equipment: ContractorClothingOuterCoatAcidRaincoatMagenta
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatAcidRaincoatMagenta
+  equipment:
+    outerClothing: ClothingOuterCoatAcidRaincoatMagenta
+
+- type: loadout
+  id: ContractorClothingOuterCoatAcidRaincoatYellow
+  equipment: ContractorClothingOuterCoatAcidRaincoatYellow
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT2
+  price: 1200
+
+- type: startingGear
+  id: ContractorClothingOuterCoatAcidRaincoatYellow
+  equipment:
+    outerClothing: ClothingOuterCoatAcidRaincoatYellow
 
 
 #T3 for lols
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/shoes.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/shoes.yml
index db22097f659..a130ea6be2c 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/shoes.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/shoes.yml
@@ -404,6 +404,20 @@
   equipment:
     shoes: ClothingShoesFlippers
 
+- type: loadout
+  id: ContractorClothingShoesBootsPunkRandomized
+  equipment: ContractorClothingShoesBootsPunkRandomized
+  name: punk boots (random)
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 600
+
+- type: startingGear
+  id: ContractorClothingShoesBootsPunkRandomized
+  equipment:
+    shoes: ClothingShoesBootsPunkRandomized
+
 #T2
 - type: loadout
   id: ContractorClothingShoesDameDane
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/outer.yml
index d7adae9343f..edf5691d49e 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/outer.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/outer.yml
@@ -17,3 +17,44 @@
   id: MercenaryClothingOuterVestWebMercenaryBlack
   equipment:
     outerClothing: ClothingOuterVestWebMercenaryBlack
+
+- type: loadout # Punkish (Static visuals)
+  id: MercenaryClothingOuterArmorPunkGreen
+  equipment: MercenaryClothingOuterArmorPunkGreen
+  price: 600
+
+- type: startingGear
+  id: MercenaryClothingOuterArmorPunkGreen
+  equipment:
+    outerClothing: ClothingOuterArmorPunkGreen
+
+- type: loadout # Punkish (Static visuals)
+  id: MercenaryClothingOuterArmorPunkOrange
+  equipment: MercenaryClothingOuterArmorPunkOrange
+  price: 600
+
+- type: startingGear
+  id: MercenaryClothingOuterArmorPunkOrange
+  equipment:
+    outerClothing: ClothingOuterArmorPunkOrange
+
+- type: loadout # Punkish (Static visuals)
+  id: MercenaryClothingOuterArmorPunkRed
+  equipment: MercenaryClothingOuterArmorPunkRed
+  price: 600
+
+- type: startingGear
+  id: MercenaryClothingOuterArmorPunkRed
+  equipment:
+    outerClothing: ClothingOuterArmorPunkRed
+
+- type: loadout # Punkish (Randomized visuals)
+  id: MercenaryClothingOuterArmorPunkRandomized
+  equipment: MercenaryClothingOuterArmorPunkRandomized
+  name: punk webvest (random)
+  price: 600
+
+- type: startingGear
+  id: MercenaryClothingOuterArmorPunkRandomized
+  equipment:
+    outerClothing: ClothingOuterArmorPunkRandomized
diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
index 6699d2d21cb..ac9a6a5027f 100644
--- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
@@ -88,6 +88,11 @@
   - ContractorClothingUniformJumpsuitScientistFormal
   - ContractorClothingUniformJumpsuitRoboticist
   - ContractorClothingUniformJumpskirtRoboticist
+  - ContractorClothingUniformRandomPunkCroptop # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomPunkTanktop # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomArmlessNoSkirt # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomPunkCroptopShorts # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomPunkTanktopShorts # Punkish (Randomized visuals)
   - ContractorClothingUniformJumpsuitMonasticRobeDark
   - ContractorClothingUniformJumpsuitMonasticRobeLight
   - ContractorClothingUniformJumpsuitChaplainPilgrimVest
@@ -295,6 +300,22 @@
   - ContractorClothingOuterDameDane
   - ContractorClothingOuterWinterCoatPlaid
   - ContractorClothingOuterCoatBomber
+  - ContractorClothingOuterCoatBomberPunkRed # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLeather # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketBiker # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketJamrock # Punkish (Static visuals)
+  - ContractorClothingOuterCoatBomberAerostatic # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanBlue # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanBrown # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanRed # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanMagenta # Punkish (Static visuals)
+  - ContractorClothingOuterCoatBomberPinkSleeves # Punkish (Static visuals)
+  - ContractorClothingOuterCoatBomberRandomized # Punkish (Randomized visuals)
+  - ContractorClothingOuterCoatAcidRaincoat # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatBlue # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatGreen # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatYellow # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatMagenta # Punkish (Static visuals)
   - ContractorClothingOuterCoatBishop
   - ContractorClothingOuterCoatWitchHunter
   - ContractorClothingOuterCoatCardinal
@@ -333,6 +354,8 @@
   - ContractorPlantBag
   - ContractorConstructionBag
   - ContractorClothingBeltMartialBlack
+  - ContractorClothingBeltPunkRandomized # Punkish (Randomized visuals)
+  - ContractorClothingBeltPunkRandomizedFilled # Punkish (Randomized visuals)
   - ContractorClothingBeltChampion
 
 - type: loadoutGroup
@@ -373,6 +396,7 @@
   - ContractorClothingShoesSlippers
   - ContractorClothingShoeSlippersDuck
   - ContractorClothingShoesFlippers
+  - ContractorClothingShoesBootsPunkRandomized # Punkish (Randomized visuals)
   - ContractorClothingShoesDameDane
   - ContractorClothingShoesBootsWork
   - ContractorClothingShoesBootsCowboyBlack
@@ -594,6 +618,8 @@
   - ContractorClothingEyesHudDiagnostic
   - ContractorClothingEyesGlassesMeson
   - ContractorClothingEyesHudMedical
+  - ContractorClothingEyesPunkGoggles # Punkish (Randomized visuals)
+  - ContractorClothingEyesPunkInfoShades # Punkish (Randomized visuals)
   - ContractorClothingEyesEyepatchHudDiag
   - ContractorClothingEyesEyepatchHudMedical
   
@@ -638,6 +664,8 @@
   - ContractorBalloonNT
   - ContractorPonderingOrb
   - ContractorPlushieRGBee
+  - ContractorHoloGraffitiProjector # Punkish (might be annoying)
+  - ContractorFlashlightUmbrella
   - ContractorDawInstrumentFlatpack
   - ContractorHoverbikeFlatpack
   - ContractorEmotionalPetCarrier
@@ -651,6 +679,7 @@
   - ContractorClothingMaskBreathMedical
   - ContractorClothingMaskSterile
   - ContractorClothingMaskGas
+  - ContractorClothingMaskPunkHalf # Punkish (Randomized visuals)
   - ContractorClothingMaskGasExplorer
   - ContractorClothingMaskGasCaptain
   - ContractorClothingMaskGasAtmos
diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
index 44e8819e3f1..dfac6481e24 100644
--- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
@@ -98,6 +98,11 @@
   - ContractorClothingUniformJumpsuitScientistFormal
   - ContractorClothingUniformJumpsuitRoboticist
   - ContractorClothingUniformJumpskirtRoboticist
+  - ContractorClothingUniformRandomPunkCroptop # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomPunkTanktop # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomArmlessNoSkirt # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomPunkCroptopShorts # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomPunkTanktopShorts # Punkish (Randomized visuals)
   - ContractorClothingUniformJumpsuitMonasticRobeDark
   - ContractorClothingUniformJumpsuitMonasticRobeLight
   - ContractorClothingUniformJumpsuitChaplainPilgrimVest
@@ -300,6 +305,10 @@
   loadouts:
   - MercenaryClothingOuterVestWebMercenary
   - MercenaryClothingOuterVestWebMercenaryBlack
+  - MercenaryClothingOuterArmorPunkGreen # Punkish (Static visuals)
+  - MercenaryClothingOuterArmorPunkOrange # Punkish (Static visuals)
+  - MercenaryClothingOuterArmorPunkRed # Punkish (Static visuals)
+  - MercenaryClothingOuterArmorPunkRandomized # Punkish (Randomized visuals)
   - ContractorClothingOuterSuitEmergency
   - ContractorClothingOuterHardsuitEVA
   - ContractorClothingOuterHardsuitBasic
@@ -361,6 +370,22 @@
   - ContractorClothingOuterDameDane
   - ContractorClothingOuterWinterCoatPlaid
   - ContractorClothingOuterCoatBomber
+  - ContractorClothingOuterCoatBomberPunkRed # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLeather # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketBiker # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketJamrock # Punkish (Static visuals)
+  - ContractorClothingOuterCoatBomberAerostatic # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanBlue # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanBrown # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanRed # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanMagenta # Punkish (Static visuals)
+  - ContractorClothingOuterCoatBomberPinkSleeves # Punkish (Static visuals)
+  - ContractorClothingOuterCoatBomberRandomized # Punkish (Randomized visuals)
+  - ContractorClothingOuterCoatAcidRaincoat # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatBlue # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatGreen # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatYellow # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatMagenta # Punkish (Static visuals)
   - ContractorClothingOuterCoatBishop
   - ContractorClothingOuterCoatWitchHunter
   - ContractorClothingOuterCoatCardinal
@@ -408,6 +433,7 @@
   - ContractorClothingShoesSlippers
   - ContractorClothingShoeSlippersDuck
   - ContractorClothingShoesFlippers
+  - ContractorClothingShoesBootsPunkRandomized # Punkish (Randomized visuals)
   - ContractorClothingShoesDameDane
   - ContractorClothingShoesBootsWork
   - ContractorClothingShoesBootsCowboyBlack
@@ -594,6 +620,8 @@
   - ContractorClothingEyesHudDiagnostic
   - ContractorClothingEyesGlassesMeson
   - ContractorClothingEyesHudMedical
+  - ContractorClothingEyesPunkGoggles # Punkish (Randomized visuals)
+  - ContractorClothingEyesPunkInfoShades # Punkish (Randomized visuals)
   - ContractorClothingEyesEyepatchHudDiag
   - ContractorClothingEyesEyepatchHudMedical
 
@@ -608,6 +636,7 @@
   - ContractorClothingMaskBreathMedical
   - ContractorClothingMaskSterile
   - ContractorClothingMaskGas
+  - ContractorClothingMaskPunkHalf # Punkish (Randomized visuals)
   - ContractorClothingMaskGasExplorer
   - ContractorClothingMaskGasCaptain
   - ContractorClothingMaskGasAtmos
@@ -651,4 +680,6 @@
   - ContractorPlantBag
   - ContractorConstructionBag
   - ContractorClothingBeltMartialBlack
+  - ContractorClothingBeltPunkRandomized # Punkish (Randomized visuals)
+  - ContractorClothingBeltPunkRandomizedFilled # Punkish (Randomized visuals)
   - ContractorClothingBeltChampion
diff --git a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
index 73717eb7469..8a3e2fdbeda 100644
--- a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
@@ -89,6 +89,11 @@
   - ContractorClothingUniformJumpsuitScientistFormal
   - ContractorClothingUniformJumpsuitRoboticist
   - ContractorClothingUniformJumpskirtRoboticist
+  - ContractorClothingUniformRandomPunkCroptop # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomPunkTanktop # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomArmlessNoSkirt # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomPunkCroptopShorts # Punkish (Randomized visuals)
+  - ContractorClothingUniformRandomPunkTanktopShorts # Punkish (Randomized visuals)
   - ContractorClothingUniformJumpsuitMonasticRobeDark
   - ContractorClothingUniformJumpsuitMonasticRobeLight
   - ContractorClothingUniformJumpsuitChaplainPilgrimVest
@@ -303,6 +308,22 @@
   - ContractorClothingOuterCoatTrench
   - ContractorClothingOuterDameDane
   - ContractorClothingOuterWinterCoatPlaid
+  - ContractorClothingOuterCoatBomberPunkRed # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLeather # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketBiker # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketJamrock # Punkish (Static visuals)
+  - ContractorClothingOuterCoatBomberAerostatic # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanBlue # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanBrown # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanRed # Punkish (Static visuals)
+  - ContractorClothingOuterCoatJacketLettermanMagenta # Punkish (Static visuals)
+  - ContractorClothingOuterCoatBomberPinkSleeves # Punkish (Static visuals)
+  - ContractorClothingOuterCoatBomberRandomized # Punkish (Randomized visuals)
+  - ContractorClothingOuterCoatAcidRaincoat # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatBlue # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatGreen # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatYellow # Punkish (Static visuals)
+  - ContractorClothingOuterCoatAcidRaincoatMagenta # Punkish (Static visuals)
   - ContractorClothingOuterCoatBishop
   - ContractorClothingOuterCoatWitchHunter
   - ContractorClothingOuterCoatCardinal
@@ -349,6 +370,7 @@
   - ContractorClothingShoesSlippers
   - ContractorClothingShoeSlippersDuck
   - ContractorClothingShoesFlippers
+  - ContractorClothingShoesBootsPunkRandomized # Punkish (Randomized visuals)
   - ContractorClothingShoesDameDane
   - ContractorClothingShoesBootsWork
   - ContractorClothingShoesBootsCowboyBlack
@@ -575,6 +597,8 @@
   - ContractorClothingEyesHudDiagnostic
   - ContractorClothingEyesGlassesMeson
   - ContractorClothingEyesHudMedical
+  - ContractorClothingEyesPunkGoggles # Punkish (Randomized visuals)
+  - ContractorClothingEyesPunkInfoShades # Punkish (Randomized visuals)
   - ContractorClothingEyesEyepatchHudDiag
   - ContractorClothingEyesEyepatchHudMedical
 
@@ -588,6 +612,7 @@
   - ContractorClothingMaskBreathMedical
   - ContractorClothingMaskSterile
   - ContractorClothingMaskGas
+  - ContractorClothingMaskPunkHalf # Punkish (Randomized visuals)
   - ContractorClothingMaskGasExplorer
   - ContractorClothingMaskGasCaptain
   - ContractorClothingMaskGasAtmos
@@ -628,4 +653,6 @@
   - ContractorPlantBag
   - ContractorConstructionBag
   - ContractorClothingBeltMartialBlack
+  - ContractorClothingBeltPunkRandomized # Punkish (Randomized visuals)
+  - ContractorClothingBeltPunkRandomizedFilled # Punkish (Randomized visuals)
   - ContractorClothingBeltChampion
diff --git a/Resources/Prototypes/_NF/Palettes/cyberpunk.yml b/Resources/Prototypes/_NF/Palettes/cyberpunk.yml
new file mode 100644
index 00000000000..019c3c9cf8c
--- /dev/null
+++ b/Resources/Prototypes/_NF/Palettes/cyberpunk.yml
@@ -0,0 +1,62 @@
+- type: palette
+  id: Cyberpunk
+  name: cyberpunk full
+  colors:
+    cyan1: "#85daeb"
+    cyan2: "#5fc9e7"
+    cyan3: "#5efdf7"
+    blue1: "#5fa1e7"
+    blue2: "#5f6ee7"
+    blue3: "#4c60aa"
+    blue4: "#444774"
+    black: "#32313b"
+    purple1: "#463c5e"
+    purple2: "#5d4776"
+    purple3: "#855395"
+    purple4: "#ab58a8"
+    purple5: "#ca60ae"
+    purple6: "#ff5dcc"
+    peach: "#f3a787"
+    yellow1: "#f5daa7"
+    yellow2: "#fdfe89"
+    green1: "#8dd894"
+    green2: "#5dc190"
+    green3: "#4ab9a3"
+    bluegreen: "#4593a5"
+    red1: "#f96363"
+    red2: "#db5a5a"
+    red3: "#c85353"
+
+- type: palette
+  id: CyberpunkDark
+  name: cyberpunk dark
+  colors:
+    blue1: "#5fa1e7"
+    blue2: "#5f6ee7"
+    blue3: "#4c60aa"
+    blue4: "#444774"
+    black: "#32313b"
+    purple1: "#463c5e"
+    purple2: "#5d4776"
+    purple3: "#855395"
+    bluegreen: "#4593a5"
+
+- type: palette
+  id: CyberpunkNeon
+  name: cyberpunk neon
+  colors:
+    cyan1: "#85daeb"
+    cyan2: "#5fc9e7"
+    cyan3: "#5efdf7"
+    purple5: "#ca60ae"
+    purple6: "#ff5dcc"
+    peach: "#f3a787"
+    yellow1: "#f5daa7"
+    yellow2: "#fdfe89"
+    green1: "#8dd894"
+    green2: "#5dc190"
+    green3: "#4ab9a3"
+    bluegreen: "#4593a5"
+    red1: "#f96363"
+    red2: "#db5a5a"
+    red3: "#c85353"
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/punk_gangers.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/punk_gangers.yml
new file mode 100644
index 00000000000..d9f870b06d1
--- /dev/null
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/punk_gangers.yml
@@ -0,0 +1,64 @@
+- type: startingGear
+  id: PunkGangerGearMelee
+  equipment:
+    jumpsuit: ClothingUniformRandomPunkCroptop
+    belt: ClothingBeltPunkRandomized
+    shoes: ClothingShoesBootsPunkRandomized
+    #gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterCoatBomberRandomized
+    back: ClothingBackpackPunkLootA
+  inhand:
+    - SpawnInhandMeleeWeaponPunkGangLow
+
+- type: startingGear
+  id: PunkGangerGearPistol
+  equipment:
+    mask: ClothingMaskPunkHalf
+    jumpsuit: ClothingUniformRandomPunkCroptop
+    belt: ClothingBeltPunkRandomized
+    shoes: ClothingShoesBootsPunkRandomized
+    gloves: ClothingHandsGlovesColorBlackPistol
+    outerClothing: ClothingOuterCoatBomberRandomized
+    back: ClothingBackpackPunkLootB
+  inhand:
+    - SpawnInhandMeleeWeaponPunkGangLow
+
+- type: startingGear
+  id: PunkGangerGearShotgun
+  equipment:
+    mask: ClothingMaskPunkHalf
+    jumpsuit: ClothingUniformRandomPunkCroptop
+    belt: ClothingBeltPunkRandomized
+    shoes: ClothingShoesBootsPunkRandomized
+    gloves: ClothingHandsGlovesColorBlackShotgun
+    outerClothing: ClothingOuterCoatBomberRandomized
+    back: ClothingBackpackPunkLootC
+  inhand:
+    - SpawnInhandMeleeWeaponPunkGangLow
+
+- type: startingGear
+  id: PunkGangerArmoredGearMelee
+  equipment:
+    eyes: ClothingEyesPunkGoggles
+    mask: ClothingMaskPunkHalf
+    jumpsuit: ClothingUniformRandomPunkTanktop
+    belt: ClothingBeltPunkRandomized
+    shoes: ClothingShoesBootsPunkRandomized
+    outerClothing: ClothingOuterArmorPunkRandomized
+    back: ClothingBackpackPunkLootA
+  inhand:
+    - SpawnInhandMeleeWeaponPunkGangLow
+
+- type: startingGear
+  id: PunkGangerArmoredEliteGear
+  equipment:
+    eyes: ClothingEyesPunkInfoShades
+    mask: ClothingMaskPunkHalf
+    jumpsuit: ClothingUniformRandomPunkTanktop
+    belt: ClothingBeltPunkRandomized
+    shoes: ClothingShoesBootsPunkRandomized
+    gloves: ClothingHandsGlovesColorBlackSMG
+    outerClothing: ClothingOuterArmorElitePunkRandomized
+    back: ClothingBackpackPunkLootD
+  inhand:
+    - SpawnInhandMeleeWeaponPunkGangLow
diff --git a/Resources/Prototypes/_NF/Traits/neutral.yml b/Resources/Prototypes/_NF/Traits/neutral.yml
index 14daae5572a..fb2a5064fa8 100644
--- a/Resources/Prototypes/_NF/Traits/neutral.yml
+++ b/Resources/Prototypes/_NF/Traits/neutral.yml
@@ -3,4 +3,11 @@
   name: trait-goblin-accent-name
   description: trait-goblin-accent-desc
   components:
-    - type: GoblinAccent
\ No newline at end of file
+    - type: GoblinAccent
+
+- type: trait
+  id: StreetpunkAccent
+  name: trait-streetpunk-accent-name
+  description: trait-streetpunk-accent-desc
+  components:
+    - type: StreetpunkAccent
diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml
index 6f937c2166a..9884b2877fd 100644
--- a/Resources/Prototypes/_NF/ai_factions.yml
+++ b/Resources/Prototypes/_NF/ai_factions.yml
@@ -12,7 +12,16 @@
   - Chicken
   - Monkey
   - Goblin
+  - WizFedFaction
+  - BloodCultNF
+  - PirateNF
+  - ExplorersExpeditionNF
+  - ArtifactConstruct
+  - StreetGangNF
   - DinosaursNF
+  - MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
 
 - type: npcFaction
   id: Dwarf
@@ -38,6 +47,7 @@
 - type: npcFaction
   id: WizFedFaction
   hostile:
+  ## SS14 factions
   - NanoTrasen
   - Syndicate
   - SimpleHostile
@@ -46,14 +56,23 @@
   - Zombie
   - Revolutionary
   - Xeno
+  ## Frontier Factions
+  - Goblin
+  #- WizFedFaction
   - BloodCultNF
   - PirateNF
-  - Goblin
+  - ExplorersExpeditionNF
+  #- ArtifactConstruct
+  - StreetGangNF
   - DinosaursNF
+  - MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
 
 - type: npcFaction
   id: BloodCultNF
   hostile:
+  ## SS14 factions
   - NanoTrasen
   - Syndicate
   - SimpleHostile
@@ -62,38 +81,95 @@
   - Zombie
   - Revolutionary
   - Xeno
+  ## Frontier Factions
+  - Goblin
   - WizFedFaction
+  #- BloodCultNF
   - PirateNF
+  - ExplorersExpeditionNF
+  - ArtifactConstruct
+  - StreetGangNF
   - DinosaursNF
+  - MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
 
 - type: npcFaction
   id: PirateNF
   hostile:
+  ## SS14 factions
   - NanoTrasen
-  - SimpleHostile
   - Syndicate
-  - Xeno
+  - SimpleHostile
+  - Passive
+  - PetsNT
   - Zombie
   - Revolutionary
-  - WizFedFaction # Frontier
-  - BloodCultNF # Frontier
+  - Xeno
+  ## Frontier Factions
+  - WizFedFaction
+  - BloodCultNF
+  - PirateNF
+  - ExplorersExpeditionNF
+  - ArtifactConstruct
+  - StreetGangNF
   - DinosaursNF
+  - MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
 
 - type: npcFaction
   id: ArtifactConstruct
   hostile:
+  ## SS14 factions
   - NanoTrasen
   - Syndicate
+  - SimpleHostile
+  - Passive
+  - PetsNT
+  - Zombie
   - Revolutionary
-#  - WizFedFaction # Magic
+  - Xeno
+  ## Frontier Factions
+  #- WizFedFaction # Magic
   - BloodCultNF
-  - Goblin
+  - PirateNF
+  - ExplorersExpeditionNF
+  #- ArtifactConstruct
+  - StreetGangNF
   - DinosaursNF
+  - MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
+
+- type: npcFaction
+  id: StreetGangNF
+  hostile:
+  ## SS14 factions
+  - NanoTrasen
+  - Syndicate
+  - SimpleHostile
+  - Passive
+  - PetsNT
+  - Zombie
+  #- Revolutionary # Like their style
+  - Xeno
+  ## Frontier Factions
+  - WizFedFaction
+  - BloodCultNF
   - PirateNF
+  - ExplorersExpeditionNF
+  - ArtifactConstruct
+  #- StreetGangNF
+  - DinosaursNF
+  - MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
 
 - type: npcFaction
   id: DinosaursNF
   hostile:
+  ## SS14 factions
   - NanoTrasen
   - Syndicate
   - SimpleHostile
@@ -102,7 +178,110 @@
   - Zombie
   - Revolutionary
   - Xeno
+  ## Frontier Factions
+  - WizFedFaction
+  - BloodCultNF
+  - PirateNF
+  - ExplorersExpeditionNF
+  - ArtifactConstruct
+  - StreetGangNF
+  #- DinosaursNF
+  - MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
+
+- type: npcFaction
+  id: ExplorersExpeditionNF
+  hostile:
+  ## SS14 factions
+  - NanoTrasen
+  - Syndicate
+  - SimpleHostile
+  - Passive
+  - PetsNT
+  - Zombie
+  - Revolutionary
+  - Xeno
+  ## Frontier Factions
+  - WizFedFaction
+  - BloodCultNF
+  - PirateNF
+  #- ExplorersExpeditionNF
+  - ArtifactConstruct
+  - StreetGangNF
+  - DinosaursNF
+  - MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
+
+- type: npcFaction
+  id: MercenariesExpeditionNF
+  hostile:
+  ## SS14 factions
+  - NanoTrasen
+  - Syndicate
+  - SimpleHostile
+  - Passive
+  - PetsNT
+  - Zombie
+  - Revolutionary
+  - Xeno
+  ## Frontier Factions
+  - WizFedFaction
+  - BloodCultNF
+  - PirateNF
+  - ExplorersExpeditionNF
+  - ArtifactConstruct
+  - StreetGangNF
+  - DinosaursNF
+  #- MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
+
+- type: npcFaction
+  id: SiliconsExpeditionNF
+  hostile:
+  ## SS14 factions
+  - NanoTrasen
+  - Syndicate
+  - SimpleHostile
+  - Passive
+  - PetsNT
+  - Zombie
+  - Revolutionary
+  - Xeno
+  ## Frontier Factions
+  - WizFedFaction
+  - BloodCultNF
+  - PirateNF
+  - ExplorersExpeditionNF
+  - ArtifactConstruct
+  - StreetGangNF
+  - DinosaursNF
+  - MercenariesExpeditionNF
+  #- SiliconsExpeditionNF
+  - AberrantFleshExpeditionNF
+
+- type: npcFaction
+  id: AberrantFleshExpeditionNF
+  hostile:
+  ## SS14 factions
+  - NanoTrasen
+  - Syndicate
+  - SimpleHostile
+  - Passive
+  - PetsNT
+  - Zombie
+  - Revolutionary
+  - Xeno
+  ## Frontier Factions
   - WizFedFaction
-  - Goblin
   - BloodCultNF
   - PirateNF
+  - ExplorersExpeditionNF
+  - ArtifactConstruct
+  - StreetGangNF
+  - DinosaursNF
+  - MercenariesExpeditionNF
+  - SiliconsExpeditionNF
+  #- AberrantFleshExpeditionNF
diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
index fe840e64ae4..24328cd38ec 100644
--- a/Resources/Prototypes/ai_factions.yml
+++ b/Resources/Prototypes/ai_factions.yml
@@ -9,8 +9,14 @@
     - Revolutionary
     - WizFedFaction # Frontier
     - BloodCultNF # Frontier
-    - DinosaursNF # Frontier
     - PirateNF # Frontier
+    - ExplorersExpeditionNF # Frontier
+    - ArtifactConstruct # Frontier
+    - StreetGangNF # Frontier
+    - DinosaursNF # Frontier
+    - MercenariesExpeditionNF # Frontier
+    - SiliconsExpeditionNF # Frontier
+    - AberrantFleshExpeditionNF # Frontier
 
 - type: npcFaction
   id: NanoTrasen
@@ -22,8 +28,14 @@
   - Revolutionary
   - WizFedFaction # Frontier
   - BloodCultNF # Frontier
-  - DinosaursNF # Frontier
   - PirateNF # Frontier
+  - ExplorersExpeditionNF # Frontier
+  - ArtifactConstruct # Frontier
+  - StreetGangNF # Frontier
+  - DinosaursNF # Frontier
+  - MercenariesExpeditionNF # Frontier
+  - SiliconsExpeditionNF # Frontier
+  - AberrantFleshExpeditionNF # Frontier
 
 - type: npcFaction
   id: Mouse
@@ -42,8 +54,14 @@
   - Xeno
   - WizFedFaction # Frontier
   - BloodCultNF # Frontier
-  - DinosaursNF # Frontier
   - PirateNF # Frontier
+  - ExplorersExpeditionNF # Frontier
+  - ArtifactConstruct # Frontier
+  - StreetGangNF # Frontier
+  - DinosaursNF # Frontier
+  - MercenariesExpeditionNF # Frontier
+  - SiliconsExpeditionNF # Frontier
+  - AberrantFleshExpeditionNF # Frontier
 
 - type: npcFaction
   id: SimpleHostile
@@ -56,8 +74,14 @@
   - Revolutionary
   - WizFedFaction # Frontier
   - BloodCultNF # Frontier
-  - DinosaursNF # Frontier
   - PirateNF # Frontier
+  - ExplorersExpeditionNF # Frontier
+  - ArtifactConstruct # Frontier
+  - StreetGangNF # Frontier
+  - DinosaursNF # Frontier
+  - MercenariesExpeditionNF # Frontier
+  - SiliconsExpeditionNF # Frontier
+  - AberrantFleshExpeditionNF # Frontier
 
 - type: npcFaction
   id: SimpleNeutral
@@ -72,8 +96,14 @@
   - Zombie
   - WizFedFaction # Frontier
   - BloodCultNF # Frontier
-  - DinosaursNF # Frontier
   - PirateNF # Frontier
+  - ExplorersExpeditionNF # Frontier
+  - ArtifactConstruct # Frontier
+  - StreetGangNF # Frontier
+  - DinosaursNF # Frontier
+  - MercenariesExpeditionNF # Frontier
+  - SiliconsExpeditionNF # Frontier
+  - AberrantFleshExpeditionNF # Frontier
 
 - type: npcFaction
   id: Xeno
@@ -86,8 +116,14 @@
   - Revolutionary
   - WizFedFaction # Frontier
   - BloodCultNF # Frontier
-  - DinosaursNF # Frontier
   - PirateNF # Frontier
+  - ExplorersExpeditionNF # Frontier
+  - ArtifactConstruct # Frontier
+  - StreetGangNF # Frontier
+  - DinosaursNF # Frontier
+  - MercenariesExpeditionNF # Frontier
+  - SiliconsExpeditionNF # Frontier
+  - AberrantFleshExpeditionNF # Frontier
 
 - type: npcFaction
   id: Zombie
@@ -101,8 +137,14 @@
   - Revolutionary
   - WizFedFaction # Frontier
   - BloodCultNF # Frontier
-  - DinosaursNF # Frontier
   - PirateNF # Frontier
+  - ExplorersExpeditionNF # Frontier
+  - ArtifactConstruct # Frontier
+  - StreetGangNF # Frontier
+  - DinosaursNF # Frontier
+  - MercenariesExpeditionNF # Frontier
+  - SiliconsExpeditionNF # Frontier
+  - AberrantFleshExpeditionNF # Frontier
 
 - type: npcFaction
   id: Revolutionary
@@ -113,4 +155,11 @@
   - Dragon
   - WizFedFaction # Frontier
   - BloodCultNF # Frontier
+  - PirateNF # Frontier
+  - ExplorersExpeditionNF # Frontier
+  - ArtifactConstruct # Frontier
+  #- StreetGangNF # Frontier
   - DinosaursNF # Frontier
+  - MercenariesExpeditionNF # Frontier
+  - SiliconsExpeditionNF # Frontier
+  - AberrantFleshExpeditionNF # Frontier
diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/base_belt_01.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/base_belt_01.png
new file mode 100644
index 00000000000..7a9eda2f084
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/base_belt_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_01.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_01.png
new file mode 100644
index 00000000000..e7e41083c0e
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_02.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_02.png
new file mode 100644
index 00000000000..0c489edd3f9
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_03.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_03.png
new file mode 100644
index 00000000000..e6c306774e8
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_04.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_04.png
new file mode 100644
index 00000000000..02ae49f97c1
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_04.png differ
diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_05.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_05.png
new file mode 100644
index 00000000000..26e10e1e4b8
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/decor_base_belt_05.png differ
diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/inhand-left.png
new file mode 100644
index 00000000000..ed5b493cb92
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/inhand-right.png
new file mode 100644
index 00000000000..0ca7d62fdb3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/mask_null.png b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/mask_null.png
new file mode 100644
index 00000000000..2975c479be7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/mask_null.png differ
diff --git a/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json
new file mode 100644
index 00000000000..0e058c9dfe4
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Belt/punk.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by erhardsteinhauer (discord/github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base_belt_01",
+            "directions": 4
+        },
+        {
+            "name": "decor_base_belt_01",
+            "directions": 4
+        },
+        {
+            "name": "decor_base_belt_02",
+            "directions": 4
+        },
+        {
+            "name": "decor_base_belt_03",
+            "directions": 4
+        },
+        {
+            "name": "decor_base_belt_04",
+            "directions": 4
+        },
+        {
+            "name": "decor_base_belt_05",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "mask_null",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/base_glasses_01.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/base_glasses_01.png
new file mode 100644
index 00000000000..7d3bbef739d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/base_glasses_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/base_glasses_02.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/base_glasses_02.png
new file mode 100644
index 00000000000..94d988cf2a7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/base_glasses_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/decor_base_glasses_01.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/decor_base_glasses_01.png
new file mode 100644
index 00000000000..49569ecd261
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/decor_base_glasses_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/decor_base_glasses_02.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/decor_base_glasses_02.png
new file mode 100644
index 00000000000..9448ba07e75
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/decor_base_glasses_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_base_glasses_01.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_base_glasses_01.png
new file mode 100644
index 00000000000..8f286759a97
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_base_glasses_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_base_glasses_02.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_base_glasses_02.png
new file mode 100644
index 00000000000..2fc228967db
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_base_glasses_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_01.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_01.png
new file mode 100644
index 00000000000..4da917e00b5
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_02.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_02.png
new file mode 100644
index 00000000000..f51d04c7fda
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/icon_decor_base_glasses_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/inhand-left.png
new file mode 100644
index 00000000000..8117af2ac11
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/inhand-right.png
new file mode 100644
index 00000000000..c7a2cf00d71
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/meta.json b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/meta.json
new file mode 100644
index 00000000000..8cbba68378a
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi/meta.json
@@ -0,0 +1,54 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Based on welding and leforge sprites from https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/eyes.dmi resprited by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon_base_glasses_01"
+    },
+    {
+      "name": "icon_decor_base_glasses_01"
+    },
+    {
+      "name": "icon_base_glasses_02"
+    },
+    {
+      "name": "icon_decor_base_glasses_02"
+    },
+    {
+      "name": "base_glasses_01",
+      "directions": 4
+    },
+    {
+      "name": "base_glasses_02",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_glasses_01",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_glasses_02",
+      "directions": 4,
+	  "delays":
+	  [
+        [ 0.1, 0.1, 0.8, 0.4 ],
+        [ 0.1, 0.1, 0.8, 0.4 ],
+        [ 0.1, 0.1, 0.8, 0.4 ],
+        [ 0.1, 0.1, 0.8, 0.4 ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..0121cea426a
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi/icon.png
new file mode 100644
index 00000000000..d446c0a966a
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi/meta.json
new file mode 100644
index 00000000000..e10341e615b
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | resprited for acid raincoat hood by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..5f4740a3c85
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi/icon.png
new file mode 100644
index 00000000000..608c9c76797
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi/meta.json
new file mode 100644
index 00000000000..e10341e615b
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | resprited for acid raincoat hood by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..dbaa85d347f
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi/icon.png
new file mode 100644
index 00000000000..39e6e7a6782
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi/meta.json
new file mode 100644
index 00000000000..e10341e615b
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | resprited for acid raincoat hood by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..75ef2facdcd
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi/icon.png
new file mode 100644
index 00000000000..3ef3eb524a6
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi/meta.json
new file mode 100644
index 00000000000..e10341e615b
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | resprited for acid raincoat hood by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..a4fc8678701
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi/icon.png
new file mode 100644
index 00000000000..b0db10ab448
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi/meta.json
new file mode 100644
index 00000000000..e10341e615b
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | resprited for acid raincoat hood by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/base_halfmask_01.png b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/base_halfmask_01.png
new file mode 100644
index 00000000000..34f8d2af0e2
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/base_halfmask_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/decor_base_halfmask_01.png b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/decor_base_halfmask_01.png
new file mode 100644
index 00000000000..22c36e0840b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/decor_base_halfmask_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/inhand-left.png
new file mode 100644
index 00000000000..190068a165a
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/inhand-right.png
new file mode 100644
index 00000000000..9853f119bbb
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json
new file mode 100644
index 00000000000..0efb71fbea8
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Resprited by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base_halfmask_01",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_halfmask_01",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..7def3536535
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/icon.png
new file mode 100644
index 00000000000..ef7c22e953b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/inhand-left.png
new file mode 100644
index 00000000000..0df4e47e4b2
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/inhand-right.png
new file mode 100644
index 00000000000..936ae845570
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/meta.json
new file mode 100644
index 00000000000..e0d437b8ece
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..f4ca240551a
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/icon.png
new file mode 100644
index 00000000000..18e7fc54418
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/inhand-left.png
new file mode 100644
index 00000000000..de7e7ee846d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/inhand-right.png
new file mode 100644
index 00000000000..f24a1d68aee
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/meta.json
new file mode 100644
index 00000000000..e0d437b8ece
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_01.png
new file mode 100644
index 00000000000..3814c619e57
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_02.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_02.png
new file mode 100644
index 00000000000..41c9b37d2be
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_03.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_03.png
new file mode 100644
index 00000000000..c47f86b092d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_04.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_04.png
new file mode 100644
index 00000000000..ccc07c6f1a1
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_04.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_05.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_05.png
new file mode 100644
index 00000000000..6e65e24243c
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/base_OuterClothing_armor_05.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_01.png
new file mode 100644
index 00000000000..13687c01d44
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_02.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_02.png
new file mode 100644
index 00000000000..90150781094
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_03.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_03.png
new file mode 100644
index 00000000000..316143fd652
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_04.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_04.png
new file mode 100644
index 00000000000..ea268dec115
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_04.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_05.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_05.png
new file mode 100644
index 00000000000..ea63ddd9873
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_05.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_06.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_06.png
new file mode 100644
index 00000000000..9068f3ee828
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/decor_base_OuterClothing_armor_06.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_01.png
new file mode 100644
index 00000000000..7364bd97b13
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_02.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_02.png
new file mode 100644
index 00000000000..f7b597edf1e
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_03.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_03.png
new file mode 100644
index 00000000000..4817b626ec1
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_04.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_04.png
new file mode 100644
index 00000000000..6dbf0f00d02
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_04.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_05.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_05.png
new file mode 100644
index 00000000000..8757a4003a9
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/icon_armor_05.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/inhand-left.png
new file mode 100644
index 00000000000..7fd2e48ca99
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/inhand-right.png
new file mode 100644
index 00000000000..f4f8ead4c30
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/mask_null.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/mask_null.png
new file mode 100644
index 00000000000..2975c479be7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/mask_null.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/meta.json
new file mode 100644
index 00000000000..d196f28c415
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/meta.json
@@ -0,0 +1,98 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation, edited and separated into layers by erhardsteinhauer (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon_armor_01"
+    },
+    {
+      "name": "icon_armor_02"
+    },
+    {
+      "name": "icon_armor_03"
+    },
+    {
+      "name": "icon_armor_04"
+    },
+    {
+      "name": "icon_armor_05"
+    },
+    {
+      "name": "base_OuterClothing_armor_01",
+      "directions": 4
+    },
+    {
+      "name": "base_OuterClothing_armor_02",
+      "directions": 4
+    },
+    {
+      "name": "base_OuterClothing_armor_03",
+      "directions": 4
+    },
+    {
+      "name": "base_OuterClothing_armor_04",
+      "directions": 4
+    },
+    {
+      "name": "base_OuterClothing_armor_05",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_01",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_02",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_03",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_04",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_05",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_06",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "mask_null",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_armor_01",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_armor_02",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_armor_03",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_armor_04",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_01.png
new file mode 100644
index 00000000000..f2111b4f1b3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_02.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_02.png
new file mode 100644
index 00000000000..01b3175af61
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_03.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_03.png
new file mode 100644
index 00000000000..ce0a76e863a
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_04.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_04.png
new file mode 100644
index 00000000000..c4e9a174a65
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi/overlay_base_OuterClothing_armor_04.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/base_OuterClothing_armor_01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/base_OuterClothing_armor_01.png
new file mode 100644
index 00000000000..1bca94bd190
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/base_OuterClothing_armor_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_01.png
new file mode 100644
index 00000000000..da73e9d8780
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_02.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_02.png
new file mode 100644
index 00000000000..ca4b9c6002a
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_03.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_03.png
new file mode 100644
index 00000000000..0b98706f19d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_04.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_04.png
new file mode 100644
index 00000000000..f02178720b9
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_04.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_05.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_05.png
new file mode 100644
index 00000000000..7b369fb1605
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/decor_base_OuterClothing_armor_05.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/mask_null.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/mask_null.png
new file mode 100644
index 00000000000..2975c479be7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/mask_null.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/meta.json
new file mode 100644
index 00000000000..b1fb6aa0255
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation, edited and separated into layers by erhardsteinhauer (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base_OuterClothing_armor_01",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_01",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_02",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_03",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_04",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_armor_05",
+      "directions": 4
+    },
+    {
+      "name": "mask_null",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_armor_01",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/overlay_base_OuterClothing_armor_01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/overlay_base_OuterClothing_armor_01.png
new file mode 100644
index 00000000000..289528125dc
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi/overlay_base_OuterClothing_armor_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..c74ed8fc13c
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/icon.png
new file mode 100644
index 00000000000..5fbd5724ccf
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/inhand-left.png
new file mode 100644
index 00000000000..a5133d966f2
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/inhand-right.png
new file mode 100644
index 00000000000..cbdf78f4007
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/meta.json
new file mode 100644
index 00000000000..e0d437b8ece
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_red.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..351a43bcaa6
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/icon.png
new file mode 100644
index 00000000000..deb62dd58ba
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/inhand-left.png
new file mode 100644
index 00000000000..e1ff9db3a68
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/inhand-right.png
new file mode 100644
index 00000000000..d5698440f11
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/meta.json
new file mode 100644
index 00000000000..2834ac8f8d9
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Made by Github user Psychpsyo for Space Station 14 | resprited for acid raincoat by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..21d83215cec
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/icon.png
new file mode 100644
index 00000000000..d2a8d51e372
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/inhand-left.png
new file mode 100644
index 00000000000..3dc2a157bda
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/inhand-right.png
new file mode 100644
index 00000000000..de3eec56b6d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/meta.json
new file mode 100644
index 00000000000..2834ac8f8d9
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_blue.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Made by Github user Psychpsyo for Space Station 14 | resprited for acid raincoat by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..a9f8c8deeb8
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/icon.png
new file mode 100644
index 00000000000..8f95774529b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/inhand-left.png
new file mode 100644
index 00000000000..8e1f2b43ba7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/inhand-right.png
new file mode 100644
index 00000000000..1462b1368dc
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/meta.json
new file mode 100644
index 00000000000..2834ac8f8d9
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_green.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Made by Github user Psychpsyo for Space Station 14 | resprited for acid raincoat by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..20e7dc4c226
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/icon.png
new file mode 100644
index 00000000000..1c2c5068f8f
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/inhand-left.png
new file mode 100644
index 00000000000..ee8d6988193
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/inhand-right.png
new file mode 100644
index 00000000000..61f0b3dd0e5
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/meta.json
new file mode 100644
index 00000000000..2834ac8f8d9
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_magenta.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Made by Github user Psychpsyo for Space Station 14 | resprited for acid raincoat by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..364d583fc79
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/icon.png
new file mode 100644
index 00000000000..51f84e3acba
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/inhand-left.png
new file mode 100644
index 00000000000..26aaafe4bf2
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/inhand-right.png
new file mode 100644
index 00000000000..f0a7d87d709
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/meta.json
new file mode 100644
index 00000000000..2834ac8f8d9
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/acid_raincoat_yellow.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Made by Github user Psychpsyo for Space Station 14 | resprited for acid raincoat by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..caf1ec43a34
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/icon.png
new file mode 100644
index 00000000000..17dbccfc249
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/inhand-left.png
new file mode 100644
index 00000000000..c4de9d7dc1b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/inhand-right.png
new file mode 100644
index 00000000000..1f0251b25bd
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/meta.json
new file mode 100644
index 00000000000..6bcb85e3c07
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/blazer_jamrock.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suits/jacket.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..ec5da9fb1aa
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/icon.png
new file mode 100644
index 00000000000..527e2b3a64e
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/inhand-left.png
new file mode 100644
index 00000000000..8fc05322965
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/inhand-right.png
new file mode 100644
index 00000000000..9d21bdf0a97
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/meta.json
new file mode 100644
index 00000000000..6bcb85e3c07
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_aerostatic.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suits/jacket.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..ca1cb167bd5
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/icon.png
new file mode 100644
index 00000000000..33a5d34b0db
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/inhand-left.png
new file mode 100644
index 00000000000..cfd4c4936ec
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/inhand-right.png
new file mode 100644
index 00000000000..a86a559f136
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/meta.json
new file mode 100644
index 00000000000..87418987f55
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_pinksleeves.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suits/jacket.dmi | recolored by erhardsteinhauer for New Frontier with https://www.pixilart.com/palettes/cyberpunk-v1-24161",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..6efe85b61a3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/icon.png
new file mode 100644
index 00000000000..e4e8c52af6b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/inhand-left.png
new file mode 100644
index 00000000000..a513a6d9265
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/inhand-right.png
new file mode 100644
index 00000000000..4865e001206
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/meta.json
new file mode 100644
index 00000000000..4fcaa76c240
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/bomber_punk_red.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Based on bomber taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | resprited by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..00ad4fe345b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/icon.png
new file mode 100644
index 00000000000..acfd6e4ac5c
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/inhand-left.png
new file mode 100644
index 00000000000..342dc4032ac
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/inhand-right.png
new file mode 100644
index 00000000000..8f0c61efb62
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/meta.json
new file mode 100644
index 00000000000..6bcb85e3c07
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_biker.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suits/jacket.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..57d31a48d90
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/icon.png
new file mode 100644
index 00000000000..31e0353bf9b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/inhand-left.png
new file mode 100644
index 00000000000..342dc4032ac
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/inhand-right.png
new file mode 100644
index 00000000000..8f0c61efb62
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/meta.json
new file mode 100644
index 00000000000..6bcb85e3c07
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_leather.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suits/jacket.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..a9a2d75a954
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/icon.png
new file mode 100644
index 00000000000..984923dda43
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/inhand-left.png
new file mode 100644
index 00000000000..98ebdf0e98b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/inhand-right.png
new file mode 100644
index 00000000000..705de1dbdaf
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/meta.json
new file mode 100644
index 00000000000..6bcb85e3c07
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_blue.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suits/jacket.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..fd27a543562
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/icon.png
new file mode 100644
index 00000000000..41b64862808
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/inhand-left.png
new file mode 100644
index 00000000000..45968148146
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/inhand-right.png
new file mode 100644
index 00000000000..91cbe1d4d61
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/meta.json
new file mode 100644
index 00000000000..6bcb85e3c07
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_brown.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suits/jacket.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..91893a9ae41
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/icon.png
new file mode 100644
index 00000000000..4ec6fb39c2d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/inhand-left.png
new file mode 100644
index 00000000000..21df3e25500
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/inhand-right.png
new file mode 100644
index 00000000000..a0eaac85ce4
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/meta.json
new file mode 100644
index 00000000000..87418987f55
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_magenta.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suits/jacket.dmi | recolored by erhardsteinhauer for New Frontier with https://www.pixilart.com/palettes/cyberpunk-v1-24161",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000..e0b7fc5d136
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/icon.png
new file mode 100644
index 00000000000..10df25d682e
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/inhand-left.png
new file mode 100644
index 00000000000..9713fdda116
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/inhand-right.png
new file mode 100644
index 00000000000..2f8f14bb689
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/meta.json
new file mode 100644
index 00000000000..6bcb85e3c07
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_letterman_red.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suits/jacket.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_01.png
new file mode 100644
index 00000000000..90b293d463e
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_02.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_02.png
new file mode 100644
index 00000000000..2514d445ec0
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_03.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_03.png
new file mode 100644
index 00000000000..c05097d4cce
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_04.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_04.png
new file mode 100644
index 00000000000..3664c2dae9d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_jacket_04.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_letterman.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_letterman.png
new file mode 100644
index 00000000000..2210feadbf8
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/base_OuterClothing_letterman.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/decor_base_OuterClothing_jacket_01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/decor_base_OuterClothing_jacket_01.png
new file mode 100644
index 00000000000..826cf64fd05
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/decor_base_OuterClothing_jacket_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/decor_base_OuterClothing_jacket_02.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/decor_base_OuterClothing_jacket_02.png
new file mode 100644
index 00000000000..5dae0642452
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/decor_base_OuterClothing_jacket_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/decor_base_OuterClothing_letterman.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/decor_base_OuterClothing_letterman.png
new file mode 100644
index 00000000000..2371390eb94
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/decor_base_OuterClothing_letterman.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/inhand-left.png
new file mode 100644
index 00000000000..77a9693e954
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/inhand-right.png
new file mode 100644
index 00000000000..68ea63cc154
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/mask_null.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/mask_null.png
new file mode 100644
index 00000000000..2975c479be7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/mask_null.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/meta.json
new file mode 100644
index 00000000000..07c6947c016
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/meta.json
@@ -0,0 +1,83 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suits/jacket.dmi , separated into layers and added new ones by erhardsteinhauer (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base_OuterClothing_letterman",
+      "directions": 4
+    },
+    {
+      "name": "base_OuterClothing_jacket_01",
+      "directions": 4
+    },
+    {
+      "name": "base_OuterClothing_jacket_02",
+      "directions": 4
+    },
+    {
+      "name": "base_OuterClothing_jacket_03",
+      "directions": 4
+    },
+    {
+      "name": "base_OuterClothing_jacket_04",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_letterman",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_jacket_01",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_OuterClothing_jacket_02",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_jacket_01",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_jacket_02",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_jacket_03",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_jacket_04",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_jacket_05",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_jacket_06",
+      "directions": 4
+    },
+    {
+      "name": "overlay_base_OuterClothing_jacket_07",
+      "directions": 4
+    },
+    {
+      "name": "mask_null",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_01.png
new file mode 100644
index 00000000000..f2111b4f1b3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_02.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_02.png
new file mode 100644
index 00000000000..01b3175af61
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_03.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_03.png
new file mode 100644
index 00000000000..ce0a76e863a
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_04.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_04.png
new file mode 100644
index 00000000000..c4e9a174a65
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_04.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_05.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_05.png
new file mode 100644
index 00000000000..2d1b7635cec
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_05.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_06.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_06.png
new file mode 100644
index 00000000000..a0f142ab256
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_06.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_07.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_07.png
new file mode 100644
index 00000000000..b3fefeebc6a
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/jacket_procedural.rsi/overlay_base_OuterClothing_jacket_07.png differ
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/base_boots_01.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/base_boots_01.png
new file mode 100644
index 00000000000..c122b55cbdb
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/base_boots_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/decor_base_boots_01.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/decor_base_boots_01.png
new file mode 100644
index 00000000000..c0db30ee678
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/decor_base_boots_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/decor_base_boots_02.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/decor_base_boots_02.png
new file mode 100644
index 00000000000..ace0fa1663d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/decor_base_boots_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/inhand-left.png
new file mode 100644
index 00000000000..3a183904f06
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/inhand-right.png
new file mode 100644
index 00000000000..a8695b59c57
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/mask_null.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/mask_null.png
new file mode 100644
index 00000000000..2975c479be7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/mask_null.png differ
diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json
new file mode 100644
index 00000000000..63a5c0b80af
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/punk.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by erhardsteinhauer (discord/github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+     {
+      "name": "base_boots_01",
+      "directions": 4
+     },
+     {
+      "name": "decor_base_boots_01",
+      "directions": 4
+     },
+     {
+      "name": "decor_base_boots_02",
+      "directions": 4
+     },
+     {
+      "name": "mask_null",
+      "directions": 4
+     },
+     {
+      "name": "inhand-right",
+      "directions": 4
+     },
+     {
+      "name": "inhand-left",
+      "directions": 4
+     }
+   ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_leg_short.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_leg_short.png
new file mode 100644
index 00000000000..e3b74ba7b65
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_leg_short.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_leg_standard.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_leg_standard.png
new file mode 100644
index 00000000000..7140a3869c3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_leg_standard.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_torso_armless.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_torso_armless.png
new file mode 100644
index 00000000000..2864e1c04e7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_torso_armless.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_torso_croptop_armless.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_torso_croptop_armless.png
new file mode 100644
index 00000000000..6bfc957109e
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/base_torso_croptop_armless.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_01.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_01.png
new file mode 100644
index 00000000000..f8ff99ecc5d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_02.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_02.png
new file mode 100644
index 00000000000..888c5d968c2
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_03.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_03.png
new file mode 100644
index 00000000000..3dcda4c3e34
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_04.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_04.png
new file mode 100644
index 00000000000..fdb2880dbda
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_short_04.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_01.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_01.png
new file mode 100644
index 00000000000..3beadabea77
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_02.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_02.png
new file mode 100644
index 00000000000..bf5c4de3f59
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_03.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_03.png
new file mode 100644
index 00000000000..33bc4c2ab7d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_04.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_04.png
new file mode 100644
index 00000000000..4c3199b4198
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_04.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_05.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_05.png
new file mode 100644
index 00000000000..b78dfa817e5
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_leg_standard_05.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_torso_croptop_armless_01.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_torso_croptop_armless_01.png
new file mode 100644
index 00000000000..d178d4c6b20
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_torso_croptop_armless_01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_torso_croptop_armless_02.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_torso_croptop_armless_02.png
new file mode 100644
index 00000000000..1fc83cdcbba
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_torso_croptop_armless_02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_torso_croptop_armless_03.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_torso_croptop_armless_03.png
new file mode 100644
index 00000000000..527f376f5e3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/decor_base_torso_croptop_armless_03.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/inhand-left.png
new file mode 100644
index 00000000000..2cf20407017
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/inhand-right.png
new file mode 100644
index 00000000000..a6dd1d8b8b9
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/mask_null.png b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/mask_null.png
new file mode 100644
index 00000000000..2975c479be7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/mask_null.png differ
diff --git a/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/meta.json
new file mode 100644
index 00000000000..0f083625163
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Uniforms/punk_procedural.rsi/meta.json
@@ -0,0 +1,87 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "The sprite base is taken from  tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, separated into layers and added new ones by TheShuEd (github), croptops and additional decor options by erhardsteinhauer",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base_leg_standard",
+      "directions": 4
+    },
+    {
+      "name": "base_leg_short",
+      "directions": 4
+    },
+    {
+      "name": "base_torso_armless",
+      "directions": 4
+    },
+    {
+      "name": "base_torso_croptop_armless",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_leg_standard_01",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_leg_standard_02",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_leg_standard_03",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_leg_standard_04",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_leg_short_01",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_leg_short_02",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_leg_short_03",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_leg_short_04",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_leg_standard_05",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_torso_croptop_armless_01",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_torso_croptop_armless_02",
+      "directions": 4
+    },
+    {
+      "name": "decor_base_torso_croptop_armless_03",
+      "directions": 4
+    },
+    {
+      "name": "mask_null",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Devices/Holoprojectors/graffiti.rsi/icon.png b/Resources/Textures/_NF/Objects/Devices/Holoprojectors/graffiti.rsi/icon.png
new file mode 100644
index 00000000000..640f2881605
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/Holoprojectors/graffiti.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/Holoprojectors/graffiti.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/Holoprojectors/graffiti.rsi/meta.json
new file mode 100644
index 00000000000..22c628acd0d
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Devices/Holoprojectors/graffiti.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+     "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587, and resprited by TheShuEd (github), recolored by erhardsteinhauer",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [ 0.3, 0.3, 0.3, 0.3 ]
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/flashlight-on.png b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/flashlight-on.png
new file mode 100644
index 00000000000..8d97ebdec53
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/flashlight-on.png differ
diff --git a/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/flashlight-overlay.png b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/flashlight-overlay.png
new file mode 100644
index 00000000000..cad64a5262a
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/flashlight-overlay.png differ
diff --git a/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/flashlight.png b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/flashlight.png
new file mode 100644
index 00000000000..803f0f2911f
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/flashlight.png differ
diff --git a/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/folded.png b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/folded.png
new file mode 100644
index 00000000000..0bc26825eaa
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/folded.png differ
diff --git a/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-left-light.png b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-left-light.png
new file mode 100644
index 00000000000..2b27d8b1259
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-left-light.png differ
diff --git a/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-left.png
new file mode 100644
index 00000000000..eb86526e52a
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-right-light.png b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-right-light.png
new file mode 100644
index 00000000000..5eaea713a56
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-right-light.png differ
diff --git a/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-right.png
new file mode 100644
index 00000000000..d418e995827
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/meta.json b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/meta.json
new file mode 100644
index 00000000000..fdf994c0000
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Tools/umbrella.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/lighting.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "flashlight"
+    },
+    {
+      "name": "flashlight-on"
+    },
+    {
+      "name": "flashlight-overlay"
+    },
+    {
+      "name": "folded"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-light",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-light",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti01.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti01.png
new file mode 100644
index 00000000000..52b81a4a64e
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti01.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti02.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti02.png
new file mode 100644
index 00000000000..00a31c88dc6
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti02.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti03.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti03.png
new file mode 100644
index 00000000000..9c2a39dc576
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti03.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti04.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti04.png
new file mode 100644
index 00000000000..a4be72b0236
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti04.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti05.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti05.png
new file mode 100644
index 00000000000..399505bf189
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti05.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti06.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti06.png
new file mode 100644
index 00000000000..d9af88cd1c3
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti06.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti07.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti07.png
new file mode 100644
index 00000000000..5a2ed529a68
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti07.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti08.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti08.png
new file mode 100644
index 00000000000..f97cb34bb9d
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti08.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti09.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti09.png
new file mode 100644
index 00000000000..51a95d7b3c6
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti09.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti10.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti10.png
new file mode 100644
index 00000000000..dbafa26fdd0
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti10.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti11.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti11.png
new file mode 100644
index 00000000000..c6a9d461322
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti11.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti12.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti12.png
new file mode 100644
index 00000000000..46c1852e12a
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti12.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti13.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti13.png
new file mode 100644
index 00000000000..85e4b0b7fb1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti13.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti14.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti14.png
new file mode 100644
index 00000000000..334c965c0a3
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti14.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti15.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti15.png
new file mode 100644
index 00000000000..ecf2de50e70
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti15.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti16.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti16.png
new file mode 100644
index 00000000000..dc344b39b94
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti16.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti17.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti17.png
new file mode 100644
index 00000000000..0e831751e70
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti17.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti18.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti18.png
new file mode 100644
index 00000000000..133fe98a727
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti18.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti19.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti19.png
new file mode 100644
index 00000000000..d01b41fcabb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti19.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti20.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti20.png
new file mode 100644
index 00000000000..6a4d0d3a761
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti20.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti21.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti21.png
new file mode 100644
index 00000000000..8ce64bdebfc
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti21.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight01.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight01.png
new file mode 100644
index 00000000000..49132c842d9
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight01.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight02.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight02.png
new file mode 100644
index 00000000000..18c3a1ba296
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight02.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight03.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight03.png
new file mode 100644
index 00000000000..83615bee983
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight03.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight04.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight04.png
new file mode 100644
index 00000000000..c2b680d14e7
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight04.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight05.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight05.png
new file mode 100644
index 00000000000..a0032230b8c
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight05.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight06.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight06.png
new file mode 100644
index 00000000000..8b5a21b3f09
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight06.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight07.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight07.png
new file mode 100644
index 00000000000..5cdbca8d95d
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight07.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight08.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight08.png
new file mode 100644
index 00000000000..c830b870880
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight08.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight09.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight09.png
new file mode 100644
index 00000000000..b12e7c5ca23
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight09.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight10.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight10.png
new file mode 100644
index 00000000000..e4af835e384
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight10.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight11.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight11.png
new file mode 100644
index 00000000000..c44a3b3d966
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight11.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight12.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight12.png
new file mode 100644
index 00000000000..a3a34661f41
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight12.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight13.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight13.png
new file mode 100644
index 00000000000..ee558451ba0
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight13.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight14.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight14.png
new file mode 100644
index 00000000000..c86ad4d0b63
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight14.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight14_1.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight14_1.png
new file mode 100644
index 00000000000..b7295fe3ea0
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight14_1.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight15.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight15.png
new file mode 100644
index 00000000000..85dd1c64d1c
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight15.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight15_1.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight15_1.png
new file mode 100644
index 00000000000..dfb649093b5
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight15_1.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight16.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight16.png
new file mode 100644
index 00000000000..4f35f47e79e
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight16.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight17.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight17.png
new file mode 100644
index 00000000000..42b2a196c2e
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight17.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight18.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight18.png
new file mode 100644
index 00000000000..1a6e61668a2
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight18.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight19.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight19.png
new file mode 100644
index 00000000000..58e2e759ceb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight19.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight20.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight20.png
new file mode 100644
index 00000000000..76f89dd9955
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight20.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight21.png b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight21.png
new file mode 100644
index 00000000000..66134bcd56a
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/holograffiti_highlight21.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/meta.json b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/meta.json
new file mode 100644
index 00000000000..d1ee59a33d9
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Holo/graffiti/highlighted.rsi/meta.json
@@ -0,0 +1,143 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Holograffiti01-holograffiti10 were taken from tgstation13 and modified by erhardsteinhauer (discord); holograffiti12, holograffiti14, holograffiti15, holograffiti19, holograffiti20 - edits to SS14 sprites; holograffiti11 - holograffiti21 by exrhardsteinhauer (discord)",
+    "states": [
+        {
+            "name": "holograffiti01"
+        },
+        {
+            "name": "holograffiti02"
+        },
+        {
+            "name": "holograffiti03"
+        },
+        {
+            "name": "holograffiti04"
+        },
+        {
+            "name": "holograffiti05"
+        },
+        {
+            "name": "holograffiti06"
+        },
+        {
+            "name": "holograffiti07"
+        },
+        {
+            "name": "holograffiti08"
+        },
+        {
+            "name": "holograffiti09"
+        },
+        {
+            "name": "holograffiti10"
+        },
+        {
+            "name": "holograffiti11"
+        },
+        {
+            "name": "holograffiti12"
+        },
+        {
+            "name": "holograffiti13"
+        },
+        {
+            "name": "holograffiti14"
+        },
+        {
+            "name": "holograffiti15"
+        },
+        {
+            "name": "holograffiti16"
+        },
+        {
+            "name": "holograffiti17"
+        },
+        {
+            "name": "holograffiti18"
+        },
+        {
+            "name": "holograffiti19"
+        },
+        {
+            "name": "holograffiti20"
+        },
+        {
+            "name": "holograffiti21"
+        },
+        {
+            "name": "holograffiti_highlight01"
+        },
+        {
+            "name": "holograffiti_highlight02"
+        },
+        {
+            "name": "holograffiti_highlight03"
+        },
+        {
+            "name": "holograffiti_highlight04"
+        },
+        {
+            "name": "holograffiti_highlight05"
+        },
+        {
+            "name": "holograffiti_highlight06"
+        },
+        {
+            "name": "holograffiti_highlight07"
+        },
+        {
+            "name": "holograffiti_highlight08"
+        },
+        {
+            "name": "holograffiti_highlight09"
+        },
+        {
+            "name": "holograffiti_highlight10"
+        },
+        {
+            "name": "holograffiti_highlight11"
+        },
+        {
+            "name": "holograffiti_highlight12"
+        },
+        {
+            "name": "holograffiti_highlight13"
+        },
+        {
+            "name": "holograffiti_highlight14"
+        },
+        {
+            "name": "holograffiti_highlight14_1"
+        },
+        {
+            "name": "holograffiti_highlight15"
+        },
+        {
+            "name": "holograffiti_highlight15_1"
+        },
+        {
+            "name": "holograffiti_highlight16"
+        },
+        {
+            "name": "holograffiti_highlight17"
+        },
+        {
+            "name": "holograffiti_highlight18"
+        },
+        {
+            "name": "holograffiti_highlight19"
+        },
+        {
+            "name": "holograffiti_highlight20"
+        },
+        {
+            "name": "holograffiti_highlight21"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti01.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti01.png
new file mode 100644
index 00000000000..16769999413
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti01.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti02.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti02.png
new file mode 100644
index 00000000000..e0e341c0a32
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti02.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti03.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti03.png
new file mode 100644
index 00000000000..d65c74241ad
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti03.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti04.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti04.png
new file mode 100644
index 00000000000..89e39f146e5
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti04.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti05.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti05.png
new file mode 100644
index 00000000000..13482676011
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti05.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti06.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti06.png
new file mode 100644
index 00000000000..bad58265e81
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti06.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti07.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti07.png
new file mode 100644
index 00000000000..d2e56c03300
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti07.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti08.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti08.png
new file mode 100644
index 00000000000..629936d2249
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti08.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti09.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti09.png
new file mode 100644
index 00000000000..dd9899c7d05
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti09.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti10.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti10.png
new file mode 100644
index 00000000000..57dd0ef57c5
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti10.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti11.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti11.png
new file mode 100644
index 00000000000..d79d81f2d73
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti11.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti12.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti12.png
new file mode 100644
index 00000000000..e641359aa1b
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti12.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti13.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti13.png
new file mode 100644
index 00000000000..9a0610854f7
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti13.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti14.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti14.png
new file mode 100644
index 00000000000..7b2c5f54b5a
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti14.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti15.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti15.png
new file mode 100644
index 00000000000..9edebfaefc9
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti15.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti16.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti16.png
new file mode 100644
index 00000000000..b4d53525c25
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti16.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti17.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti17.png
new file mode 100644
index 00000000000..c8d118b4368
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti17.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti18.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti18.png
new file mode 100644
index 00000000000..4a61fbcbea7
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti18.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti19.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti19.png
new file mode 100644
index 00000000000..907775b4e58
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti19.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti20.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti20.png
new file mode 100644
index 00000000000..3595a150d54
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti20.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti21.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti21.png
new file mode 100644
index 00000000000..6744712f182
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti21.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti22.png b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti22.png
new file mode 100644
index 00000000000..1e24117d7fb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/holograffiti22.png differ
diff --git a/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/meta.json b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/meta.json
new file mode 100644
index 00000000000..43ea700b170
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Holo/graffiti/simple.rsi/meta.json
@@ -0,0 +1,77 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Holograffiti01-holograffiti04 were taken from tgstation13 and modified by erhardsteinhauer (discord), holograffiti05 - holograffiti22 by exrhardsteinhauer (discord)",
+    "states": [
+        {
+            "name": "holograffiti01"
+        },
+        {
+            "name": "holograffiti02"
+        },
+        {
+            "name": "holograffiti03"
+        },
+        {
+            "name": "holograffiti04"
+        },
+        {
+            "name": "holograffiti05"
+        },
+        {
+            "name": "holograffiti06"
+        },
+        {
+            "name": "holograffiti07"
+        },
+        {
+            "name": "holograffiti08"
+        },
+        {
+            "name": "holograffiti09"
+        },
+        {
+            "name": "holograffiti10"
+        },
+        {
+            "name": "holograffiti11"
+        },
+        {
+            "name": "holograffiti12"
+        },
+        {
+            "name": "holograffiti13"
+        },
+        {
+            "name": "holograffiti14"
+        },
+        {
+            "name": "holograffiti15"
+        },
+        {
+            "name": "holograffiti16"
+        },
+        {
+            "name": "holograffiti17"
+        },
+        {
+            "name": "holograffiti18"
+        },
+        {
+            "name": "holograffiti19"
+        },
+        {
+            "name": "holograffiti20"
+        },
+        {
+            "name": "holograffiti21"
+        },
+        {
+            "name": "holograffiti22"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/vandalized.rsi/clothing-vandalized-deny-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/vandalized.rsi/clothing-vandalized-deny-unshaded.png
new file mode 100644
index 00000000000..d67626c0024
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/vandalized.rsi/clothing-vandalized-deny-unshaded.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/vandalized.rsi/clothing-vandalized-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/vandalized.rsi/clothing-vandalized-unshaded.png
new file mode 100644
index 00000000000..ef85de14eda
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/vandalized.rsi/clothing-vandalized-unshaded.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/vandalized.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/vandalized.rsi/meta.json
new file mode 100644
index 00000000000..ebec00f7357
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/vandalized.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , edited by erhardsteinhauer (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "clothing-vandalized-unshaded",
+      "delays": [
+        [
+          1,
+          0.1,
+          1,
+          0.1,
+          1,
+          0.1,
+          1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "clothing-vandalized-deny-unshaded",
+      "delays": [
+        [
+          1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}