Automatic changelog update

initial commit

Resources/Changelog/DeltaVAdmin.yml

@@ -371,5 +371,14 @@ Entries:
   id: 41
   time: '2026-08-22T16:18:32.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/6435
+- author: einknusprigestoast
+  changes:
+  - message: ERT elite hardsuits now have different values
+    type: Tweak
+  - message: added new guns to ERT gamma and amber loadouts
+    type: Add
+  id: 42
+  time: '2026-09-09T14:07:35.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6239
 Name: DeltaVAdmin
 Order: 5

Resources/Changelog/DeltaVChangelog.yml

@@ -1,219 +1,4 @@
 Entries:
-- author: Pharaz4
-  changes:
-  - message: Fixed blukie and paramed suit not displaying for harpy.
-    type: Fix
-  id: 2145
-  time: '2026-03-01T11:18:43.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5414
-- author: Velcroboy
-  changes:
-  - message: Wizard now starts in the Wizard's Den and gets a teleport scroll
-    type: Tweak
-  id: 2146
-  time: '2026-03-01T13:38:18.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5215
-- author: rebe83
-  changes:
-  - message: Bottles, vials, and chem injectors no longer fit inside cigarette boxes.
-      Use a combat kit like the rest of us!
-    type: Tweak
-  id: 2147
-  time: '2026-03-01T14:12:59.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5402
-- author: Stxcking
-  changes:
-  - message: Health analyzer can show who claimed a patient.
-    type: Tweak
-  id: 2148
-  time: '2026-03-01T19:47:57.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5110
-- author: pootslap
-  changes:
-  - message: Rat servants are slightly faster but weaker.
-    type: Tweak
-  - message: Rat Kings have a few new titles and are now more clearly labelled as
-      antagonists.
-    type: Tweak
-  id: 2149
-  time: '2026-03-02T17:48:25.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5326
-- author: JoulesBerg
-  changes:
-  - message: Vents, air injectors, and pumps can be pipes in their alternate configurations
-      now.
-    type: Add
-  id: 2150
-  time: '2026-03-02T18:17:30.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5372
-- author: Halo3moth
-  changes:
-  - message: Hos has a new robe for a significant aura increase, amazing sprites by
-      Ci1rus
-    type: Add
-  id: 2151
-  time: '2026-03-02T19:36:29.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5425
-- author: Jimboe
-  changes:
-  - message: SUBMARINE HAS GOTTEN SUBBIER - Power rework completed, Minor Atmos changes
-      to engineering. Atmos will eventually all reflect engineering soon. Solars have
-      been improved!
-    type: Tweak
-  id: 2152
-  time: '2026-03-03T03:16:06.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5394
-- author: Velcroboy
-  changes:
-  - message: 'Evac Shuttles: NTES- Fishbowl and NTES-BC20 are APC compliant'
-    type: Tweak
-  id: 2153
-  time: '2026-03-03T04:32:39.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5457
-- author: SirRequiem
-  changes:
-  - message: 'Terra: Added additional meteor shielding, meteor avoidance zones, Robotics
-      console, AI Recovery Console, AI subnet/cameras, mail cart, and medical crash
-      cart'
-    type: Add
-  - message: 'Terra: Waste and Distro have pre-enabled pumps now, and power bank has
-      been slightly improved'
-    type: Tweak
-  - message: 'Terra: APCs are now all below 20kw in regards to the new breaker system'
-    type: Fix
-  id: 2154
-  time: '2026-03-04T01:23:21.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5432
-- author: Woljif
-  changes:
-  - message: Sec jetpacks are no longer mini-jetpacks and can hold 3.0L
-    type: Tweak
-  id: 2155
-  time: '2026-03-05T20:46:13.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5357
-- author: EmberAstra
-  changes:
-  - message: Fixed the Research Digi-Board storage space lacking an UI. Did you even
-      know it had some?
-    type: Fix
-  id: 2156
-  time: '2026-03-05T21:17:37.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5434
-- author: Stxcking
-  changes:
-  - message: Changed the mailbox sprite!
-    type: Tweak
-  id: 2157
-  time: '2026-03-05T21:18:52.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5433
-- author: EmberAstra
-  changes:
-  - message: Added the power digi-board! Monitor your energy situation on the move!
-      Find it in CE's locker.
-    type: Add
-  id: 2158
-  time: '2026-03-06T15:36:34.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5435
-- author: BarryNorfolk
-  changes:
-  - message: Silicons no longer change their battery usage depending on the temperature
-      around them
-    type: Remove
-  - message: IPCs now once again have working alerts for their batteries
-    type: Fix
-  id: 2159
-  time: '2026-03-06T16:10:00.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5345
-- author: marigauge
-  changes:
-  - message: reverted soretizone changes hopefully fixing flashing
-    type: Fix
-  id: 2160
-  time: '2026-03-07T09:45:22.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5391
-- author: Pharaz4
-  changes:
-  - message: Added kitchen freezer.
-    type: Add
-  id: 2161
-  time: '2026-03-07T16:24:25.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5443
-- author: Cepelinas1
-  changes:
-  - message: 'A new antag role has been added: Internal Affairs! NanoTrasen is hiring
-      any employees who would love to protect the company.'
-    type: Add
-  id: 2162
-  time: '2026-03-07T20:35:19.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5450
-- author: Coryler
-  changes:
-  - message: Add Universal Pinpointer to the Syndicate Uplink
-    type: Add
-  id: 2163
-  time: '2026-03-09T09:12:29.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5471
-- author: HameyTychol
-  changes:
-  - message: Made more items recyclable
-    type: Tweak
-  id: 2164
-  time: '2026-03-09T09:43:25.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5398
-- author: snowywinters
-  changes:
-  - message: Watchdogs now work as a death rattle also decreased the price to 9k
-    type: Tweak
-  - message: Fixed watchdogs not working
-    type: Fix
-  id: 2165
-  time: '2026-03-09T10:17:49.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5475
-- author: Woljif
-  changes:
-  - message: The Kammerer is now a 2x4 in your bag
-    type: Tweak
-  id: 2166
-  time: '2026-03-09T10:55:09.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5469
-- author: DisposableCrewmember42
-  changes:
-  - message: Conspirators now requires 32 connected players to roll. The ingame delay
-      before choosing conspirators is increased.
-    type: Fix
-  id: 2167
-  time: '2026-03-09T11:39:35.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5490
-- author: Stxcking
-  changes:
-  - message: 'Added a new space ruin: Abandoned Dojo!'
-    type: Add
-  id: 2168
-  time: '2026-03-09T11:48:58.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5427
-- author: verybigman311
-  changes:
-  - message: Electropacks can no longer be removed by non-Security.
-    type: Tweak
-  - message: Shock collars work once more.
-    type: Fix
-  id: 2169
-  time: '2026-03-09T13:32:05.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5332
-- author: rebe83
-  changes:
-  - message: Makeshift crowbar-wrench now actually does wrenchy things.
-    type: Fix
-  id: 2170
-  time: '2026-03-09T13:31:50.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5388
-- author: jimbobby-the-FUCKING-first
-  changes:
-  - message: You can now saw off the forged shotgun.
-    type: Add
-  id: 2171
-  time: '2026-03-09T13:40:13.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5120
 - author: snowywinters
   changes:
   - message: Ammo fab can now make all types of ammo
@@ -4437,4 +4222,230 @@
   id: 2645
   time: '2026-08-27T19:26:08.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/6432
+- author: CarolCuchara
+  changes:
+  - message: New caseless shotgun shells that wont leave behind a trace!
+    type: Add
+  - message: The Hushpup now comes equiped with caseless shotgun shells!
+    type: Tweak
+  id: 2646
+  time: '2026-08-28T16:38:08.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6457
+- author: Vapetastic-Gaming
+  changes:
+  - message: Survival Scheduler has been slightly tamed, and will give moments of
+      calm, while also applying pressure via spawns. Survival Scheduler refused to
+      read you a bedtime story, sorry chat.
+    type: Tweak
+  id: 2647
+  time: '2026-08-28T23:54:33.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6440
+- author: BriBrooo
+  changes:
+  - message: Hydroponics' booklet on reagents contained an error.
+    type: Fix
+  id: 2648
+  time: '2026-09-06T23:35:52.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6483
+- author: nlaky
+  changes:
+  - message: Vulp alt tail can now wag
+    type: Tweak
+  id: 2649
+  time: '2026-09-07T00:17:23.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6480
+- author: Macrocosm, Stxcking
+  changes:
+  - message: Added 20+ new Thaven markings, most notably, tails!
+    type: Add
+  - message: Thavens can select their undergarments again.
+    type: Fix
+  - message: Thaven markings display the correct locale marking name.
+    type: Fix
+  - message: Thavens have unique organ sprites now.
+    type: Tweak
+  id: 2650
+  time: '2026-09-07T00:18:45.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6162
+- author: AnimatorBrie
+  changes:
+  - message: Added surplus boots, a strictly-cosmetic variant of jackboots. Available
+      now at your local Clothesmate vendor.
+    type: Add
+  id: 2651
+  time: '2026-09-07T00:33:43.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6472
+- author: StarboundSolaris
+  changes:
+  - message: Added even more names for Pitbulls and Ventbulls!
+    type: Add
+  - message: Ventbulls also now actually roam the vents. Godspeed mice mains.
+    type: Add
+  - message: Ventbulls now appear as ghost roles!
+    type: Add
+  id: 2652
+  time: '2026-09-09T14:15:30.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6449
+- author: pixelStrife
+  changes:
+  - message: Ethanol content of drinks has been re-standardized. No more adding ethanol
+      directly, only metabolizing. (Non-ethanol substances too!)
+    type: Fix
+  - message: Silencer is once again non-alcoholic, for mimes that would rather keep
+      their wits about them.
+    type: Fix
+  id: 2653
+  time: '2026-09-09T14:18:38.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6486
+- author: EmberAstra
+  changes:
+  - message: Shadekins can now have hair and facial hair.
+    type: Add
+  id: 2654
+  time: '2026-09-09T14:54:45.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6453
+- author: SumofThreeParts
+  changes:
+  - message: Added the Anaconda to the uplink.
+    type: Add
+  id: 2655
+  time: '2026-09-09T15:49:18.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6458
+- author: BarryNorfolk
+  changes:
+  - message: Fixed displays for ETA/ETD not displaying
+    type: Fix
+  id: 2656
+  time: '2026-09-10T23:39:44.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6497
+- author: kotobdev
+  changes:
+  - message: Asakim should, once again, be very rare.
+    type: Fix
+  id: 2657
+  time: '2026-09-13T22:19:40.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6455
+- author: Pinoinha
+  changes:
+  - message: Fixed service borgs being unable to pickup beer bottles when using the
+      fishing module
+    type: Fix
+  id: 2658
+  time: '2026-09-14T17:44:42.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6503
+- author: SumofThreeParts
+  changes:
+  - message: Glimmer prober locks out at 600 glimmer instead of 750 glimmer.
+    type: Tweak
+  id: 2659
+  time: '2026-09-16T12:31:05.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6493
+- author: Apersos-coll
+  changes:
+  - message: Added new crewsided heavy laser gun the Unstable Core Refractor, for
+      when stable reactors weren't enough.
+    type: Add
+  id: 2660
+  time: '2026-09-16T12:44:37.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6491
+- author: pixelStrife
+  changes:
+  - message: Ovinia now make actual noise when gasping and deathgasping (instead of
+      text only.)
+    type: Tweak
+  id: 2661
+  time: '2026-09-17T04:05:19.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6481
+- author: keekee38
+  changes:
+  - message: slimes can have prosthetic limbs too
+    type: Add
+  id: 2662
+  time: '2026-09-17T04:19:40.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6496
+- author: kotobdev
+  changes:
+  - message: Removed a shitmed-remnant Asakim objective.
+    type: Remove
+  - message: Asakim ghostrole rules have been reworded to be a little less friendly.
+    type: Tweak
+  - message: Asakim armor now slows any non-Asakim by 80%, to discourage crewmembers
+      from intentionally springlocking themselves.
+    type: Tweak
+  - message: Asakim shouldn't get stuck in doors.
+    type: Fix
+  id: 2663
+  time: '2026-09-17T04:22:46.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6452
+- author: Apersos-coll
+  changes:
+  - message: Somebody at CC had an idea and too much money to spend, and somehow got
+      a new pulse style pistol designed. The EPU-U001
+    type: Add
+  id: 2664
+  time: '2026-09-17T10:41:02.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6507
+- author: Apersos-coll
+  changes:
+  - message: Fixed Unstable Core Refractors back/suit storage sprites
+    type: Fix
+  id: 2665
+  time: '2026-09-17T14:03:34.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6517
+- author: stormyatt
+  changes:
+  - message: hitmen now get freelancer comms roundstart
+    type: Add
+  - message: thieves now get freelancer comms roundstart
+    type: Add
+  - message: traitors can now buy freelancer comms for 1tc. hiring hours
+    type: Add
+  id: 2666
+  time: '2026-09-17T14:04:53.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6495
+- author: keekee38
+  changes:
+  - message: med kits no longer fit into pockets
+    type: Fix
+  id: 2667
+  time: '2026-09-20T20:10:57.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6523
+- author: Radezolid
+  changes:
+  - message: Fixed Smile's core not being able to be picked up.
+    type: Fix
+  id: 2668
+  time: '2026-09-21T17:15:20.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6529
+- author: Apersos-coll
+  changes:
+  - message: you now actually need to get all components to craft the unstable core
+      refractor. And the container can no longer hold the entire universe inside of
+      it.
+    type: Fix
+  id: 2669
+  time: '2026-09-22T09:22:57.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6522
+- author: Kashieru1987
+  changes:
+  - message: Ejecting from a security chest rig now prioritizes the handgun instead
+      of the radio, like the security belt!
+    type: Tweak
+  id: 2670
+  time: '2026-09-25T16:10:53.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6546
+- author: Stop-Signs , Gintoki23
+  changes:
+  - message: New lobby art courtesy of Gintoki23
+    type: Add
+  id: 2671
+  time: '2026-09-25T20:46:48.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6542
+- author: AftrLite
+  changes:
+  - message: The justice airlocks have been resprited!
+    type: Tweak
+  id: 2672
+  time: '2026-09-28T10:53:34.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6563
 Order: 1

Resources/Changelog/Maps.yml

@@ -1087,4 +1087,34 @@
   id: 125
   time: '2026-07-14T00:30:06.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/6242
+- author: Field Command
+  changes:
+  - message: 'Central Command: New CC is here!'
+    type: Add
+  id: 126
+  time: '2026-09-05T14:03:09.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6198
+- author: BriBrooo
+  changes:
+  - message: Added a light gray version of the air sensor.
+    type: Add
+  id: 127
+  time: '2026-09-17T03:01:35.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6340
+- author: This_Is_Gray
+  changes:
+  - message: 'Anvil: Anvil Station is now recieving crew members. Bring a spray bottle!'
+    type: Add
+  - message: 'Anvil: The NTES Hammerhead is here to transport you from Anvil Station.'
+    type: Add
+  id: 128
+  time: '2026-09-25T18:24:42.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/4338
+- author: IAmNotGray
+  changes:
+  - message: 'Anvil: The Hammerhead has been met with a compulsory removal.'
+    type: Fix
+  id: 129
+  time: '2026-09-26T00:01:30.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6549
 Order: 3

Resources/Locale/en-US/_DV/datasets/names/pitbull.ftl

@@ -13,13 +13,13 @@ names-pitbull-dataset-11 = Echo
 names-pitbull-dataset-12 = Cuddles
 names-pitbull-dataset-13 = Killer
 names-pitbull-dataset-14 = Paisley
-names-pitbull-dataset-15 = Echo
+names-pitbull-dataset-15 = Ravager
 names-pitbull-dataset-16 = Sweetie
 names-pitbull-dataset-17 = Tutu
 names-pitbull-dataset-18 = Reaper
 names-pitbull-dataset-19 = Peaches
 names-pitbull-dataset-20 = Cujo
-names-pitbull-dataset-21 = Cuddles
+names-pitbull-dataset-21 = Chompers
 names-pitbull-dataset-22 = Lucifer
 names-pitbull-dataset-23 = Daisy
 names-pitbull-dataset-24 = Blaze
@@ -64,3 +64,41 @@ names-pitbull-dataset-60 = Menace
 names-pitbull-dataset-61 = Buddy
 names-pitbull-dataset-62 = Rocky
 names-pitbull-dataset-63 = Boulder
+names-pitbull-dataset-64 = Hellspawn
+names-pitbull-dataset-65 = Bape
+names-pitbull-dataset-66 = Skullbreaker
+names-pitbull-dataset-67 = Billy
+names-pitbull-dataset-68 = Bobby
+names-pitbull-dataset-69 = Steve
+names-pitbull-dataset-70 = Phil
+names-pitbull-dataset-71 = Tesla
+names-pitbull-dataset-72 = Creature
+names-pitbull-dataset-73 = Flowery
+names-pitbull-dataset-74 = Jarona
+names-pitbull-dataset-75 = Raider
+names-pitbull-dataset-76 = Shitlet
+names-pitbull-dataset-77 = Mr Worldwide
+names-pitbull-dataset-78 = Rat
+names-pitbull-dataset-79 = Cynophobia
+names-pitbull-dataset-80 = Divine Comedy
+names-pitbull-dataset-81 = Comedy
+names-pitbull-dataset-82 = Irenic
+names-pitbull-dataset-83 = Fluffy
+names-pitbull-dataset-84 = Chaser
+names-pitbull-dataset-85 = Pitt
+names-pitbull-dataset-86 = Bull
+names-pitbull-dataset-87 = Sakura
+names-pitbull-dataset-88 = Singularity
+names-pitbull-dataset-89 = Singuloose
+names-pitbull-dataset-90 = Mustard
+names-pitbull-dataset-91 = Gravy
+names-pitbull-dataset-92 = Tesloose
+names-pitbull-dataset-93 = Root Beer
+names-pitbull-dataset-94 = Tritfire
+names-pitbull-dataset-95 = Spoonlicker
+names-pitbull-dataset-96 = Devil
+names-pitbull-dataset-97 = Shepard
+names-pitbull-dataset-98 = Gaster
+names-pitbull-dataset-99 = Roots
+names-pitbull-dataset-100 = Friend
+names-pitbull-dataset-101 = Pookie

