Merge branch 'DeltaV-Station:master' into Proposition

Content.Client/Credits/CreditsWindow.xaml.cs

@@ -29,9 +29,9 @@ public sealed partial class CreditsWindow : DefaultWindow
 
         private static readonly Dictionary<string, int> PatronTierPriority = new()
         {
-            ["Nuclear Operative"] = 1,
-            ["Syndicate Agent"] = 2,
-            ["Revolutionary"] = 3
+            ["Central Commander"] = 1,
+            ["Captain"] = 2,
+            ["Assistant"] = 3
         };
 
         public CreditsWindow()

Resources/Changelog/DeltaVChangelog.yml

@@ -1552,3 +1552,23 @@ Entries:
         addition of medical cyborgs. 
   id: 233
   time: '2024-02-08T19:21:16.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Fix
+      message: Fixed missing Mantis stamp sprite.
+  id: 234
+  time: '2024-02-09T10:47:35.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Tweak
+      message: .38 Special is now in the ammo techfab.
+    - type: Fix
+      message: Fixed .38 Special Mindbreaker not breaking minds.
+  id: 235
+  time: '2024-02-10T23:17:28.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Fix
+      message: Fixed glimmer mite being extremely loud for some.
+  id: 236
+  time: '2024-02-10T23:21:56.0000000+00:00'

Resources/ConfigPresets/DeltaV/deltav.toml

@@ -43,5 +43,5 @@ rich_main_icon_id = "deltav"
 [ic]
 flavor_text = true
 
-[worldgen]
-enabled = true
+#[worldgen]
+#enabled = true

Resources/Credits/GitHub.txt

@@ -1 +1 @@
-08A, 0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AitorLogedo, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, Arendian, arimah, artak10t, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Delete69, deltanedas, DeltaV-Bot, DerbyX, DmitriyMX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, evilexecutive, exp111, Fahasor, FairlySadPanda, ficcialfaint, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LudwigVonChesterfield, Lukasz825700516, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Master2112, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, ModeratelyAware, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, Myakot, Myctai, N3X15, Nails-n-Tape, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, Nylux, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, Phill101, PixelTheKermit, PJB3005, pofitlo, pointer-to-null, PoorMansDreams, potato1234x, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, Ranger6012, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, renodubois, RiceMar1244, RieBi, RIKELOLDABOSS, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, SadAways, Samsterious, SamV522, SaphireLattice, ScalyChimp, scrato, Scribbles0, ScumbagDog, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, TadJohnson00, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, ThunderBear2006, timothyteakettle, TimrodDX, Titian3, TK-A369, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, Volotomite, volundr-, Vordenburg, vulppine, Warentan, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xRiriq, yathxyz, Ygg01, YotaXP, youarereadingthis, YuriyKiss, zach-hill, Zandario, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+08A, 0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AitorLogedo, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, Arendian, arimah, artak10t, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Delete69, deltanedas, DeltaV-Bot, DerbyX, DmitriyMX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exp111, Fahasor, FairlySadPanda, ficcialfaint, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Master2112, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, ModeratelyAware, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, Myakot, Myctai, N3X15, Nails-n-Tape, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, Nylux, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, Phill101, PixelTheKermit, PJB3005, pofitlo, pointer-to-null, PoorMansDreams, potato1234x, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, Ranger6012, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, renodubois, RiceMar1244, RieBi, RIKELOLDABOSS, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, SadAways, Samsterious, SamV522, SaphireLattice, ScalyChimp, scrato, Scribbles0, ScumbagDog, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, TadJohnson00, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, ThunderBear2006, timothyteakettle, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Vordenburg, vulppine, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xRiriq, yathxyz, Ygg01, YotaXP, youarereadingthis, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem

Resources/Credits/Patrons.yml

