Automatic changelog update

Fix beer bottles (#6503 )
* fix:beer bottles were missing the DrinkBottle tag * Revert "fix:beer bottles were missing the DrinkBottle tag" This reverts commit 320bdfeaf9. * fix:beer bottles were missing the DrinkBottle tag * Update Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml missing DeltaV tag to specify that it's a delta-v specific change Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: pinoinha <55506432+Pinoinha@users.noreply.github.com> --------- Signed-off-by: pinoinha <55506432+Pinoinha@users.noreply.github.com> Co-authored-by: Marina Barros <azulmarina799@gmail.com> Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
2026-09-29 15:47:26 +00:00 · 2026-09-14 19:45:03 +02:00 · 2026-09-14 12:44:42 -05:00 · 2026-09-14 00:20:01 +02:00 · 2026-09-13 15:19:39 -07:00 · 2026-09-13 04:36:32 +02:00
496 changed files with 139185 additions and 44775 deletions
@@ -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
@@ -1,111 +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!
@@ -4437,4 +4330,115 @@
  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
 Order: 1
@@ -1087,4 +1087,11 @@
  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
 Order: 3
@@ -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
@@ -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.
@@ -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.

@@ -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
@@ -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)
-
@@ -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
@@ -97,7 +97,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: Gravity
      gravityShakeSound: !type:SoundPathSpecifier
        path: /Audio/Effects/alert.ogg
@@ -77,7 +77,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: Gravity
      gravityShakeSound: !type:SoundPathSpecifier
        path: /Audio/Effects/alert.ogg
@@ -90,7 +90,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: DecalGrid
      chunkCollection:
        version: 2
@@ -64,7 +64,7 @@ entities:
    - type: DeviceNetwork
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
      deviceNetId: Wireless
    - type: DecalGrid
      chunkCollection:
@@ -88,7 +88,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: DecalGrid
      chunkCollection:
        version: 2
@@ -76,7 +76,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: ImplicitRoof
    - type: GridPathfinding
    - type: Gravity
@@ -71,7 +71,7 @@ entities:
    - type: DeviceNetwork
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
      deviceNetId: Wireless
    - type: DecalGrid
      chunkCollection:
@@ -95,7 +95,7 @@ entities:
    - type: DeviceNetwork
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: DecalGrid
      chunkCollection:
        version: 2
@@ -78,7 +78,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: DecalGrid
      chunkCollection:
        version: 2
@@ -69,7 +69,7 @@ entities:
    - type: DeviceNetwork
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
      deviceNetId: Wireless
    - type: DecalGrid
      chunkCollection:
@@ -109,7 +109,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: DecalGrid
      chunkCollection:
        version: 2
@@ -97,7 +97,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: DecalGrid
      chunkCollection:
        version: 2
@@ -85,7 +85,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: DecalGrid
      chunkCollection:
        version: 2
@@ -75,7 +75,7 @@ entities:
    - type: DeviceNetwork
      configurators: [ ]
      deviceLists: [ ]
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
      deviceNetId: Wireless
    - type: GridPathfinding
    - type: DecalGrid
@@ -126,7 +126,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: GridPathfinding
    - type: DecalGrid
      chunkCollection:
@@ -94,7 +94,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: DecalGrid
      chunkCollection:
        version: 2
@@ -75,7 +75,7 @@ entities:
    - type: DeviceNetwork
      configurators: [ ]
      deviceLists: [ ]
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
      deviceNetId: Wireless
    - type: GridPathfinding
    - type: DecalGrid
@@ -81,7 +81,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: Gravity
      gravityShakeSound: !type:SoundPathSpecifier
        path: /Audio/Effects/alert.ogg
@@ -73,7 +73,7 @@ entities:
      deviceNetId: Wireless
      configurators: []
      deviceLists: []
-      transmitFrequencyId: ShuttleTimer
+      transmitFrequencyId: NTNet
    - type: DecalGrid
      chunkCollection:
        version: 2
@@ -447,5 +447,5 @@
      storagebase: !type:AllSelector
        children:
        - id: WeaponShotgunHushpup
-        - id: BoxLethalshot
+        - id: BoxShellCaseless # DeltaV switched default to caseless shells
        - id: TreasureCoinIron
@@ -142,6 +142,7 @@
    ClothingUniformBrownSuitSkirt: 2
    ClothingShoesLeather: 2
    ClothingShoesBootsLaceup: 2