Resources/Locale/en-US/_DV/ghost/roles/asakim.ftl

@@ -1,9 +1,9 @@
 ghost-role-information-asakim-name = Asakim Warrior
 ghost-role-information-asakim-description = A genetically enhanced bioweapon, stranded in the sector after cryostasis failure.
 ghost-role-information-asakim-rules =
-    You are a [color=yellow][bold]Free-Agent[/bold][/color]. You may pursue your given objectives, or find your own way through life.
+    You are a [color=yellow][bold]Free-Agent[/bold][/color]. Your objectives will put you in varying levels of conflict with the station.
     You have [color=red]no knowledge[/color] (maybe basic at most) [color=red]of this sector of space, its inhabitants, its factions, or its culture[/color]. While you cannot speak their language, you can understand it.
-    You may kill your targets if you have any, and you may kill to defend yourself and your property. [color=green]Civilians and the innocent are not your enemy[/color], and may be useful to you (if you can get past the language barrier - try an AAC tablet!). Fight with honor.
+    You may kill your targets if you have any, and you may kill to defend yourself and your property. [color=yellow]You should be somewhat wary of crewmembers, especially Security[/color]- but they may be useful to you (if you can get past the language barrier - try an AAC tablet!). Fight with honor.
 asakim-role-briefing =
     You are an Asakim, a genetically-engineered weapon from a distant part of space.
     You've awoken from long-term cryosleep in an unfamiliar sector, and an unfamiliar time.

Resources/Locale/en-US/_DV/recipes/tags.ftl

@@ -37,6 +37,8 @@ construction-graph-tag-ancientbook = Damaged Ancient Book
 
 # Weapons
 construction-graph-tag-silversword = silver sword
+construction-graph-tag-unstable-reactor-core = Unstable Reactor Core
+construction-graph-tag-unstable-reactor-housing = Unstable Reactor Housing
 
 # Other
 construction-graph-tag-jug = jug

Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl

@@ -20,3 +20,6 @@ uplink-dualswords-desc = A set of dual swords made for those who prefer somethin
 
 uplink-leveraction-name = SKL93 AP Bundle
 uplink-leveraction-desc = A bundle containing a SKL93 lever action sniper loaded with AP ammo. Comes with a spare box of standard magnum.
+
+uplink-anaconda-name = Anaconda Bundle
+uplink-anaconda-desc = A inaccurate one handed SMG with a 100 bullet mag. Perfect for laying down supressive fire.

Resources/Locale/en-US/_DV/tools/ERT_selector.ftl

@@ -7,6 +7,9 @@ ert-amber-gun-desc-aegun = One advanced energy gun, for both lethal and non-leth
 ert-amber-gun-name-mixlaser = Mixed Laser bundle
 ert-amber-gun-desc-mixlaser = A disabler SMG together with a Laser Carbine, bundled with a portable recharger.
 
+ert-amber-gun-name-kammerer = Kammerer
+ert-amber-gun-desc-kammerer = Do not be afraid Captain.
+
 ert-medkit-name = First aid kit
 ert-medkit-desc = A simple first aid kit, dont get shoot too hard.
 
@@ -76,6 +79,9 @@ ert-Immolatorkit-desc = The original firestarter bundled together with a portabl
 ert-IK60kit-name = IK-60 bundle
 ert-IK60kit-desc = IK-60-M bundled together with 4 Laser magazines. Watch your ammo consumption.
 
+ert-jackdawkit-name = Jackdaw bundle
+ert-jackdawkit-desc = A caseless rifle, paired with 20 round magazines. Property of Internal Affairs.
+
 ert-GammaC4-name = C4 box
 ert-GammaC4-desc = 4 timed charges of plastic breaching explosives.
 

Resources/Locale/en-US/_Impstation/accessories/thaven-hair.ftl

@@ -1,207 +0,0 @@
-marking-ThavenHairAfro = Afro
-marking-ThavenHairAfro2 = Afro 2
-marking-ThavenHairBigafro = Afro (Large)
-marking-ThavenHairAntenna = Ahoge
-marking-ThavenHairBalding = Balding Hair
-marking-ThavenHairBedhead = Bedhead
-marking-ThavenHairBedheadv2 = Bedhead 2
-marking-ThavenHairBedheadv3 = Bedhead 3
-marking-ThavenHairLongBedhead = Long Bedhead
-marking-ThavenHairLongBedhead2 = Long Bedhead 2
-marking-ThavenHairFloorlengthBedhead = Floorlength Bedhead
-marking-ThavenHairBeehive = Beehive
-marking-ThavenHairBeehive2 = Beehive 2
-marking-ThavenHairBob = Bob Hair
-marking-ThavenHairBob2 = Bob Hair 2
-marking-ThavenHairBobcut = Bob Hair 3
-marking-ThavenHairBob4 = Bob Hair 4
-marking-ThavenHairBob5 = Bob Hair 5
-marking-ThavenHairBobcurl = Bobcurl
-marking-ThavenHairBoddicker = Boddicker
-marking-ThavenHairBowlcut = Bowlcut
-marking-ThavenHairBowlcut2 = Bowlcut 2
-marking-ThavenHairBraid = Braid (Floorlength)
-marking-ThavenHairBraided = Braided
-marking-ThavenHairBraidfront = Braided Front
-marking-ThavenHairBraid2 = Braid (High)
-marking-ThavenHairHbraid = Braid (Low)
-marking-ThavenHairShortbraid = Braid (Short)
-marking-ThavenHairBraidtail = Braided Tail
-marking-ThavenHairBun = Bun Head
-marking-ThavenHairBunhead2 = Bun Head 2
-marking-ThavenHairBun3 = Bun Head 3
-marking-ThavenHairLargebun = Bun (Large)
-marking-ThavenHairManbun = Bun (Manbun)
-marking-ThavenHairTightbun = Bun (Tight)
-marking-ThavenHairBusiness = Business Hair
-marking-ThavenHairBusiness2 = Business Hair 2
-marking-ThavenHairBusiness3 = Business Hair 3
-marking-ThavenHairBusiness4 = Business Hair 4
-marking-ThavenHairBuzzcut = Buzzcut
-marking-ThavenHairCia = CIA
-marking-ThavenHairClassicAfro = Classic Afro
-marking-ThavenHairClassicBigAfro = Classic Big Afro
-marking-ThavenHairClassicBusiness = Classic Business Hair
-marking-ThavenHairClassicciaBusiness = Classic CIA
-marking-ThavenHairClassicCornrows = Classic Cornrows
-marking-ThavenHairClassicCornrows2 = Classic Cornrows 2
-marking-ThavenHairClassicFloorlengthBedhead = Classic Floorlength Bedhead
-marking-ThavenHairClassicLong2 = Classic Long Hair 2
-marking-ThavenHairClassicLong3 = Classic Long Hair 3
-marking-ThavenHairClassicModern = Classic Modern
-marking-ThavenHairClassicMulder = Classic Mulder
-marking-ThavenHairClassicWisp = Classic Wisp
-marking-ThavenHairCoffeeHouse = Coffee House
-marking-ThavenHairCombover = Combover
-marking-ThavenHairCornrows = Cornrows
-marking-ThavenHairCornrows2 = Cornrows 2
-marking-ThavenHairCornrowbun = Cornrow Bun
-marking-ThavenHairCornrowbraid = Cornrow Braid
-marking-ThavenHairCornrowtail = Cornrow Tail
-marking-ThavenHairCrewcut = Crewcut
-marking-ThavenHairCrewcut2 = Crewcut 2
-marking-ThavenHairCurls = Curls
-marking-ThavenHairC = Cut Hair
-marking-ThavenHairDandypompadour = Dandy Pompadour
-marking-ThavenHairDevilock = Devil Lock
-marking-ThavenHairDoublebun = Double Bun
-marking-ThavenHairDoublebunLong = Double Bun Long
-marking-ThavenHairDreads = Dreadlocks
-marking-ThavenHairDrillHair = Drill Hair
-marking-ThavenHairDrillruru = Drillruru
-marking-ThavenHairDrillhairextended = Drill Hair (Extended)
-marking-ThavenHairEmo = Emo
-marking-ThavenHairEmo2 = Emo2
-marking-ThavenHairLongeremo = Longer Emo
-marking-ThavenHairEmofringe = Emo Fringe
-marking-ThavenHairNofade = Fade (None)
-marking-ThavenHairHighfade = Fade (High)
-marking-ThavenHairMedfade = Fade (Medium)
-marking-ThavenHairLowfade = Fade (Low)
-marking-ThavenHairBaldfade = Fade (Bald)
-marking-ThavenHairFeather = Feather
-marking-ThavenHairFather = Father
-marking-ThavenHairSargeant = Flat Top
-marking-ThavenHairFlair = Flair
-marking-ThavenHairBigflattop = Flat Top (Big)
-marking-ThavenHairFlow = Flow Hair
-marking-ThavenHairGelled = Gelled Back
-marking-ThavenHairGentle = Gentle
-marking-ThavenHairHalfbang = Half-banged Hair
-marking-ThavenHairHalfbang2 = Half-banged Hair 2
-marking-ThavenHairHalfshaved = Half-shaved
-marking-ThavenHairHedgehog = Hedgehog Hair
-marking-ThavenHairHimecut = Hime Cut
-marking-ThavenHairHimecut2 = Hime Cut 2
-marking-ThavenHairShorthime = Hime Cut (Short)
-marking-ThavenHairHimeup = Hime Updo
-marking-ThavenHairHitop = Hitop
-marking-ThavenHairJade = Jade
-marking-ThavenHairJensen = Jensen Hair
-marking-ThavenHairJoestar = Joestar
-marking-ThavenHairKeanu = Keanu Hair
-marking-ThavenHairKusanagi = Kusanagi Hair
-marking-ThavenHairLongBow = Long Bow
-marking-ThavenHairLong = Long Hair 1
-marking-ThavenHairLong2 = Long Hair 2
-marking-ThavenHairLong3 = Long Hair 3
-marking-ThavenHairLongWithBundles = Long With Bundles
-marking-ThavenHairLongovereye = Long Over Eye
-marking-ThavenHairLbangs = Long Bangs
-marking-ThavenHairLongemo = Long Emo
-marking-ThavenHairLongfringe = Long Fringe
-marking-ThavenHairLongsidepart = Long Side Part
-marking-ThavenHairMediumSidepart = Medium Side Part
-marking-ThavenHairMegaeyebrows = Mega Eyebrows
-marking-ThavenHairMessy = Messy
-marking-ThavenHairModern = Modern
-marking-ThavenHairMohawk = Mohawk
-marking-ThavenHairNitori = Nitori
-marking-ThavenHairReversemohawk = Mohawk (Reverse)
-marking-ThavenHairUnshavenMohawk = Mohawk (Unshaven)
-marking-ThavenHairMulder = Mulder
-marking-ThavenHairOdango = Odango
-marking-ThavenHairOmbre = Ombre
-marking-ThavenHairOneshoulder = One Shoulder
-marking-ThavenHairShortovereye = Over Eye
-marking-ThavenHairOxton = Oxton
-marking-ThavenHairParted = Parted
-marking-ThavenHairPart = Parted (Side)
-marking-ThavenHairKagami = Pigtails
-marking-ThavenHairPigtails = Pigtails 2
-marking-ThavenHairPigtails2 = Pigtails 3
-marking-ThavenHairPixie = Pixie Cut
-marking-ThavenHairPompadour = Pompadour
-marking-ThavenHairBigpompadour = Pompadour (Big)
-marking-ThavenHairPonytail = Ponytail
-marking-ThavenHairPonytail2 = Ponytail 2
-marking-ThavenHairPonytail3 = Ponytail 3
-marking-ThavenHairPonytail4 = Ponytail 4
-marking-ThavenHairPonytail5 = Ponytail 5
-marking-ThavenHairPonytail6 = Ponytail 6
-marking-ThavenHairPonytail7 = Ponytail 7
-marking-ThavenHairHighponytail = Ponytail (High)
-marking-ThavenHairStail = Ponytail (Short)
-marking-ThavenHairLongstraightponytail = Ponytail (Long)
-marking-ThavenHairCountry = Ponytail (Country)
-marking-ThavenHairFringetail = Ponytail (Fringe)
-marking-ThavenHairSidetail = Ponytail (Side)
-marking-ThavenHairSidetail2 = Ponytail (Side) 2
-marking-ThavenHairSidetail3 = Ponytail (Side) 3
-marking-ThavenHairSidetail4 = Ponytail (Side) 4
-marking-ThavenHairSpikyponytail = Ponytail (Spiky)
-marking-ThavenHairPoofy = Poofy
-marking-ThavenHairBald = Bald
-marking-ThavenHairClassicCia = Classic CIA
-marking-ThavenHairQuiff = Quiff
-marking-ThavenHairRonin = Ronin
-marking-ThavenHairShaped = Shaped
-marking-ThavenHairShaved = Shaved
-marking-ThavenHairShavedMohawk = Shaved Mohawk
-marking-ThavenHairShavedpart = Shaved Part
-marking-ThavenHairShortbangs = Short Bangs
-marking-ThavenHairA = Short Hair
-marking-ThavenHairShorthair2 = Short Hair 2
-marking-ThavenHairShorthair3 = Short Hair 3
-marking-ThavenHairShorthair9 = Short Hair 9
-marking-ThavenHairD = Short Hair 4
-marking-ThavenHairE = Short Hair 5
-marking-ThavenHairF = Short Hair 6
-marking-ThavenHairShorthairg = Short Hair 7
-marking-ThavenHair80s = Short Hair 80s
-marking-ThavenHairRosa = Short Hair Rosa
-marking-ThavenHairB = Shoulder-length Hair
-marking-ThavenHairShoulderLengthOverEye = Shoulder-length Over Eye
-marking-ThavenHairSidecut = Sidecut
-marking-ThavenHairSkinhead = Skinhead
-marking-ThavenHairProtagonist = Slightly Long Hair
-marking-ThavenHairSpikey = Spiky
-marking-ThavenHairSpiky = Spiky 2
-marking-ThavenHairSpiky2 = Spiky 3
-marking-ThavenHairSpookyLong = Spooky Long
-marking-ThavenHairSwept = Swept Back Hair
-marking-ThavenHairSwept2 = Swept Back Hair 2
-marking-ThavenHairTailed = Tailed
-marking-ThavenHairThinning = Thinning
-marking-ThavenHairThinningfront = Thinning (Front)
-marking-ThavenHairThinningrear = Thinning (Rear)
-marking-ThavenHairTopknot = Topknot
-marking-ThavenHairTressshoulder = Tress Shoulder
-marking-ThavenHairTrimmed = Trimmed
-marking-ThavenHairTrimflat = Trim Flat
-marking-ThavenHairTwintail = Twintails
-marking-ThavenHairTwoStrands = Two Strands
-marking-ThavenHairUndercut = Undercut
-marking-ThavenHairUndercutleft = Undercut Left
-marking-ThavenHairUndercutright = Undercut Right
-marking-ThavenHairUneven = Uneven
-marking-ThavenHairUnkept = Unkept
-marking-ThavenHairUpdo = Updo
-marking-ThavenHairVlong = Very Long Hair
-marking-ThavenHairLongest = Very Long Hair 2
-marking-ThavenHairLongest2 = Very Long Over Eye
-marking-ThavenHairVeryshortovereyealternate = Very Short Over Eye
-marking-ThavenHairVlongfringe = Very Long with Fringe
-marking-ThavenHairVolaju = Volaju
-marking-ThavenHairWisp = Wisp
-marking-ThavenHairFrenchbraid = French Braid

Resources/Locale/en-US/_Impstation/markings/thaven.ftl

@@ -1,27 +0,0 @@
-marking-ThavenEars1-ears1 = Small Ears
-marking-ThavenEars1 = Small Ears
-
-marking-ThavenEars2-ears2 = Medium Ears
-marking-ThavenEars2 = Medium Ears
-
-marking-ThavenEars3-ears3 = Long Ears
-marking-ThavenEars3 = Long Ears
-
-marking-ThavenEars4-ears4 = Droopy Ears
-marking-ThavenEars4 = Droopy Ears
-
-marking-ThavenPiercings-piercings = Helix Piercing
-marking-ThavenPiercings =  Helix Piercing
-
-marking-ThavenPiercings2-piercings2 = Hoop Piercing
-marking-ThavenPiercings2 = Hoop Piercing
-
-marking-ThavenChestTattoo1-chesttat1 = Back Tattoo
-marking-ThavenChestTattoo1 = Back Tattoo
-
-marking-ThavenLArmTattoo1-larmtat1 = Arm Band (Left)
-marking-ThavenLArmTattoo1 = Arm Band (Left)
-
-marking-ThavenRArmTattoo1-larmtat1 = Arm Band (Right)
-marking-ThavenRArmTattoo1 =  Arm Band (Right)
-

Resources/Locale/en-US/_MARCO/markings/thaven.ftl