@@ -1,212 +1,58 @@
-- Name: "Tomeno"
-  Tier: Revolutionary
-- Name: "Daniel Thompson"
-  Tier: Revolutionary
-- Name: "Farewell Fire"
-  Tier: Syndicate Agent
-- Name: "MetalClone"
-  Tier: Nuclear Operative
-- Name: "CPM311"
-  Tier: Revolutionary
-- Name: "Bobberunio"
-  Tier: Revolutionary
-- Name: "vifs_vestige"
-  Tier: Syndicate Agent
-- Name: "Anthony Fleck"
-  Tier: Nuclear Operative
-- Name: "Nico Thate"
-  Tier: Revolutionary
-- Name: "Zandario"
-  Tier: Nuclear Operative
-- Name: "Darren Brady"
-  Tier: Revolutionary
-- Name: "DramaBuns"
-  Tier: Revolutionary
-- Name: "Ethan Keller"
-  Tier: Revolutionary
-- Name: "Eric VW"
-  Tier: Revolutionary
-- Name: "Joshington Awesomahee"
-  Tier: Revolutionary
-- Name: "Altana"
-  Tier: Revolutionary
-- Name: "clyf"
-  Tier: Nuclear Operative
-- Name: "spinnermaster"
-  Tier: Syndicate Agent
-- Name: "Will M."
-  Tier: Revolutionary
-- Name: "The Hateful Flesh"
-  Tier: Revolutionary
-- Name: "Viridian"
-  Tier: Revolutionary
-- Name: "Nicholas Hillblom"
-  Tier: Revolutionary
-- Name: "Austin Nelson"
-  Tier: Syndicate Agent
-- Name: "John Edward Hamilton Barchard"
-  Tier: Revolutionary
-- Name: "Cormos Lemming"
-  Tier: Nuclear Operative
-- Name: "Hamcha"
-  Tier: Revolutionary
-- Name: "Peter \"Azmond\" Newhouse"
-  Tier: Revolutionary
-- Name: "Zakanater 19"
-  Tier: Revolutionary
-- Name: "Kris Piper"
-  Tier: Revolutionary
-- Name: "Mikhail"
-  Tier: Revolutionary
-- Name: "Ramiro Agis"
-  Tier: Revolutionary
-- Name: "osborn"
-  Tier: Syndicate Agent
-- Name: "Uinseann"
-  Tier: Revolutionary
-- Name: "Brandon Campbell"
-  Tier: Nuclear Operative
-- Name: "KevKev"
-  Tier: Revolutionary
-- Name: "Jacob Schramm"
-  Tier: Revolutionary
-- Name: "Matouš Hrdlička"
-  Tier: Nuclear Operative
-- Name: "Pasemi"
-  Tier: Revolutionary
-- Name: "Late Fox"
-  Tier: Revolutionary
-- Name: "Dan"
-  Tier: Syndicate Agent
-- Name: "Scott MacCombie"
-  Tier: Nuclear Operative
-- Name: "Gaxeer"
-  Tier: Syndicate Agent
-- Name: "Tamora Droppa"
-  Tier: Revolutionary
-- Name: "Gavin Simmons"
-  Tier: Syndicate Agent
-- Name: "Saphire"
-  Tier: Revolutionary
-- Name: "DubzyVEVO"
-  Tier: Revolutionary
-- Name: "Never Solus"
-  Tier: Syndicate Agent
-- Name: "Gnomo"
-  Tier: Nuclear Operative
-- Name: "TheGoldElite"
-  Tier: Revolutionary
-- Name: "JhenMaster"
-  Tier: Revolutionary
-- Name: "Akira"
-  Tier: Revolutionary
-- Name: "Dave"
-  Tier: Revolutionary
-- Name: "Александр Белошапка"
-  Tier: Revolutionary
-- Name: "Gordod"
-  Tier: Syndicate Agent
-- Name: "tomhendo"
-  Tier: Syndicate Agent
-- Name: "Odin The Wanderer"
-  Tier: Revolutionary
-- Name: "tokie"
-  Tier: Nuclear Operative
-- Name: "Wallace Megas"
-  Tier: Revolutionary
-- Name: "Vandell"
-  Tier: Revolutionary
-- Name: "Enricoc3l"
-  Tier: Revolutionary
-- Name: "DadNotTheBelt"
-  Tier: Nuclear Operative
-- Name: "David"
-  Tier: Revolutionary
-- Name: "Watson Whittington"
-  Tier: Syndicate Agent
-- Name: "Tim Foley"
-  Tier: Syndicate Agent
-- Name: "Blight"
-  Tier: Syndicate Agent
-- Name: "Katarn"
-  Tier: Revolutionary
-- Name: "eric156"
-  Tier: Revolutionary
-- Name: "SHANE ALAN ZINDA"
-  Tier: Nuclear Operative
-- Name: "Glenn Olsen"
-  Tier: Syndicate Agent
-- Name: "Constellations"
-  Tier: Syndicate Agent
-- Name: "Charles Baron"
-  Tier: Syndicate Agent
-- Name: "Shaina Gibson"
-  Tier: Revolutionary
-- Name: "Wolfie"
-  Tier: Revolutionary
-- Name: "Alexandre Courtin"
-  Tier: Revolutionary
-- Name: "Geekyhobo2"
-  Tier: Revolutionary
-- Name: "Nicholas"
-  Tier: Nuclear Operative
-- Name: "GeneralMarty"
-  Tier: Revolutionary
-- Name: "HCG"
-  Tier: Revolutionary
-- Name: "ShaunTexas"
-  Tier: Syndicate Agent
-- Name: "Malachi Housewright"
-  Tier: Revolutionary
-- Name: "Petalmeat"
-  Tier: Syndicate Agent
-- Name: "Jakub Kędziora"
-  Tier: Syndicate Agent
-- Name: "Adam Smedstad"
-  Tier: Revolutionary
+- Name: "weirdrock"
+  Tier: Captain
+- Name: "Drifter Drifter"
+  Tier: Captain
+- Name: "Bikowu"
+  Tier: Assistant
+- Name: "Hasan al-Binabi"
+  Tier: Central Commander
+- Name: "lleft The Dragon"
+  Tier: Central Commander
+- Name: "Pandaconda"
+  Tier: Assistant
+- Name: "Lazhannya"
+  Tier: Captain
+- Name: "Bonktrauma"
+  Tier: Captain
+- Name: "Haltell"
+  Tier: Captain
+- Name: "Delta.Pizza"
+  Tier: Captain
+- Name: "steph kaus"
+  Tier: Captain
+- Name: "HyperionGM"
+  Tier: Central Commander
+- Name: "MikeAndIkes"
+  Tier: Assistant
+- Name: "Ashley"
+  Tier: Central Commander
+- Name: "mura"
+  Tier: Captain
+- Name: "Adeinitas"
+  Tier: Captain
+- Name: "Shock"
+  Tier: Captain
+- Name: "Dead Rabbit"
+  Tier: Captain
+- Name: "T-Dog"
+  Tier: Captain
 - Name: "oBerry"