+    ClothingShoesBootsSurplus: 3
    # End DeltaV additions
  contrabandInventory:
    ClothingMaskNeckGaiter: 2
@@ -485,6 +485,7 @@
  - type: Tag
    tags:
    - Beer
+    - DrinkBottle # DeltaV

 - type: entity
  parent: [DrinkVisualsAllFilled, DrinkBottleGlassSmallBaseFull]
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,4 +2,4 @@
  id: NamesPitbulls
  values:
    prefix: names-pitbull-dataset-
-    count: 63
+    count: 101
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,6 +14,7 @@
    - ERTPatosBundle
    - ERTaegunBundle
    - ERTmixlaserBundle
+    - ERTkammerer

 - type: entity
  parent: ToolboxThief
@@ -100,6 +101,7 @@
    - ERTGammaSecWT
    - ERTGammaSecImmolator
    - ERTGammaSecIK60
+    - ERTGammaSecJackdaw

 - type: entity
  parent: ToolboxThief
@@ -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
@@ -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" ]
@@ -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
@@ -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
@@ -805,7 +805,7 @@
    containers:
      board: [ DoorElectronicsERT ]

-# Centcomm external doors
+# Centcomm doors
 - type: entity
  parent: AirlockExternal
  id: AirlockExternalCentralCommandLocked
@@ -823,3 +823,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 ]
@@ -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"]]
@@ -20,7 +20,6 @@
    - id: RatKingSpawn
    - id: NTAgentSleeper
    - id: ColossusSpawn
-    - id: AsakimShuttle
    - id: HitmanShuttle

 # Replaces upstream meteor events until they're good
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-
@@ -1,92 +0,0 @@
- type: marking
-  id: ThavenEars1
-  bodyPart: HeadSide
-  groupWhitelist: [Thaven]
-  forcedColoring: true
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
-    state: ears1
-
- type: marking
-  id: ThavenEars2
-  bodyPart: HeadSide
-  groupWhitelist: [Thaven]
-  forcedColoring: true
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
-    state: ears2
-
- type: marking
-  id: ThavenEars3
-  bodyPart: HeadSide
-  groupWhitelist: [Thaven]
-  forcedColoring: true
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
-    state: ears3
-
- type: marking
-  id: ThavenEars4
-  bodyPart: HeadSide
-  groupWhitelist: [Thaven]
-  forcedColoring: true
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
-    state: ears4
-
- type: marking
-  id: ThavenPiercings
-  bodyPart: HeadTop
-  groupWhitelist: [Thaven]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
-    state: piercings
-
- type: marking
-  id: ThavenPiercings2
-  bodyPart: HeadTop
-  groupWhitelist: [Thaven]
-  forcedColoring: false
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
-    state: piercings2
-
- type: marking
-  id: ThavenChestTattoo1
-  bodyPart: Chest
-  groupWhitelist: [Thaven]
-  coloring:
-    default:
-      type:
-        !type:TattooColoring
-      fallbackColor: "#666666"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
-    state: chesttat1
-
- type: marking
-  id: ThavenLArmTattoo1
-  bodyPart: LArm
-  groupWhitelist: [Thaven]
-  coloring:
-    default:
-      type:
-        !type:TattooColoring
-      fallbackColor: "#666666"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
-    state: larmtat1
-
- type: marking
-  id: ThavenRArmTattoo1
-  bodyPart: RArm
-  groupWhitelist: [Thaven]
-  coloring:
-    default:
-      type:
-        !type:TattooColoring
-      fallbackColor: "#666666"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
-    state: rarmtat1
@@ -1,90 +0,0 @@
- type: marking
-  id: UndershirtDefault
-  bodyPart: UndergarmentTop
-  groupWhitelist: null # DeltaV - removed restrictions
-  coloring:
-    default:
-      type:
-        !type:SimpleColoring
-          color: "#FFFFFF"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/undershirt.rsi
-    state: undershirt
-
- type: marking
-  id: UndershirtRolled
-  bodyPart: UndergarmentTop
-  groupWhitelist: null # DeltaV - removed restrictions
-  coloring:
-    default:
-      type:
-        !type:SimpleColoring
-          color: "#FFFFFF"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/undershirt.rsi
-    state: rolled_undershirt
-
- type: marking
-  id: UndershirtSleeveless
-  bodyPart: UndergarmentTop
-  groupWhitelist: null # DeltaV - removed restrictions
-  coloring:
-    default:
-      type:
-        !type:SimpleColoring
-          color: "#FFFFFF"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/undershirt.rsi
-    state: sleeveless
-
- type: marking
-  id: UndershirtRolledSleeveless
-  bodyPart: UndergarmentTop
-  groupWhitelist: null # DeltaV - removed restrictions
-  coloring:
-    default:
-      type:
-        !type:SimpleColoring
-          color: "#FFFFFF"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/undershirt.rsi
-    state: rolled_undershirt_sleeveless
-
- type: marking
-  id: UndershirtGrossSleeveless
-  bodyPart: UndergarmentTop
-  groupWhitelist: null # DeltaV - removed restrictions
-  coloring:
-    default:
-      type:
-        !type:SimpleColoring
-          color: "#FFFFFF"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/undershirt.rsi
-    state: gross_sleeveless
-
- type: marking
-  id: UndershirtNanotrasen
-  bodyPart: UndergarmentTop
-  groupWhitelist: null # DeltaV - removed restrictions
-  coloring:
-    default:
-      type:
-        !type:SimpleColoring
-          color: "#FFFFFF"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/undershirt.rsi
-    state: nanotrasen
-
- type: marking
-  id: UndershirtBraStrapless
-  bodyPart: UndergarmentTop
-  groupWhitelist: null # DeltaV - removed restrictions
-  coloring:
-    default:
-      type:
-        !type:SimpleColoring
-          color: "#FFFFFF"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/undershirt.rsi
-    state: strapless
@@ -1,25 +0,0 @@
- type: marking
-  id: UnderwearLowriders
-  bodyPart: UndergarmentBottom
-  groupWhitelist: null # DeltaV - removed restrictions
-  coloring:
-    default:
-      type:
-        !type:SimpleColoring
-          color: "#FFFFFF"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/underwear.rsi
-    state: lowriders
-
- type: marking
-  id: UnderwearTanga
-  bodyPart: UndergarmentBottom
-  groupWhitelist: null # DeltaV - removed restrictions
-  coloring:
-    default:
-      type:
-        !type:SimpleColoring
-          color: "#FFFFFF"
-  sprites:
-  - sprite: _Impstation/Mobs/Customization/underwear.rsi
-    state: tanga
@@ -34,12 +34,14 @@
      uiWindowPos: 0,2
      strippingWindowPos: 0,1
      displayName: Neck