@@ -0,0 +1,877 @@
+# Chest
+
+marking-BodyhairThaven = Body Hair
+marking-BodyhairThaven-hair = Body Hair
+
+marking-Gills = Gills
+marking-Gills-gills = Gills
+
+marking-ThavenAbs = Muscles
+marking-ThavenAbs-muscular = Muscles
+
+marking-ThavenBiteMark = Big Bite Scar
+marking-ThavenBiteMark-bitemark = Big Bite Scar
+
+marking-ThavenBodyStripes = Pinstripes
+marking-ThavenBodyStripes-stripes = Pinstripes
+
+marking-ThavenChestScales = Scales
+marking-ThavenChestScales-scales = Scales
+
+marking-ThavenChestTattoo1 = Back Tattoo
+marking-ThavenChestTattoo1-tat1 = Back Tattoo
+
+marking-ThavenSpinechill = Spinechill
+marking-ThavenSpinechill-spinechill = Spinechill
+
+marking-ThavenSpines = Spines
+marking-ThavenSpines-spines = Spines
+
+marking-ThavenTattooWave = Wave Tattoo
+marking-ThavenTattooWave-tattoowave = Wave Tattoo
+
+marking-ThavenTattooVines = Vine Tattoo
+marking-ThavenTattooVines-tattoovines = Vine Tattoo
+
+marking-ThavenTiger = Tiger Stripes
+marking-ThavenTiger-tiger1 = Tiger Belly
+marking-ThavenTiger-tiger2 = Tiger Stripes
+
+marking-ThavenTopSurgery = Top Surgery
+marking-ThavenTopSurgery-nonaturals = Top Surgery
+
+# Head
+
+marking-ThavenHeadCap = Dappled Crown
+marking-ThavenHeadCap-cap1 = Crown
+marking-ThavenHeadCap-cap2 = Dapples
+
+marking-ThavenHeadScales = Scales
+marking-ThavenHeadScales-scales = Scales
+
+marking-ThavenHeadStripes = Pinstripes
+marking-ThavenHeadStripes-stripes = Pinstripes
+
+marking-ThavenShadow = Gloomy
+marking-ThavenShadow-shadowthaven = Gloomy
+
+# Snout
+
+# Eyes
+
+marking-SharkminnowEyeliner = Sharkminnow Eyeliner
+marking-SharkminnowEyeliner-sharkminnoweyeliner = Sharkminnow Eyeliner
+
+marking-ThavenEyesSharkminnow = Sharkminnow Eyes
+marking-ThavenEyesSharkminnow-sharkminnow = Sharkminnow Eyes
+
+marking-ThavenEyesSharkminnowGlowing = Glowing Sharkminnow Eyes
+marking-ThavenEyesSharkminnowGlowing-sharkminnow = Glowing Sharkminnow Eyes
+
+marking-ThavenLEyeGlow = Glowing Eye (Left)
+marking-ThavenLEyeGlow-glowleft = Glowing Eye (Left)
+
+marking-ThavenREyeGlow = Glowing Eye (Right)
+marking-ThavenREyeGlow-glowright = Glowing Eye (Right)
+
+# RArm
+
+marking-ThavenRArmScales = Scales (Right Arm)
+marking-ThavenRArmScales-scales = Scales (Right Arm)
+
+marking-ThavenRArmTattoo1 =  Arm Band (Right)
+marking-ThavenRArmTattoo1-tat1 = Arm Band (Right)
+
+marking-ThavenTigerRArm = Tiger Stripes (Right)
+marking-ThavenTigerRArm-tiger = Tiger Stripes (Right)
+
+# LArm
+
+marking-ThavenLArmScales = Scales (Left Arm)
+marking-ThavenLArmScales-scales = Scales (Left Arm)
+
+marking-ThavenLArmTattoo1 = Arm Band (Left)
+marking-ThavenLArmTattoo1-tat1 = Arm Band (Left)
+
+marking-ThavenTigerLArm = Tiger Stripes (Left)
+marking-ThavenTigerLArm-tiger = Tiger Stripes (Left)
+
+# RLeg
+
+marking-ThavenRLegScales = Scales (Right)
+marking-ThavenRLegScales-scales = Scales (Right)
+
+# LLeg
+
+marking-ThavenLLegScales = Scales (Left)
+marking-ThavenLLegScales-scales = Scales (Left)
+
+# UndergarmentBottom
+
+marking-UnderwearBriefsT = Briefs
+marking-UnderwearBriefsT-briefs = Underwear
+
+marking-UnderwearDefaultT = Boxers
+marking-UnderwearDefaultT-boxers = Underwear
+
+marking-UnderwearLowridersT = Lowriders
+marking-UnderwearLowridersT-lowriders = Underwear
+
+marking-UnderwearSatinT = Satin
+marking-UnderwearSatinT-satin = Underwear
+
+marking-UnderwearTangaT = Tanga
+marking-UnderwearTangaT-tanga = Underwear
+
+# UndergarmentTop
+
+marking-UndergarmentTopBinderT = Binder
+marking-UndergarmentTopBinderT-binder = Binder
+
+marking-UndershirtBraClassicT = Bra
+marking-UndershirtBraClassicT-classic = Bra
+
+marking-UndershirtBraSportsT = Bra (Sports)
+marking-UndershirtBraSportsT-sports = Bra
+
+marking-UndershirtBraStraplessT = Bra (Strapless)
+marking-UndershirtBraStraplessT-strapless = Bra
+
+marking-UndershirtDefaultT = Undershirt
+marking-UndershirtDefaultT-undershirt = Undershirt
+
+marking-UndershirtGrossSleevelessT = Tanktop (Gross)
+marking-UndershirtGrossSleevelessT-grosssleeveless = Tanktop
+
+marking-UndershirtNanotrasenT = Undershirt (Nanotrasen)
+marking-UndershirtNanotrasenT-nanotrasen = Undershirt
+
+marking-UndershirtRolledT = Undershirt (Cropped)
+marking-UndershirtRolledT-rolledundershirt = Undershirt
+
+# LFoot
+
+# RFoot
+
+# LHand
+
+# RHand
+
+# FacialHair
+
+# Hair
+
+marking-BurqaSolidThaven = Burqa
+marking-BurqaSolidThaven-burqa = Burqa
+
+marking-HairFloralLongThaven = Floral hair (Long)
+marking-HairFloralLongThaven-florallong1 = Hair
+marking-HairFloralLongThaven-florallong2 = Flowers
+
+marking-HairFloralMidThaven = Floral hair (Medium)
+marking-HairFloralMidThaven-floralmid1 = Hair
+marking-HairFloralMidThaven-floralmid2 = Flowers
+
+marking-HijabFashionableThaven = Hijab (Fashionable)
+marking-HijabFashionableThaven-hijabchic = Hijab (Fashionable)
+
+marking-HijabSimpleThaven = Hijab (Simple)
+marking-HijabSimpleThaven-hijabsimple = Hijab (Simple)
+
+marking-MessyPonytailThaven = Messy Ponytail
+marking-MessyPonytailThaven-messyponytail = Messy Ponytail
+
+marking-NiqabThaven = Niqab
+marking-NiqabThaven-niqab = Niqab
+
+marking-ThavenHair80s = Short Hair 80s
+marking-ThavenHair80s-80s = Short Hair 80s
+
+marking-ThavenHairA = Short Hair
+marking-ThavenHairA-a = Short Hair
+# did anyone else hear just one single angelic note
+
+marking-ThavenHairB = Shoulder-length Hair
+marking-ThavenHairB-b = Shoulder-length Hair
+
+marking-ThavenHairBald = Bald
+marking-ThavenHairBald-bald = Bald
+
+marking-ThavenHairBaldfade = Fade (Bald)
+marking-ThavenHairBaldfade-baldface = Fade (Bald)
+
+marking-ThavenHairBalding = Balding Hair
+marking-ThavenHairBalding-e = Balding Hair
+
+marking-ThavenHairBedhead = Bedhead
+marking-ThavenHairBedhead-bedhead = Bedhead
+
+marking-ThavenHairBedheadv2 = Bedhead 2
+marking-ThavenHairBedheadv2-bedhead2 = Bedhead 2
+
+marking-ThavenHairBedheadv3 = Bedhead 3
+marking-ThavenHairBedheadv3-bedhead3 = Bedhead 3
+
+marking-ThavenHairBeehive = Beehive
+marking-ThavenHairBeehive-beehive = Beehive
+
+marking-ThavenHairBeehive2 = Beehive 2
+marking-ThavenHairBeehive2-beehive2 = Beehive 2
+
+marking-ThavenHairBigflattop = Flat Top (Big)
+marking-ThavenHairBigflattop-bigflattop = Flat Top (Big)
+
+marking-ThavenHairBigpompadour = Pompadour (Big)
+marking-ThavenHairBigpompadour-bigpompadour = Pompadour (Big)
+
+marking-ThavenHairBob = Bob Hair
+marking-ThavenHairBob-bob = Bob Hair
+
+marking-ThavenHairBob2 = Bob Hair 2
+marking-ThavenHairBob2-bob2 = Bob Hair 2
+
+marking-ThavenHairBob4 = Bob Hair 4
+marking-ThavenHairBob4-bob4 = Bob Hair 4
+
+marking-ThavenHairBob5 = Bob Hair 5
+marking-ThavenHairBob5-bob5 = Bob Hair 5
+
+marking-ThavenHairBobcurl = Bobcurl
+marking-ThavenHairBobcurl-bobcurl = Bobcurl
+
+marking-ThavenHairBobcut = Bob Hair 3
+marking-ThavenHairBobcut-bobcut = Bob Hair 3
+
+marking-ThavenHairBowlcut = Bowlcut
+marking-ThavenHairBowlcut-bowlcut = Bowlcut
+
+marking-ThavenHairBowlcut2 = Bowlcut 2
+marking-ThavenHairBowlcut2-bowlcut2 = Bowlcut 2
+
+marking-ThavenHairBraid = Braid (Floorlength)
+marking-ThavenHairBraid-braid = Braid (Floorlength)
+
+marking-ThavenHairBraid2 = Braid (High)
+marking-ThavenHairBraid2-braid2 = Braid (High)
+
+marking-ThavenHairBraided = Braided
+marking-ThavenHairBraided-braided = Braided
+
+marking-ThavenHairBraidfront = Braided Front
+marking-ThavenHairBraidfront-braidfront = Braided Front
+
+marking-ThavenHairBraidtail = Braided Tail
+marking-ThavenHairBraidtail-braidtail = Braided Tail
+
+marking-ThavenHairBun = Bun Head
+marking-ThavenHairBun-bun = Bun Head
+
+marking-ThavenHairBun3 = Bun Head 3
+marking-ThavenHairBun3-bun3 = Bun Head 3
+
+marking-ThavenHairBunhead2 = Bun Head 2
+marking-ThavenHairBunhead2-bunhead2 = Bun Head 2
+
+marking-ThavenHairBusiness = Business Hair
+marking-ThavenHairBusiness-business = Business Hair
+
+marking-ThavenHairBusiness2 = Business Hair 2
+marking-ThavenHairBusiness2-business2 = Business Hair 2
+
+marking-ThavenHairBusiness3 = Business Hair 3
+marking-ThavenHairBusiness3-business3 = Business Hair 3
+
+marking-ThavenHairBusiness4 = Business Hair 4
+marking-ThavenHairBusiness4-business4 = Business Hair 4
+
+marking-ThavenHairBuzzcut = Buzzcut
+marking-ThavenHairBuzzcut-buzzcut = Buzzcut
+
+marking-ThavenHairC = Cut Hair
+marking-ThavenHairC-c = Cut Hair
+
+marking-ThavenHairCia = CIA
+marking-ThavenHairCia-cia = CIA
+
+marking-ThavenHairClassicAfro = Classic Afro
+marking-ThavenHairClassicAfro-classicafro = Classic Afro
+
+marking-ThavenHairClassicCia = Classic CIA
+marking-ThavenHairClassicCia-classiccia = Classic CIA
+
+marking-ThavenHairClassicciaBusiness = Classic CIA Business
+marking-ThavenHairClassicciaBusiness-classicciabusiness = Classic CIA Business
+
+marking-ThavenHairClassicCornrows = Classic Cornrows
+marking-ThavenHairClassicCornrows-classiccornrows = Classic Cornrows
+
+marking-ThavenHairClassicCornrows2 = Classic Cornrows 2
+marking-ThavenHairClassicCornrows2-cornrows2 = Classic Cornrows 2
+
+marking-ThavenHairClassicFloorlengthBedhead = Classic Floorlength Bedhead
+marking-ThavenHairClassicFloorlengthBedhead-classicfloorlengthbedhead = Classic Floorlength Bedhead
+
+marking-ThavenHairClassicLong2 = Classic Long Hair 2
+marking-ThavenHairClassicLong2-classiclong2 = Classic Long Hair 2
+
+marking-ThavenHairClassicLong3 = Classic Long Hair 3
+marking-ThavenHairClassicLong3-classiclong3 = Classic Long Hair 3
+
+marking-ThavenHairClassicModern = Classic Modern
+marking-ThavenHairClassicModern-modern = Classic Modern
+
+marking-ThavenHairClassicMulder = Classic Mulder
+marking-ThavenHairClassicMulder-classicmulder = Classic Mulder
+
+marking-ThavenHairClassicWisp = Classic Wisp
+marking-ThavenHairClassicWisp-classicwisp = Classic Wisp
+
+marking-ThavenHairCoffeeHouse = Coffee House
+marking-ThavenHairCoffeeHouse-coffeehouse = Coffee House
+
+marking-ThavenHairCombover = Combover
+marking-ThavenHairCombover-combover = Combover
+
+marking-ThavenHairCornrowbraid = Cornrow Braid
+marking-ThavenHairCornrowbraid-cornrowbraid = Cornrow Braid
+
+marking-ThavenHairCornrowbun = Cornrow Bun
+marking-ThavenHairCornrowbun-cornrowbun = Cornrow Bun
+
+marking-ThavenHairCornrows = Cornrows
+marking-ThavenHairCornrows-cornrows = Cornrows
+
+marking-ThavenHairCornrows2 = Cornrows 2
+marking-ThavenHairCornrows2-cornrows2 = Cornrows 2
+
+marking-ThavenHairCornrowtail = Cornrow Tail
+marking-ThavenHairCornrowtail-cornrowtail = Cornrow Tail
+
+marking-ThavenHairCountry = Ponytail (Country)
+marking-ThavenHairCountry-country = Ponytail (Country)
+
+marking-ThavenHairCrewcut = Crewcut
+marking-ThavenHairCrewcut-crewcut = Crewcut
+
+marking-ThavenHairCrewcut2 = Crewcut 2
+marking-ThavenHairCrewcut2-crewcut2 = Crewcut 2
+
+marking-ThavenHairCurls = Curls
+marking-ThavenHairCurls-curls = Curls
+
+marking-ThavenHairDandypompadour = Dandy Pompadour
+marking-ThavenHairDandypompadour-dandypompadour = Dandy Pompadour
+
+marking-ThavenHairDevilock = Devil Lock
+marking-ThavenHairDevilock-devilock = Devil Lock
+
+marking-ThavenHairDoublebun = Double Bun
+marking-ThavenHairDoublebun-doublebun = Double Bun
+
+marking-ThavenHairDoublebunLong = Double Bun Long
+marking-ThavenHairDoublebunLong-doublebunlong = Double Bun Long
+
+marking-ThavenHairDreads = Dreadlocks
+marking-ThavenHairDreads-dreads = Dreadlocks
+
+marking-ThavenHairDrillHair = Drill Hair
+marking-ThavenHairDrillHair-drillhair = Drill Hair
+
+marking-ThavenHairDrillhairextended = Drill Hair (Extended)
+marking-ThavenHairDrillhairextended-drillhairextended = Drill Hair (Extended)
+
+marking-ThavenHairDrillruru = Drillruru
+marking-ThavenHairDrillruru-drillruru = Drillruru
+
+marking-ThavenHairDyedLong = Dyed Long
+marking-ThavenHairDyedLong-dyedlong1 = Dyed Long
+
+marking-ThavenHairDyedShort = Dyed Short
+marking-ThavenHairDyedShort-dyedshort1 = Dyed Short
+
+marking-ThavenHairEmo2 = Emo
+marking-ThavenHairEmo2-emo2 = Emo
+
+marking-ThavenHairEmofringe = Emo Fringe
+marking-ThavenHairEmofringe-emofringe = Emo Fringe
+
+marking-ThavenHairFather = Father
+marking-ThavenHairFather-father = Father
+
+marking-ThavenHairFeather = Feather
+marking-ThavenHairFeather-feather = Feather
+
+marking-ThavenHairFlair = Flair
+marking-ThavenHairFlair-flair = Flair
+
+marking-ThavenHairFloorlengthBedhead = Floorlength Bedhead
+marking-ThavenHairFloorlengthBedhead-floorlengthbedhead = Floorlength Bedhead
+
+marking-ThavenHairFlow = Flow Hair
+marking-ThavenHairFlow-f = Flow Hair
+
+marking-ThavenHairFrenchbraid = French Braid
+marking-ThavenHairFrenchbraid-frenchbraid = French Braid
+
+marking-ThavenHairFringetail = Ponytail (Fringe)
+marking-ThavenHairFringetail-fringetail = Ponytail (Fringe)
+
+marking-ThavenHairGelled = Gelled Back
+marking-ThavenHairGelled-gelled = Gelled Back
+
+marking-ThavenHairGentle = Gentle
+marking-ThavenHairGentle-gentle = Gentle
+
+marking-ThavenHairHalfbang = Half-banged Hair
+marking-ThavenHairHalfbang-halfbang = Half-banged Hair
+
+marking-ThavenHairHalfbang2 = Half-banged Hair 2
+marking-ThavenHairHalfbang2-halfbang2 = Half-banged Hair 2
+
+marking-ThavenHairHalfshaved = Half-shaved
+marking-ThavenHairHalfshaved-halfshaved = Half-shaved
+
+marking-ThavenHairHalfUpLong = Half-Up (Long)
+marking-ThavenHairHalfUpLong-halfuplong = Half-Up (Long)
+
+marking-ThavenHairHalfUpShort = Half-Up (Short)
+marking-ThavenHairHalfUpShort-halfupshort = Half-Up (Short)
+
+marking-ThavenHairHalfUpUndercut = Half-Up (Undercut)
+marking-ThavenHairHalfUpUndercut-halfupundercut = Half-Up (Undercut)
+
+marking-ThavenHairHbraid = Braid (Low)
+marking-ThavenHairHbraid-hbraid = Braid (Low)
+
+marking-ThavenHairHedgehog = Hedgehog Hair
+marking-ThavenHairHedgehog-hedgehog = Hedgehog Hair
+
+marking-ThavenHairHighfade = Fade (High)
+marking-ThavenHairHighfade-highfade = Fade (High)
+
+marking-ThavenHairHighponytail = Ponytail (High)
+marking-ThavenHairHighponytail-highponytail = Ponytail (High)
+
+marking-ThavenHairHimecut = Hime Cut
+marking-ThavenHairHimecut-himecut = Hime Cut
+
+marking-ThavenHairHimecut2 = Hime Cut 2
+marking-ThavenHairHimecut2-himecut2 = Hime Cut 2
+
+marking-ThavenHairHimeup = Hime Updo
+marking-ThavenHairHimeup-himeup = Hime Updo
+
+marking-ThavenHairHitop = Hitop
+marking-ThavenHairHitop-hitop = Hitop
+
+marking-ThavenHairJade = Jade
+marking-ThavenHairJade-jade = Jade
+
+marking-ThavenHairJensen = Jensen Hair
+marking-ThavenHairJensen-jensen = Jensen Hair
+
+marking-ThavenHairJoestar = Joestar
+marking-ThavenHairJoestar-joestar = Joestar
+
+marking-ThavenHairKagami = Pigtails
+marking-ThavenHairKagami-kagami = Pigtails
+
+marking-ThavenHairKeanu = Keanu Hair
+marking-ThavenHairKeanu-keanu = Keanu Hair
+
+marking-ThavenHairKusanagi = Kusanagi Hair
+marking-ThavenHairKusanagi-kusanagi = Kusanagi Hair
+
+marking-ThavenHairLargebun = Bun (Large)
+marking-ThavenHairLargebun-largebun = Bun (Large)
+
+marking-ThavenHairLbangs = Long Bangs
+marking-ThavenHairLbangs-lbangs = Long Bangs
+
+marking-ThavenHairLong = Long Hair 1
+marking-ThavenHairLong-long = Long Hair 1
+
+marking-ThavenHairLong2 = Long Hair 2
+marking-ThavenHairLong2-long2 = Long Hair 2
+
+marking-ThavenHairLong3 = Long Hair 3
+marking-ThavenHairLong3-long3 = Long Hair 3
+
+marking-ThavenHairLongBedhead = Long Bedhead
+marking-ThavenHairLongBedhead-longbedhead = Long Bedhead
+
+marking-ThavenHairLongBedhead2 = Long Bedhead 2
+marking-ThavenHairLongBedhead2-longbedhead2 = Long Bedhead 2
+
+marking-ThavenHairLongeremo = Longer Emo
+marking-ThavenHairLongeremo-longeremo = Longer Emo
+
+marking-ThavenHairLongest = Very Long Hair 2
+marking-ThavenHairLongest-longest = Very Long Hair 2
+
+marking-ThavenHairLongest2 = Very Long Over Eye
+marking-ThavenHairLongest2-longest2 = Very Long Over Eye
+
+marking-ThavenHairLongfringe = Long Fringe
+marking-ThavenHairLongfringe-longfringe = Long Fringe
+
+marking-ThavenHairLongovereye = Long Over Eye
+marking-ThavenHairLongovereye-longovereye = Long Over Eye
+
+marking-ThavenHairLongsidepart = Long Side Part
+
+marking-ThavenHairLongstraightponytail = Ponytail (Long)
+marking-ThavenHairLongstraightponytail-longsidepart = Ponytail (Long)
+
+marking-ThavenHairLongWithBundles = Long With Bundles
+marking-ThavenHairLongWithBundles-longbundled = Long With Bundles
+
+marking-ThavenHairLowfade = Fade (Low)
+marking-ThavenHairLowfade-lowfade = Fade (Low)
+
+marking-ThavenHairManbun = Bun (Manbun)
+marking-ThavenHairManbun-manbun = Bun (Manbun)
+
+marking-ThavenHairMedfade = Fade (Medium)
+marking-ThavenHairMedfade-medfade = Fade (Medium)
+
+marking-ThavenHairMediumSidepart = Medium Side Part
+marking-ThavenHairMediumSidepart-mediumsidepart = Medium Side Part
+
+marking-ThavenHairMegaeyebrows = Mega Eyebrows
+marking-ThavenHairMegaeyebrows-megaeyebrows = Mega Eyebrows
+
+marking-ThavenHairMessy = Messy
+marking-ThavenHairMessy-messy = Messy
+
+marking-ThavenHairMidPartLong = Middle Part (Long)
+marking-ThavenHairMidPartLong-midpartlong = Middle Part (Long)
+
+marking-ThavenHairMidPartLonger = Middle Part (Longer)
+marking-ThavenHairMidPartLonger-midpartlonger = Middle Part (Longer)
+
+marking-ThavenHairModern = Modern
+marking-ThavenHairModern-modern = Modern
+
+marking-ThavenHairMohawk = Mohawk
+marking-ThavenHairMohawk-d = Mohawk
+
+marking-ThavenHairMulder = Mulder
+marking-ThavenHairMulder-mulder = Mulder
+
+marking-ThavenHairMullet = Mullet
+marking-ThavenHairMullet-mullet = Mullet
+
+marking-ThavenHairMulletSideshave = Mullet (Sideshave)
+marking-ThavenHairMulletSideshave-mulletsideshave = Mullet (Sideshave)
+
+marking-ThavenHairNitori = Nitori
+marking-ThavenHairNitori-nitori = Nitori
+
+marking-ThavenHairNofade = Fade (None)
+marking-ThavenHairNofade-nofade = Fade (None)
+
+marking-ThavenHairOdango = Odango
+marking-ThavenHairOdango-odango = Odango
+
+marking-ThavenHairOmbre = Ombre
+marking-ThavenHairOmbre-ombre = Ombre
+
+marking-ThavenHairOneshoulder = One Shoulder
+marking-ThavenHairOneshoulder-oneshoulder = One Shoulder
+
+marking-ThavenHairOxton = Oxton
+marking-ThavenHairOxton-oxton = Oxton
+
+marking-ThavenHairPart = Parted (Side)
+marking-ThavenHairPart-part = Parted (Side)
+
+marking-ThavenHairParted = Parted
+marking-ThavenHairParted-parted = Parted
+
+marking-ThavenHairPigtails = Pigtails 2
+marking-ThavenHairPigtails-pigtails = Pigtails 2
+
+marking-ThavenHairPigtails2 = Pigtails 3
+marking-ThavenHairPigtails2-pigtails2 = Pigtails 3
+
+marking-ThavenHairPixie = Pixie Cut
+marking-ThavenHairPixie-pixie = Pixie Cut
+
+marking-ThavenHairPompadour = Pompadour
+marking-ThavenHairPompadour-pompadour = Pompadour
+
+marking-ThavenHairPonytail = Ponytail
+marking-ThavenHairPonytail-ponytail = Ponytail
+
+marking-ThavenHairPonytail2 = Ponytail 2
+marking-ThavenHairPonytail2-ponytail2 = Ponytail 2
+
+marking-ThavenHairPonytail3 = Ponytail 3
+marking-ThavenHairPonytail3-ponytail3 = Ponytail 3
+
+marking-ThavenHairPonytail4 = Ponytail 4
+marking-ThavenHairPonytail4-ponytail4 = Ponytail 4
+
+marking-ThavenHairPonytail5 = Ponytail 5
+marking-ThavenHairPonytail5-ponytail5 = Ponytail 5
+
+marking-ThavenHairPonytail6 = Ponytail 6
+marking-ThavenHairPonytail6-ponytail6 = Ponytail 6
+
+marking-ThavenHairPonytail7 = Ponytail 7
+marking-ThavenHairPonytail7-ponytail7 = Ponytail 7
+
+marking-ThavenHairPoofy = Poofy
+marking-ThavenHairPoofy-poofy = Poofy
+
+marking-ThavenHairProtagonist = Slightly Long Hair
+marking-ThavenHairProtagonist-protagonist = Slightly Long Hair
+
+marking-ThavenHairQuiff = Quiff
+marking-ThavenHairQuiff-quiff = Quiff
+
+marking-ThavenHairReversemohawk = Mohawk (Reverse)
+marking-ThavenHairReversemohawk-reversemohawk = Mohawk (Reverse)
+
+marking-ThavenHairRonin = Ronin
+marking-ThavenHairRonin-ronin = Ronin
+
+marking-ThavenHairRosa = Short Hair Rosa
+marking-ThavenHairRosa-rosa = Short Hair Rosa
+
+marking-ThavenHairSargeant = Flat Top
+marking-ThavenHairSargeant-sargeant = Flat Top
+
+marking-ThavenHairShaved = Shaved
+marking-ThavenHairShaved-shaved = Shaved
+
+marking-ThavenHairShavedMohawk = Shaved Mohawk
+marking-ThavenHairShavedMohawk-shavedmohawk = Shaved Mohawk
+
+marking-ThavenHairShavedpart = Shaved Part
+marking-ThavenHairShavedpart-shavedpart = Shaved Part
+
+marking-ThavenHairShortbangs = Short Bangs
+marking-ThavenHairShortbangs-shortbangs = Short Bangs
+
+marking-ThavenHairShortbraid = Braid (Short)
+marking-ThavenHairShortbraid-shortbraid = Braid (Short)
+
+marking-ThavenHairShorthair2 = Short Hair 2
+marking-ThavenHairShorthair2-shorthair2 = Short Hair 2
+
+marking-ThavenHairShorthair3 = Short Hair 3
+marking-ThavenHairShorthair3-shorthair3 = Short Hair 3
+
+marking-ThavenHairShorthair9 = Short Hair 9
+marking-ThavenHairShorthair9-shorthair9 = Short Hair 9
+
+marking-ThavenHairShorthime = Hime Cut (Short)
+marking-ThavenHairShorthime-shorthime = Hime Cut (Short)
+
+marking-ThavenHairShortovereye = Over Eye
+marking-ThavenHairShortovereye-shortovereye = Over Eye
+
+marking-ThavenHairShoulderLengthOverEye = Shoulder-length Over Eye
+marking-ThavenHairShoulderLengthOverEye-shoulderlengthovereye = Shoulder-length Over Eye
+
+marking-ThavenHairSidecut = Sidecut
+marking-ThavenHairSidecut-sidecut = Sidecut
+
+marking-ThavenHairSideshaveCurly = Sideshave (Curly)
+marking-ThavenHairSideshaveCurly-sideshavecurly = Sideshave (Curly)
+
+marking-ThavenHairSidetail = Ponytail (Side)
+marking-ThavenHairSidetail-sidetail = Ponytail (Side)
+
+marking-ThavenHairSidetail2 = Ponytail (Side) 2
+marking-ThavenHairSidetail2-sidetail2 = Ponytail (Side) 2
+
+marking-ThavenHairSidetail3 = Ponytail (Side) 3
+marking-ThavenHairSidetail3-sidetail3 = Ponytail (Side) 3
+
+marking-ThavenHairSidetail4 = Ponytail (Side) 4
+marking-ThavenHairSidetail4-sidetail4 = Ponytail (Side) 4
+
+marking-ThavenHairSkinhead = High And Tight
+marking-ThavenHairSkinhead-skinhead = High And Tight
+
+marking-ThavenHairSpiky = Spiky 2
+marking-ThavenHairSpiky-spiky = Spiky 2
+
+marking-ThavenHairSpikyponytailLong = Ponytail (Spiky Long)
+marking-ThavenHairSpikyponytailLong-spikyponytaillong = Ponytail (Spiky Long)
+
+marking-ThavenHairSpikyponytail = Ponytail (Spiky)
+marking-ThavenHairSpikyponytail-spikyponytail = Ponytail (Spiky)
+
+marking-ThavenHairSpookyLong = Spooky Long
+marking-ThavenHairSpookyLong-spookylong = Spooky Long
+
+marking-ThavenHairStail = Ponytail (Short)
+marking-ThavenHairStail-stail = Ponytail (Short)
+
+marking-ThavenHairSwept = Swept Back Hair
+marking-ThavenHairSwept-swept = Swept Back Hair
+
+marking-ThavenHairSwept2 = Swept Back Hair 2
+marking-ThavenHairSwept2-swept2 = Swept Back Hair 2
+
+marking-ThavenHairTailed = Tailed
+marking-ThavenHairTailed-tailed = Tailed
+
+marking-ThavenHairThinning = Thinning
+marking-ThavenHairThinning-thinning = Thinning
+
+marking-ThavenHairThinningfront = Thinning (Front)
+marking-ThavenHairThinningfront-thinningfront = Thinning (Front)
+
+marking-ThavenHairThinningrear = Thinning (Rear)
+marking-ThavenHairThinningrear-thinningrear = Thinning (Rear)
+
+marking-ThavenHairTightbun = Bun (Tight)
+marking-ThavenHairTightbun-tightbun = Bun (Tight)
+
+marking-ThavenHairTopknot = Topknot
+marking-ThavenHairTopknot-topknot = Topknot
+
+marking-ThavenHairTressshoulder = Tress Shoulder
+marking-ThavenHairTressshoulder-tressshoulder = Tress Shoulder
+
+marking-ThavenHairTrimflat = Trim Flat
+marking-ThavenHairTrimflat-trimflat = Trim Flat
+
+marking-ThavenHairTrimmed = Trimmed
+marking-ThavenHairTrimmed-trimmed = Trimmed
+
+marking-ThavenHairTwintail = Twintails
+marking-ThavenHairTwintail-twintail = Twintails
+
+marking-ThavenHairTwoStrands = Two Strands
+marking-ThavenHairTwoStrands-twostrands = Two Strands
+
+marking-ThavenHairUndercut = Undercut
+marking-ThavenHairUndercut-undercut = Undercut
+
+marking-ThavenHairUndercutCurly = Undercut (Curly)
+marking-ThavenHairUndercutCurly-undercutcurly = Undercut (Curly)
+
+marking-ThavenHairUndercutleft = Undercut Left
+marking-ThavenHairUndercutleft-undercutleft = Undercut Left
+
+marking-ThavenHairUndercutright = Undercut Right
+marking-ThavenHairUndercutright-undercutright = Undercut Right
+
+marking-ThavenHairUneven = Uneven
+marking-ThavenHairUneven-uneven = Uneven
+
+marking-ThavenHairUnkept = Unkept
+marking-ThavenHairUnkept-unkept = Unkept
+
+marking-ThavenHairVeryshortovereyealternate = Very Short Over Eye
+marking-ThavenHairVeryshortovereyealternate-veryshortovereyealternate = Very Short Over Eye
+
+marking-ThavenHairVlong = Very Long Hair
+marking-ThavenHairVlong-vlong = Very Long Hair
+
+marking-ThavenHairVlongfringe = Very Long with Fringe
+marking-ThavenHairVlongfringe-vlongfringe = Very Long with Fringe
+
+marking-ThavenHairVolaju = Volaju
+marking-ThavenHairVolaju-volaju = Volaju
+
+marking-ThavenHairWisp = Wisp
+marking-ThavenHairWisp-wisp = Wisp
+
+marking-TichelFashionableThaven = Tichel (Fashionable)
+marking-TichelFashionableThaven-tichelfashionable = Tichel (Fashionable)
+
+marking-TichelSimpleThaven = Tichel (Simple)
+marking-TichelSimpleThaven-tichelsimple = Tichel (Simple)
+
+marking-ShaggyThaven = Shaggy
+marking-ShaggyThaven-shaggythaven = Shaggy
+
+marking-ShaggyLongerThaven = Shaggy (Longer)
+marking-ShaggyLongerThaven-shaggylongerthaven = Shaggy (Longer)
+
+marking-SusieThaven = Mean Girl (Bangs)
+marking-SusieThaven-susiethaven = Mean Girl (Bangs)
+
+marking-SusieNoBangsThaven = Mean Girl
+marking-SusieNoBangsThaven-susienobangsthaven = Mean Girl
+
+# HeadSide
+
+marking-ThavenEars1 = Small Ears
+marking-ThavenEars1-ears1 = Small Ears
+
+marking-ThavenEars2 = Medium Ears
+marking-ThavenEars2-ears2 = Medium Ears
+
+marking-ThavenEars3 = Long Ears
+marking-ThavenEars3-ears3 = Long Ears
+
+marking-ThavenEars4 = Droopy Ears
+marking-ThavenEars4-ears4 = Droopy Ears
+
+marking-ThavenEarsBigFins = Big Fins
+marking-ThavenEarsBigFins-bigfins = Outer
+marking-ThavenEarsBigFins-bigfins2 = Inner
+
+marking-ThavenEarsTwinFins = Twin Fins
+marking-ThavenEarsTwinFins-twinfin = Twin Fins
+
+marking-ThavenFishEars = Finned Ears
+marking-ThavenFishEars-fishears = Finned Ears
+
+marking-ThavenNoEars = Recolorable ears
+marking-ThavenNoEars-noears = For use with head coverings
+
+# HeadTop
+
+marking-ThavenHibiscus = Hibiscus
+marking-ThavenHibiscus-hibiscus1 = Petals
+marking-ThavenHibiscus-hibiscus2 = Anthers
+
+marking-ThavenPiercings =  Helix Piercing
+marking-ThavenPiercings-piercings = Helix Piercing
+
+marking-ThavenPiercings2 = Hoop Piercing
+marking-ThavenPiercings2-piercings2 = Hoop Piercing
+
+# Tail
+
+marking-ThavenBasicTail = Basic Tail
+marking-ThavenBasicTail-basic = Basic Tail
+
+marking-ThavenBigTail = Big Tail
+marking-ThavenBigTail-big1 = Tail
+marking-ThavenBigTail-big2 = Fin
+
+marking-ThavenTadpoleTail = Tadpole Tail
+marking-ThavenTadpoleTail-tadpole1 = Tail
+marking-ThavenTadpoleTail-tadpole2 = Fin
+
+marking-ThavenTailEel = Eel Tail
+marking-ThavenTailEel-eel1 = Eel Tail Trunk
+marking-ThavenTailEel-eel2 = Eel Tail Tip
+
+marking-ThavenTailEelOverlay = Eel Tail (Overlay)
+marking-ThavenTailEelOverlay-eel3 = Eel Inner
+marking-ThavenTailEelOverlay-eel4 = Eel Outer
+
+marking-ThavenTailNurse = Swept Tail
+marking-ThavenTailNurse-nurse1 = Tail
+marking-ThavenTailNurse-nurse2 = Stripes
+
+marking-ThavenTailStub = Stub Tail
+marking-ThavenTailStub-stub1 = Tail
+marking-ThavenTailStub-stub2 = Stripes
+
+marking-ThavenTailThresher = Thresher Tail
+marking-ThavenTailThresher-thresher1 = Tail
+marking-ThavenTailThresher-thresher2 = Stripes
+
+# RArmExtension