-  Tier: Nuclear Operative
-- Name: "DireBoar"
-  Tier: Revolutionary
-- Name: "Ignoramis"
-  Tier: Revolutionary
-- Name: "Repo"
-  Tier: Nuclear Operative
-- Name: "612"
-  Tier: Revolutionary
-- Name: "Higgtastic"
-  Tier: Revolutionary
-- Name: "Sandvich enjoyer"
-  Tier: Revolutionary
-- Name: "Mihailo Trickovic"
-  Tier: Syndicate Agent
-- Name: "Vice Emargo"
-  Tier: Revolutionary
-- Name: "awndrssk"
-  Tier: Revolutionary
-- Name: "François Desautels"
-  Tier: Revolutionary
-- Name: "MasterFurret"
-  Tier: Revolutionary
-- Name: "tapohuy"
-  Tier: Revolutionary
-- Name: "Adam Clarke"
-  Tier: Nuclear Operative
-- Name: "Sam Hediger"
-  Tier: Syndicate Agent
-- Name: "Vexxtraordinary"
-  Tier: Revolutionary
-- Name: "Graded"
-  Tier: Syndicate Agent
-- Name: "Christian Hodel"
-  Tier: Revolutionary
-- Name: "IceStorm theDragon"
-  Tier: Revolutionary
-- Name: "Solidus Snake"
-  Tier: Nuclear Operative
-- Name: "Pangaron"
-  Tier: Syndicate Agent
-- Name: "Sed"
-  Tier: Nuclear Operative
-- Name: "Aiden Baker"
-  Tier: Revolutionary
+  Tier: Central Commander
+- Name: "Wakefield"
+  Tier: Captain
+- Name: "Hûvy"
+  Tier: Assistant
+- Name: "TheGungeonologist"
+  Tier: Central Commander
+- Name: "Ethan"
+  Tier: Captain
+- Name: "TeeJay Neuroth"
+  Tier: Captain
+- Name: "Neptunia_Counseling"
+  Tier: Central Commander
+- Name: "rosysyntax"
+  Tier: Assistant
+- Name: "Kurzaen"
+  Tier: Captain
+- Name: "tokie"
+  Tier: Central Commander

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml

@@ -48,10 +48,26 @@
 - type: entity
   id: BulletSpecialMindbreaker
   name: bullet (.38 special mindbreaker)
-  parent: BaseBullet
+  parent: BaseBulletPractice
   noSpawn: true
   components:
   - type: Projectile
     damage:
       types:
-        Blunt: 3
+        Blunt: 1
+  - type: SolutionContainerManager
+    solutions:
+      ammo:
+        maxVol: 9
+  - type: RefillableSolution
+    solution: ammo
+  - type: DrainableSolution
+    solution: ammo
+  - type: SolutionInjectOnCollide
+    transferAmount: 9
+    blockSlots: NONE #shouldn't be blocked by a mask
+  - type: InjectableSolution
+    solution: ammo
+  - type: GuideHelp
+    guides:
+    - Psionics

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

@@ -36,7 +36,7 @@
       state: disabler
     - proto: BulletEnergyGunLaser
       fireCost: 200
-      name: kill
+      name: lethal
       state: lethal
   - type: MagazineVisuals
     magState: mag
@@ -151,7 +151,7 @@
       state: disabler
     - proto: BulletEnergyGunLaser
       fireCost: 200
-      name: kill
+      name: lethal
       state: lethal
   - type: MagazineVisuals
     magState: mag