+      offset: 0, 0.03
    - name: mask
      slotTexture: mask
      slotFlags: MASK
      uiWindowPos: 1,2
      strippingWindowPos: 1,1
      displayName: Mask
+      offset: 0, 0.0655
    - name: eyes
      slotTexture: glasses
      slotFlags: EYES
@@ -47,6 +49,7 @@
      uiWindowPos: 0,3
      strippingWindowPos: 0,0
      displayName: Eyes
+      offset: 0, 0.0655
    - name: ears
      slotTexture: ears
      slotFlags: EARS
@@ -54,12 +57,14 @@
      uiWindowPos: 2,2
      strippingWindowPos: 2,0
      displayName: Ears
+      offset: 0, 0.0615
    - name: head
      slotTexture: head
      slotFlags: HEAD
      uiWindowPos: 1,3
      strippingWindowPos: 1,0
      displayName: Head
+      offset: 0, 0.06
    - name: pocket1
      slotTexture: pocket
      fullTextureName: template_small
@@ -17,7 +17,7 @@
    #startAnnouncement: station-event-asakim-shuttle-detected # DeltaV - no
    #  startAudio:
    #    path: /Audio/Misc/notice1.ogg
-    weight: 3
+    weight: 0.85 # DeltaV - was 2, got moved to more active scheduler, now 0.85
    minimumPlayers: 25 # DeltaV
    maxOccurrences: 1 # DeltaV - was 4
    duration: null # DeltaV
@@ -8,18 +8,21 @@
  color: "#a45c08"
  metabolisms:
    Digestion:
+      metabolites: # Delta-V: switch from AdjustReagent system to Metabolites for consistency
+        Theobromine: 0.1
+        Sugar: 0.4
      effects:
      - !type:SatiateThirst
        factor: 2
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.05
-      - !type:AdjustReagent
-        reagent: Sugar
-        amount: 0.2
+#      - !type:AdjustReagent # Delta-V -See above
+#        reagent: Theobromine
+#        amount: 0.05
+#      - !type:AdjustReagent
+#        reagent: Sugar
+#        amount: 0.2
  metamorphicSprite:
    sprite: _NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi
    state: icon_empty
  metamorphicMaxFillLevels: 2
  metamorphicFillBaseName: fill-
-  metamorphicChangeColor: false
+  metamorphicChangeColor: false
@@ -15,7 +15,6 @@ Botany and Chemistry can often work together to produce better medicine (or recr
 <GuideReagentEmbed Reagent="UnstableMutagen"/>
 <GuideReagentEmbed Reagent="Cryoxadone"/>
 <GuideReagentEmbed Reagent="Dylovene"/>
-<GuideReagentEmbed Reagent="Cryoxadone"/>
 <GuideReagentEmbed Reagent="Phalanximine"/>

 </Document>
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/space-wizards/space-station-14/commit/af3593a3b7c2a36b0e0c4a19cc846e96f139fb58 with sprites by SpaceRox1244, edited by Carol",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "caseless"
+        }
+    ]
+}
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, modified by Carol",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-spent"
+        }
+    ]
+}
@@ -0,0 +1,48 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "sprites made by SumOfThreeParts",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by @Stxcking (github) for DeltaV, cc closets recolored by FieldCommand",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "open",
+            "directions": 1
+        },
+        {
+            "name": "door",
+            "directions": 1
+        },
+        {
+            "name": "unlocked",
+            "directions": 1
+        },
+        {
+            "name": "locked",
+            "directions": 1
+        },
+        {
+            "name": "welded",
+            "directions": 1
+        },
+        {
+            "name": "base",
+            "directions": 1
+        }
+    ]
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Delta-V bot	e409e98bf6	Automatic changelog update	2026-09-14 19:45:03 +02:00
pinoinha Vanessa Marina Barros	760af2e261	Fix beer bottles (#6503 ) * fix:beer bottles were missing the DrinkBottle tag * Revert "fix:beer bottles were missing the DrinkBottle tag" This reverts commit `320bdfeaf9`. * fix:beer bottles were missing the DrinkBottle tag * Update Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml missing DeltaV tag to specify that it's a delta-v specific change Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: pinoinha <55506432+Pinoinha@users.noreply.github.com> --------- Signed-off-by: pinoinha <55506432+Pinoinha@users.noreply.github.com> Co-authored-by: Marina Barros <azulmarina799@gmail.com> Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>	2026-09-14 12:44:42 -05:00
Delta-V bot	ebc0340fc9	Automatic changelog update	2026-09-14 00:20:01 +02:00
KOTOB	e8b6c42de4	Fix/Lower Asakim Weight (#6455 ) * whoop * nuke from antag table * we love webedits in this household Signed-off-by: KOTOB <59124164+kotobdev@users.noreply.github.com> --------- Signed-off-by: KOTOB <59124164+kotobdev@users.noreply.github.com>	2026-09-13 15:19:39 -07:00
github-actions[bot]andDeltaV-Bot	5e0d668f60	Update Credits (#6505 ) Co-authored-by: DeltaV-Bot <github@deltav.gay>	2026-09-13 04:36:32 +02:00
Delta-V bot	2c1084da78	Automatic changelog update	2026-09-11 01:40:04 +02:00
BarryNorfolk	9304aad604	Swap emergency shuttles to use NTNet (#6497 )	2026-09-10 19:39:43 -04:00
Delta-V bot	5132e64a0f	Automatic changelog update	2026-09-09 17:49:38 +02:00
SumofThreePartsandpre-commit-ci[bot]	d2bf1e9a39	Adding the Anaconda (#6458 ) * Creating the Anaconda Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * hashtag balance Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * Adding the anaconda sprites Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * Delete anaconda directory Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * Adding the anaconda sprites Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * whoops! Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * yuuuup. adding tha andaconda sprites. again Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * doing the thing!!! Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * part one of adding it to uplink Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * whoops! Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * guh Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * part 2 of adding anaconda to uplink Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * doing the thang Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * adding the thang i was told to Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * adding it but for real Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * oh yeah the description Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * grrrr grrr not correct Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> * guh Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> --------- Signed-off-by: SumofThreeParts <its.a.joke1000@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	2026-09-09 15:49:17 +00:00
Delta-V bot	865d254cd4	Automatic changelog update	2026-09-09 16:55:05 +02:00
Astra	29ec2e659f	Give shadekin hair (#6453 ) Add shadekin hair	2026-09-09 09:54:44 -05:00
Delta-V bot	690f64d592	Automatic changelog update	2026-09-09 16:18:58 +02:00
pixelStrife	b6e018eb18	Namespace drink metabolites (#6486 ) * switched Silencer parent to BaseDrink to revert to pre-Metabolite behavior (non-alcoholic) * Bring namespace drinks in line with upstream, using the new(-ish) Metabolites system in place of the AdjustReagent effect	2026-09-09 09:18:38 -05:00
Delta-V bot	8bcddf4333	Automatic changelog update	2026-09-09 16:15:50 +02:00
Solaris Solaris pre-commit-ci[bot]	34940ecde7	The Pitbull Update of Doom and Despair (#6449 ) * it begins. * THEYRE IN THE VENTS * Update pitbull.yml * I AM THE ONE WHO COLLECTS THE PITBULLS * Fuck you * THAT IS BULLSHIT BLAZING * Throw a small child into upper orbit * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * 100 pitbull names * changed one * sorry one last pitbull name * Update pitbull_names.yml --------- Co-authored-by: Solaris <63768197+Solaris7518@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	2026-09-09 09:15:30 -05:00
Delta-V bot	dafd97e6e1	Automatic changelog update	2026-09-09 16:07:57 +02:00
einknusprigestoastandpre-commit-ci[bot]	593d35903d	ERT Gamma changes + gun addition - The return of the fake balancing. (#6239 ) * Added Jackdaw and Kammerer * ERT hardsuit change * Jackdaw changes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	2026-09-09 09:07:34 -05:00
Delta-V bot	1856f65a18	Automatic changelog update	2026-09-07 02:34:02 +02:00
brainslushie	9066c4af7f	Surplus boots - cosmetic jackboots (#6472 ) * +surplus boots * surplus boots in vendor	2026-09-06 21:33:42 -03:00
Stxcking	cf9a10af4e	PORT: Thaven Markings and Organs from Macrocosm (#6162 ) * Can't go wrong with Sprites * .ftl and .yml files * displacement + parts + organs * marking and displacement yaml * does arent real...yet * Imp dupe nuke * go my human+ * no shaders :< * whoopsie idk how	2026-09-06 21:18:44 -03:00
Delta-V bot	2d7af5622f	Automatic changelog update	2026-09-07 02:17:42 +02:00
nlaky	974f5ff5fa	Vulp alt tail wag + fade tip fix (#6480 ) * Add wag markings for vulp alt tail * Fix tip markings used for fade tails	2026-09-06 21:17:22 -03:00
Delta-V bot	88dc8af9a4	Automatic changelog update	2026-09-07 01:36:12 +02:00
BriBrooo	7c33759cbe	Update Botanicals.xml (#6483 ) Fixes a duplicate entry in the botanical reagent guidebook.	2026-09-06 20:35:52 -03:00
Delta-V bot	baf009af3a	Automatic changelog update	2026-09-05 16:03:30 +02:00
Field Command	b59dfa8991	Central Command remake! (#6198 ) * New Central Command * Me forget * typos and name change * Fix and typo * More polish * Requested Fixes	2026-09-05 09:03:08 -05:00
github-actions[bot]andDeltaV-Bot	e43a587ede	Update Credits (#6465 ) Co-authored-by: DeltaV-Bot <github@deltav.gay>	2026-08-30 05:00:27 +02:00
Delta-V bot	00d77213c6	Automatic changelog update	2026-08-29 01:54:53 +02:00
VapeandVanessa	389a616138	Ramping Scheduler adjustments and changes (#6440 ) * Update roundstart.yml * updakes * Rnd 2 fight * Changes done * Apply suggestion from @ShepardToTheStars Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> * Apply batched suggestions from code review Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> --------- Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>	2026-08-28 23:54:33 +00:00
Delta-V bot	07b029ff2b	Automatic changelog update	2026-08-28 18:38:29 +02:00
Carol	1043b40246	Added caseless shotgun shells (#6457 ) added caseless shotgun shells	2026-08-28 11:38:08 -05:00