Resources/Locale/en-US/store/uplink-catalog.ftl

@@ -180,6 +180,9 @@ uplink-encryption-key-desc = Two encryption keys for access to the secret freque
 uplink-binary-translator-key-name = Binary Translator Key
 uplink-binary-translator-key-desc = Lets you tap into the silicons' binary channel. Don't talk on it though, at least not without a voice mask.
 
+uplink-freelance-encryption-key-name = Freelancer Encryption Key
+uplink-freelance-encryption-key-desc = Lets you access freelancer communications. Perhaps you can find a criminal who will help you for the right price.
+
 uplink-hypopen-name = Hypopen
 uplink-hypopen-desc = A chemical hypospray disguised as a pen, capable of instantly injecting up to 10u of reagents. Starts empty.
 

Resources/Maps/_DV/Shuttles/Evac/ntes_academy.yml

@@ -97,7 +97,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: Gravity
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

Resources/Maps/_DV/Shuttles/Evac/ntes_basu.yml

@@ -77,7 +77,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: Gravity
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

Resources/Maps/_DV/Shuttles/Evac/ntes_bc20.yml

@@ -90,7 +90,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: DecalGrid
       chunkCollection:
         version: 2

Resources/Maps/_DV/Shuttles/Evac/ntes_box.yml

@@ -64,7 +64,7 @@ entities:
     - type: DeviceNetwork
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
       deviceNetId: Wireless
     - type: DecalGrid
       chunkCollection:

Resources/Maps/_DV/Shuttles/Evac/ntes_centipede.yml

@@ -88,7 +88,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: DecalGrid
       chunkCollection:
         version: 2

Resources/Maps/_DV/Shuttles/Evac/ntes_dart.yml

@@ -76,7 +76,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: ImplicitRoof
     - type: GridPathfinding
     - type: Gravity

Resources/Maps/_DV/Shuttles/Evac/ntes_delta.yml

@@ -71,7 +71,7 @@ entities:
     - type: DeviceNetwork
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
       deviceNetId: Wireless
     - type: DecalGrid
       chunkCollection:

Resources/Maps/_DV/Shuttles/Evac/ntes_fishbowl.yml

@@ -95,7 +95,7 @@ entities:
     - type: DeviceNetwork
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: DecalGrid
       chunkCollection:
         version: 2

Resources/Maps/_DV/Shuttles/Evac/ntes_kaeri.yml

@@ -78,7 +78,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: DecalGrid
       chunkCollection:
         version: 2

Resources/Maps/_DV/Shuttles/Evac/ntes_lox.yml

@@ -69,7 +69,7 @@ entities:
     - type: DeviceNetwork
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
       deviceNetId: Wireless
     - type: DecalGrid
       chunkCollection:

Resources/Maps/_DV/Shuttles/Evac/ntes_propeller.yml

@@ -109,7 +109,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: DecalGrid
       chunkCollection:
         version: 2

Resources/Maps/_DV/Shuttles/Evac/ntes_right.yml

@@ -97,7 +97,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: DecalGrid
       chunkCollection:
         version: 2

Resources/Maps/_DV/Shuttles/Evac/ntes_seal.yml

@@ -85,7 +85,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: DecalGrid
       chunkCollection:
         version: 2

Resources/Maps/_DV/Shuttles/Evac/ntes_titan.yml

@@ -75,7 +75,7 @@ entities:
     - type: DeviceNetwork
       configurators: [ ]
       deviceLists: [ ]
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
       deviceNetId: Wireless
     - type: GridPathfinding
     - type: DecalGrid

Resources/Maps/_DV/Shuttles/Evac/ntes_transport.yml

@@ -126,7 +126,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: GridPathfinding
     - type: DecalGrid
       chunkCollection:

Resources/Maps/_DV/Shuttles/Evac/ntes_uclb.yml

@@ -94,7 +94,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: DecalGrid
       chunkCollection:
         version: 2

Resources/Maps/_DV/Shuttles/Evac/ntes_vertex.yml

@@ -75,7 +75,7 @@ entities:
     - type: DeviceNetwork
       configurators: [ ]
       deviceLists: [ ]
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
       deviceNetId: Wireless
     - type: GridPathfinding
     - type: DecalGrid

Resources/Maps/_DV/Shuttles/Evac/ntes_yggdrasil.yml

@@ -81,7 +81,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: Gravity
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

Resources/Maps/_DV/Shuttles/Misc/escape_pod_dv.yml

@@ -73,7 +73,7 @@ entities:
       deviceNetId: Wireless
       configurators: []
       deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
     - type: DecalGrid
       chunkCollection:
         version: 2

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -447,5 +447,5 @@
       storagebase: !type:AllSelector
         children:
         - id: WeaponShotgunHushpup
-        - id: BoxLethalshot
+        - id: BoxShellCaseless # DeltaV switched default to caseless shells
         - id: TreasureCoinIron

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

@@ -142,6 +142,7 @@
     ClothingUniformBrownSuitSkirt: 2
     ClothingShoesLeather: 2
     ClothingShoesBootsLaceup: 2
+    ClothingShoesBootsSurplus: 3
     # End DeltaV additions
   contrabandInventory:
     ClothingMaskNeckGaiter: 2

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -159,6 +159,7 @@
     slots:
       holster:
         name: clothing-belt-sidearm
+        priority: 1 # DeltaV - Prioritize ejecting the side-arm over the radio
         whitelist:
           tags:
           - Sidearm

Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml

@@ -176,6 +176,7 @@
     - id: GoldenBikeHorn
     - id: ClothingHeadHatCatEars
     - id: GoldenPersonalAI
+    - id: UnstableReactorCore # DeltaV
     - id: TreasureCoinDiamond
       amount: !type:RangeNumberSelector
         range: 2, 5

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml

@@ -485,6 +485,7 @@
   - type: Tag
     tags:
     - Beer
+    - DrinkBottle # DeltaV
 
 - type: entity
   parent: [DrinkVisualsAllFilled, DrinkBottleGlassSmallBaseFull]

Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml

@@ -45,4 +45,5 @@
           # Begin DeltaV additions - Disallows recharging of superweapons
           - GamblagatorCartridge
           - BeamDevastator
+          - UnstableCoreRefractor
           # End DeltaV additions - Disallows recharging of superweapons

Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml

@@ -26,7 +26,7 @@
     grid:
     - 0,0,3,1
   - type: Item
-    #size: Large # DeltaV - Change size
+    size: Large
     shape: # DeltaV - Change size
     - 0,0,2,1
     sprite: Objects/Specific/Medical/firstaidkits.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -313,6 +313,7 @@
     - 0,0,3,0 # smaller than BaseShotgun by 1 tile
   - type: BallisticAmmoProvider
     capacity: 4
+    proto: ShellShotgunCaseless # DeltaV - Use caseless shells
   - type: GunRequiresWield
   - type: Gun
     soundGunshot:

Resources/Prototypes/GameRules/roundstart.yml

@@ -600,16 +600,23 @@
   - type: NextEvent # DeltaV: Queue Event for precognition
   - type: RampingStationEventScheduler
     timeKeyPoints: # DeltaV
-    - 10, 10
+    - 10, 7
     - 10, 6
-    - 10, 1
-    - 10, 3
-    - 15, 5
-    - 15, 4
-    - 20, 2
-    - 10, 1
+    - 10, 5
+    - 5, 2 # Heavy event density from minute 35 through 40
+    - 15, 10
+    - 10, 2 # Heavy event density from minute 50 through 60
     - 10, 4
-    - 10, 3
+    - 15, 6
+    - 10, 2 # Heavy density from minute 85 through 95
+    # Probable EOR, start winding down
+    - 10, 5
+    - 10, 7
+    - 20, 10
+    # Crew decided to stay so wind back up
+    - 10, 6
+    - 20, 4
+    - 20, 2
     - 70, 4
     scheduledGameRules: !type:NestedSelector
       tableId: BasicGameRulesTable

Resources/Prototypes/Maps/Pools/default.yml

@@ -4,6 +4,7 @@
 # DeltaV
   - Arena
   - Academy
+  - Anvil
   - Asterisk
   - Byoin
   - Chibi

Resources/Prototypes/Maps/anvil.yml

@@ -0,0 +1,77 @@
+- type: gameMap
+  id: Anvil
+  mapName: 'Anvil'
+  mapPath: /Maps/anvil.yml
+  minPlayers: 35
+  stations:
+    Anvil:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: '{0} Anvil Station {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: 'DV'
+        - type: StationEmergencyShuttle
+          emergencyShuttlePath: /Maps/_DV/Shuttles/Evac/ntes_dart.yml # Placeholder
+        - type: StationJobs
+          availableJobs:
+          #civilian
+            Passenger: [ -1, -1 ]
+          #command
+            Captain: [ 1, 1 ]
+            HeadOfPersonnel: [ 1, 1 ]
+            ChiefEngineer: [ 1, 1 ]
+            ChiefJustice: [ 1, 1 ]
+            ChiefMedicalOfficer: [ 1, 1 ]
+            HeadOfSecurity: [ 1, 1 ]
+            ResearchDirector: [ 1, 1 ]
+            Quartermaster: [ 1, 1 ]
+            StationAi: [ 1, 1 ]
+          #engineering
+            AtmosphericTechnician: [ 2, 2 ]
+            StationEngineer: [ 3, 5 ]
+            TechnicalAssistant: [ 2, 3 ]
+          #justice
+            Clerk: [ 1, 1 ]
+            Lawyer: [ 1, 1 ]
+            Prosecutor: [ 1, 1 ]
+          #medical
+            Chemist: [ 2, 2 ]
+            Paramedic: [ 1, 2 ]
+            MedicalDoctor: [ 3, 5 ]
+            MedicalIntern: [ 2, 3 ]
+            Psychologist: [ 1, 1 ]
+          # Surgeon: [ 1, 1 ] / Where were you when surgeon was kilL?
+          #security
+            Brigmedic: [ 1, 1 ]
+            Detective: [ 1, 1 ]
+            Prisoner: [ 3, 3 ]
+            PrisonGuard: [ 2, 3 ]
+            SecurityOfficer: [ 2, 5 ]
+            SecurityCadet: [ 2, 3 ]
+            Warden: [ 1, 1 ]
+          #service
+            Bartender: [ 2, 2 ]
+            Botanist: [ 2, 2 ]
+            Chef: [ 2, 2 ]
+            Clown: [ 1, 1 ]
+            Janitor: [ 2, 2 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 2, 3 ]
+            Reporter: [ 1, 1 ]
+            ServiceWorker: [ 4, 5 ] 
+            Librarian: [ 1, 1 ]
+            MartialArtist: [ 2, 2 ]
+          #science
+            Chaplain: [ 1, 1 ]
+            ForensicMantis: [ 1, 1 ]
+            Scientist: [ 4, 6 ]
+            ResearchAssistant: [ 4, 6 ]
+            Roboticist: [ 1, 2 ]
+            Borg: [ 2, 3 ]
+          #supply
+            CargoTechnician: [ 2, 3 ]
+            CargoAssistant: [ 1, 2 ]
+            Courier: [ 2, 2 ]
+            SalvageSpecialist: [ 2, 3 ]

Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml

@@ -14,12 +14,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.07
+      metabolites:
+        Ethanol: 0.14
 
 - type: reagent
   id: Soju
@@ -37,12 +33,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.15
+      metabolites:
+        Ethanol: 0.14
 
 - type: reagent
   id: OrangeCreamice
@@ -60,12 +52,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.05
+      metabolites:
+        Ethanol: 0.1
 
 - type: reagent
   id: Silverjack
@@ -83,12 +71,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.0625
+      metabolites:
+        Ethanol: 0.125
 
 - type: reagent
   id: Brainbomb
@@ -106,6 +90,10 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
+      metabolites:
+        Ethanol: 0.17
+        THC: 0.66
+        SpaceDrugs: 0.66
       effects:
       - !type:HealthChange
         conditions:
@@ -115,17 +103,6 @@
         damage:
           types:
             Caustic: 0.25
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.085
-      - !type:AdjustReagent
-        reagent: THC
-        amount: 0.33
-      - !type:AdjustReagent
-        reagent: SpaceDrugs
-        amount: 0.33
 
 - type: reagent
   id: ClownBlood
@@ -143,12 +120,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.025
+      metabolites:
+        Ethanol: 0.05
 
 - type: reagent
   id: CircusJuice
@@ -166,12 +139,9 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
+      metabolites:
+        Ethanol: 0.125
       effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.0625
       - !type:Emote #It's very funny
         emote: Laugh
         probability: 0.15
@@ -192,12 +162,9 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
+      metabolites:
+        Ethanol: 0.13
       effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.065
       - !type:AdjustTemperature
         amount: 75 # thermal energy, not temperature!
 
@@ -217,9 +184,5 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.03
+      metabolites:
+        Ethanol: 0.06

Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml

@@ -14,12 +14,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 3
-      - !type:AdjustReagent
-        reagent: Radium
-        amount: 0.01
+      metabolites:
+        Radium: 0.02
 
 - type: reagent
   id: PinkDrink
@@ -35,11 +31,6 @@
   metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
-  metabolisms:
-    Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 3
 
 - type: reagent
   id: BubbleTea
@@ -57,12 +48,6 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 3
-      - !type:AdjustReagent
-        reagent: Sugar
-        amount: 0.2
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.1
+      metabolites:
+        Sugar: 0.4
+        Nutriment: 0.2

Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml

@@ -1543,7 +1543,7 @@
 - type: reagent
   id: Silencer
   name: reagent-name-silencer
-  parent: BaseAlcohol
+  parent: BaseDrink #Delta-V: drink was non-alcoholic before switch to Metabolites, components are all non-alcoholic
   desc: reagent-desc-silencer
   physicalDesc: reagent-physical-desc-nothing # DeltaV: Desc changed
   flavor: silencer #Delta-V Flavor additions

Resources/Prototypes/Research/arsenal.yml

@@ -215,6 +215,7 @@
   - WeaponAdvancedLaser
   - PortableRecharger
   - WeaponEnergyGunAdvanced # DeltaV - Advanced Energy Gun
+  - UnstableReactorHousing # DeltaV
 
 - type: technology
   id: ThermalWeaponry

Resources/Prototypes/Roles/Antags/thief.yml

@@ -16,3 +16,4 @@
     #- ThiefBeacon # DeltaV - no more objectives
     - SatchelThief
     - ClothingHandsChameleonThief # DeltaV - add back thieving gloves
+    - EncryptionKeyFreelance # DeltaV

Resources/Prototypes/_DEN/Reagents/Consumable/Drink/alcohol.yml

@@ -14,12 +14,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.2
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.4
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.2
   fizziness: 0.25
 
 - type: reagent
@@ -38,12 +40,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.1
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.2
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.1
   fizziness: 0.25
 
 - type: reagent
@@ -62,12 +66,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.1
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.2
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.1
   fizziness: 0.25
 
 - type: reagent
@@ -86,12 +92,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.12
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.24
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.12
   fizziness: 0.25
 
 - type: reagent
@@ -110,15 +118,18 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.15
-      - !type:AdjustReagent
-        reagent: LotophagoiOil
-        amount: 0.12
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.3
+        LotophagoiOil: 0.24
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.15
+#      - !type:AdjustReagent
+#        reagent: LotophagoiOil
+#        amount: 0.12
   fizziness: 0.25
 
 - type: reagent
@@ -137,12 +148,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.08
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.16
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.08
   fizziness: 0.25
 
 - type: reagent
@@ -161,12 +174,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.08
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.16
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.08
   fizziness: 0.25
 
 - type: reagent
@@ -185,12 +200,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.08
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.16
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.08
 
 
   fizziness: 0.25
@@ -211,12 +228,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.08
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.16
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.08
   fizziness: 0.25
 
 - type: reagent
@@ -235,12 +254,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.15
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.3
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.15
   fizziness: 0.25
 
 - type: reagent
@@ -259,12 +280,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.4
       effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.2
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.2
       - !type:GenericStatusEffect
         key: KnockedDown
         component: KnockedDown
@@ -297,12 +320,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.12
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.24
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.12
   fizziness: 0.25
 
 - type: reagent
@@ -321,12 +346,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.08
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.16
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.08
   fizziness: 0.25
 
 - type: reagent
@@ -345,12 +372,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.1
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.2
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.1
   fizziness: 0.25
 
 - type: reagent
@@ -369,12 +398,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.12
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.24
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.12
   fizziness: 0.25
 
 - type: reagent
@@ -393,12 +424,14 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.1
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.2
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.1
   fizziness: 0.25
 
 - type: reagent
@@ -417,10 +450,12 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.1
+      metabolites: #Delta-V - swap AdjustReagent to metabolites for consistency, SatiateThirst is on parent now
+        Ethanol: 0.2
+#      effects:
+#      - !type:SatiateThirst
+#        factor: 2
+#      - !type:AdjustReagent
+#        reagent: Ethanol
+#        amount: 0.1
   fizziness: 0.25

Resources/Prototypes/_DEN/Voice/speech_emote_sounds.yml

@@ -30,6 +30,12 @@
       collection: OviniaBaa
     Moo:
       collection: Moo
+    # Begin DeltaV additions
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
+    # End DeltaV additions
     Gulp: # Goob
       path: /Audio/_Goobstation/Voice/Human/gulp.ogg
 
@@ -64,6 +70,12 @@
       collection: OviniaBaa
     Moo:
       collection: Moo
+    # Begin DeltaV additions
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
+    # End DeltaV additions
     Gulp: # Goob
       path: /Audio/_Goobstation/Voice/Human/gulp.ogg
 

Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml

@@ -1,4 +1,5 @@
 - type: entity
+  parent: BaseItem
   id: SentientSmileCore
   name: sentient smile core
   components:

Resources/Prototypes/_DV/Body/Species/asakim.yml

@@ -101,12 +101,14 @@
     baseWalkSpeed : 2.7
     baseSprintSpeed : 4.65
     weightlessAcceleration: 1.5 # Slightly more manueverable in space.
+  - type: ClothingSlowResistance
+    modifier: 1.0 # Completely unaffected by clothing slow
   - type: Fixtures
     fixtures: # TODO: This needs a second fixture just for mob collisions.
       fix1:
         shape:
           !type:PhysShapeCircle
-          radius: 0.48
+          radius: 0.39
         density: 275 # Its an abandoned bioweapon species with 4 arms, of course it should be able to fight a Oni.
         restitution: 0.0
         mask:

Resources/Prototypes/_DV/Body/Species/shadekin.yml

@@ -2,10 +2,10 @@
   id: Shadekin
   limits:
     enum.HumanoidVisualLayers.Hair:
-      limit: 0
+      limit: 1
       required: false
     enum.HumanoidVisualLayers.FacialHair:
-      limit: 0
+      limit: 1
       required: false
     enum.HumanoidVisualLayers.Chest:
       limit: 2

Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml

@@ -100,6 +100,16 @@
   category: Armory
   group: market
 
+- type: cargoProduct
+  id: ArmoryUnstableCore
+  icon:
+    sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
+    state: icon
+  product: CrateArmoryUnstableCore
+  cost: 10000
+  category: Armory
+  group: market
+
 - type: cargoProduct
   id: CargoArmoryPatos
   icon:

Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml

@@ -34,6 +34,17 @@
   - WeaponDisablerSMG
   - PortableRecharger
 
+- type: thiefBackpackSet
+  id: ERTkammerer
+  name: ert-amber-gun-name-kammerer
+  description: ert-amber-gun-desc-kammerer
+  sprite:
+    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+    state: icon
+  content:
+  - WeaponShotgunKammerer
+  - BoxLethalshot
+
 - type: thiefBackpackSet
   id: ERTMedkit
   name: ert-medkit-name
@@ -347,6 +358,24 @@
   - MagazineLaser
   - MagazineLaser
 
+- type: thiefBackpackSet
+  id: ERTGammaSecJackdaw
+  name: ert-jackdawkit-name
+  description: ert-jackdawkit-desc
+  sprite:
+   sprite: _DV/Objects/Weapons/Guns/Rifles/jackdaw.rsi
+   state: icon
+  content:
+  - WeaponRifleJackdaw
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+
 - type: thiefBackpackSet
   id: ERTGammaC4
   name: ert-GammaC4-name

Resources/Prototypes/_DV/Catalog/Fills/Crates/armory.yml

@@ -119,6 +119,21 @@
         - id: ClothingShoesBootsCowboyBlackFilled
           amount: 2
 
+- type: entity
+  parent: CrateWeaponSecure
+  id: CrateArmoryUnstableCore
+  name: unstable reactor core crate
+  description: Contains a radiation suit and a unstable reactor core in its containment. Requires Armory access to open.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: UnstableReactorContainerFilled
+          amount: 1
+        - id: ClothingOuterSuitRad
+          amount: 2
+
 - type: entity
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
   id: CrateCargoArmoryPatos

Resources/Prototypes/_DV/Catalog/Fills/Items/briefcases.yml

@@ -70,3 +70,22 @@
         - id: WeaponLeverActionSKL93AP
         - id: MagazineBoxMagnum
         - id: ClothingHeadHatCowboyBlack
+
+- type: entity
+  parent: BriefcaseSyndie
+  id: BriefcaseSyndieAnacondaBundleFilled
+  suffix: Syndicate, Anaconda Bundle
+  components:
+  - type: Item
+    size: Ginormous
+  - type: Storage
+    maxItemSize: Huge
+    grid:
+    - 0,0,6,1
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: WeaponSubMachineGunAnaconda
+        - id: MagazineLightRifleBox
+        - id: MagazineLightRifleBox

Resources/Prototypes/_DV/Catalog/Uplink/disruption.yml

@@ -54,3 +54,14 @@
      blacklist:
        tags:
        - NukeOpsUplink
+
+- type: listing
+  id: UplinkFreelanceKey
+  name: uplink-freelance-encryption-key-name
+  description: uplink-freelance-encryption-key-desc
+  icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: pirate_label }
+  productEntity: EncryptionKeyFreelance
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkDeception

Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml

@@ -103,3 +103,17 @@
     Telecrystal: 10
   categories:
   - UplinkWeaponry
+
+- type: listing
+  id: UplinkAnaconda
+  name: uplink-anaconda-name
+  description: uplink-anaconda-desc
+  icon: { sprite: /Textures/_DV/Objects/Weapons/Guns/SMGs/anaconda.rsi, state: icon }
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 15
+  productEntity: BriefcaseSyndieAnacondaBundleFilled
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkWeaponry

Resources/Prototypes/_DV/Datasets/Names/pitbull_names.yml

@@ -2,4 +2,4 @@
   id: NamesPitbulls
   values:
     prefix: names-pitbull-dataset-
-    count: 63
+    count: 101

Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -397,8 +397,9 @@
       coefficients:
         Blunt: 0.5
         Slash: 0.5
-        Piercing: 0.50
+        Piercing: 0.6
         Heat: 0.6
+        Cold: 0.7
         Radiation: 0
         Caustic: 0.35
         Holy: 0.50

Resources/Prototypes/_DV/Entities/Clothing/Shoes/boots.yml

@@ -20,3 +20,14 @@
     sprite: _DV/Clothing/Shoes/Boots/fishing_boots.rsi
   - type: Clothing
     sprite: _DV/Clothing/Shoes/Boots/fishing_boots.rsi
+
+- type: entity
+  parent: [ClothingShoesBaseButcherable]
+  id: ClothingShoesBootsSurplus
+  name: surplus boots
+  description: An old pair of boots. Not so useful for combat, but still plenty stylish.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/jackboots.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/jackboots.rsi

Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/vulpkanin.yml

@@ -400,7 +400,7 @@
   - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
     state: vulp_wag
   - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
-    state: vulp_wag-tip #fade
+    state: vulp_wag-fade #fade
 
 - type: marking
   id: VulpTailTipAnimated
@@ -412,6 +412,26 @@
   - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
     state: vulp_wag-tip
 
+- type: marking
+  id: VulpTailAltAnimated
+  bodyPart: Tail
+  groupWhitelist: []
+  sprites:
+  - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
+    state: vulp_wag
+  - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
+    state: vulp_wag-fade #fade
+
+- type: marking
+  id: VulpTailAltTipAnimated
+  bodyPart: Tail
+  groupWhitelist: []
+  sprites:
+  - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
+    state: vulp_wag
+  - sprite: _DV/Mobs/Customization/Vulpkanin/tail_markings.rsi
+    state: vulp_wag-tip
+
 - type: marking
   id: VulpTailFoxAnimated
   bodyPart: Tail

Resources/Prototypes/_DV/Entities/Mobs/NPCs/pitbull.yml

@@ -89,11 +89,19 @@
     needsHands: false
 
 - type: entity
-  parent: MobBasePitbull
+  parent: [ MobBasePitbull, DVNodeCrawler ] # Makes them able to actually do their job and patrol vents for mice.
   id: MobPitbullVent # ventbull
   name: Ventbull
   description: A subspecies of pitbull bred by NanoTrasen for quick and inexpensive pest control.
   components:
+  - type: GhostRole # Honestly, I couldn't figure out how to make it truely random so this will work for now I guess.
+    makeSentient: true
+    allowSpeech: true
+    allowMovement: true
+    name: "Ventbull"
+    description: "You are a ventbull, a genetically modified pitbull bred to hunt mice in the stations airvents!"
+    rules: ghost-role-information-nonantagonist-rules
+  - type: GhostTakeoverAvailable
   - type: NpcFactionMember
     factions:
       - Passive

Resources/Prototypes/_DV/Entities/Objects/Misc/specialized_weapon_parts.yml

@@ -0,0 +1,94 @@
+- type: entity
+  parent: BaseItem
+  id: UnstableReactorCore
+  name: Unstable Reactor Core
+  description: A compact, circular-shaped reactor, incapable of fully containing its energy. It's quite the fancy paperweight.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
+    state: icon
+  - type: RadiationSource
+    intensity: 4
+    slope: 0.2
+  - type: PointLight
+    color: "#00FF00"
+  - type: Tag
+    tags:
+    - UnstableReactorCore
+
+- type: entity
+  parent: [BaseItem, BaseItemCabinet]
+  id: UnstableReactorContainer
+  name: unstable reactor container
+  description: A solid, lead-based containment unit capable of completely enclosing the radioactive energy of an unstable reactor core.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/unstable_reactor_container.rsi
+    layers:
+    - state: closed
+      map: [ "enum.OpenableVisuals.Layer" ]
+    - state: core_closed
+      map: [ "enum.ItemCabinetVisuals.Layer" ]
+      visible: false
+      shader: unshaded
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+  - type: RadiationBlockingContainer
+    resistance: 4
+  - type: ItemSlots
+    slots:
+      ItemCabinet:
+        whitelist:
+          tags:
+          - UnstableReactorCore
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: { state: open }
+          False: { state: closed }
+        enum.ItemCabinetVisuals.Layer:
+          True: { state: core_open }
+          False: { state: core_closed }
+      enum.ItemCabinetVisuals.ContainsItem:
+        enum.ItemCabinetVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+
+- type: entity
+  parent: UnstableReactorContainer
+  id: UnstableReactorContainerFilled
+  suffix: Filled
+  components:
+  - type: ItemSlots
+    slots:
+      ItemCabinet:
+        startingItem: UnstableReactorCore
+        whitelist:
+          tags:
+          - UnstableReactorCore
+
+- type: entity
+  parent: BaseItem
+  id: UnstableReactorHousing
+  name: Unstable Reactor Housing
+  description: A heavy housing engineered to contain the power output of an unstable reactor core and focus it into a dense, radioactive beam. It's missing its power source.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Misc/unstable_reactor_housing.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+  - type: MultiHandedItem
+  - type: ClothingSpeedModifier
+    walkModifier: 0.75
+    sprintModifier: 0.75
+  - type: HeldSpeedModifier
+  - type: Construction
+    graph: UnstableCoreRefractorConstruct
+    node: start
+  - type: Tag
+    tags:
+    - UnstableReactorHousing

Resources/Prototypes/_DV/Entities/Objects/Specific/ERT_loadout_selector.yml

@@ -14,6 +14,7 @@
     - ERTPatosBundle
     - ERTaegunBundle
     - ERTmixlaserBundle
+    - ERTkammerer
 
 - type: entity
   parent: ToolboxThief
@@ -100,6 +101,7 @@
     - ERTGammaSecWT
     - ERTGammaSecImmolator
     - ERTGammaSecIK60
+    - ERTGammaSecJackdaw
 
 - type: entity
   parent: ToolboxThief

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml

@@ -6,3 +6,20 @@
   components:
   - type: BallisticAmmoProvider
     proto: ShellSoulbreaker
+
+- type: entity
+  parent: AmmoProviderShotgunShell
+  id: BoxShellCaseless
+  name: ammunition box (.50 caseless)
+  description: A box full of caseless shotgun cartridges, designed to leave no trace behind.
+  components:
+  - type: BallisticAmmoProvider
+    proto: ShellShotgunCaseless
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi
+    layers:
+    - state: base
+      map: [ "enum.GunVisualLayers.Base" ]
+    - state: mag-1
+      map: [ "enum.GunVisualLayers.Mag" ]
+    - state: caseless

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -0,0 +1,14 @@
+- type: entity
+  parent: [ ShellShotgun ]
+  id: ShellShotgunCaseless
+  name: caseless shell (.50 pellet)
+  description: An advanced caseless cartridge used by most modern shotguns. Leaves no trace behind while firing standard kinetic ammunition.
+  components:
+  - type: CartridgeAmmo
+    proto: PelletShotgunSpread
+    deleteOnSpawn: true
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Ammunition/Casings/caseless_shotgun_shell.rsi
+    layers:
+    - state: base
+      map: [ "enum.AmmoVisualLayers.Base" ]

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -695,3 +695,114 @@
           tags:
           - PowerCell
           - PowerCellSmall
+
+- type: entity
+  parent: [ BaseWeaponBattery, BaseSecurityContraband ]
+  id: WeaponUnstableCoreRefractor
+  name: Unstable core refractor
+  description: A weaponized nuclear control rod. Capable of transforming the energy output of an unstable reactor core into radioactive beams.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Battery/unstable_core_refractor.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-0
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Item
+    size: Ginormous
+  - type: MultiHandedItem
+  - type: ClothingSpeedModifier
+    walkModifier: 0.6
+    sprintModifier: 0.6
+  - type: HeldSpeedModifier
+  - type: Clothing
+    sprite: _DV/Objects/Weapons/Guns/Battery/unstable_core_refractor.rsi
+    slots:
+    - Back
+    - SuitStorage
+  - type: Gun
+    soundGunshot:
+      path: /Audio/_DV/Weapons/Guns/Gunshots/beamcannon.ogg
+    selectedMode: FullAuto
+    fireRate: 20
+    availableModes: FullAuto
+    minAngle: 1
+    maxAngle: 45
+    angleIncrease: -1.5
+    angleDecay: -5
+  - type: Battery
+    maxCharge: 12000
+    startingCharge: 12000
+  - type: BatterySelfRecharger
+    autoRechargeRate: 1100
+  - type: BatteryAmmoProvider
+    proto: FocussedCoreExhaust
+    fireCost: 200
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+  - type: Construction
+    graph: UnstableCoreRefractor
+    node: UnstableRefractor
+  - type: Tag
+    tags:
+    - UnstableCoreRefractor
+
+- type: entity
+  name: EPU-001 Integrity
+  parent: [BaseWeaponBatterySmall, BaseCentcommContraband]
+  id: WeaponPulseGunIntegrity
+  description: Hefty and unforgiving are both words you might describe this unit of a sidearm with. It's heavier than most laser pistols, but features better ergonomics than usual. It's a heavily modified Pulse-pattern pistol, using a technology kept confidential at the highest level. The sturdy metal frame is engraved in a few places, along the front cover it reads 'EPU-001', and the grip has a shiny NT logo made of pure brushed terran gold. The only thing you can tell, is that it's almost certainly a weapon for person of high status. Are you supposed to have this..?
+  suffix: Admeme
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Item
+    storedOffset: -2,-5
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+  - type: Clothing
+    sprite: _DV/Objects/Weapons/Guns/Battery/pulsegun_integrity.rsi
+  - type: Gun
+    selectedMode: FullAuto
+    fireRate: 2.5
+    availableModes:
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
+  - type: BatteryAmmoProvider
+    proto: CompactPulse
+    fireCost: 250
+  - type: EnergyGun
+    fireModes:
+    - proto: CompactPulse
+      fireCost: 250
+      name: lethal
+    - proto: BulletDisabler
+      fireCost: 150
+      name: paralyze
+  - type: Battery
+    maxCharge: 2000
+    startingCharge: 2000
+  - type: BatterySelfRecharger
+    autoRechargeRate: 150
+  - type: Tag
+    tags:
+    - Sidearm
+    - LaserWeapon
+    - ConcealCarry

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml

@@ -142,3 +142,48 @@
         Heat: 50
         Radiation: 25
         Structural: 75
+
+- type: entity
+  parent: BasicHitscan
+  id: FocussedCoreExhaust
+  name: Focussed Core Exhaust
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanBasicVisuals
+    muzzleFlash:
+      sprite: _DV/Objects/Weapons/Guns/Projectiles/unstable_rad_projectile.rsi
+      state: unstable_muzzle_flash
+    travelFlash:
+      sprite: _DV/Objects/Weapons/Guns/Projectiles/unstable_rad_projectile.rsi
+      state: unstable_beam
+    impactFlash:
+      sprite: _DV/Objects/Weapons/Guns/Projectiles/unstable_rad_projectile.rsi
+      state: unstable_impact
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 2
+        Radiation: 4
+  - type: HitscanTemperature
+    heatChange: 11000
+
+- type: entity
+  parent: BasicHitscan
+  id: CompactPulse
+  name: compact pulse
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 25
+  - type: HitscanBasicVisuals
+    muzzleFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: muzzle_blue
+    travelFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: beam_blue
+    impactFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: impact_blue

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -45,7 +45,7 @@
   parent: [BaseWeaponRifle, BaseGunWieldable]
   id: WeaponRifleJackdaw
   description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo.
-  suffix: Deathsquad
+  suffix: ERT # was Deathsquad
   components:
   - type: Item
     size: Large
@@ -56,12 +56,15 @@
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
+  - type: GunWieldBonus
+    minAngle: -15
+    maxAngle: -11
   - type: Gun
-    minAngle: 2
-    maxAngle: 6
+    minAngle: 17
+    maxAngle: 17
     angleIncrease: 2
     angleDecay: 8
-    fireRate: 6 # DeltaV - was 8
+    fireRate: 6 # was 8
     selectedMode: FullAuto
     availableModes:
     - SemiAuto
@@ -73,7 +76,7 @@
     slots:
       gun_magazine:
         name: Magazine
-        startingItem: MagazineCaselessRifle
+        startingItem: MagazineCaselessRifleShort # was a normal magazine
         insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
         priority: 2

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -87,3 +87,61 @@
     steps: 5
     zeroVisible: true
   - type: Appearance
+
+- type: entity
+  name: Anaconda
+  parent: BaseWeaponSubMachineGun
+  id: WeaponSubMachineGunAnaconda
+  description: A bulky and powerful one handed weapon, developed by Donk Co to outdo Waffle Corp. Too cumbersome to wield. Feeds from .30 ammo belts.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/SMGs/anaconda.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,2,1
+  - type: Clothing
+    sprite: _DV/Objects/Weapons/Guns/SMGs/anaconda.rsi
+    slots:
+    - Back
+    - suitStorage
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+    minAngle: 5
+    maxAngle: 30
+    fireRate: 4.5
+    angleIncrease: 5
+    angleDecay: 25
+    selectedMode: FullAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+  - type: ChamberMagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineLightRifleBox
+        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineLightRifleBox
+      gun_chamber:
+        name: Chamber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeLightRifle
+  - type: MagazineVisuals
+    magState: mag
+    steps: 4
+    zeroVisible: true
+  - type: Appearance

Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml

@@ -712,6 +712,16 @@
     containers:
       board: [ DoorElectronicsSecurity ]
 
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalSecurityShuttleLocked
+  suffix: External, Glass, Security, Docking, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
+
+
 # Station-Specific Airlocks
 - type: entity
   parent: HighSecDoor
@@ -723,13 +733,22 @@
       board: [ DoorElectronicsSecurity ]
 
 - type: entity
-  parent: HighSecDoor
-  id: HighSecEngineeringLocked
-  suffix: Engineering, Locked
+  parent: AirlockMiningGlass
+  id: AirlockMiningGlassSecurity
+  suffix: Security, Locked
   components:
   - type: ContainerFill
     containers:
-      board: [ DoorElectronicsEngineering ]
+      board: [ DoorElectronicsSecurity ]
+
+- type: entity
+  parent: AirlockMining
+  id: AirlockMiningSecurity
+  suffix: Security, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
 
 - type: entity
   parent: HighSecDoor
@@ -740,6 +759,15 @@
     containers:
       board: [ DoorElectronicsJustice ]
 
+- type: entity
+  parent: HighSecDoor
+  id: HighSecEngineeringLocked
+  suffix: Engineering, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsEngineering ]
+
 - type: entity
   parent: HighSecDoor
   id: HighSecChiefJusticeLocked
@@ -805,7 +833,7 @@
     containers:
       board: [ DoorElectronicsERT ]
 
-# Centcomm external doors
+# Centcomm doors
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalCentralCommandLocked
@@ -823,3 +851,21 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsCentralCommand ]
+
+- type: entity
+  parent: AirlockFreezer
+  id: AirlockFreezerCentralCommanLocked
+  suffix: Freezer, Centcomm, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintCentcommLocked
+  suffix: Maint, Centcomm, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]

Resources/Prototypes/_DV/Entities/Structures/Specific/Atmospherics/freezer.yml

@@ -0,0 +1,4 @@
+- type: entity
+  parent: [ AirSensorFreezerBase, AirSensorGray ]
+  id: AirSensorGrayFreezer
+  suffix: Freezer Atmosphere, gray

Resources/Prototypes/_DV/Entities/Structures/Specific/Atmospherics/sensor.yml

@@ -1,8 +1,34 @@
+- type: entity
+  parent: [ AirSensor ]
+  id: AirSensorGray
+  suffix: gray
+  components:
+  - type: Sprite
+    drawdepth: FloorObjects
+    sprite: _DV/Structures/Specific/Atmospherics/sensor.rsi
+
+- type: entity
+  parent: [ AirSensorAssembly ]
+  id: AirSensorGrayAssembly
+  suffix: gray
+  components:
+  - type: Sprite
+    drawdepth: FloorObjects
+    sprite: _DV/Structures/Specific/Atmospherics/sensor.rsi
+    layers:
+    - state: gsensor0
+
+
 # put this in a burn chamber or something you don't want to have show up as dangerous
 - type: entity
   parent: [ AirSensor, BaseUnsetSensor ]
   id: AirSensorUnset
 
+- type: entity
+  parent: [ AirSensorGray, BaseUnsetSensor ]
+  id: AirSensorGrayUnset
+  suffix: Unset, gray
+
 - type: entity
   abstract: true
   id: BaseUnsetSensor

Resources/Prototypes/_DV/Entities/Structures/Specific/Atmospherics/vox.yml

@@ -0,0 +1,4 @@
+- type: entity
+  parent: [ AirSensorVoxBase, AirSensorGray]
+  id: AirSensorGrayVox
+  suffix: Vox Atmosphere, gray

Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml

@@ -495,3 +495,46 @@
     stateDoorClosed: eng_evac_door
   - type: AccessReader
     access: [ [ "Maintenance" ] ]
+
+# CC Safe
+- type: entity
+  id: SafeCentralCommandDV
+  parent: GunSafe
+  name: safe
+  description: The perfect place for all the secret documents.
+  components:
+  - type: Appearance
+  - type: Sprite
+    sprite: _DV/Structures/Storage/Closets/ccsgunsafe.rsi
+    noRot: true
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+  - type: EntityStorageVisuals
+    stateBaseClosed: base
+    stateDoorOpen: open
+    stateDoorClosed: door
+
+- type: entity
+  id: SafeCentralCommandLockedDV
+  parent: SafeCentralCommandDV
+  suffix: CC, Locked
+  components:
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
+- type: entity
+  id: SafeERTLockedDV
+  parent: SafeCentralCommandDV
+  suffix: ERT, Locked
+  components:
+  - type: AccessReader
+    access: [["ERT"]]

Resources/Prototypes/_DV/GameRules/events.yml

@@ -20,7 +20,6 @@
     - id: RatKingSpawn
     - id: NTAgentSleeper
     - id: ColossusSpawn
-    - id: AsakimShuttle
     - id: HitmanShuttle
 
 # Replaces upstream meteor events until they're good

Resources/Prototypes/_DV/GameRules/glimmer_events.yml

@@ -201,7 +201,7 @@
   id: GlimmerLockProbers
   components:
   - type: GlimmerEvent
-    minimumGlimmer: 750
+    minimumGlimmer: 600
   - type: LockProbersRule
 
 - type: entity

Resources/Prototypes/_DV/Mapping/maps.yml

@@ -14,6 +14,13 @@
   - Centcomm
   - Stamps # no CC official locker to put the stamp in
 
+- type: mapCategories
+  id: CentcommLegacy
+  map: /Maps/_DV/Nonstations/centcommlegacy.yml
+  allowed:
+  - Centcomm
+  - Stamps # no CC official locker to put the stamp in
+
 # Stations
 
 - type: mapCategories

Resources/Prototypes/_DV/Objectives/asakim.yml

@@ -68,14 +68,6 @@
   components:
   - type: Objective
 
-- type: entity
-  parent: [BaseAsakimObjective, BaseSurviveObjective]
-  id: AsakimUpgradeObjective
-  name: ">UPGRADE"
-  description: Preliminary sector scans detect possible high-value cybernetics. Upgrade your body.
-  components:
-  - type: Objective
-
 - type: entity
   parent: [BaseAsakimObjective, BaseSurviveObjective]
   id: AsakimAllyObjective

Resources/Prototypes/_DV/Objectives/objectiveGroups.yml

@@ -116,7 +116,6 @@
     AsakimObjectiveGroupTheft: 1
     AsakimObjectiveGroupInfiltrate: 1
     AsakimObjectiveGroupInterrogate: 1
-    AsakimObjectiveGroupUpgrade: 1
     AsakimObjectiveGroupAlly: 1
 
 - type: weightedRandom
@@ -139,11 +138,6 @@
   weights:
     AsakimInterrogateObjective: 1
 
-- type: weightedRandom
-  id: AsakimObjectiveGroupUpgrade
-  weights:
-    AsakimUpgradeObjective: 1
-
 - type: weightedRandom
   id: AsakimObjectiveGroupAlly
   weights:

Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml

@@ -9,12 +9,11 @@
   recognizable: true
   metabolisms:
     Digestion:
+      metabolites:
+        Ethanol: 0.6
       effects:
       - !type:SatiateThirst
         factor: 1
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.3
 
 - type: reagent
   id: OldFashioned
@@ -32,12 +31,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.2
+      metabolites:
+        Ethanol: 0.4
 
 - type: reagent
   id: MnatsaCollins
@@ -55,12 +50,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.07
+      metabolites:
+        Ethanol: 0.14
   fizziness: 0.4
 
 - type: reagent
@@ -79,12 +70,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.07
+      metabolites:
+        Ethanol: 0.14
 
 - type: reagent
   id: FiveOClock
@@ -102,12 +89,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.07
+      metabolites:
+        Ethanol: 0.14
 
 - type: reagent
   id: Mliko
@@ -125,12 +108,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 1
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.02
+      metabolites:
+        Ethanol: 0.04
 
 - type: reagent
   id: Firebolt
@@ -148,9 +127,5 @@
   metamorphicChangeColor: true
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.2
+      metabolites:
+        Ethanol: 0.4

Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml

@@ -40,7 +40,7 @@
 - type: reagent
   id: HealthViolation
   name: reagent-name-healthviolation
-  parent: BaseDrink
+  parent: BaseAlcohol
   desc: reagent-desc-healthviolation
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: healthcodeviolation
@@ -53,12 +53,9 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
+      metabolites:
+        Ethanol: 0.6
       effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.3
       - !type:PopupMessage
         conditions:
         - !type:ReagentCondition
@@ -78,7 +75,7 @@
 - type: reagent
   id: Gunmetal #Credit to DinkusMcsplinkus for inspiring this drink. This could've also been called "Creamy Ignition"
   name: reagent-name-gunmetal
-  parent: BaseDrink
+  parent: BaseAlcohol
   desc: reagent-desc-gunmetal
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: gunmetal
@@ -91,12 +88,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.20
+      metabolites:
+        Ethanol: 0.4
     Bloodstream:
       effects:
       - !type:HealthChange
@@ -107,7 +100,7 @@
 - type: reagent
   id: LemonDrop
   name: reagent-name-lemondrop
-  parent: BaseDrink
+  parent: BaseAlcohol
   desc: reagent-desc-lemondrop
   physicalDesc: reagent-physical-desc-lemony-fresh
   flavor: lemondrop
@@ -119,17 +112,13 @@
   metamorphicFillBaseName: fill-
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.15
+      metabolites:
+        Ethanol: 0.3
 
 - type: reagent
   id: GreenGrass
   name: reagent-name-greengrass
-  parent: BaseDrink
+  parent: BaseAlcohol
   desc: reagent-desc-greengrass
   physicalDesc: reagent-physical-desc-tangy
   flavor: greengrass
@@ -141,17 +130,13 @@
   metamorphicFillBaseName: fill-
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.05
+      metabolites:
+        Ethanol: 0.1
 
 - type: reagent
   id: ArsonistsBrew
   name: reagent-name-arsonistsbrew
-  parent: BaseDrink
+  parent: BaseAlcohol
   desc: reagent-desc-arsonistsbrew
   physicalDesc: reagent-physical-desc-volatile
   flavor: arsonistsbrew
@@ -164,12 +149,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.30
+      metabolites:
+        Ethanol: 0.6
     Bloodstream:
       effects:
       - !type:HealthChange
@@ -201,7 +182,7 @@
 - type: reagent
   id: Mothamphetamine
   name: reagent-name-mothamphetamine
-  parent: BaseDrink
+  parent: BaseAlcohol
   desc: reagent-desc-mothamphetamine
   physicalDesc: reagent-physical-desc-fuzzy
   flavor: mothamphetamine #Delta-V Flavor additions
@@ -214,12 +195,8 @@
   metamorphicChangeColor: false
   metabolisms:
     Digestion:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.25
+      metabolites:
+        Ethanol: 0.5
     Bloodstream:
       effects:
       - !type:Jitter

Resources/Prototypes/_DV/Reagents/Consumable/Drink/frozen_treats.yml

@@ -134,10 +134,8 @@
   recognizable: true
   metabolisms:
     Digestion:
-      effects:
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.05
+      metabolites:
+        Theobromine: 0.1
   metamorphicSprite:
     sprite: _DV/Objects/Consumable/Drinks/frozen_treats/icecream-chocolate.rsi
     state: icon_empty
@@ -166,14 +164,13 @@
   recognizable: true
   metabolisms:
     Digestion:
+      metabolites:
+        Theobromine: 0.1
       effects:
       - !type:ModifyStatusEffect
         effectProto: StatusEffectDrowsiness
         time: 2
         type: Remove
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.05
   metamorphicSprite:
     sprite: _DV/Objects/Consumable/Drinks/frozen_treats/icecream-coffee.rsi
     state: icon_empty
@@ -252,10 +249,8 @@
   recognizable: true
   metabolisms:
     Digestion:
-      effects:
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.05
+      metabolites:
+        Theobromine: 0.1
   metamorphicSprite:
     sprite: _DV/Objects/Consumable/Drinks/frozen_treats/icecream-neapolitan.rsi
     state: icon_empty
@@ -283,10 +278,9 @@
   recognizable: true
   metabolisms:
     Digestion:
+      metabolites:
+        Theobromine: 0.1
       effects:
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.05
       - !type:SatiateThirst
         factor: 2
       - !type:HealthChange
@@ -312,6 +306,8 @@
   recognizable: true
   metabolisms:
     Digestion:
+      metabolites:
+        Theobromine: 0.1
       effects:
       - !type:SatiateThirst
         factor: 3
@@ -325,9 +321,6 @@
         damage:
           types:
             Cold: .5
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.05
   metamorphicSprite:
     sprite: _DV/Objects/Consumable/Drinks/frozen_treats/icecream-tower.rsi
     state: icon_empty

Resources/Prototypes/_DV/Reagents/Consumable/Drink/soda.yml

@@ -8,6 +8,8 @@
   color: "#570303"
   metabolisms:
     Digestion:
+      metabolites:
+        UncookedAnimalProteins: 0.1
       effects:
       - !type:SatiateThirst
         factor: 2.0
@@ -15,6 +17,3 @@
         - !type:MetabolizerTypeCondition
           type: [ Human ]
           inverted: true
-      - !type:AdjustReagent
-        reagent: UncookedAnimalProteins
-        amount: 0.05

Resources/Prototypes/_DV/Recipes/Construction/Graphs/unstable_core_refractor.yml

@@ -0,0 +1,40 @@
+- type: constructionGraph
+  id: UnstableCoreRefractorConstruct
+  start: start
+  graph:
+  - node: start
+    entity: UnstableReactorHousing
+    edges:
+    - to: UnstableRefractor
+      steps:
+      - tag: UnstableReactorCore
+        name: construction-graph-tag-unstable-reactor-core
+        icon:
+          sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
+          state: icon
+        doAfter: 6
+  - node: UnstableRefractor
+    entity: WeaponUnstableCoreRefractor
+
+- type: constructionGraph
+  id: UnstableCoreRefractor
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: UnstableRefractor
+      steps:
+      - tag: UnstableReactorHousing
+        name: construction-graph-tag-unstable-reactor-housing
+        icon:
+          sprite: _DV/Objects/Misc/unstable_reactor_housing.rsi
+          state: icon
+        doAfter: 1
+      - tag: UnstableReactorCore
+        name: construction-graph-tag-unstable-reactor-core
+        icon:
+          sprite: _DV/Objects/Misc/unstable_reactor_core.rsi
+          state: icon
+        doAfter: 6
+  - node: UnstableRefractor
+    entity: WeaponUnstableCoreRefractor

Resources/Prototypes/_DV/Recipes/Construction/weapons.yml

@@ -0,0 +1,7 @@
+- type: construction
+  id: WeaponUnstableCoreRefractor
+  graph: UnstableCoreRefractor
+  startNode: start
+  targetNode: UnstableRefractor
+  category: construction-category-weapons
+  objectType: Item

Resources/Prototypes/_DV/Recipes/Lathes/Packs/security.yml

@@ -100,6 +100,7 @@
   - WeaponBeamCannon
   - WeaponEnergyGunAdvanced
   - WeaponImmolator
+  - UnstableReactorHousing
 
 - type: latheRecipePack
   id: SecurityHardsuits

Resources/Prototypes/_DV/Recipes/Lathes/security.yml

@@ -429,3 +429,16 @@
   materials:
     Steel: 1000
     Uranium: 250
+
+# Crafting base component for Unstable Core Refractor
+
+- type: latheRecipe
+  parent: BaseWeaponRecipeLong
+  id: UnstableReactorHousing
+  result: UnstableReactorHousing
+  materials:
+    Steel: 4500
+    Glass: 1500
+    Gold: 1500
+    Silver: 3000
+    Uranium: 1000

Resources/Prototypes/_DV/Roles/Antags/hitman.yml

@@ -13,6 +13,7 @@
   storage:
     back:
     - HitmanCase
+    - EncryptionKeyFreelance
 
 - type: startingGear
   id: HitmanGhostGear
@@ -27,3 +28,4 @@
   storage:
     back:
     - HitmanCase
+    - EncryptionKeyFreelance

Resources/Prototypes/_DV/tags.yml

@@ -311,3 +311,12 @@
 
 - type: Tag
   id: SynthesizerInstrument # ConstructionGraph: SuperSynthesizerGraph
+
+- type: Tag
+  id: UnstableReactorCore #Craftable Unstable Core Refractor
+
+- type: Tag
+  id: UnstableReactorHousing #Craftable Unstable Core Refractor
+
+- type: Tag
+  id: UnstableCoreRefractor

Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml

@@ -1,7 +1,7 @@
 - type: marking
   id: CyberLimbsMarkingComp1LArm
   bodyPart: LArm
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: l_arm-primary
@@ -13,7 +13,7 @@
 - type: marking
   id: CyberLimbsMarkingComp1LHand
   bodyPart: LHand
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: l_hand
@@ -21,7 +21,7 @@
 - type: marking
   id: CyberLimbsMarkingComp1LLeg
   bodyPart: LLeg
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: l_leg-primary
@@ -32,7 +32,7 @@
 - type: marking
   id: CyberLimbsMarkingComp1LFoot
   bodyPart: LFoot
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: l_foot
@@ -42,7 +42,7 @@
 - type: marking
   id: CyberLimbsMarkingComp1RArm
   bodyPart: RArm
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: r_arm-primary
@@ -55,7 +55,7 @@
 - type: marking
   id: CyberLimbsMarkingComp1RHand
   bodyPart: RHand
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: r_hand
@@ -63,7 +63,7 @@
 - type: marking
   id: CyberLimbsMarkingComp1RLeg
   bodyPart: RLeg
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: r_leg-primary
@@ -74,7 +74,7 @@
 - type: marking
   id: CyberLimbsMarkingComp1RFoot
   bodyPart: RFoot
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi
     state: r_foot

Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml

@@ -1,7 +1,7 @@
 - type: marking
   id: CyberLimbsMarkingComp2LArm
   bodyPart: LArm
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: l_arm-1
@@ -11,7 +11,7 @@
 - type: marking
   id: CyberLimbsMarkingComp2LHand
   bodyPart: LHand
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: l_hand-1
@@ -21,7 +21,7 @@
 - type: marking
   id: CyberLimbsMarkingComp2LLeg
   bodyPart: LLeg
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: l_leg-1
@@ -32,7 +32,7 @@
 - type: marking
   id: CyberLimbsMarkingComp2LFoot
   bodyPart: LFoot
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: l_foot-1
@@ -44,7 +44,7 @@
 - type: marking
   id: CyberLimbsMarkingComp2RArm
   bodyPart: RArm
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: r_arm-1
@@ -55,7 +55,7 @@
 - type: marking
   id: CyberLimbsMarkingComp2RHand
   bodyPart: RHand
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: r_hand-1
@@ -66,7 +66,7 @@
 - type: marking
   id: CyberLimbsMarkingComp2RLeg
   bodyPart: RLeg
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: r_leg-1
@@ -77,7 +77,7 @@
 - type: marking
   id: CyberLimbsMarkingComp2RFoot
   bodyPart: RFoot
-  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune] # DeltaV - Feroxi, Kitsune
+  groupWhitelist: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi, Kitsune, Slime] # DeltaV - Feroxi, Kitsune, Slime
   sprites:
   - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi
     state: r_foot-1

Resources/Prototypes/_Impstation/Body/Species/thaven.yml

@@ -1,4 +1,6 @@
-- type: markingsGroup
+# Begin DeltaV Changes - This entire file was restructured for Nubody
+- type: markingsGroup
+  parent: Undergarments
   id: Thaven
   onlyGroupWhitelisted: true
   limits:
@@ -15,6 +17,9 @@
     enum.HumanoidVisualLayers.Head:
       limit: 4
       required: false
+    enum.HumanoidVisualLayers.FacialHair:
+      limit: 1
+      required: false
     enum.HumanoidVisualLayers.Chest:
       limit: 4
       required: false
@@ -24,60 +29,69 @@
     enum.HumanoidVisualLayers.RArm:
       limit: 4
       required: false
+    enum.HumanoidVisualLayers.LHand:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.RHand:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.LLeg:
+      limit: 3
+      required: false
+    enum.HumanoidVisualLayers.RLeg:
+      limit: 3
+      required: false
+    enum.HumanoidVisualLayers.LFoot:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.RFoot:
+      limit: 1
+      required: false
     enum.HumanoidVisualLayers.Overlay:
       limit: 6
       required: false
     enum.HumanoidVisualLayers.Snout:
       limit: 1
       required: false
+    enum.HumanoidVisualLayers.Tail:
+      limit: 1
+      required: false
+    enum.HumanoidVisualLayers.TailOverlay:
+      limit: 6
+      required: false
+    enum.HumanoidVisualLayers.Special:
+      limit: 1
+      required: false
 
 - type: entity
   parent: BaseSpeciesAppearance
   id: AppearanceThaven
+  categories: [ HideSpawnMenu ]
   name: thaven appearance
   components:
   - type: Inventory
+    speciesId: thaven
     templateId: thaven
     displacements:
       jumpsuit:
         sizeMaps:
           32:
-            sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi
+            sprite: _MACRO/Mobs/Species/Thaven/displacement.rsi
             state: jumpsuit
-      head:
-        sizeMaps:
-          32:
-            sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi
-            state: head
-      eyes:
-        sizeMaps:
-          32:
-            sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi
-            state: eyes
-      ears:
-        sizeMaps:
-          32:
-            sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi
-            state: head
-      mask:
-        sizeMaps:
-          32:
-            sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi
-            state: mask
-      neck:
-        sizeMaps:
-          32:
-            sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi
-            state: neck
       outerClothing:
         sizeMaps:
           32:
-            sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi
+            sprite: _MACRO/Mobs/Species/Thaven/displacement.rsi
             state: outerclothing_hardsuit
+      head:
+        sizeMaps:
+          32:
+            sprite: _MACRO/Mobs/Species/Thaven/displacement.rsi
+            state: head
       gloves:
         sizeMaps:
           32:
-            sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi
+            sprite: _MACRO/Mobs/Species/Thaven/displacement.rsi
             state: hands
   - type: InitialBody
     organs:
@@ -85,21 +99,19 @@
       Head: OrganThavenHead
       ArmLeft: OrganThavenArmLeft
       ArmRight: OrganThavenArmRight
-      HandLeft: OrganThavenHandLeft
       HandRight: OrganThavenHandRight
+      HandLeft: OrganThavenHandLeft
       LegLeft: OrganThavenLegLeft
       LegRight: OrganThavenLegRight
       FootLeft: OrganThavenFootLeft
       FootRight: OrganThavenFootRight
       Brain: OrganThavenBrain
       Eyes: OrganThavenEyes
-      Ears: OrganHumanEars
-      Appendix: OrganHumanAppendix
-      Lungs: OrganHumanLungs
-      Heart: OrganHumanHeart
-      Stomach: OrganHumanStomach
-      Liver: OrganHumanLiver
-      Kidneys: OrganHumanKidneys
+      Lungs: OrganThavenLungs
+      Heart: OrganThavenHeart
+      Stomach: OrganThavenStomach
+      Liver: OrganThavenLiver
+      Kidneys: OrganThavenKidneys
   - type: HumanoidProfile
     species: Thaven
 
@@ -111,7 +123,7 @@
   name: Urist McEars
   components:
   - type: Icon
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi # Unlike dwarves elves are NOT made of slime
+    sprite: _MACRO/Mobs/Species/Thaven/parts.rsi
     state: full
   - type: ThavenMoods
   - type: Respirator
@@ -153,7 +165,7 @@
         layer:
         - MobLayer
   - type: TypingIndicator
-    proto: Thaven # DeltaV unique typing indicator
+    proto: Thaven # DeltaV - unique typing indicator
   - type: Vocal
     sounds:
       Male: MaleThaven
@@ -173,21 +185,21 @@
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
   - type: CosmicMarkVisuals # DeltaV - cosmic cult
-    offset: 0, 0.0625 #2 pixels up
+    offset: 0, 0.0625 # 2 pixels up
 
 - type: entity
+  abstract: true
   parent: OrganBase
   id: OrganThaven
-  abstract: true
   suffix: Thaven
 
 - type: entity
+  abstract: true
   parent: OrganThaven
   id: OrganThavenInternal
-  abstract: true
   components:
   - type: Sprite
-    sprite: Mobs/Species/Human/organs.rsi
+    sprite: _MACRO/Mobs/Species/Thaven/organs.rsi
 
 - type: entity
   parent: OrganThaven
@@ -195,69 +207,55 @@
   abstract: true
   components:
   - type: Sprite
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
+    sprite: _MACRO/Mobs/Species/Thaven/parts.rsi
   - type: VisualOrgan
     data:
-      sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
+      sprite: _MACRO/Mobs/Species/Thaven/parts.rsi
   - type: VisualOrganMarkings
     markingData:
       group: Thaven
 
-- type: entity
-  parent: [ OrganBaseEyes, OrganThavenExternal, OrganThavenInternal ]
-  id: OrganThavenEyes
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/organs.rsi
-  - type: VisualOrgan
-    layer: enum.HumanoidVisualLayers.Eyes
-    data:
-      sprite: _Impstation/Mobs/Species/Thaven/parts.rsi # Delta V - Using DV Eyes
-      state: eyes
-#  DV - Marking Displacement requires additional pr from may.
-#  - type: VisualOrganMarkings
-#    markingsDisplacement:
-#      Eyes:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Thaven/displacement.rsi
-#            state: eyes
-
-- type: entity
-  parent: [ OrganBaseHead, OrganThavenExternal ]
-  id: OrganThavenHead
-
 - type: entity
   parent: [ OrganBaseTorso, OrganThavenExternal ]
   id: OrganThavenTorso
 
 - type: entity
-  parent: [ OrganBaseLegLeft, OrganThavenExternal ]
-  id: OrganThavenLegLeft
-
-- type: entity
-  parent: [ OrganBaseHandLeft, OrganThavenExternal ]
-  id: OrganThavenHandLeft
+  parent: [ OrganBaseHead, OrganThavenExternal ]
+  id: OrganThavenHead
+  components:
+  - type: VisualOrganMarkings
+    hideableLayers:
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.HeadSide
+    - enum.HumanoidVisualLayers.Snout
 
 - type: entity
   parent: [ OrganBaseArmLeft, OrganThavenExternal ]
   id: OrganThavenArmLeft
 
 - type: entity
-  parent: [ OrganBaseFootLeft, OrganThavenExternal ]
-  id: OrganThavenFootLeft
+  parent: [ OrganBaseArmRight, OrganThavenExternal ]
+  id: OrganThavenArmRight
 
 - type: entity
-  parent: [ OrganBaseLegRight, OrganThavenExternal ]
-  id: OrganThavenLegRight
+  parent: [ OrganBaseHandLeft, OrganThavenExternal ]
+  id: OrganThavenHandLeft
 
 - type: entity
   parent: [ OrganBaseHandRight, OrganThavenExternal ]
   id: OrganThavenHandRight
 
 - type: entity
-  parent: [ OrganBaseArmRight, OrganThavenExternal ]
-  id: OrganThavenArmRight
+  parent: [ OrganBaseLegLeft, OrganThavenExternal ]
+  id: OrganThavenLegLeft
+
+- type: entity
+  parent: [ OrganBaseLegRight, OrganThavenExternal ]
+  id: OrganThavenLegRight
+
+- type: entity
+  parent: [ OrganBaseFootLeft, OrganThavenExternal ]
+  id: OrganThavenFootLeft
 
 - type: entity
   parent: [ OrganBaseFootRight, OrganThavenExternal ]
@@ -266,5 +264,40 @@
 - type: entity
   parent: [ OrganBaseBrain, OrganThavenInternal ]
   id: OrganThavenBrain
-  name: thaven brain
   description: "An organic positronic brain. Quite remarkable, really."
+
+- type: entity
+  parent: [ OrganBaseEyes, OrganThavenInternal, OrganThavenExternal ]
+  id: OrganThavenEyes
+  description: "The dark sclera have a faint, iridescent coating."
+  components:
+  - type: VisualOrgan
+    data:
+      sprite: _MACRO/Mobs/Species/Thaven/parts.rsi
+      state: eyes
+
+- type: entity
+  parent: [ OrganBaseLungs, OrganThavenInternal, OrganHumanMetabolizer ]
+  id: OrganThavenLungs
+  description: "Technically not lungs since they don't draw chemicals from the air, these strange, durable organs use the motion of respiration to provide energy for cell maintenance."
+
+- type: entity
+  parent: [ OrganBaseHeart, OrganThavenInternal, OrganHumanMetabolizer ]
+  id: OrganThavenHeart
+  description: "The toxic heart of a thaven. You're wearing gloves, right?"
+
+- type: entity
+  parent: [ OrganBaseStomach, OrganThavenInternal, OrganHumanMetabolizer ]
+  id: OrganThavenStomach
+  description: "Surprisingly similar to the stomach of a sharkminnow."
+
+- type: entity
+  parent: [ OrganBaseLiver, OrganThavenInternal, OrganHumanMetabolizer ]
+  id: OrganThavenLiver
+  description: "It loosely resembles a slab of dragon flesh."
+
+- type: entity
+  parent: [ OrganBaseKidneys, OrganThavenInternal, OrganHumanMetabolizer ]
+  id: OrganThavenKidneys
+  description: "Shiny, coppery veins make these the most ornate kidneys known to modern science."
+# End DeltaV Changes - This entire file was restructured for Nubody

Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml

@@ -1,238 +0,0 @@
-##i did markings for a lot of different species so for now theyre are all here##
-##if no one else does it ill do a cleanup of all marking coding in a few months##
-##-carousel##
-
-#- type: marking
-#  id: FullID
-#  bodyPart: Part
-#  groupWhitelist: [Species, Species]
-#  youre on your own for figuring out the coloring system, my friend
-#  sprites:
-#  - sprite: _Impstation/Mobs/Customization/filelocation.rsi
-#    state: filename
-#  shaded: unshaded //use for markings that ignore shader
-
-- type: marking
-  id: Gills
-  bodyPart: Chest
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenchestgills
-
-- type: marking
-  id: ThavenChestScales
-  bodyPart: Chest
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenchestscales
-
-- type: marking
-  id: ThavenHeadScales
-  bodyPart: Head
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenheadscales
-
-- type: marking
-  id: ThavenLArmScales
-  bodyPart: LArm
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenleftarmscales
-
-- type: marking
-  id: ThavenRArmScales
-  bodyPart: RArm
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenrightarmscales
-
-- type: marking
-  id: ThavenLLegScales
-  bodyPart: LLeg
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenleftlegscales
-
-- type: marking
-  id: ThavenRLegScales
-  bodyPart: RLeg
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenrightlegscales
-
-#- type: marking
-#  id: ThavenLHandScales
-#  bodyPart: LHand
-#  groupWhitelist: [ Thaven ]
-#  forcedColoring: false
-#  sprites:
-#  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-#    state: thavenlefthandscales
-
-#- type: marking
-#  id: ThavenRHandScales
-#  bodyPart: RHand
-#  groupWhitelist: [ Thaven ]
-#  forcedColoring: false
-#  sprites:
-#  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-#    state: thavenrighthandscales
-
-#- type: marking
-#  id: Thiddies
-#  bodyPart: Chest
-#  groupWhitelist: [ Thaven ]
-#  forcedColoring: true
-#  sprites:
-#  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-#    state: thavenbignaturals
-#commented out until i find a way to hide them under clothes
-
-
-- type: marking
-  id: ThavenTopSurgery
-  bodyPart: Chest
-  groupWhitelist: [ Thaven ]
-  forcedColoring: true
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavennonaturals
-
-- type: marking
-  id: ThavenFishEars
-  bodyPart: HeadSide
-  groupWhitelist: [ Thaven ]
-  forcedColoring: true
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenfishears
-
-- type: marking
-  id: ThavenTattooVines
-  bodyPart: Chest
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thaventattoovines
-
-- type: marking
-  id: ThavenSpines
-  bodyPart: Chest
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenspines
-
-- type: marking
-  id: ThavenBiteMark
-  bodyPart: Chest
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenbitemark
-
-- type: marking
-  id: ThavenTattooWave
-  bodyPart: Chest
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thaventattoowave
-
-- type: marking
-  id: SharkminnowEyeliner
-  bodyPart: HeadTop
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thaventattoosharkminnoweyeliner
-
-- type: marking
-  id: ThavenTiger
-  bodyPart: Chest
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thaventiger1
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thaventiger2
-
-- type: marking
-  id: ThavenTigerRArm
-  bodyPart: RArm
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thaventigerarmsr
-
-- type: marking
-  id: ThavenTigerLArm
-  bodyPart: LArm
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thaventigerarmsl
-
-- type: marking
-  id: ThavenHeadStripes
-  bodyPart: Head
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenheadstripes
-
-- type: marking
-  id: ThavenBodyStripes
-  bodyPart: Chest
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenbodystripes
-
-- type: marking
-  id: ThavenEarsBigFins
-  bodyPart: HeadSide
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenearsbigfins
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenearsbigfins2
-
-- type: marking
-  id: ThavenHeadCap
-  bodyPart: Head
-  groupWhitelist: [ Thaven ]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenheadcap1
-  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: thavenheadcap2
-