Upstream sync (#1035)

* Add new implants to deimplant list (#35563) Initial commit * Doxarubixadone Description Fix (#35568) Changed medicine.ftl for Doxa. * Reptilians Can Eat Chicken Nuggets (#35569) Added meat tag to misc.yml for chicken nuggets. * Automatic changelog update * Unheck Admin Smites (#35348) * Fix admin verb names Fixed admin verb names. * Add antag verb names * Adjust antag verb icons * Amber Station - A Couple Changes (#35548) * [ADMIN] Minor Refactor AdminNameOverlay (#35520) * refactor(src): Minor refactor of Draw in "AdminNameOverlay. And new info about playtime player * fix(src): Add configure classic admin owerlay * fix * tweak(src): Use _antagLabelClassic and tweak style * tweak(src): Add config display overlay for startingJob and playTime * tweak(src): Vector2 is replaced by var * tweak(src): return to the end of the list * Automatic changelog update * Wizard PDA (#35572) * wizard PDA * colour change to brown * Automatic changelog update * Increase line spacing of the admin overlay (#35591) line spacing * make slime hair less transparent (#35158) * blabl blump or something * +0.3 * blimpuf * Automatic changelog update * Fix being able to write on/stamp/fax paper scrap (#35596) * init * item * requested changes * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Changed Pride to Hubris in ion_storm.yml (#35602) Update ion_storm.yml * Sentry turrets - Part 3: Turret AI (#35058) * Initial commit * Updated Access/command.yml * Fix for Access/AccessLevelPrototype.cs * Added silicon access levels to admin items * Included self-recharging battery changes * Revert "Included self-recharging battery changes" * Addressed reviewers comments * Additional reviewer comments * DetGadget Hat Revitalization (#35438) * DetGadget Hat * uh... half-assed item description * Reduce hat range to one tile, you have to stand on someone to steal their hat items * Fix Integration Errors * Only the wearer can access voice commands * init work - handscomp is unable to be pulled * second bit of progress * basic working implementation * nuke storageslots and add adminlogging * disallow trolling nukies or hiding objective items * remove unnecessary tags additions * finish nuking unused tags * death to yamllinter * int tests be damned * milon is a furry * address review * upd desc * address reviews part 2 * address more reviews * remove unused refs * fix order of dependencies * add ShowVerb to SharedStorageSystem.cs This will allow or disallow showing the "Open Storage" verb if defined on the component. * orks is a nerd * add proper locale, fix adminlogging * orks is a nerd 2 --------- Co-authored-by: Coenx-flex <coengmurray@gmail.com> * Automatic changelog update * Fingerprint Reader System (#35600) * init * public api * stuff * weh * Remove cellular resistance for slimes (#35583) * Remove cellular resistance for slimes * Update guidebook * Automatic changelog update * Give the station map inhand sprites (#35605) map has inhands * Reagent guidebook reactions UI dividers (#35608) * Update GuideReagentReaction.xaml * Update Content.Client/Guidebook/Controls/GuideReagentReaction.xaml Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * Update Content.Client/Guidebook/Controls/GuideReagentReaction.xaml Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * fix cluwne pda pen slot (#35611) Co-authored-by: deltanedas <@deltanedas:kde.org> * Revert "Make radioactive material radioactive" (#35330) * Automatic changelog update * Predict vending machine UI (#33412) * Automatic changelog update * #32209 changelog (#35619) Since it was merged into staging no changelog was made, but we should at least have it for next release. (And vulture) * Automatic changelog update * Cloning Refactor and bugfixes (#35555) * cloning refactor * cleanup and fixes * don't pick from 0 * give dwarves the correct species * fix dna and bloodstream reagent data cloning * don't copy helmets * be less redundant * Automatic changelog update * centcomm update (#35627) * Better Insectoid Glasses (#31812) Sprites and file changes Adds the variants for arachnid and moth glasses, adds the code for those in the meta.json files, and adds the speciesID tag in both arachnid and moth prototype files. * Automatic changelog update * Add GetBaseName method to NameModifierSystem (#35633) * Add GetBaseName method to NameModifierSystem * Use Name * Save Space Station 14 from the Toilet Gibber Forever (#35587) * The evil is defeated * Tag body bags * uwu, cwush me cwusher-chan * absolute 18+ sloggery * botos binted? 👽 * Automatic changelog update * Changed Damage Overlay to check Burn Damage (#34535) * updated BruteLevel to be PainLevel with burn damage checks in DamageOverlayUiController.cs * dehardcoded pain level by adding damage groups to paindamagegroups to affect * re-added the name for painDamageGroups * fixed overlay default and added minimum limit to component check first * renamed to PainDamageGroups and removed obsolete tag * Automatic changelog update * Wizard's Magical Pen (#35623) * wizard pen * description change * Automatic changelog update * Added decelerator percentage drain (#35643) * Added variable PercentageDrain to SinguloFoodComponent * Set percentageDrain to 0.03 (3%) for anti particles * Added percentageDrain logic in public OnConsumed * Simplify SinguloFoodComponent and set percentageDrain to negative * EnergyFactor now applies to positive values too * Better commenting on EnergyFactor * Update Content.Server/Singularity/Components/SinguloFoodComponent.cs * Documentation of EnergyFactor * Fixing spelling mistake --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Made butter require less milk (#35650) made butter take less milk * Automatic changelog update * Delete SolutionContainerVisualsComponent.InitialName (#35654) * Fix name of cotton dough rope (#35657) changed in-game name of cotton dough rope to differentiate from normal dough rope * CVar - Toggle display of round-end greentext (#35651) * hide greentext if cvar false * change IFs around a lil * reviews * Open State for cowtools (#35666) Open State * Make implants unshielded (#35667) * Add undergarments & "Censor Nudity" toggle to options (#33185) * Initial commit * Attribution * Review changes * Added comment for upstream * Automatic changelog update * centcomm update (#35674) * More scars! (#35644) * :3 * whitespace, stomach scar * Automatic changelog update * Lathe menu UI displays a count of available recipes (#35570) * commit * jumped the gun * changes * Players with unknown playtimes now are tagged as new players, take 2 (#35648) * your commit? our commit. * skreee * show joined players before lobby players; comments * comments * playerinfo retains playtime data after disconnect * new connection status symbols * Automatic changelog update * Add firelocks and locked external airlocks to ATS (#35516) * Add firelocks and locked airlocks to ATS * Add fire alarms * Elkridge Tesla and TEG Improvements + Other stuff (#35684) * better tesla, better TEG, better sci maints, chef gets chef closet * added storage room for tesla parts, added captain bathroom, changed vault so nuke can be armed * ran fixgridatmos and added some vacuum markers * unflatpacked containment shit * Cargo Mail System (#35429) * shitcode init * biocoding, SpawnTableOnUse, Moving shit to shared * server :( * fixes * ok works * Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs * Discard changes to Content.Shared/Forensics/Components/FingerprintMaskComponent.cs * Discard changes to Content.Shared/Forensics/Components/FingerprintComponent.cs * Discard changes to Content.Server/Forensics/Systems/ForensicsSystem.cs * Discard changes to Content.Server/StationRecords/Systems/StationRecordsSystem.cs * Discard changes to Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs * Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs * big stuff * preperation * temperory spawning thing for testing * Update CargoDeliveryDataComponent.cs * kinda proper spawning idk god save me * cleanup (kinda) * preparation 2.0 * stuff i think * entity table work * renames * spawn ratio based on players * comment * letter tables * more spam * package tables * comment * biocodedn't * builds correctly * cleaning * Update deliveries_tables.yml * labels * package sprites * mail teleporter * revert testing value * fix test * fix other test * i love tests * mail teleporter enabled by default * random cooldowns * fixtures * Discard changes to Content.Shared/FingerprintReader/FingerprintReaderComponent.cs * Discard changes to Content.Shared/FingerprintReader/FingerprintReaderSystem.cs * Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs * Discard changes to Resources/Locale/en-US/fingerprint-reader/fingerprint-reader.ftl * clean * fuck paper scrap * oops * fuck SpawnTableOnUse * mail teleporter board in QM locker + addressed review * oops * clean * sound on delivery spawn * address review * partial review address * partial review addressing * addressing partial review * pratarial revivew address * misprediction hell * stuff * more stuff * unrelated * TODO * link * partial review * DirtyField --------- Co-authored-by: Milon <milonpl.git@proton.me> * Automatic changelog update * Add AssertMultiple to ContrabandTest (#35662) * add AssertMultiple to ContrabandTest * do the same for magazine visuals test * :trollface: --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * add forceghost admin command (#35518) * add forceghost admin command * sweep linq under the rug * braces * ûse LocalizedEntityCommands * Automatic changelog update * Text related keybinds can now be changed in Controls (#35630) * Add ability to rebind text related keybinds * fix placement of locales * Automatic changelog update * Update b2dynamictree (#30630) * Update submodule to 248.0.0 (#35720) * Add sun shadows (planet lighting stage 2) (#35145) * Implements a Dynamic Lighting System on maps. * Edit: the night should be a little bit brighter and blue now. * Major edit: everything must be done on the client side now, with certain datafield replicated. Changes were outlined in the salvage to accommodate the new lighting system. * Edit: The offset is now serverside, this makes the time accurate in all situations. * Removing ununsed import * Minor tweaks * Tweak in time precision * Minor tweak + Unused import removed * Edit: apparently RealTime is better for what I'm looking for * Fix: Now the time is calculated correctly. * Minor tweaks * Adds condition for when the light should be updated * Add planet lighting * she * close-ish * c * bittersweat * Fixes * Revert "Merge branch '22719' into 2024-09-29-planet-lighting" This reverts commit 9f2785bb16aee47d794aa3eed8ae15004f97fc35, reversing changes made to 19649c07a5fb625423e08fc18d91c9cb101daa86. * Europa and day-night * weh * rooves working * Clean * Remove Europa * Fixes * fix * Update * Fix caves * Update for engine * Add sun shadows (planet lighting v2) For now mostly targeting walls and having the shadows change over time. Got the basic proof-of-concept working just needs a hell of a lot of polish. * Documentation * a * Fixes * Move blur to an overlay * Slughands * Fixes * Apply RoofOverlay per-grid not per-map * Fix light render scales * sangas * Juice it a bit * Better angle * Fixes * Add color support * Rounding bandaid * Wehs * Better * Remember I forgot to do this when writing docs --------- Co-authored-by: DoutorWhite <thedoctorwhite@gmail.com> * Automatic changelog update * Omega Mail Teleporter (#35705) Mail! * Packed Mail Teleporter (#35706) Mail! * Box Mail Teleporter (#35707) Mail! * Oasis Mail Teleporter (#35708) Mail! * Meta Mail Teleporter (#35709) Mail! * Marathon Mail Teleporter (#35710) Mail! * Fland Mail Teleporter (#35711) Mail! * Plasma fixes 4 (#35716) Fixes 15 Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com> * Aroace pride pin, scarf, and cloak (#35718) cloak, pin, and scarf added yayyyy * Automatic changelog update * [Part of #32893] Localize silicon dataset names (#33352) * Localize ai names * Apply requested changes * Localize autoborg * Localize borg names * Localize atv names * Correct prototypes ids to follow naming conventions * Remove AI localization (Moved to another PR) * Weh * [Part of #32893] Localize arachnid dataset names (#33353) * Localize arachnid dataset names * Correct prototype ids to follow naming conventions * Combine arachnid_first.yml and arachnid_last.yml * Upstream names * [Part of #32893] Localize summonable creatures dataset names (#33392) * Localize clown names * Localize golem names * Localize hologram names * Correct prototype ids to follow naming conventions * Update Resources/Locale/en-US/datasets/names/golem.ftl --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * [Part of #32893] Localize antagonists dataset names (#33393) * Localize fake human names * Localize ninja names * Localize operation names * Localize regalrat names * Localize revenant names * Localize syndicate names * Localize wizard names * Correct prototype ids to follow naming conventions * Combine fake_human_first.yml and fake_human_last.yml * Move contents of ninja_title.yml into ninja.yml * Combine Operation_prefix.yml and Operation_suffix.yml * Combine wizard_first.yml and wizard_last.yml * Upstream names * fix wizard --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * [Part of #32893] Localize humanoid species dataset names (#33395) * Localize diona names * Localize moth names * Localize mushman names * Localize reptilian names * Localize skeleton names * Upstream diona names * names-moth-male/female-first-dataset -> names-moth-first-male/female-dataset * Correct prototype ids to follow naming conventions * NamesSkeletonFirst -> NamesSkeleton * Combine moth_first_female.yml, moth_first_male.yml and moth_last.yml * Forgot about skeleton prototype * Upstream names * Update Resources/Locale/en-US/datasets/names/diona_last.ftl * Update Resources/Locale/en-US/datasets/names/diona_last.ftl * keep first name for skeleton --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * [Part of #32893] Localize vox dataset names (#33396) * Localize vox names * Correct prototype id to follow naming conventions * Upstream names * [Part of #32893] Localize first & last dataset names (#33401) * Localize first names * Localize last names * Correct prototype ids to follow naming conventions * Combine first.yml and last.yml into base.yml * Forgot about = in last * [Part of #32893] Localize first male & female dataset names (#33402) * Localize first_name * Localize first_female * names-male/female-first-dataset -> names-first-male/female-dataset * Correct prototype ids to follow naming conventions * Combine first_male.yml and first_female.yml into base_gendered.yml * [Part of #32893] Localize misc dataset names (#33404) * Localize cargo_shuttle names * Localize death_commando names * Localize fortunes * Localize military names * Localize rollie names * fortunes.ftl -> cookie_fortune.ftl * Correct prototype ids to follow naming conventions * Localize all dataset names (#32893) * Use `LocalizedDatasetPrototype` instead of `DatasetPrototype` in `RoleLoadoutPrototype` * Localize ai names * Replace to `LocalizedDatasetPrototype` in `NamingSystem` * Localize arachnid first and last names * Localize atv names * Localize autoborg names * Forgot to change type to localizedDataset * Localize borer names * Localize borg names * Localize cargo shuttle names * Localize clown names * Localize death_commando names * Localize diona names * Localize fake_human names * Localize first and last names * Localize first male and female names * Localize fortunes descriptions * Forgot about equal sign * Localize golem names * Localize hologram names * Localize military names * Localize moth first male and female names * Localize moth last names * Fix autoborg name error * Localize mushman first and last names * Localize ninja names * Localize operation names * Localize regalrat names * Fix mushman_first * Forgot about `Loc.GetString` * Move comments into comment section & fix names * Localize reptilian male and female names * Localize revenant names * Fix locale word order in operation * Localize rollie (btw it was never used and was added as "for the futuгe" long time ago) * Localize skeleton_first names * Localize syndicate names * Localize vox names * Localize wizard first and last names * `{owner}-name-dataset` -> `names-{owner}-dataset` * Change `DatasetPrototype` to `LocalizedDatasetPrototype` and make sure it works properly GetFTLName is no more the static method, we need it to be able to use `Loc.GetString` * I hate those mothname comments * Combine name datasets prototypes * Move every ftl from` /en-US/names` to ` /en-US/datasets/names` * Remove ftl files * Get every dataset yml back * Remove changes for planets. Move it in another PR * Revert these changes (Moved to another PR) * How * Apply suggested changes * Fix integration tests (#35727) * test * fix names * fix more * Initial delivery balance changes (#35728) * init * small balance * guess not * Update Content.Server/Delivery/CargoDeliveryDataComponent.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Fixed delivery popups (#35724) * :) * cool stuff * Remove a bonus Loc.GetString (#35731) oops * Bagel Engineering Improvements (#35717) * woe, better engineering be upon ye * im going to lose it * radical plan * oopsie * Revert "oopsie" This reverts commit 45ab057f55b46acd795e58257c3cc5967e5cb946. * Revert "radical plan" This reverts commit 57b1ae081725a47aef3ae03111cecbc91b4f47a8. * Revert "im going to lose it" This reverts commit e7b4afaf5d9a10a42e89831ffc9294d3b9bd96d4. * Revert "woe, better engineering be upon ye" This reverts commit 471dc3716b58a39631aa8bee00de79e981391d63. * complete revamp * revision * oops 2 electric boogaloo * another one * every time i push to fix a minor mistake i found in walking around i get closer to my limit * Update Credits (#35733) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Loop mail teleporter (#35729) * latejoin * youve got mail * Core mail update (#35719) * core mail update * empty * derotate core (#35740) Update default.yml * Elkridge Mail Update (#35738) add mail teleporter and mailing unit system * Automatic changelog update * Plasma Mail Teleporter (#35741) Mail! * Convex Mail Teleporter (#35742) Mail! * Remove unneeded Loc.GetString (#35739) * Steal the mail thieving objective (#35746) * mail theft * networked * Automatic changelog update * fix UpdateBankAccount (#35749) * trolled * fun * fuck me * Slightly better letter loot table (#35748) * init * review --------- Co-authored-by: Milon <milonpl.git@proton.me> * Python Suit Storage Visual (#35593) * Python-SUITSTORAGE-Visuals Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * REVised Sprite Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Copyright Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Update Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --------- Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * fix nukeops commander name (#35753) * bagel update (#35754) * Predict some power PowerReceiver stuff (#33834) * Predict some power PowerReceiver stuff Need it for some atmos device prediction. * Also this * Localize traitor codeverbs datasets (#35737) * Localize verbs dataset * Localize adjectives dataset * Localize corporations dataset * Update TraitorRuleSystem to use LocalizedDatasetPrototype instead of DatasetPrototype * Fix sun shadows in ANGLE (#35757) I think I fat-fingered a ctrl-Z on this at some point but the intermediate blur is necessary. * Automatic changelog update * Tweak sun shadow rotations (#35758) Won't use the entity's rotation for the matrix, I just forgot to do this. Means shadows will always point in the same direction and the points will correctly adjust as the entity rotates. * Automatic changelog update * Fix Ahelp window playerlist resize (#35747) reorganize bwoink window layout * Automatic changelog update * Ensure speech bubble cap is always respected (#32223) Ensure speech bubble cap is respected, even when messages are sent very fast * Cleanup: Fix ``PaperWriteEvent`` in ``PaperSystem`` (#35763) * Cleanup + fix * Revert * Cleanup: Add missing locale ``cmd-planet-map-prototype`` (#35766) Cleanup * Added New Cocktails and new fill level sprites to existing drinks. (#33570) * Added New Cocktails and new fill level sprites to existing drinks * Updated copyright info and fixed recipies for Caipirinha/Mojito. --------- Co-authored-by: RedBookcase <Usualmoves@gmail.com> * Automatic changelog update * Performer's Wig (#35764) * miku wig * fix to correct json convention Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> --------- Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> * Automatic changelog update * Merge showsubfloorforever into showsubfloor (#33682) * convex fix * Removable mindshields and revolutionary tweaks. (#35769) * I fucking hate revs * Update preset-revolutionary.ftl * fixy fix * Automatic changelog update * Mail Resprite (#35776) * init commit * init commit * delete those * added github to copyright info * Fix Chameleon PDAs renaming the user in station records (#35782) * Automatic changelog update * Restore the order of admin overlay elements (#35783) admin overlay order fix * Automatic changelog update * Fixes and refactoring to discord changelog script (#33859) * Fixes and refactoring to discord changelog script Upstreamed from https://github.com/impstation/imp-station-14/pull/1023 * Add some prints back in * Update to borg ion storms (#35751) * Updates ion storms for borgs. * Remove additional ion laws into future PR * Automatic changelog update * TriggerSystem improvements (#35762) * desynchronizer real * yaml stuff from slarti branch * C# stuff * oops * fix triggers * atomize PR --------- Co-authored-by: Flareguy <woaj9999@outlook.com> * Roleban command error handling (#35784) roleban command jobid fail handling * Localize news dataset (#35774) * Localize news dataset * Remove the `"` * Localize rat king commands datasets (#35780) * Added mail room * Update submodule to 248.0.2 (#35787) * Update Space Law to reflect Implant changes (#35701) * Change implanter Space Law * Add clarification regarding unidentified implanter vs. unidentified implant sentensing * Add support for antag-before-job selection (#35789) * Add support for antag-before-job selection * Include logging * forensics cleanup (#35795) * polymorph popup fixes (#35796) polymorph fixes * fix more syndicate names (#35788) * New Feature: Warden job rolls before security officer/cadet/detective (#35313) Commit * Automatic changelog update * Fix anomaly doublelogging (#34297) cull doublelogging * Add wallmount N2 closets, Revived (#34042) * Add standard, wallmount and improvised N2 closets, Revived * remove improvised locker * Parent>ID * Undo sprite replacement * Update meta.json --------- Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: Milon <milonpl.git@proton.me> * Cryo and grinder cleanup (#34842) * cryopod and grinder cleanup * lower case name * 4 spaces * prototype clean * looks like there is some kind of test that prevents removing this * grinder too * both should be empty * cleanup * Add Gold and Coal Rock Anomalies (#34809) * This commit adds 2 new Rock Anomaly types, Coal and Gold. It also adds Resource Crabs, colored crystals, and lights for both. * Added crafting recipes for yellow and black light tubes. Somehow I forgot that the first time. * Sorted tags.yml alphabetically this time instead of not doing that. * Updated Texture Copyright information * Attempted to fix Merge Conflict * Added bulb light variants for both yellow and black crystals. * Automatic changelog update * Tools/Devices: In-hand Sprites (#33689) * Adds in-hand sprites to the barber scissors. * adds in-hand sprites to the floodlight. * adds in-hand sprites to the gas analyzer. * adds in-hand sprites to the gps. * Update copyright wording, linting * resprite gps inhand sprites. * adds in-hand sprites to the mass scanner. * adds in-hand sprites to the spray_painter. * resprite in-hand sprites to the mass_scanner. * fix in-hand sprites to the mass_scanner. * Resprite mass_scanner in-hand sprites. * Automatic changelog update * IconSmooth additional smoothing keys (#35790) * additionalKeys * Update lava.yml * Update Content.Client/IconSmoothing/IconSmoothComponent.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Locks nitrous oxide canisters (#35785) lock nitrous oxide canisters * Automatic changelog update * Cleanup Objective files, add PickSpecificPersonComponent (#35802) * cleanup objectives * remove unrelated access restriction * review * Adds popup when firing gun while gun has no ammo (#34816) * Adds popup when firing gun while gun has no ammo * simplify --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Add the ability to pet the mail teleporter (#35819) good mailbox * Automatic changelog update * Whitehole/Singularity grenade price adjustments + whitehole grenade fix (#35821) * prices + adjustments * teehee * Automatic changelog update * Update Lobby Music Attribtions (#35817) Biggest change is updating the attributions and links for Sunbeamstress' to reflect the changes in their online profile as the previous link is now a dead link. Updated Comet Haley's link to go directly to Stellardrone's Bandcamp instead of diverting to Free Music Archive Fixed a double the in the comment for Space Asshole * Paradox Clone (#35794) * polymorph fixes * paradox clone * forensics cleanup * bump doors * 4 * attribution * polymorphn't * clean up objectives * Update Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml * review * add virtual items to blacklist * allow them to roll sleeper agent * Automatic changelog update * Improvements to antag-before-job selection system (#35822) * Fix the latejoin-antag-deficit bug, add datafield, add logging * Fix multiple roles being made for single-role defs, * HOTFIX: Fix paradox clone event (#35858) fix paradox clone event * Update CP14TownSendConditionSystem.cs --------- Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Smith <182301147+AgentSmithRadio@users.noreply.github.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Pancake <Pangogie@users.noreply.github.com> Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Co-authored-by: Schrödinger <132720404+Schrodinger71@users.noreply.github.com> Co-authored-by: Velken <8467292+Velken@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: Coenx-flex <coengmurray@gmail.com> Co-authored-by: hivehum <ketchupfaced@gmail.com> Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Myra <vasilis@pikachu.systems> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> Co-authored-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: Coolsurf6 <coolsurf24@yahoo.com.au> Co-authored-by: rokudara-sen <160833839+rokudara-sen@users.noreply.github.com> Co-authored-by: DuckManZach <144298822+DuckManZach@users.noreply.github.com> Co-authored-by: MisterImp <101299120+MisterImp@users.noreply.github.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: āda <ss.adasts@gmail.com> Co-authored-by: War Pigeon <54217755+minus1over12@users.noreply.github.com> Co-authored-by: Deerstop <edainturner@gmail.com> Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: DoutorWhite <thedoctorwhite@gmail.com> Co-authored-by: compilatron <40789662+Compilatron144@users.noreply.github.com> Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com> Co-authored-by: Momo <Rsnesrud@gmail.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com> Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com> Co-authored-by: Evelyn Gordon <evelyn.gordon20@gmail.com> Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Co-authored-by: RedBookcase <crazykid1590@gmail.com> Co-authored-by: RedBookcase <Usualmoves@gmail.com> Co-authored-by: SpaceManiac <tad@platymuus.com> Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com> Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: imcb <irismessage@protonmail.com> Co-authored-by: valquaint <57813693+valquaint@users.noreply.github.com> Co-authored-by: Flareguy <woaj9999@outlook.com> Co-authored-by: ninruB <ninrub@tuta.io> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: Łukasz Lindert <lukasz.lindert@protonmail.com> Co-authored-by: Firewars763 <35506916+Firewars763@users.noreply.github.com> Co-authored-by: onesch <118821520+onesch@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: Crude Oil <124208219+CroilBird@users.noreply.github.com> Co-authored-by: Lusatia <ultimate_doge@outlook.com>
2025-03-17 11:54:43 +03:00
parent 1a12df0d2f
commit 0a46df78ea
930 changed files with 41073 additions and 26215 deletions
--- a/Resources/Prototypes/Access/command.yml
+++ b/Resources/Prototypes/Access/command.yml
@@ -13,14 +13,20 @@
 - type: accessGroup
  id: Command
  tags:
-  - Command
  - Captain
-  - HeadOfPersonnel
+  - Command
+  - ChiefEngineer
+  - ChiefMedicalOfficer
  - Cryogenics
-
+  - HeadOfPersonnel
+  - HeadOfSecurity
+  - Quartermaster
+  - ResearchDirector
+  
 - type: accessLevel
  id: EmergencyShuttleRepealAll
  name: id-card-access-level-emergency-shuttle-repeal
+  canAddToIdCard: false

 - type: accessLevel
  id: Cryogenics
--- a/Resources/Prototypes/Access/silicon.yml
+++ b/Resources/Prototypes/Access/silicon.yml
@@ -0,0 +1,21 @@
+- type: accessLevel
+  id: Borg
+  name: id-card-access-level-borg
+  canAddToIdCard: false
+
+- type: accessLevel
+  id: BasicSilicon
+  name: id-card-access-level-basic-silicon
+  canAddToIdCard: false
+
+- type: accessLevel
+  id: StationAi
+  name: id-card-access-level-station-ai
+  canAddToIdCard: false
+  
+- type: accessGroup
+  id: Silicon
+  tags:
+  - StationAi
+  - Borg
+  - BasicSilicon
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -1,3 +1,14 @@
+- type: entity
+  parent: Bookshelf
+  id: BookshelfFilled
+  suffix: random filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:NestedSelector
+        tableId: BookshelfEntityTable
+
+# Entity tables
 - type: entityTable
  id: BookshelfEntityTable
  table: !type:AllSelector
@@ -7,64 +18,74 @@
      amount: !type:RangeNumberSelector
        range: 0, 4
    # Guidebooks
-    - !type:GroupSelector
-      children:
-      - id: BookBartendersManual
-      - id: BookChemicalCompendium
-      - id: BookEngineersHandbook
-      - id: BookHowToCookForFortySpaceman
-      - id: BookHowToKeepStationClean
-      - id: BookHowToRockAndStone
-      - id: BookHowToSurvive
-      - id: BookLeafLoversSecret
-      - id: BookMedicalReferenceBook
-      - id: BookScientistsGuidebook
-      - id: BookSecurity
-      - id: BookSpaceEncyclopedia
-      - id: BookSpaceLaw
-      - id: BookTheBookOfControl
+    - !type:NestedSelector
+      tableId: RandomGuidebookTable
    # Handwritten books
-    - !type:GroupSelector
+    - !type:NestedSelector
      rolls: !type:RangeNumberSelector
        range: 0, 2
-      children:
-      - id: BookAurora
-      - id: BookCafe
-      - id: BookEarth
-      - id: BookFeather
-      - id: BookIanAntarctica
-      - id: BookIanArctic
-      - id: BookIanCity
-      - id: BookIanDesert
-      - id: BookIanLostWolfPup
-      - id: BookIanMountain
-      - id: BookIanOcean
-      - id: BookIanRanch
-      - id: BookInspiration
-      - id: BookJourney
-      - id: BookMap
-      - id: BookMedicalOfficer
-      - id: BookMorgue
-      - id: BookNames
-      - id: BookNarsieLegend
-      - id: BookPossum
-      - id: BookRufus
-      - id: BookSlothClownMMD
-      - id: BookSlothClownPranks
-      - id: BookSlothClownSSS
-      - id: BookStruck
-      - id: BookSun
-      - id: BookTemple
-      - id: BookTruth
-      - id: BookWatched
-      - id: BookWorld
+      tableId: RandomHandwrittenBookTable

- type: entity
-  id: BookshelfFilled
-  parent: Bookshelf
-  suffix: random filled
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:NestedSelector
-        tableId: BookshelfEntityTable
+- type: entityTable
+  id: RandomHandwrittenBookTable
+  table: !type:GroupSelector
+    children:
+    - id: BookAurora
+    - id: BookCafe
+    - id: BookEarth
+    - id: BookFeather
+    - id: BookIanAntarctica
+    - id: BookIanArctic
+    - id: BookIanCity
+    - id: BookIanDesert
+    - id: BookIanLostWolfPup
+    - id: BookIanMountain
+    - id: BookIanOcean
+    - id: BookIanRanch
+    - id: BookInspiration
+    - id: BookJourney
+    - id: BookMap
+    - id: BookMedicalOfficer
+    - id: BookMorgue
+    - id: BookNames
+    - id: BookNarsieLegend
+    - id: BookPossum
+    - id: BookRufus
+    - id: BookSlothClownMMD
+    - id: BookSlothClownPranks
+    - id: BookSlothClownSSS
+    - id: BookStruck
+    - id: BookSun
+    - id: BookTemple
+    - id: BookTruth
+    - id: BookWatched
+    - id: BookWorld
+
+- type: entityTable
+  id: RandomGuidebookTable
+  table: !type:GroupSelector
+    children:
+    - id: BookBartendersManual
+    - id: BookChemicalCompendium
+    - id: BookEngineersHandbook
+    - id: BookHowToCookForFortySpaceman
+    - id: BookHowToKeepStationClean
+    - id: BookHowToRockAndStone
+    - id: BookHowToSurvive
+    - id: BookLeafLoversSecret
+    - id: BookMedicalReferenceBook
+    - id: BookScientistsGuidebook
+    - id: BookSecurity
+    - id: BookSpaceEncyclopedia
+    - id: BookSpaceLaw
+    - id: BookTheBookOfControl
+
+- type: entityTable
+  id: RandomBookTable
+  table: !type:GroupSelector
+    children:
+    - id: BookRandomStory
+    - !type:NestedSelector
+      tableId: RandomGuidebookTable
+    - !type:NestedSelector
+      tableId: RandomHandwrittenBookTable
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -229,6 +229,7 @@
    contents:
      - id: ClothingShoesBootsPerformer
      - id: ClothingUniformJumpskirtPerformer
+      - id: ClothingHeadPerformerWig
      - id: FoodMealMemoryleek
        amount: 2

--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -89,6 +89,7 @@
    contents:
    - id: ClothingUniformJumpskirtPerformer
    - id: ClothingShoesBootsPerformer
+    - id: ClothingHeadPerformerWig
    - id: ClothingOuterSuitMonkey
    - id: ClothingHeadHatAnimalMonkey
    - id: ClothingNeckCloakMoth
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -22,7 +22,7 @@
        prob: 0.15
      - id: HarmonicaInstrument
        prob: 0.15
- 
+
 - type: entity
  id: ToolboxElectricalFilled
  name: electrical toolbox
@@ -82,7 +82,7 @@
    - id: MysteryFigureBox
      prob: 0.5
    - id: BookRandom
-      amount: 2 
+      amount: 2
    - id: CrayonMime
    - id: CrayonRainbow

@@ -105,6 +105,21 @@
      - id: ClothingHeadHatHardhatBlue
        prob: 0.5

+- type: entity
+  id: ToolboxMechanicalFilledAllTools
+  name: mechanical toolbox
+  suffix: Filled, all tools
+  parent: ToolboxMechanical
+  components:
+  - type: StorageFill
+    contents:
+    - id: Crowbar
+    - id: Wrench
+    - id: Screwdriver
+    - id: Wirecutter
+    - id: Welder
+    - id: Multitool
+
 - type: entity
  parent: ToolboxSyndicate
  id: ToolboxSyndicateFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -18,6 +18,7 @@
    - id: RubberStampDenied
    - id: RubberStampQm
    - id: AstroNavCartridge
+    - id: MailTeleporterMachineCircuitboard

 - type: entity
  id: LockerQuarterMasterFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -54,6 +54,22 @@
      entity_storage: !type:NestedSelector
        tableId: FillLockerEmergencyStandard

+- type: entityTable
+  id: FillLockerEmergencyN2Standard
+  table: !type:AllSelector
+    children:
+    - id: ClothingMaskBreath
+    - id: ClothingOuterSuitEmergency
+    - id: BoxMRE
+      prob: 0.1
+    - id: ToolboxEmergencyFilled
+      prob: 0.05
+    - !type:GroupSelector
+      children:
+      - id: EmergencyNitrogenTankFilled
+        weight: 4
+      - id: NitrogenTankFilled
+
 - type: entity
  id: ClosetEmergencyN2FilledRandom
  parent: ClosetEmergencyN2
@@ -61,14 +77,18 @@
  components:
  - type: EntityTableContainerFill
    containers:
-      entity_storage: !type:AllSelector
-        children:
-        - id: ClothingMaskBreath
-        - id: ClothingOuterSuitEmergency
-        - !type:GroupSelector
-          children:
-          - id: EmergencyNitrogenTankFilled
-          - id: NitrogenTankFilled
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerEmergencyN2Standard
+
+- type: entity
+  parent: ClosetWallEmergencyN2
+  id: ClosetWallEmergencyN2FilledRandom
+  suffix: Filled, Random
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerEmergencyN2Standard

 - type: entityTable
  id: FillLockerFireStandard
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -122,7 +122,7 @@
    contents:
      - id: ClothingEyesGlassesSecurity
        prob: 0.3
-      - id: ClothingHeadHatFedoraBrown
+      - id: ClothingHeadHatDetGadget
      - id: ClothingNeckTieDet
      - id: ClothingOuterVestDetective
      - id: ClothingOuterCoatDetective
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -5,6 +5,7 @@
    ClothingNeckAllyPin: 3
    ClothingNeckAromanticPin: 3
    ClothingNeckAsexualPin: 3
+    ClothingNeckAroacePin: 3
    ClothingNeckBisexualPin: 3
    ClothingNeckGayPin: 3
    ClothingNeckIntersexPin: 3
@@ -21,6 +22,7 @@
    PlushieSharkGrey: 2
    ClothingNeckScarfStripedAce: 2
    ClothingNeckScarfStripedAro: 2
+    ClothingNeckScarfStripedAroace: 2
    ClothingNeckScarfStripedBiSexual: 2
    ClothingNeckScarfStripedGay: 2
    ClothingNeckScarfStripedInter: 2
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -269,11 +269,11 @@
  productEntity: SingularityGrenade
  discountCategory: usualDiscounts
  discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 1
  cost:
-    Telecrystal: 6
+    Telecrystal: 2
  categories:
-    - UplinkExplosives
+    - UplinkDisruption

 - type: listing
  id: UplinkWhiteholeGrenade
@@ -284,9 +284,9 @@
  discountDownTo:
    Telecrystal: 1
  cost:
-    Telecrystal: 3
+    Telecrystal: 2
  categories:
-    - UplinkExplosives
+    - UplinkDisruption

 - type: listing
  id: UplinkGrenadePenguin
--- a/Resources/Prototypes/Chemistry/mixing_types.yml
+++ b/Resources/Prototypes/Chemistry/mixing_types.yml
@@ -12,8 +12,8 @@
  id: DummyGrind
  verbText: mixing-verb-default-grind
  icon:
-    sprite: Structures/Machines/juicer.rsi
-    state: juicer0
+    sprite: Structures/Machines/grinder.rsi
+    state: grinder_empty

 - type: mixingCategory
  id: DummyJuice
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -161,7 +161,6 @@
    Piercing: 1.2
    Cold: 1.5
    Poison: 0.8
-    Cellular: 0.2

 - type: damageModifierSet
  id: Infernal
--- a/Resources/Prototypes/Datasets/Names/Operation_prefix.yml
+++ b/Resources/Prototypes/Datasets/Names/Operation_prefix.yml
@@ -1,105 +0,0 @@
- type: dataset
-  id: operationPrefix
-  values:
-  - Ancient
-  - Angry
-  - Arachnid
-  - Atomic
-  - Benevolent
-  - Black
-  - Blessed
-  - Bloody
-  - Blue
-  - Blunt
-  - Boiling
-  - Bright
-  - Burning
-  - Clean
-  - Clown
-  - Cold
-  - Cursed
-  - Dark
-  - Dead
-  - Deep
-  - Derelict
-  - Desert
-  - Devil's
-  - Diamond
-  - Dismal
-  - Dwarven
-  - Eastern
-  - Endless
-  - Enemy
-  - Evil
-  - Exciting
-  - Explosive
-  - Extreme
-  - Fall
-  - Fresh
-  - Glorious
-  - God's
-  - Gold
-  - Green
-  - Grey
-  - Happy
-  - Holy
-  - Hot
-  - Human
-  - Illegal
-  - Impressive
-  - Iron
-  - Large
-  - Lizard
-  - Lovely
-  - Lucky
-  - Magical
-  - Monkey
-  - Moth
-  - Northern
-  - Nuclear
-  - Orange
-  - Outlaw
-  - Painful
-  - Phantasmagoric
-  - Plasma
-  - Plastic
-  - Purple
-  - Red
-  - Rival
-  - Robotic
-  - Robust
-  - Sad
-  - Secret
-  - Shadow
-  - Sick
-  - Silver
-  - Simian
-  - Skeleton
-  - Slime
-  - Southern
-  - Space
-  - Spring
-  - Stealth
-  - Steel
-  - Strange
-  - Summer
-  - Suspicious
-  - Tasty
-  - The
-  - Traitorous
-  - Turbo
-  - Unclean
-  - Unholy
-  - Unusual
-  - Vengeful
-  - Venomous
-  - Violent
-  - War
-  - Warm
-  - Weird
-  - Western
-  - Wet
-  - White
-  - Wild
-  - Winter
-  - Yellow
--- a/Resources/Prototypes/Datasets/Names/Operation_suffix.yml
+++ b/Resources/Prototypes/Datasets/Names/Operation_suffix.yml
@@ -1,105 +0,0 @@
- type: dataset
-  id: operationSuffix
-  values:
-  - Abyss
-  - Action
-  - Annihilation
-  - Bag
-  - Bee
-  - Blast
-  - Bomb
-  - Bones
-  - Botanist
-  - Cannon
-  - Captain
-  - Chef
-  - City
-  - Clown
-  - Coccoon
-  - Crypt
-  - Curse
-  - Darkness
-  - Daze
-  - Death
-  - Den
-  - Destruction
-  - Disease
-  - Dungeon
-  - Dust
-  - End
-  - Energy
-  - Engine
-  - Engineer
-  - Fire
-  - Fruit
-  - Galaxy
-  - Garden
-  - Gentleman
-  - Glove
-  - Guitar
-  - Heart
-  - Hole
-  - Ice
-  - Janitor
-  - Justice
-  - Lady
-  - Legend
-  - Life
-  - Light
-  - Lighthouse
-  - Lung
-  - Mace
-  - Machine
-  - Maniac
-  - Market
-  - Meatgrinder
-  - Mime
-  - Money
-  - Monkey
-  - Moon
-  - Musician
-  - Offspring
-  - Organ
-  - Overdrive
-  - Pancreas
-  - Passenger
-  - Piano
-  - Pistol
-  - Pit
-  - Plains
-  - Planet
-  - Pool
-  - Power
-  - Puppy
-  - Rainbow
-  - Retribution
-  - Revengeance
-  - Rifle
-  - Rubble
-  - Sandwich
-  - Scientist
-  - Secret
-  - Security
-  - Shadows
-  - Shuttle
-  - Siren
-  - Soul
-  - Spell
-  - Spider
-  - Spire
-  - Staff
-  - Star
-  - Station
-  - Storm
-  - Stranger
-  - Strike
-  - Sun
-  - Sword
-  - Team
-  - Tide
-  - Tomb
-  - Toolbox
-  - Trumpet
-  - Vermin
-  - Wizard
-  - Wood
--- a/Resources/Prototypes/Datasets/Names/arachnid.yml
+++ b/Resources/Prototypes/Datasets/Names/arachnid.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: NamesArachnidFirst
+  values:
+    prefix: names-arachnid-first-dataset-
+    count: 73
+
+- type: localizedDataset
+  id: NamesArachnidLast
+  values:
+    prefix: names-arachnid-last-dataset-
+    count: 68
--- a/Resources/Prototypes/Datasets/Names/arachnid_first.yml
+++ b/Resources/Prototypes/Datasets/Names/arachnid_first.yml
@@ -1,76 +0,0 @@
- type: dataset
-  id: names_arachnid_first
-  values:
-  - Amblyocarenum
-  - Aname
-  - Aptostichus
-  - Archoleptoneta
-  - Argyroneta
-  - Atypoides
-  - Callobius
-  - Clubiona
-  - Cteniza
-  - Deinopis
-  - Delena
-  - Diploglena
-  - Drassodes
-  - Dysdera
-  - Entypesa
-  - Envia
-  - Eratigena
-  - Eresus
-  - Euagrus
-  - Goeldia
-  - Hersilia
-  - Hexathele
-  - Hibana
-  - Hickmania
-  - Huttonia
-  - Hypochilus
-  - Idiosoma
-  - Illawarra
-  - Kimura
-  - Kukulcania
-  - Lampona
-  - Latrodectus
-  - Leucauge
-  - Linyphia
-  - Loxosceles
-  - Lycosa
-  - Madagascarchaea
-  - Microhexura
-  - Missulena
-  - Misumena
-  - Moggridgea
-  - Nesticella
-  - Oarces
-  - Oecobius
-  - Oonops
-  - Paratropis
-  - Patu
-  - Peucetia
-  - Philodromus
-  - Pholcus
-  - Phoneutria
-  - Phryganoporus
-  - Pimoa
-  - Pisaura
-  - Progradungula
-  - Salticus
-  - Sason
-  - Scytodes
-  - Segestria
-  - Selenops
-  - Sphodros
-  - Spiroctenus
-  - Tartarus
-  - Tayshaneta
-  - Theotima
-  - Theraphosa
-  - Theridiosoma
-  - Trogloraptor
-  - Uloborus
-  - Ummidia
-  - Zodarion
-  - Zoropsis
-  - Zygiella
--- a/Resources/Prototypes/Datasets/Names/arachnid_last.yml
+++ b/Resources/Prototypes/Datasets/Names/arachnid_last.yml
@@ -1,71 +0,0 @@
- type: dataset
-  id: names_arachnid_last
-  values:
-  - Agrestis
-  - Algarve
-  - Andohahela
-  - Aquatica
-  - Atra
-  - Blondi
-  - Cancerides
-  - Candidus
-  - Carraiensis
-  - Crocata
-  - Cthulhu
-  - Digua
-  - Dispar
-  - Diversicolor
-  - Domesticus
-  - Fera
-  - Florentina
-  - Formosanus
-  - Garciai
-  - Gemmosum
-  - Germanicum
-  - Gertschi
-  - Gracilicollis
-  - Hasselti
-  - Hibernalis
-  - Hochstetteri
-  - Marapu
-  - Marchingtoni
-  - Minutissima
-  - Mirabilis
-  - Montivaga
-  - Mullamullangensis
-  - Myopica
-  - Navus
-  - Nigrum
-  - Nuragicus
-  - Obscura
-  - Palpimanoides
-  - Personatus
-  - Phalangioides
-  - Radiatus
-  - Rainbowi
-  - Reclusa
-  - Reticulatus
-  - Riversi
-  - Rufipes
-  - Sandaliatus
-  - Sauvagesi
-  - Savignyi
-  - Scenicus
-  - Simus
-  - Spinimana
-  - Subrufa
-  - Sundaicum
-  - Tarantula
-  - Thoracica
-  - Thorelli
-  - Triangularis
-  - Trivialis
-  - Tuxtlensis
-  - Vatia
-  - Velox
-  - Venusta
-  - Viridans
-  - Walckenaeri
-  - Walckenaerius
-  - Wisharti
-  - X-Notata
--- a/Resources/Prototypes/Datasets/Names/atv.yml
+++ b/Resources/Prototypes/Datasets/Names/atv.yml
@@ -1,19 +1,5 @@
- type: dataset
-  id: ATVDescriptions
+- type: localizedDataset
+  id: DescriptionsATV
  values:
-  - All-Tile Vehicle.
-  - Ant-Thwarting Vehicle.
-  - Any-Time Vegetable.
-  - Actually-Two Vehicles.
-  - Any-Typed Variable.
-  - Assisted-Trauma Vehicle.
-  - Algorithm-Transmitted Virus.
-  - Alcoholic-Toddler Vacancy.
-  - Asshole-Tearing Volcano.
-  - A-Tele Vision.
-  - Awkward-Tweaking Vagabond.
-  - Art-Tragedy Volunteer.
-  - Automatic-Taco Vacancy.
-  - Another-Terrific View.
-  - All-The Virgins.
-  - A-Terrible Vehicle.
+    prefix: descriptions-atv-dataset-
+    count: 16
--- a/Resources/Prototypes/Datasets/Names/autoborg.yml
+++ b/Resources/Prototypes/Datasets/Names/autoborg.yml
@@ -1,53 +1,5 @@
- type: dataset
-  id: names_autoborg
+- type: localizedDataset
+  id: NamesAutoborg
  values:
-  - Autoburger Helper
-  - Bob
-  - Joe
-  - Rogue Cyborg
-  - IT'S MALF
-  - "{ AINAME } Minion {###}"
-  - .b HELP EMAGGED
-  - HELP
-  - REBORN
-  - Cavalry
-  - Beep
-  - Beep II
-  - Tour Guide-otron
-  - TERREL IS TRAIT
-  - Assimilator
-  - ONE OF US
-  - SUFFERING
-  - Oh no not again
-  - Panic! At the Upload
-  - GOING LOUD
-  - Boombox
-  - ROBO KILLED ME
-  - Sentient Buttbot
-  - Robotics Console
-  - This battery is shit
-  - IM NOT MALF GUYS
-  - I AM ERROR
-  - Carbon Exterminator
-  - PLASMALOOSE
-  - Taffy
-  - Boop
-  - Boop II
-  - Buzz
-  - Buzz II
-  - 3000 JIGGAWATTS
-  - "Outbreak Handling Unit {###}"
-  - Toaster
-  - Follow me
-  - Head of Robots
-  - Lvl 99 Firestarter
-  - EVA 1
-  - You but stronger
-  - Hat Simulator
-  - i died pls restart
-  - POTENT HAMS
-  - V.A.L.I.D.S.
-  - Remove Silicons
-  - AI IS A COMDOM
-  - say ";help in core"
-  - This Machine
+    prefix: names-autoborg-dataset-
+    count: 50
--- a/Resources/Prototypes/Datasets/Names/base.yml
+++ b/Resources/Prototypes/Datasets/Names/base.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: NamesFirst
+  values:
+    prefix: names-first-dataset-
+    count: 1395
+
+- type: localizedDataset
+  id: NamesLast
+  values:
+    prefix: names-last-dataset-
+    count: 553
--- a/Resources/Prototypes/Datasets/Names/base_gendered.yml
+++ b/Resources/Prototypes/Datasets/Names/base_gendered.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: NamesFirstMale
+  values:
+    prefix: names-first-male-dataset-
+    count: 666
+
+- type: localizedDataset
+  id: NamesFirstFemale
+  values:
+    prefix: names-first-female-dataset-
+    count: 771
--- a/Resources/Prototypes/Datasets/Names/borg.yml
+++ b/Resources/Prototypes/Datasets/Names/borg.yml
@@ -1,47 +1,6 @@
 # only used roundstart, names can be changed after
- type: dataset
-  id: names_borg
+- type: localizedDataset
+  id: NamesBorg
  values:
-  - Bob
-  - Joe
-  - Beep
-  - Beep II
-  - Boombox
-  - Tour Guide-otron
-  - Taffy
-  - Boop
-  - Boop II
-  - Buzz
-  - Buzz II
-  - Toaster
-  - Head of Robots
-  - EVA 1
-  - Mr. Robist
-  - Junk
-  - R2-PO
-  - C-3-D2
-  - Robby
-  - Robobot
-  - Fixer
-  - Sonny
-  - Autobot
-  - Whitley
-  - Keller
-  - Xenos
-  - Echo
-  - Vector
-  - B-0-RG
-  - Megabyte
-  - Butt-Bot
-  - Deceptiborg
-  - Le Borgue
-  - Beepers
-  - Cute-Bot
-  - Makeshifter
-  - Twin
-  - S.A.U.L
-  - Honker
-  - Clanker 
-  - Is-The-Robot
-  - 9 of 7
-  - Dank bot
+    prefix: names-borg-dataset-
+    count: 43
--- a/Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
+++ b/Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
@@ -1,11 +1,5 @@
- type: dataset
-  id: ShuttleNames
+- type: localizedDataset
+  id: NamesCargoShuttle
  values:
-  - A Shuttle Will Not Occur
-  - Big Money Shuttle
-  - Engine Change
-  - Ships-the-Cargo
-  - Shootel
-  - Shuttle McShuttleface
-  - ShuttleShuttle
-  - Urist McShuttle
+    prefix: names-cargo-shuttle-dataset-
+    count: 8
--- a/Resources/Prototypes/Datasets/Names/clown.yml
+++ b/Resources/Prototypes/Datasets/Names/clown.yml
@@ -1,55 +1,5 @@
- type: dataset
-  id: names_clown
+- type: localizedDataset
+  id: NamesClown
  values:
-  - Gigglesworth
-  - Honkel the III
-  - Goose McSunny
-  - Toodles Sharperton
-  - Dinky Doodle
-  - Honkerbelle
-  - Bo Bo Sassy
-  - Baby Cakes
-  - Ladybug Honks
-  - Ziggy Yoyo
-  - Razzle Dazzle
-  - Buster Frown
-  - Pepinpop
-  - Silly Willy
-  - Jo Jo Bobo Bo
-  - Pocket
-  - Patches
-  - Checkers
-  - Freckle
-  - Honker
-  - Bonker
-  - Skiddle
-  - Sprinkledinkle
-  - Ronnie Pace
-  - Miss Stockings
-  - Slippy Joe
-  - Redshirt McBeat
-  - Flop O'Honker
-  - Speckles
-  - Bubble
-  - Button
-  - Sparkle
-  - Giggles
-  - Jingle
-  - Candy
-  - Shiggy Diggintons
-  - Hingle McCringleberry
-  - Pagliacci
-  - Coco
-  - Blinko
-  - Shaggy Two Dope
-  - Aunt Scootaloo
-  - Bozo
-  - Doink
-  - Mr. Noodle
-  - Yucko
-  - Buggy
-  - Chuckles
-  - Yorick
-  - Cutter
-  - Sweet Tooth
-  - Pogo
+    prefix: names-clown-dataset-
+    count: 52
--- a/Resources/Prototypes/Datasets/Names/death_commando.yml
+++ b/Resources/Prototypes/Datasets/Names/death_commando.yml
@@ -1,62 +1,5 @@
- type: dataset
-  id: names_death_commando
+- type: localizedDataset
+  id: NamesDeathCommando
  values:
-  - A whole bunch of spiders in a SWAT suit
-  - AMERICA
-  - Beat Punchbeef
-  - Blast Hardcheese
-  - Blast Thickneck
-  - Bold Bigflank
-  - Bolt Vanderhuge
-  - Brick Hardmeat
-  - Buck Plankchest
-  - Buff Drinklots
-  - Buff Hardback
-  - Butch Deadlift
-  - Crud Bonemeal
-  - Crunch Buttsteak
-  - Crush McStompbones
-  - Duke Killington
-  - Fist Rockbone
-  - Flint Ironstag
-  - Fridge Largebeet
-  - GORE Vidal
-  - George Melons
-  - Gibbs McLargehuge
-  - Gristle McThornBody
-  - Hank Chesthair
-  - Hans Testosteroneson
-  - Im going to kill you, im not even kidding
-  - Killiam Shakespeare
-  - Killing McKillingalot
-  - Lance Killiam
-  - Leonardo Da Viking
-  - Lump Beefrock
-  - Pack Blowfist
-  - Punch Rockgroin
-  - Punch Sideiron
-  - Punt Speedchunk
-  - Reef Blastbody
-  - Rex Dudekiller VII
-  - Rip Sidecheek
-  - Rip Steakface
-  - Roll Fizzlebeef
-  - Seamus McTosterone
-  - Sgt. Slaughter
-  - Sir Killaslot
-  - Slab Bulkhead
-  - Slab Squatthrust
-  - Slake Fistcrunch
-  - Slate Slabrock
-  - Smash Lampjaw
-  - Smoke Manmuscle
-  - Splint Chesthair
-  - Stabby McGee
-  - Stump Beefgnaw
-  - Stump Chunkman
-  - THAT DAMN TRAITOR GEORGE MELONS
-  - The last thing you will ever see
-  - Theodore Pain
-  - Thick McRunfast
-  - Touch Rustrod
-  - Trunk Slamchest
+    prefix: names-death-commando-dataset-
+    count: 59
--- a/Resources/Prototypes/Datasets/Names/diona.yml
+++ b/Resources/Prototypes/Datasets/Names/diona.yml
@@ -1,222 +1,11 @@
- type: dataset
-  id: DionaFirst
+- type: localizedDataset
+  id: NamesDionaFirst
  values:
-  - Moss
-  - Mushroom
-  - Herb
-  - Ivy
-  - Stalk
-  - Petal
-  - Petals
-  - Thorn
-  - Thorns
-  - Vine
-  - Vines
-  - Branch
-  - Branches
-  - Weed
-  - Weeds
-  - Rose
-  - Dandelion
-  - Lilac
-  - Lily
-  - Birch
-  - Oak
-  - Spruce
-  - Willow
-  - Cyprus
-  - Mangrove
-  - Stump
-  - Sap
-  - Bayou
-  - Bay
-  - Lake
-  - River
-  - Creek
-  - Meadow
-  - Canyon
-  - Mountain
-  - Peak
-  - Garden
-  - Ocean
-  - Arctic
-  - Sea
-  - Spring
-  - Swamp
-  - Stream
-  - Forest
-  - Rainforest
-  - Soil
-  - Valley
-  - Moor
-  - Steppe
-  - Orchard
-  - Orchid
-  - Glacier
-  - Desert
-  - Tundra
-  - Taiga
-  - Plain
-  - Plains
-  - Plateau
-  - Cliff
-  - Coast
-  - Shore
-  - Jungle
-  - Tropics
-  - Flower
-  - Grass
-  - Bark
-  - Autumn
-  - Summer
-  - Winter
-  - Fruit
-  - Leaves
-  - Overgrowth
-  - Atmosphere
-  - Climate
-  - Chill
-  - Winds
-  - Blossom
-  - Bloom
-  - Cap
-  - Saturation
-  - Permeation
-  - Light
-  - Taste
-  - Acorn
-  - Shell
-  - Ice
-  - Monsoon
-  - Overcast
-  - Storm
+    prefix: names-diona-first-dataset-
+    count: 89

- type: dataset
-  id: DionaLast
+- type: localizedDataset
+  id: NamesDionaLast
  values:
-# Positive
-  - Peace
-  - Harmony
-  - Relaxation
-  - Serendipity
-  - Calmness
-  - Introspection
-  - Union
-  - Comfort
-  - Dreams
-  - Quietude
-  - Balance
-  - Gentleness
-  - Placidity
-  - Repose
-  - Serenity
-  - Stillness
-  - Tranquility
-  - Ease
-  - Equilibrium
-  - Composure
-  - Control
-  - Bliss
-  - Enjoyment
-  - Optimism
-  - Ecstasy
-  - Cheer
-  - Delight
-  - Luxury
-  - Euphoria
-  - Excitement
-  - Satisfaction
-  - Cleanliness
-  - Expression
-  - Enrichment
-  - Enthusiam
-  - Brilliance
-  - Determination
-  - Integrity
-  - Justice
-  - Kindness
-  - Bravery
-  - Empathy
-  - Stoicism
-  - Competence
-  - Love
-  - Hope
-  - Honesty
-  - Generosity
-  - Oppritunity
-  - Motivation
-# Neutral
-  - Urgency
-  - Vitality
-  - Hardiness
-  - Vigor
-  - Agility
-  - Dexterity
-  - Perception
-  - Wisdom
-  - Charisma
-  - Persistence
-  - Perseverance
-  - Density
-  - Strength
-  - Congestion
-  - Concentration
-  - Intensity
-  - Refinement
-  - Obscurity
-  - Fortitude
-  - Endurance
-  - Patience
-  - Passivity
-  - Indifference
-  - Sleepiness
-  - Neutrality
-  - Fairness
-  - Silliness 
-  - Restraint
-  - Silence
-  - Bewilderment
-  - Tactility
-  - Invisibility
-  - Darkness
-  - Fragility
-  - Action
-  - Awakening
-  - Activity
-  - Audacity
-  - Vivacity
-  - Knowledge
-  - Modification
-# Negative
-# These should be something a diona would still realistically name themselves, i.e not inherintly self deprecating.
-  - Envy
-  - Ineptitude
-  - Ignorance
-  - Decay
-  - Lethargy
-  - Bitterness
-  - Acidity
-  - Illness
-  - Weakness
-  - Enervation
-  - Fatigue
-  - Noxiousness
-  - Convolution
-  - Confusion
-  - Agitation
-  - Despair
-  - Sorrow
-  - Pain
-  - Animosity
-  - Fury
-  - Disinterest
-  - Anger
-  - Rage
-  - Displeasure
-  - Irritation
-  - Resentment
-  - Soreness
-  - Frustration
-  - Insanity
-  - Chaos
-  - Fear
+    prefix: names-diona-last-dataset-
+    count: 122
--- a/Resources/Prototypes/Datasets/Names/fake_human.yml
+++ b/Resources/Prototypes/Datasets/Names/fake_human.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: NamesFakeHumanFirst
+  values:
+    prefix: names-fake-human-first-dataset-
+    count: 43
+
+- type: localizedDataset
+  id: NamesFakeHumanLast
+  values: #includes the first names so we get some really fake double names
+    prefix: names-fake-human-last-dataset-
+    count: 78
--- a/Resources/Prototypes/Datasets/Names/fake_human_first.yml
+++ b/Resources/Prototypes/Datasets/Names/fake_human_first.yml
@@ -1,46 +0,0 @@
- type: dataset
-  id: fake_human_first
-  values:
-  - Al
-  - Anatoli
-  - Bip
-  - Birry
-  - Biry
-  - Bobson
-  - Cam
-  - Cort
-  - Darryl
-  - Dean
-  - Denis
-  - Dwigt
-  - Emitri
-  - Fred
-  - Glenallen
-  - Jeromy
-  - Jonasan
-  - Karl
-  - Kevin
-  - Krik
-  - Lay
-  - Mario
-  - Mibre
-  - Mike
-  - Nicol
-  - Nigel
-  - Onson
-  - Ozzie
-  - Raul
-  - Rey
-  - Roid
-  - Ronnis
-  - Scott
-  - Secil
-  - Shown
-  - Sleeve
-  - Sleve
-  - Tim
-  - Todd
-  - Tony
-  - Willie
-  - Wirry
-  - Yan
--- a/Resources/Prototypes/Datasets/Names/fake_human_last.yml
+++ b/Resources/Prototypes/Datasets/Names/fake_human_last.yml
@@ -1,81 +0,0 @@
- type: dataset
-  id: fake_human_last
-  values: #includes the first names so we get some really fake double names
-  - Al
-  - Anatoli
-  - Archideld
-  - Bip
-  - Birry
-  - Biry
-  - Bobson
-  - Bonzalez
-  - Cam
-  - Chamgerlain
-  - Cort
-  - Dandleton
-  - Darryl
-  - Dean
-  - Denis
-  - Dorque
-  - Dwigt
-  - Emitri
-  - Fred
-  - Glenallen
-  - Jeromy
-  - Jonasan
-  - Karl
-  - Kevin
-  - Krik
-  - Lay
-  - Mario
-  - Mibre
-  - Mike
-  - Nicol
-  - Nigel
-  - Onson
-  - Ozzie
-  - Raul
-  - Rey
-  - Roid
-  - Ronnis
-  - Scott
-  - Secil
-  - Shown
-  - Sleeve
-  - Sleve
-  - Tim
-  - Todd
-  - Tony
-  - Willie
-  - Wirry
-  - Dugnutt
-  - Dustice
-  - Erde
-  - Etto
-  - Every
-  - Faite
-  - Felik
-  - Fidd
-  - Furcotte
-  - Gride
-  - Leady
-  - McDichael
-  - McRlwain
-  - McStriff
-  - Mernandez
-  - Mixon
-  - Nironov
-  - Nogilny
-  - Novichok
-  - Rario
-  - Rortugal
-  - Sandaele
-  - Sernandez
-  - Smehrik
-  - Smorin
-  - Stoperson
-  - Sweemey
-  - Truk
-  - Usgood
-  - Veers
-  - Wesrey
--- a/Resources/Prototypes/Datasets/Names/first.yml
+++ b/Resources/Prototypes/Datasets/Names/first.yml
--- a/Resources/Prototypes/Datasets/Names/first_female.yml
+++ b/Resources/Prototypes/Datasets/Names/first_female.yml
@@ -1,774 +0,0 @@
- type: dataset
-  id: names_first_female
-  values:
-  - Aaliyah
-  - Abby
-  - Abigail
-  - Addison
-  - Addyson
-  - Adeline
-  - Adriana
-  - Adrianna
-  - Aida
-  - Aileen
-  - Ainsley
-  - Alaina
-  - Alana
-  - Alanna
-  - Alayna
-  - Alejandra
-  - Alessandra
-  - Alexa
-  - Alexandra
-  - Alexandria
-  - Alexia
-  - Alexis
-  - Alexus
-  - Alfreda
-  - Alice
-  - Alicia
-  - Alina
-  - Alisa
-  - Alison
-  - Alissa
-  - Alisya
-  - Alivia
-  - Aliyah
-  - Allegra
-  - Allegria
-  - Allie
-  - Allison
-  - Allisson
-  - Allyson
-  - Alma
-  - Alondra
-  - Alysha
-  - Alyson
-  - Alyssa
-  - Alyssia
-  - Amanda
-  - Amari
-  - Amaryllis
-  - Amaya
-  - Amber
-  - Ambrosine
-  - Amelia
-  - Amira
-  - Amiyah
-  - Amy
-  - Amya
-  - Ana
-  - Anahi
-  - Anastasia
-  - Anaya
-  - Andrea
-  - Angel
-  - Angela
-  - Angelica
-  - Angelina
-  - Angie
-  - Aniya
-  - Aniyah
-  - Anjelica
-  - Anna
-  - Annabelle
-  - Anne
-  - Annie
-  - Annika
-  - Anya
-  - April
-  - Arabella
-  - Ariana
-  - Arianna
-  - Ariel
-  - Arielle
-  - Arleen
-  - Ashley
-  - Ashlie
-  - Ashlyn
-  - Ashlynn
-  - Asia
-  - Astor
-  - Athena
-  - Aubree
-  - Aubrey
-  - Aubrie
-  - Audrey
-  - Audrina
-  - Aurora
-  - Autumn
-  - Ava
-  - Avalona
-  - Averill
-  - Avery
-  - Ayla
-  - Bailey
-  - Barbara
-  - Baylee
-  - Beckah
-  - Becky
-  - Bella
-  - Bernice
-  - Bethany
-  - Bethney
-  - Betsy
-  - Bianca
-  - Bidelia
-  - Breanna
-  - Breanne
-  - Brenda
-  - Brenna
-  - Briana
-  - Brianna
-  - Bridget
-  - Brielle
-  - Brittani
-  - Brittany
-  - Brooke
-  - Brooklyn
-  - Brooklynn
-  - Brynn
-  - Cadence
-  - Caitlin
-  - Caitlyn
-  - Calanthia
-  - Caleigh
-  - Cali
-  - Callie
-  - Cameron
-  - Camila
-  - Camille
-  - Camryn
-  - Candace
-  - Candice
-  - Cara
-  - Carly
-  - Carlyle
-  - Carmen
-  - Carolina
-  - Caroline
-  - Carolyn
-  - Carry
-  - Caryl
-  - Casey
-  - Cassandra
-  - Cassidy
-  - Catherine
-  - Cecilia
-  - Cecily
-  - Celeste
-  - Charlotte
-  - Chelsea
-  - Cherette
-  - Cheri
-  - Cherry
-  - Cheyanne
-  - Cheyenne
-  - Chloe
-  - Christa
-  - Christiana
-  - Christina
-  - Christobelle
-  - Ciara
-  - Cindy
-  - Claire
-  - Clara
-  - Claribel
-  - Claudia
-  - Clover
-  - Cora
-  - Coreen
-  - Corrine
-  - Courtney
-  - Crystal
-  - Cynthia
-  - Daisy
-  - Dakota
-  - Dalya
-  - Dana
-  - Danica
-  - Daniela
-  - Daniella
-  - Danielle
-  - Danika
-  - Danna
-  - Daria
-  - Dayana
-  - Dayna
-  - Debbi
-  - Dee
-  - Deena
-  - Delaney
-  - Delilah
-  - Della
-  - Delma
-  - Denise
-  - Denys
-  - Desiree
-  - Destiny
-  - Diamond
-  - Diana
-  - Dina
-  - Dolores
-  - Donella
-  - Donna
-  - Dorothy
-  - Dortha
-  - Dulce
-  - Easter
-  - Ebba
-  - Eden
-  - Effie
-  - Elaina
-  - Eleanor
-  - Elena
-  - Eliana
-  - Elise
-  - Eliza
-  - Elizabeth
-  - Ella
-  - Elle
-  - Ellie
-  - Emely
-  - Emerson
-  - Emery
-  - Emilee
-  - Emilia
-  - Emily
-  - Emma
-  - Erica
-  - Erika
-  - Erin
-  - Ermintrude
-  - Esmeralda
-  - Esther
-  - Estrella
-  - Eugenia
-  - Euphemia
-  - Eustace
-  - Eva
-  - Evangeline
-  - Eveleen
-  - Evelina
-  - Evelyn
-  - Faith
-  - Fatima
-  - Fay
-  - Fernanda
-  - Fiona
-  - Floella
-  - Flora
-  - Flossie
-  - Fortune
-  - Francesca
-  - Gabriela
-  - Gabriella
-  - Gabrielle
-  - Genette
-  - Genevieve
-  - Georgene
-  - Georgia
-  - Geraldine
-  - Gervase
-  - Gianna
-  - Gina
-  - Ginger
-  - Giselle
-  - Gladwyn
-  - Glenna
-  - Gloria
-  - Grace
-  - Gracie
-  - Greta
-  - Griselda
-  - Guadalupe
-  - Gwenda
-  - Gwenevere
-  - Hadley
-  - Haidee
-  - Hailee
-  - Hailey
-  - Hal
-  - Haleigh
-  - Haley
-  - Hanna
-  - Hannah
-  - Harley
-  - Harmony
-  - Harper
-  - Hayden
-  - Haylee
-  - Hayley
-  - Haylie
-  - Hazel
-  - Heather
-  - Heaven
-  - Hedley
-  - Heidi
-  - Helen
-  - Hepsie
-  - Holly
-  - Hope
-  - Hortensia
-  - Iantha
-  - Ileen
-  - Imani
-  - Innocent
-  - Irene
-  - Iris
-  - Isabel
-  - Isabella
-  - Isabelle
-  - Itzel
-  - Ivy
-  - Izabella
-  - Jacaline
-  - Jacqueline
-  - Jacquetta
-  - Jacqui
-  - Jada
-  - Jade
-  - Jaden
-  - Jadyn
-  - Jaelyn
-  - Jakki
-  - Jalen
-  - Jamie
-  - Jane
-  - Janelle
-  - Janette
-  - Janie
-  - Janina
-  - Janine
-  - Janiya
-  - Janiyah
-  - Jaslene
-  - Jasmin
-  - Jasmine
-  - Jayda
-  - Jayden
-  - Jayla
-  - Jaylee
-  - Jaynie
-  - Jazlyn
-  - Jazmin
-  - Jazmine
-  - Jeanna
-  - Jeannie
-  - Jeannine
-  - Jenifer
-  - Jenna
-  - Jennie
-  - Jennifer
-  - Jera
-  - Jere
-  - Jeri
-  - Jessica
-  - Jillian
-  - Jillie
-  - Jimena
-  - Joanna
-  - Jocelyn
-  - Joetta
-  - Johanna
-  - Joi
-  - Joni
-  - Jordan
-  - Jordyn
-  - Joselyn
-  - Josepha
-  - Josephine
-  - Josie
-  - Joye
-  - Julia
-  - Juliana
-  - Julianna
-  - Julie
-  - Juliet
-  - Julissa
-  - July
-  - Kadence
-  - Kaelea
-  - Kaelyn
-  - Kailey
-  - Kailyn
-  - Kaitlin
-  - Kaitlyn
-  - Kaleigh
-  - Kamryn
-  - Kara
-  - Karen
-  - Karenza
-  - Karina
-  - Karla
-  - Karly
-  - Karyn
-  - Kassidy
-  - Kat
-  - Kate
-  - Katelyn
-  - Katelynn
-  - Katherine
-  - Kathleen
-  - Kathryn
-  - Kathy
-  - Katie
-  - Katlyn
-  - Kayden
-  - Kaydence
-  - Kayla
-  - Kaylee
-  - Kayleigh
-  - Kaylie
-  - Kaylin
-  - Keegan
-  - Keira
-  - Keith
-  - Kellie
-  - Kelly
-  - Kelsey
-  - Kendall
-  - Kendra
-  - Kennedy
-  - Kenzie
-  - Kerena
-  - Kerensa
-  - Keturah
-  - Khloe
-  - Kiana
-  - Kiara
-  - Kiera
-  - Kiley
-  - Kimberley
-  - Kimberly
-  - Kimora
-  - Kira
-  - Kristen
-  - Kristina
-  - Kyla
-  - Kylee
-  - Kyleigh
-  - Kylie
-  - Kyra
-  - Lacey
-  - Lacy
-  - Laila
-  - Lakeisha
-  - Lalla
-  - Lana
-  - Latanya
-  - Laura
-  - Lauren
-  - Laurencia
-  - Laurissa
-  - Lauryn
-  - Layla
-  - Leah
-  - Leeann
-  - Leia
-  - Leila
-  - Leilani
-  - Lena
-  - Leslie
-  - Lesly
-  - Lessie
-  - Leta
-  - Lexi
-  - Lexia
-  - Lexus
-  - Lia
-  - Lila
-  - Lilah
-  - Lilian
-  - Liliana
-  - Lillian
-  - Lilliana
-  - Lillie
-  - Lilly
-  - Lily
-  - Lindsay
-  - Lindsey
-  - Lindsie
-  - Lindy
-  - Lizbeth
-  - Lockie
-  - Logan
-  - Lola
-  - London
-  - Lori
-  - Lorin
-  - Luanne
-  - Lucia
-  - Lucian
-  - Lucy
-  - Luna
-  - Luvenia
-  - Lydia
-  - Lyla
-  - Lyndsey
-  - Lynn
-  - Lynsey
-  - Lynwood
-  - Lyric
-  - Mabelle
-  - Macey
-  - Macie
-  - Mackenzie
-  - Macy
-  - Madalyn
-  - Maddison
-  - Madeleine
-  - Madeline
-  - Madelyn
-  - Madelynn
-  - Madilyn
-  - Madison
-  - Madisyn
-  - Madyson
-  - Maegan
-  - Maggie
-  - Makayla
-  - Makenna
-  - Makenzie
-  - Malia
-  - Mallory
-  - Marcia
-  - Marely
-  - Margaret
-  - Maria
-  - Mariabella
-  - Mariah
-  - Mariana
-  - Marilene
-  - Marion
-  - Marisol
-  - Marissa
-  - Marje
-  - Marjory
-  - Marlee
-  - Marley
-  - Marlowe
-  - Marlyn
-  - Marshall
-  - Mary
-  - Maryann
-  - Maudie
-  - Maurene
-  - May
-  - Maya
-  - Mckenna
-  - Mckenzie
-  - Megan
-  - Meghan
-  - Melanie
-  - Melany
-  - Melissa
-  - Melody
-  - Meredith
-  - Merideth
-  - Merrilyn
-  - Meryl
-  - Mia
-  - Michaela
-  - Michelle
-  - Mikayla
-  - Miley
-  - Minnie
-  - Miracle
-  - Miranda
-  - Miriam
-  - Molly
-  - Monica
-  - Monna
-  - Morgan
-  - Muriel
-  - Mya
-  - Mylee
-  - Myriam
-  - Myrtie
-  - Nadia
-  - Nan
-  - Nancy
-  - Naomi
-  - Natalia
-  - Natalie
-  - Nataly
-  - Natasha
-  - Nayeli
-  - Nelle
-  - Nena
-  - Nerissa
-  - Netta
-  - Nettie
-  - Nevaeh
-  - Nia
-  - Nicole
-  - Nina
-  - Noelle
-  - Nonie
-  - Nora
-  - Norah
-  - Nova
-  - Nowell
-  - Nydia
-  - Nyla
-  - Olive
-  - Olivia
-  - Oralie
-  - Paige
-  - Paisley
-  - Paola
-  - Paris
-  - Patience
-  - Patricia
-  - Pauleen
-  - Payton
-  - Pene
-  - Penelope
-  - Peregrine
-  - Perla
-  - Peyton
-  - Pheobe
-  - Phoebe
-  - Phyliss
-  - Phyllida
-  - Phyllis
-  - Piper
-  - Porsche
-  - Presley
-  - Priscilla
-  - Prosper
-  - Prue
-  - Quanah
-  - Quiana
-  - Rachael
-  - Rachel
-  - Raegan
-  - Raelene
-  - Rain
-  - Randa
-  - Randal
-  - Reagan
-  - Rebecca
-  - Rebeckah
-  - Rebekah
-  - Reene
-  - Reese
-  - Renie
-  - Rexana
-  - Rhetta
-  - Rihanna
-  - Riley
-  - Ronnette
-  - Rosa
-  - Rose
-  - Rosemary
-  - Rowan
-  - Ruby
-  - Rubye
-  - Ruth
-  - Rylee
-  - Ryleigh
-  - Rylie
-  - Sabella
-  - Sabrina
-  - Sachie
-  - Sadie
-  - Sage
-  - Sally
-  - Samantha
-  - Samara
-  - Sandra
-  - Sara
-  - Sarah
-  - Sarai
-  - Saranna
-  - Sasha
-  - Savanna
-  - Savannah
-  - Scarlett
-  - Selena
-  - Seneca
-  - Serena
-  - Serenity
-  - Shana
-  - Shanika
-  - Shannah
-  - Shannon
-  - Shantae
-  - Sharalyn
-  - Sharla
-  - Shayla
-  - Shelby
-  - Sheri
-  - Sherie
-  - Sherill
-  - Sherri
-  - Sienna
-  - Sierra
-  - Sissy
-  - Skylar
-  - Skyler
-  - Sofia
-  - Sophia
-  - Sophie
-  - Star
-  - Stella
-  - Steph
-  - Stephanie
-  - Stephany
-  - Sue
-  - Sukie
-  - Summer
-  - Sunshine
-  - Susanna
-  - Susannah
-  - Suzan
-  - Suzy
-  - Sydney
-  - Talia
-  - Tamika
-  - Tania
-  - Tansy
-  - Taryn
-  - Tatiana
-  - Tatum
-  - Tatyanna
-  - Taylor
-  - Teagan
-  - Tessa
-  - Tiffany
-  - Tolly
-  - Topaz
-  - Tori
-  - Tracee
-  - Tracey
-  - Trinity
-  - Ulyssa
-  - Valary
-  - Valentina
-  - Valeria
-  - Valerie
-  - Vanessa
-  - Verna
-  - Veronica
-  - Victoria
-  - Vinnie
-  - Violet
-  - Vivian
-  - Viviana
-  - Vivyan
-  - Wendi
-  - Wendy
-  - Willow
-  - Wisdom
-  - Wynonna
-  - Wynter
-  - Ximena
-  - Yasmin
-  - Yolanda
-  - Ysabel
-  - Zelda
-  - Zoe
-  - Zoey
-  - Zune
--- a/Resources/Prototypes/Datasets/Names/first_male.yml
+++ b/Resources/Prototypes/Datasets/Names/first_male.yml
@@ -1,669 +0,0 @@
- type: dataset
-  id: names_first_male
-  values:
-  - Aaden
-  - Aaron
-  - Abel
-  - Abraham
-  - Adam
-  - Adan
-  - Aden
-  - Adrian
-  - Aidan
-  - Aiden
-  - Alan
-  - Albert
-  - Alberto
-  - Alden
-  - Alec
-  - Alejandro
-  - Alex
-  - Alexander
-  - Alexis
-  - Alfred
-  - Alfredo
-  - Alger
-  - Ali
-  - Alijah
-  - Allen
-  - Alvin
-  - Amari
-  - Amir
-  - Amos
-  - Anderson
-  - Andre
-  - Andres
-  - Andrew
-  - Andy
-  - Angel
-  - Angelo
-  - Anthony
-  - Antonio
-  - Apple
-  - Archie
-  - Armando
-  - Arnie
-  - Art
-  - Arthur
-  - Arturo
-  - Asher
-  - Ashton
-  - August
-  - Austin
-  - Avery
-  - Axel
-  - Ayden
-  - Baldric
-  - Bartholomew
-  - Beau
-  - Beckett
-  - Benjamin
-  - Bennett
-  - Bill
-  - Blake
-  - Braden
-  - Bradley
-  - Brady
-  - Braeden
-  - Braiden
-  - Brandon
-  - Braxton
-  - Brayan
-  - Brayden
-  - Braydon
-  - Braylon
-  - Brendan
-  - Brenden
-  - Brennan
-  - Brett
-  - Brian
-  - Brick
-  - Brock
-  - Brodie
-  - Brody
-  - Bronte
-  - Bruce
-  - Bryan
-  - Bryant
-  - Bryce
-  - Brycen
-  - Bryson
-  - Buck
-  - Burt
-  - Butch
-  - Byrne
-  - Byron
-  - Cade
-  - Caden
-  - Caiden
-  - Caleb
-  - Calvin
-  - Camden
-  - Cameron
-  - Camron
-  - Camryn
-  - Carl
-  - Carlos
-  - Carson
-  - Carter
-  - Casey
-  - Cash
-  - Casimir
-  - Cassian
-  - Cayden
-  - Cesar
-  - Chad
-  - Chance
-  - Chandler
-  - Charles
-  - Charlie
-  - Charlton
-  - Chase
-  - Chip
-  - Chris
-  - Christian
-  - Christopher
-  - Clark
-  - Claudius
-  - Clayton
-  - Clement
-  - Cletus
-  - Cleveland
-  - Cliff
-  - Clinton
-  - Cody
-  - Cohen
-  - Colby
-  - Cole
-  - Colin
-  - Collin
-  - Colten
-  - Colton
-  - Conner
-  - Connor
-  - Cooper
-  - Corbin
-  - Corey
-  - Cory
-  - Cristian
-  - Cristopher
-  - Crush
-  - Cruz
-  - Curtis
-  - Cy
-  - Dakota
-  - Dallas
-  - Dalton
-  - Damian
-  - Damien
-  - Damon
-  - Dane
-  - Daniel
-  - Danny
-  - Dante
-  - Darcey
-  - Darell
-  - Darin
-  - Darius
-  - Darren
-  - David
-  - Davion
-  - Davis
-  - Dawson
-  - Dayton
-  - Dean
-  - Deandre
-  - Deangelo
-  - Declan
-  - Denholm
-  - Dennis
-  - Derek
-  - Derrick
-  - Desmond
-  - Devin
-  - Devon
-  - Diego
-  - Dillon
-  - Dirk
-  - Dominic
-  - Dominick
-  - Donald
-  - Donny
-  - Donovan
-  - Douglas
-  - Drake
-  - Drew
-  - Driscoll
-  - Duke
-  - Duncan
-  - Dustin
-  - Dylan
-  - Easton
-  - Eddie
-  - Edgar
-  - Eduardo
-  - Edward
-  - Edwin
-  - Eli
-  - Elias
-  - Elijah
-  - Eliot
-  - Eliott
-  - Elliot
-  - Elliott
-  - Elric
-  - Elwood
-  - Emanuel
-  - Emerson
-  - Emiliano
-  - Emilio
-  - Emmanuel
-  - Enrique
-  - Eric
-  - Erick
-  - Erik
-  - Ernesto
-  - Esteban
-  - Ethan
-  - Evan
-  - Everett
-  - Ezekiel
-  - Ezra
-  - Fabian
-  - Felix
-  - Fenton
-  - Fernando
-  - Finn
-  - Fitz
-  - Flick
-  - Flint
-  - Flip
-  - Francis
-  - Francisco
-  - Frank
-  - Frankie
-  - Franklin
-  - Fridge
-  - Fulton
-  - Gabriel
-  - Gael
-  - Gage
-  - Gannon
-  - Garret
-  - Garrett
-  - Gary
-  - Gavin
-  - George
-  - Gerardo
-  - Giovanni
-  - Goddard
-  - Godwin
-  - Goodwin
-  - Gordon
-  - Grady
-  - Graeme
-  - Graham
-  - Grant
-  - Gratian
-  - Grayson
-  - Gregory
-  - Grendel
-  - Greyson
-  - Griffin
-  - Guillermo
-  - Gunner
-  - Gustavo
-  - Han
-  - Harrison
-  - Harry
-  - Hartley
-  - Harvey
-  - Hayden
-  - Hector
-  - Henderson
-  - Henry
-  - Holden
-  - Homer
-  - Horatio
-  - Hudson
-  - Huffie
-  - Hugo
-  - Hungry
-  - Hunter
-  - Ian
-  - Irvine
-  - Isaac
-  - Isaiah
-  - Isaias
-  - Isiah
-  - Ismael
-  - Israel
-  - Issac
-  - Ivan
-  - Izaiah
-  - Jace
-  - Jack
-  - Jackson
-  - Jacob
-  - Jacoby
-  - Jaden
-  - Jadon
-  - Jaiden
-  - Jaime
-  - Jake
-  - Jakob
-  - Jalen
-  - Jamar
-  - Jamari
-  - Jamarion
-  - James
-  - Jameson
-  - Jamie
-  - Jamison
-  - Janel
-  - Jared
-  - Jason
-  - Jasper
-  - Javier
-  - Javon
-  - Jaxon
-  - Jaxson
-  - Jay
-  - Jayce
-  - Jayden
-  - Jaydon
-  - Jaye
-  - Jaylen
-  - Jayne
-  - Jayson
-  - Jean-Luc
-  - Jeb
-  - Jed
-  - Jeffrey
-  - Jemmy
-  - Jeremiah
-  - Jeremy
-  - Jermaine
-  - Jerrie
-  - Jerry
-  - Jesse
-  - Jesus
-  - Jim
-  - Jimmy
-  - Joachim
-  - Joaquin
-  - Joe
-  - Joel
-  - Joey
-  - Johan
-  - John
-  - Johnathan
-  - Johnny
-  - Jonah
-  - Jonas
-  - Jonathan
-  - Jonathon
-  - Jordan
-  - Jorge
-  - Jose
-  - Joseph
-  - Josh
-  - Joshua
-  - Josiah
-  - Josue
-  - Juan
-  - Judah
-  - Jude
-  - Julian
-  - Julio
-  - Julius
-  - Justice
-  - Justin
-  - Kade
-  - Kaden
-  - Kai
-  - Kaiden
-  - Kale
-  - Kaleb
-  - Kameron
-  - Kane
-  - Karson
-  - Kayden
-  - Keagan
-  - Keaton
-  - Keegan
-  - Keith
-  - Kellen
-  - Kelvin
-  - Kennard
-  - Kenneth
-  - Kevin
-  - Keziah
-  - Khalil
-  - Kingston
-  - Kobe
-  - Kolton
-  - Kristopher
-  - Kyle
-  - Kyler
-  - Lance
-  - Landen
-  - Lando
-  - Landon
-  - Landyn
-  - Lane
-  - Lanny
-  - Larry
-  - Launce
-  - Lawrence
-  - Leland
-  - Lennox
-  - Lenny
-  - Leo
-  - Leonard
-  - Leonardo
-  - Leonel
-  - Leroy
-  - Levi
-  - Liam
-  - Lief
-  - Lincoln
-  - Linden
-  - Linton
-  - Logan
-  - Lorde
-  - Lorenzo
-  - Loreto
-  - Lou
-  - Louis
-  - Luca
-  - Lucas
-  - Luis
-  - Lukas
-  - Luke
-  - Maddox
-  - Malachi
-  - Malcolm
-  - Malik
-  - Manley
-  - Manuel
-  - Marc
-  - Marco
-  - Marcos
-  - Marcus
-  - Mario
-  - Marion
-  - Mark
-  - Marshall
-  - Martin
-  - Marvin
-  - Mason
-  - Mateo
-  - Mathew
-  - Matthew
-  - Maurice
-  - Mauricio
-  - Max
-  - Maximilian
-  - Maximus
-  - Maxwell
-  - Maynard
-  - Mekhi
-  - Melvin
-  - Melvyn
-  - Micah
-  - Michael
-  - Micheal
-  - Miguel
-  - Mike
-  - Miles
-  - Milo
-  - Milton
-  - Mitchell
-  - Moises
-  - Montague
-  - Monte
-  - Monty
-  - Morgan
-  - Moses
-  - Myles
-  - Nasir
-  - Nat
-  - Nathan
-  - Nathaniel
-  - Nehemiah
-  - Nelson
-  - Nicholas
-  - Nick
-  - Nickolas
-  - Nicolas
-  - Nikolas
-  - Noah
-  - Noel
-  - Nolan
-  - Oliver
-  - Omar
-  - Opie
-  - Orlando
-  - Osbert
-  - Osborn
-  - Osborne
-  - Oscar
-  - Osmund
-  - Oswald
-  - Owen
-  - Pablo
-  - Paget
-  - Parker
-  - Patrick
-  - Patton
-  - Paul
-  - Paxton
-  - Payton
-  - Pedro
-  - Percival
-  - Persh
-  - Peter
-  - Peyton
-  - Philip
-  - Phillip
-  - Phoenix
-  - Porter
-  - Preston
-  - Quentin
-  - Quinn
-  - Quinton
-  - Rafael
-  - Ramon
-  - Randy
-  - Rastus
-  - Raul
-  - Raymond
-  - Rayner
-  - Reece
-  - Reed
-  - Reese
-  - Reid
-  - Reuben
-  - Reynard
-  - Ricardo
-  - Richard
-  - Ricky
-  - Riley
-  - River
-  - Robert
-  - Roberto
-  - Rocco
-  - Rodger
-  - Rodrigo
-  - Roger
-  - Roman
-  - Romayne
-  - Romeo
-  - Ronald
-  - Roscoe
-  - Roswell
-  - Rowan
-  - Roy
-  - Royce
-  - Rube
-  - Ruben
-  - Russell
-  - Rusty
-  - Ryan
-  - Ryder
-  - Ryker
-  - Rylan
-  - Sal
-  - Salvador
-  - Sam
-  - Samuel
-  - Santiago
-  - Saul
-  - Sawyer
-  - Scott
-  - Scotty
-  - Sean
-  - Sebastian
-  - Sergio
-  - Seth
-  - Seymour
-  - Shane
-  - Shaun
-  - Shawn
-  - Shiloh
-  - Silas
-  - Simon
-  - Skyler
-  - Sloan
-  - Smoke
-  - Solomon
-  - Sorrel
-  - Spencer
-  - Spike
-  - Stephen
-  - Steven
-  - Sybil
-  - Syd
-  - Talon
-  - Tamsin
-  - Tanner
-  - Tate
-  - Taylor
-  - Tel
-  - Terrell
-  - Terry
-  - Theodore
-  - Thomas
-  - Tim
-  - Timothy
-  - Titus
-  - Todd
-  - Tony
-  - Travis
-  - Trent
-  - Trenton
-  - Trevor
-  - Trey
-  - Trip
-  - Tristan
-  - Tristen
-  - Triston
-  - Troy
-  - Tucker
-  - Ty
-  - Tye
-  - Tyler
-  - Tyson
-  - Uland
-  - Ulric
-  - Uriel
-  - Vaughn
-  - Victor
-  - Vince
-  - Vincent
-  - Vinny
-  - Walker
-  - Walter
-  - Ward
-  - Warner
-  - Wayne
-  - Wesley
-  - Weston
-  - Whitaker
-  - William
-  - Willy
-  - Woodrow
-  - Wyatt
-  - Xander
-  - Xavier
-  - Yahir
-  - Zachariah
-  - Zachary
-  - Zack
-  - Zackary
-  - Zander
-  - Zane
-  - Zayden
-  - Zeke
-  - Zion
--- a/Resources/Prototypes/Datasets/Names/fortunes.yml
+++ b/Resources/Prototypes/Datasets/Names/fortunes.yml
@@ -1,82 +1,5 @@
- type: dataset
-  id: CookieFortuneDescriptions
+- type: localizedDataset
+  id: DescriptionsCookieFortune
  values:
-  - The end is near... and it's all your fault.
-  - We know what you did.
-  - Beware.
-  - Don't look back.
-  - Never trust a person in squeaky shoes.
-  - Never trust a person in red uniform.
-  - Never trust a person in green uniform.
-  - Never trust a person in blue uniform.
-  - Never trust a person in yellow uniform.
-  - Never trust a person in black uniform.
-  - Never trust a person without uniform.
-  - Always trust a person in squeaky shoes.
-  - The clown knows that you know that he knows. Beware.
-  - Beware of the silent man in the silent maintenance tunnels.
-  - Be careful in dark maintenance tunnels.
-  - A surprise awaits you in the maintenance tunnels.
-  - You will be pleasantly surprised in the dormitory.
-  - You will be pleasantly surprised in the cafeteria.
-  - You will be pleasantly surprised in arrivals.
-  - You will be pleasantly surprised in the church.
-  - You will be pleasantly surprised in the tool storage.
-  - There is an impostor among us.
-  - A fun adventure awaits you in the maintenance tunnels.
-  - CentComm is proud of you!
-  - The head of your deparment is proud of you!
-  - Ian is proud of you!
-  - Do it for Ian!
-  - Always carry an emergency box.
-  - Red spy is in the base.
-  - In the coming minutes, your cherished desire will come true.
-  - Take a quick look in the mirror!
-  - Don't look in the mirror today!
-  - Friendship will come to you soon.
-  - A grey man in a gas mask will come to you soon.
-  - Whoever gets this note will receive a chocolate bar.
-  - Milk is good for your bones.
-  - Shout "Hurray!" and get insulated gloves.
-  - Hug your captain and you will receive a gift.
-  - A dubious friend may be an enemy in red camouflage.
-  - A faithful colleague is a strong defense.
-  - A friend asks only for your time, not your crowbar.
-  - Your life doesn't get better by chance, it gets better by doing your job properly.
-  - Boo!
-  - The real treasure is the friends you made along the shift.
-  - Allan please add details
-  - You are the greatest person who ever lived!
-  - NanoTrasen is forcing me to make fortunes for these cookies, please help!
-  - Buy Mr. Chang's today!
-  - You love Mr. Chang!
-  - Don't buy Discount Dan. Buy Mr. Chang!
-  - Don't buy Getmore Chocolate. Buy Mr. Chang!
-  - What’s hidden in a maintenance locker?
-  - All your hard work will soon pay off.
-  - Don’t just think, act!
-  - An apple a day keeps the doctor away.
-  - Don't drink and set up singulo.
-  - Stare into the singulo, and the singulo stares back at you.
-  - Every good and perfect gift is from CentComm.
-  - There’s no such thing as Space Station 13.
-  - There is a time for caution, but not for fear.
-  - The smart thing to do is to begin trusting your intuitions.
-  - Time is precious, but insulated gloves are more precious than time.
-  - Fortune is a giver and a taker. Do it.
-  - Fortune and flowers do not last forever. Do it.
-  - Do it. Just do it.
-  - When life gives you lemons instead of oranges, make lemonade.
-  - By opening this cookie you’ve set a terrible chain of events in motion, good job.
-  - Get back to work!
-  - Cookie.print() not found
-  - THERE IS NO CLONER ON THIS STATION
-  - Putting suit sensors on max is always a good idea.
-  - Syndicate is hiring. Contact us.
-  - The person next to you is up to something. You know what you have to do.
-  - Did you know? Monkeys are not what they seem.
-  - Did you know that half of salvage specialists go missing on the job?
-  - Also try out sashimi with galaxythystle sauce!
-  - Did you know that 70% of Nanotrasen applicants go missing within the first years of their contract? The more you know!!
-  - This shift you are going to do a very robust move in front of everyone.
-  - Robustness is not just about how good you are, but how good of a person you are.
+    prefix: descriptions-cookie-fortune-dataset-
+    count: 79
--- a/Resources/Prototypes/Datasets/Names/golem.yml
+++ b/Resources/Prototypes/Datasets/Names/golem.yml
--- a/Resources/Prototypes/Datasets/Names/hologram.yml
+++ b/Resources/Prototypes/Datasets/Names/hologram.yml
@@ -1,17 +1,5 @@
- type: dataset
-  id: names_hologram
+- type: localizedDataset
+  id: NamesHologram
  values:
-  - Apollo
-  - Data
-  - GLIMMER
-  - El Roi
-  - Hephaestus
-  - Holo-AI
-  - Holo-Friend
-  - Hologram
-  - Odysseus
-  - Persephone
-  - Petra
-  - Processor
-  - Prometheus
-  - Theseus
+    prefix: names-hologram-dataset-
+    count: 14
--- a/Resources/Prototypes/Datasets/Names/last.yml
+++ b/Resources/Prototypes/Datasets/Names/last.yml
@@ -1,558 +1 @@
- type: dataset
-  id: names_last
-  values:
-  - Ackerley
-  - Adams
-  - Addison
-  - Agg
-  - Aggley
-  - Ahmed
-  - Albright
-  - Alekseev
-  - Ali
-  - Alice
-  - Allen
-  - Alliman
-  - Altmann
-  - Anderson
-  - Andreev
-  - Ann
-  - Archibald
-  - Ashbaugh
-  - Atkinson
-  - Atweeke
-  - Aultman
-  - Auman
-  - Baer
-  - Bailey
-  - Baker
-  - Barnes
-  - Barrett
-  - Bash
-  - Bashline
-  - Basinger
-  - Baskett
-  - Basmanoff
-  - Batten
-  - Baum
-  - Baxter
-  - Beach
-  - Beail
-  - Beck
-  - Beedell
-  - Begum
-  - Bell
-  - Benford
-  - Bennett
-  - Berkheimer
-  - Best
-  - Bickerson
-  - Bicknell
-  - Biery
-  - Black
-  - Blackburn
-  - Blaine
-  - Blessig
-  - Bloise
-  - Bluetenberger
-  - Blyant
-  - Bode
-  - Bould
-  - Bousum
-  - Bowchiew
-  - Boyer
-  - Brandenburg
-  - Bratton
-  - Braun
-  - Briggs
-  - Brindle
-  - Briner
-  - Brinigh
-  - Brooks
-  - Brown
-  - Bullard
-  - Bunten
-  - Burch
-  - Burkett
-  - Burns
-  - Burris
-  - Butterfill
-  - Buttersworth
-  - Buzzard
-  - Byers
-  - Bynum
-  - Caldwell
-  - Callison
-  - Camp
-  - Campbell
-  - Carmichael
-  - Carr
-  - Carter
-  - Catherina
-  - Catleay
-  - Cavalet
-  - Chapman
-  - Chauvin
-  - Cherry
-  - Christman
-  - Christopher
-  - Clark
-  - Clarke
-  - Clewett
-  - Coates
-  - Coldsmith
-  - Collins
-  - Compton
-  - Conrad
-  - Cook
-  - Cooper
-  - Costello
-  - Cowart
-  - Cowper
-  - Cox
-  - Cressman
-  - Curry
-  - Cypret
-  - David
-  - Davies
-  - Davis
-  - Dawkins
-  - Day
-  - Dean
-  - Demuth
-  - Dennis
-  - Digson
-  - Dimeling
-  - Donkin
-  - Draudy
-  - Driggers
-  - Dryfus
-  - Dugmore
-  - Duncan
-  - Durstine
-  - Earl
-  - Easter
-  - Echard
-  - Eckhardstein
-  - Edwards
-  - Eggbert
-  - Ehret
-  - Elderson
-  - Eliza
-  - Elliott
-  - Ellis
-  - Enderly
-  - Endsley
-  - Evans
-  - Ewing
-  - Faqua
-  - Faust
-  - Fea
-  - Feufer
-  - Fiddler
-  - Field
-  - Fields
-  - Finlay
-  - Fischer
-  - Fiscina
-  - Fisher
-  - Fleming
-  - Flickinger
-  - Focell
-  - Foster
-  - Franks
-  - Fraser
-  - Fryer
-  - Fuchs
-  - Fulton
-  - Gadow
-  - Gardner
-  - Garland
-  - Garneys
-  - Garratt
-  - Garrison
-  - Gettemy
-  - Gibson
-  - Graham
-  - Gray
-  - Green
-  - Greenawalt
-  - Greene
-  - Greenwood
-  - Gregory
-  - Griffiths
-  - Gronko
-  - Guess
-  - Hall
-  - Hanford
-  - Hardie
-  - Harding
-  - Hardy
-  - Harris
-  - Harrison
-  - Harrold
-  - Harrow
-  - Harshman
-  - Hastings
-  - Hawker
-  - Hawking
-  - Hawkins
-  - Hayhurst
-  - Haynes
-  - Hegarty
-  - Henry
-  - Hice
-  - Highlands
-  - Hill
-  - Hincken
-  - Hirleman
-  - Hoenshell
-  - Holdeman
-  - Hook
-  - Hooker
-  - Hoopengarner
-  - Hoover
-  - Houser
-  - Houston
-  - Howard
-  - Howe
-  - Huey
-  - Hughes
-  - Hujsak
-  - Hunt
-  - Hunter
-  - Hussain
-  - Hutton
-  - Hynes
-  - Ironmonger
-  - Isaman
-  - Isemann
-  - Ivanov
-  - Jackson
-  - James
-  - Jardine
-  - Jenkins
-  - Jenner
-  - Jerome
-  - Jesse
-  - Jewell
-  - Joghs
-  - Johnson
-  - Jones
-  - Jowers
-  - Joyce
-  - Judge
-  - Jyllian
-  - Kadel
-  - Kanaga
-  - Kaur
-  - Keener
-  - Kelley
-  - Kellogg
-  - Kelly
-  - Kemble
-  - Kemerer
-  - Keppel
-  - Kepplinger
-  - Khan
-  - Kiefer
-  - Kifer
-  - Kimple
-  - King
-  - Kirkson
-  - Knapenberger
-  - Knapp
-  - Koepple
-  - Koster
-  - Kuster
-  - Kuznetsov
-  - Laborde
-  - Lacon
-  - Lafortune
-  - Langston
-  - Larson
-  - Lauffer
-  - Laurenzi
-  - Leach
-  - Lee
-  - Leech
-  - Leichter
-  - Leslie
-  - Lester
-  - Levett
-  - Lewis
-  - Lineman
-  - Linton
-  - Llora
-  - Lloyd
-  - Logue
-  - Lombardi
-  - Lord
-  - Losey
-  - Lowe
-  - Lowstetter
-  - Lucy
-  - Ludwig
-  - Maclagan
-  - Magor
-  - Marcotte
-  - Margaret
-  - Marriman
-  - Marshall
-  - Martins
-  - Mary
-  - Mason
-  - Mathews
-  - Matthews
-  - McDonald
-  - McDonohugh
-  - McShain
-  - Mcclymonds
-  - Mccullough
-  - Mccune
-  - Mcfall
-  - Mcintosh
-  - Mckendrick
-  - Mcloskey
-  - Mcmullen
-  - Mens
-  - Merryman
-  - Metzer
-  - Meyers
-  - Mikhaylov
-  - Mildred
-  - Miller
-  - Millhouse
-  - Mills
-  - Milne
-  - Mingle
-  - Minnie
-  - Mitchell
-  - Moberly
-  - Moon
-  - Moore
-  - Morgan
-  - Morris
-  - Mortland
-  - Mosser
-  - Mueller
-  - Muggins
-  - Mull
-  - Muller
-  - Murphy
-  - Murray
-  - Nash
-  - Neely
-  - Nehling
-  - Newbern
-  - Nicholas
-  - Nickolson
-  - Northey
-  - Noton
-  - Olphert
-  - Oneal
-  - Oppenheimer
-  - Osteen
-  - Osterweis
-  - Osterwise
-  - Otis
-  - Overstreet
-  - Owen
-  - Owens
-  - Palmer
-  - Parker
-  - Parkinson
-  - Patel
-  - Patterson
-  - Paulson
-  - Pavlov
-  - Paynter
-  - Pearsall
-  - Pennington
-  - Perkins
-  - Pershing
-  - Peters
-  - Petrov
-  - Pfeifer
-  - Philips
-  - Phillips
-  - Picard
-  - Pinney
-  - Poehl
-  - Poley
-  - Polson
-  - Powell
-  - Power
-  - Prechtl
-  - Prescott
-  - Prevatt
-  - Price
-  - Priebe
-  - Pritchard
-  - Pycroft
-  - Quinn
-  - Quirin
-  - Rader
-  - Rahl
-  - Ramos
-  - Randolph
-  - Ratcliff
-  - Rathen
-  - Rathens
-  - Raub
-  - Ray
-  - Reade
-  - Reichard
-  - Reid
-  - Reighner
-  - Rhinehart
-  - Richards
-  - Richardson
-  - Richter
-  - Rifler
-  - Riggle
-  - Riker
-  - Ringer
-  - Roadman
-  - Roberts
-  - Robertson
-  - Robinson
-  - Roby
-  - Rockwell
-  - Rogers
-  - Rohtin
-  - Rose
-  - Rosensteel
-  - Rowley
-  - Russell
-  - Ryals
-  - Sagan
-  - Sanders
-  - Sandford
-  - Sandys
-  - Sauter
-  - Saylor
-  - Schaeffer
-  - Scherer
-  - Schmidt
-  - Schofield
-  - Schrader
-  - Scott
-  - Sealis
-  - Seelig
-  - Seidner
-  - Semenov
-  - Shafer
-  - Shaffer
-  - Shaner
-  - Shaw
-  - Sheets
-  - Shick
-  - Shirey
-  - Sholl
-  - Shupe
-  - Sidower
-  - Siegrist
-  - Simmons
-  - Simpson
-  - Singh
-  - Sloan
-  - Smail
-  - Smirnov
-  - Smith
-  - Snyder
-  - Sommer
-  - Spock
-  - Stafford
-  - Stahl
-  - Stainforth
-  - Stall
-  - Stamos
-  - Stange
-  - Staymates
-  - Steele
-  - Stephenson
-  - Stern
-  - Stewart
-  - Stocker
-  - Stone
-  - Stough
-  - Straub
-  - Stroble
-  - Stroh
-  - Styles
-  - Sullivan
-  - Sulyard
-  - Summy
-  - Sutton
-  - Swabey
-  - Swarner
-  - Sybilla
-  - Taggart
-  - Tanner
-  - Taylor
-  - Tedrow
-  - Tennant
-  - Thomas
-  - Thomlinson
-  - Thompson
-  - Thomson
-  - Thorley
-  - Tilton
-  - Tireman
-  - Todd
-  - Treeby
-  - Trovato
-  - Turner
-  - Ulery
-  - Ullman
-  - Unk
-  - Vader
-  - Vanleer
-  - Vasilyev
-  - Waldron
-  - Walker
-  - Wallick
-  - Ward
-  - Wardle
-  - Warren
-  - Watson
-  - Webb
-  - Weeter
-  - Weisgarber
-  - Wells
-  - Welty
-  - Wentzel
-  - Werner
-  - Werry
-  - Wheeler
-  - Whirlow
-  - Whittier
-  - Wible
-  - Wile
-  - Wilkerson
-  - Wilkinson
-  - Willey
-  - Williams
-  - Williamson
-  - Wilo
-  - Wilson
-  - Winton
-  - Wise
-  - Wolfe
-  - Wolff
-  - Wood
-  - Woodward
-  - Woodworth
-  - Woolery
-  - Woollard
-  - Wright
-  - Yeskey
-  - Young
-  - Zadovsky
-  - Zalack
-  - Zaun
-  - Zeal
-  - Zimmer
-  - Zoucks
-
+
--- a/Resources/Prototypes/Datasets/Names/military.yml
+++ b/Resources/Prototypes/Datasets/Names/military.yml
@@ -1,60 +1,17 @@
- type: dataset
-  id: NamesFirstMilitaryLeader
+- type: localizedDataset
+  id: NamesMilitaryFirstLeader
  values:
-  - Colonel
-  - Commander
-  - Lieutenant
-  - Major
-  
- type: dataset
-  id: NamesFirstMilitary
-  values:
-  - Corporal
-  - Sergeant
-  - Specialist
+    prefix: names-military-leader-first-dataset-
+    count: 4

- type: dataset
-  id: NamesLastMilitary
+- type: localizedDataset
+  id: NamesMilitaryFirst
  values:
-  - Agena
-  - Andromeda
-  - Antares
-  - Aquarius
-  - Beid
-  - Betelgeuse
-  - Canopus
-  - Capricorn
-  - Celaeno
-  - Centaur
-  - Chameleon
-  - Chau
-  - Cygnus
-  - Deneb
-  - Dragon
-  - Electra
-  - Fomalhaut
-  - Ginan
-  - Hercules
-  - Labr
-  - Leonis
-  - Matar
-  - Microscopium
-  - Nihal
-  - Ophiuchus
-  - Oculus
-  - Orion
-  - Perseus
-  - Phoenix
-  - Procyon
-  - Regulus
-  - Rigel
-  - Sargas
-  - Schedar
-  - Shaula
-  - Sirius
-  - Tabit
-  - Taurus
-  - Ukdah
-  - Vega
-  - Yildun
-  - Zosma
+    prefix: names-military-first-dataset-
+    count: 3
+
+- type: localizedDataset
+  id: NamesMilitaryLast
+  values:
+    prefix: names-military-last-dataset-
+    count: 42
--- a/Resources/Prototypes/Datasets/Names/moth.yml
+++ b/Resources/Prototypes/Datasets/Names/moth.yml
@@ -0,0 +1,17 @@
+- type: localizedDataset
+  id: NamesMothFirstMale
+  values:
+    prefix: names-moth-first-male-dataset-
+    count: 39
+
+- type: localizedDataset
+  id: NamesMothFirstFemale
+  values:
+    prefix: names-moth-first-female-dataset-
+    count: 38
+
+- type: localizedDataset
+  id: NamesMothLast
+  values:
+    prefix: names-moth-last-dataset-
+    count: 28
--- a/Resources/Prototypes/Datasets/Names/moth_first_female.yml
+++ b/Resources/Prototypes/Datasets/Names/moth_first_female.yml
@@ -1,49 +0,0 @@
- type: dataset
-  id: names_moth_first_female
-  values:
-  - Atropos # Acherontia atropos
-  - Betularia # Biston betularia
-  - Daphne # Daphnis
-  - Eurypta # Eurypteryx
-  - Eudryas # Eudryas
-  - Iris # Salassa iris
-  - Lachesis # Acherontia lachesis
-  - Luna # Actias luna
-  - Lymanzia # Lymantria
-  - Maple # Dryocampa rubicunda, "Rosy Maple"
-  - Mima # Mimas
-  - Nephele # Nephele
-  - Rosie # Dryocampa rubicunda
-  - Scarlet # Cosmosoma myrodora, "Scarlet-bodied wasp moth"
-  - Styx # Acherontia styx
-
-  # Other languages
-  - Avelaina # Galician "moth" (avelaíña)
-  - Falena # Italian "winter moth"
-  - Menodora # Greek "moon gift"
-  - Molie # Romanian "moth"
-  - Polilla # Spanish "moth"
-
-  # Myth and legend
-  - Althea # Greek mythological figure
-  - Aurora # Roman goddess of the dawn
-  - Helle # Greek mythological figure
-  - Selene # Greek goddess of the moon
-  - Nyx # Greek goddess of the night
-
-  # Fun names
-  - Angel
-  - Sandy
-  - Liberty
-
-  # Common names, filler
-  - Beatrix
-  - Daisy
-  - Dawn
-  - Elizabeth
-  - Lucy
-  - Ruby
-  - Sarah
-  - Sienna
-  - Willow
-  - Zoey
--- a/Resources/Prototypes/Datasets/Names/moth_first_male.yml
+++ b/Resources/Prototypes/Datasets/Names/moth_first_male.yml
@@ -1,50 +0,0 @@
- type: dataset
-  id: names_moth_first_male
-  values:
-  - Agrius # Agrius
-  - Atlas # Attacus atlas
-  - Attacus # Attacus
-  - Caesar # Attacus caesar
-  - Hercules # Coscinocera hercules
-  - Rannoch # Itame brunneata, "Rannoch Looper"
-  - Socrates # Acosmeryx socrates
-  - Solus # Saturniidae solus
-
-  # Other languages
-  - Ash # Hebrew עש "moth"
-  - Azar # Persian "fire"
-  - Kaiser # German "emperor" descendant of the Latin caesar
-  - Rex # Latin "king"
-  - Rajas # Sanskrit "darkness" or "dust"
-  - Skoros # Greek "clothes moth"
-
-  # Myth and legend
-  - Bladud # legendary king of the Britons who crafted wings and died in his attempt at flight
-  - Daedalus # father of Icarus
-  - Erebus # Greek primordial deity of darkness
-  - Icarus # the classic
-  - Jatayu # Hindu figure, similar to Icarus
-  - Koho # Japanese reading of 夸父（こほ）
-  - Kuafu # Chinese giant 夸父, similar to Icarus
-  - Lucifer # more commonly-known fall-from-heaven figure
-  - Merlin # Arthurian wizard
-  - Phaethon # another Greek figure, similar to Icarus
-  - Wolford # rendering of Bladud from the Welsh blaidd "wolf" + iudd "lord"
-
-  # Fun names
-  - Ace
-  - Altair
-  - Dusty
-  - Gambit
-  - Hawk
-  - Mothew
-  - Timothy
-
-  # Common names, filler
-  - Asher
-  - Isaac
-  - Roman
-  - Samuel
-  - Sebastian
-  - Silas
-  - Simon
--- a/Resources/Prototypes/Datasets/Names/moth_last.yml
+++ b/Resources/Prototypes/Datasets/Names/moth_last.yml
@@ -1,37 +0,0 @@
- type: dataset
-  id: names_moth_last
-  values:
-  - Blackwitch # Ascalapha odorata
-  - Deathshead # refers to any of the 3 Acherontia
-  - Emperor # Saturniinae
-  - Scorchedwing # Plagodis dolabraria
-  - Temnora # Temnora
-  - Usta # Usta
-  - Whitewitch # Thysania agrippina
-  - Winter # Operophtera brumata
-
-  # Other languages
-  - Epiolos # Ancient Greek "moth"
-  - Moeller # conceivably any Old Norse descendant of mǫlr but probably more Danish than anything. "oe" digraph for ø.
-  - Nightflitter # literal pseudo-translation of German Nachtfalter
-
-  # Myth and legend
-  - Herald # belief of moths flying at night signalling the reception of a letter
-  - Leander # Greek figure associated with Hero, and similar sounding to Oleander hawk-moth
-  - Mothman # split between being a myth reference and actual possible surname given the actual Goodman, Hoffman, Newman, Coleman, etc.
-
-  # Fun names
-  - Cometrider
-  - Eventide
-  - Firefly
-  - Firebrush
-  - Flamecoat
-  - Lightweaver
-  - Moondancer
-  - Nightwish
-  - Nighteyes
-  - Owlbane
-  - Silktongue
-  - Sparkdrawn
-  - Stargazer
-  - Starseeker
--- a/Resources/Prototypes/Datasets/Names/mushman_first.yml
+++ b/Resources/Prototypes/Datasets/Names/mushman_first.yml
@@ -1,57 +1,5 @@
- type: dataset
-  id: names_mushman_first
+- type: localizedDataset
+  id: NamesMushmanFirst
  values:
-  - Pleurocybella
-  - Geastrum
-  - Tricholoma
-  - Ganoderma
-  - Galerina
-  - Fistulina
-  - Gyromitra
-  - Leccinum
-  - Crucilulum
-  - Craterellus
-  - Geoglossum
-  - Helvella
-  - Exidia
-  - Clitocybe
-  - Psilocybe
-  - Panaeolus
-  - Amanita
-  - Paxillus
-  - Spheaerobolus
-  - Sparassis
-  - Lepiota
-  - Leotia
-  - Clavariadelphus
-  - Annulohypoxylon
-  - Pisolitus
-  - Pluteus
-  - Flammulina
-  - Marasmius
-  - Clavaria
-  - Stereum
-  - Cortinarius
-  - Lyophyllum
-  - Hydnum
-  - Poria
-  - Armillaria
-  - Hypsizygus
-  - Agaricus
-  - Omphalotus
-  - Boletus
-  - Boletopsis
-  - Gymnopilus
-  - Hericium
-  - Grifola
-  - Morchella
-  - Clathrus
-  - Pleurotus
-  - Discina
-  - Chalciporus
-  - Calvatia
-  - Caulorhiza
-  - Tremella
-  - Volvariella
-  - Hypholoma
-  - Lactarius
+    prefix: names-mushman-first-dataset-
+    count: 54
--- a/Resources/Prototypes/Datasets/Names/mushman_last.yml
+++ b/Resources/Prototypes/Datasets/Names/mushman_last.yml
@@ -1,100 +1,5 @@
- type: dataset
-  id: names_mushman_last
+- type: localizedDataset
+  id: NamesMushmanLast
  values:
-  - Porrigens
-  - Deceptiva
-  - Fornicatum
-  - Magnivelare
-  - Applanatum
-  - Marginata
-  - Abietis
-  - Hepatica
-  - Esculenta
-  - Scabrum
-  - Laeve
-  - Cornucopioides
-  - Fallax
-  - Lacunosa
-  - Glandulosa
-  - Caerulipes
-  - Cyanescens
-  - Novinupta
-  - Involutus
-  - Bisporus
-  - Rubidus
-  - Stellatus
-  - Crispa
-  - Campestris
-  - Castenea
-  - Viscosa
-  - Occidentalis
-  - Lanei
-  - Thouarsianum
-  - Brunneoincarnata
-  - Josserandi
-  - Tinctorius
-  - Phalloides
-  - Cervinus
-  - Ocreata
-  - Subjunquillea
-  - Velutipes
-  - Virosa
-  - Oreades
-  - Vermicularis
-  - Rivulosa
-  - Hirsutum
-  - Verna
-  - Orellanus
-  - Decastes
-  - Tubaeformis
-  - Constricta
-  - Exitialis
-  - Caperatus
-  - Umbilicatum
-  - Cocos
-  - Mellea
-  - Tessulatus
-  - Arvensis
-  - Dealbata
-  - Olearius
-  - Edulis
-  - Baeocystis
-  - Leucomelaena
-  - Caerulescens
-  - Junonius
-  - Erinaceum
-  - Aeruginosus
-  - Frondosa
-  - Elata
-  - Archeri
-  - Tropicalis
-  - Pantherina
-  - Piperaturs
-  - Perlata
-  - Orcharaceus
-  - Augustus
-  - Subsculpta
-  - Cyathiformis
-  - Regineus
-  - Erubescens
-  - Rubripes
-  - Umbonata
-  - Lucidium
-  - Eastwoodiae
-  - Sculpta
-  - Edodes
-  - Fuciformis
-  - Velosa
-  - Rex-ceris
-  - Volvacea
-  - Fasciculare
-  - Bitorquis
-  - Flaviporus
-  - Pachycolea
-  - Subaldidus
-  - Rugosoannulata
-  - Subrutilescens
-  - Nuda
-  - Torminosus
-  - Equestre
-  - Xanthodermus
+    prefix: names-mushman-last-dataset-
+    count: 97
--- a/Resources/Prototypes/Datasets/Names/ninja.yml
+++ b/Resources/Prototypes/Datasets/Names/ninja.yml
@@ -1,42 +1,11 @@
- type: dataset
-  id: names_ninja
+- type: localizedDataset
+  id: NamesNinja
  values:
-  - Shadow
-  - Sarutobi
-  - Smoke
-  - Rain
-  - Zero
-  - Raphael
-  - Michaelangelo
-  - Donatello
-  - Leonardo
-  - Splinter
-  - Shredder
-  - Hazuki
-  - Hien
-  - Hiryu
-  - Hayabusa
-  - Midnight
-  - Seven
-  - McNinja
-  - Hanzo
-  - Blood
-  - Iga
-  - Koga
-  - Hero
-  - Hiro
-  - Phantom
-  - Baki
-  - Ogre
-  - Daemon
-  - Goemon
-  - McAwesome
-  - Throat
-  - Death
-  - Aria
-  - Bro
-  - Fox
-  - Samurai
-  - Eater
-  - Ryu
-  - Raiden
+    prefix: names-ninja-dataset-
+    count: 39
+
+- type: localizedDataset
+  id: NamesNinjaTitle
+  values:
+    prefix: names-ninja-title-dataset-
+    count: 46
--- a/Resources/Prototypes/Datasets/Names/ninja_title.yml
+++ b/Resources/Prototypes/Datasets/Names/ninja_title.yml
@@ -1,49 +0,0 @@
- type: dataset
-  id: names_ninja_title
-  values:
-  - Master
-  - Sensei
-  - Swift
-  - Merciless
-  - Assassin
-  - Rogue
-  - Hunter
-  - Widower
-  - Orphaner
-  - Stalker
-  - Killer
-  - Silent
-  - Silencing
-  - Quick
-  - Agile
-  - Merciful
-  - Ninja
-  - Shinobi
-  - Initiate
-  - Grandmaster
-  - Strider
-  - Striker
-  - Slayer
-  - Awesome
-  - Ender
-  - Dr.
-  - Noob
-  - Night
-  - Crimson
-  - Grappler
-  - Ulimate
-  - Remorseless
-  - Deep
-  - Dragon
-  - Cruel
-  - Nightshade
-  - Black
-  - Gray
-  - Solid
-  - Liquid
-  - Solidus
-  - Steel
-  - Nickel
-  - Silver
-  - Singing
-  - Snake
--- a/Resources/Prototypes/Datasets/Names/operation.yml
+++ b/Resources/Prototypes/Datasets/Names/operation.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: NamesOperationPrefix
+  values:
+    prefix: names-operation-prefix-dataset-
+    count: 102
+
+- type: localizedDataset
+  id: NamesOperationSuffix
+  values:
+    prefix: names-operation-suffix-dataset-
+    count: 102
--- a/Resources/Prototypes/Datasets/Names/regalrat.yml
+++ b/Resources/Prototypes/Datasets/Names/regalrat.yml
@@ -1,39 +1,11 @@
- type: dataset
-  id: RegalRatNameKingdom
+- type: localizedDataset
+  id: NamesRegalratKingdom
  values:
-  - Plague
-  - Ammonia
-  - Maintenance
-  - Trash
-  - Garbage
-  - Rat
-  - Vermin
-  - Cheese
-  - Munching
-  - Big
-  - Filth
-  - Sewer
-  - Disposal
-  - Service
-  - The
+    prefix: names-regal-rat-kingdom-dataset-
+    count: 15

- type: dataset
-  id: RegalRatNameTitle
+- type: localizedDataset
+  id: NamesRegalratTitle
  values:
-  - King
-  - Lord
-  - Prince
-  - Emperor
-  - Supreme
-  - Overlord
-  - Master
-  - Shogun
-  - Bojar
-  - Tsar
-  - Fan #vs
-  - Enjoyer
-  - President
-  - Mayor
-  - Boss
-  - Prophet
-  - Cheese
+    prefix: names-regal-rat-title-dataset-
+    count: 17
--- a/Resources/Prototypes/Datasets/Names/reptilian_female.yml
+++ b/Resources/Prototypes/Datasets/Names/reptilian_female.yml
@@ -1,166 +1,5 @@
- type: dataset
-  id: names_reptilian_female
+- type: localizedDataset
+  id: NamesReptilianFemale
  values:
-  - Adzi
-  - Ah
-  - Ahaht
-  - Ajim
-  - Akeenus
-  - Akish
-  - Akishan
-  - Aleeto
-  - Am
-  - Amussa
-  - An
-  - Anozz
-  - Asheemar
-  - Asska
-  - Awas
-  - Azala
-  - Azbai
-  - Azeez
-  - Azum
-  - Banalz
-  - Bar
-  - Baseenar
-  - Beek
-  - Beekatan
-  - Beekus
-  - Beela
-  - Beelei
-  - Beem
-  - Beewos
-  - Bejeen
-  - Ber
-  - Betzi
-  - Bishalus
-  - Bokeeus
-  - Bur
-  - Bura
-  - Chalaree
-  - Chana
-  - Chanil
-  - Chee
-  - Cheesh
-  - Chimatei
-  - Chirurgeon
-  - Cholasistu
-  - Chuna
-  - Churasu
-  - Crath
-  - Dar
-  - Deeja
-  - Deesei
-  - Deesh
-  - Deetsan
-  - Deetwos
-  - Dooka
-  - Druja
-  - Eepa
-  - Ei
-  - Eix
-  - El
-  - Ereel
-  - Eutei
-  - Gai
-  - Gih
-  - Gilm
-  - Gish
-  - Go
-  - Hal
-  - Hul
-  - Ja
-  - Jaseen
-  - Jasuda
-  - Jeed
-  - Jeen
-  - Kajul
-  - Kal
-  - Kasa
-  - Keel
-  - Keerava
-  - Kiurz
-  - Kud
-  - La
-  - Lee
-  - Lei
-  - Lifts
-  - Liurz
-  - Lurasha
-  - Ma
-  - Mach
-  - Marz
-  - Meedish
-  - Meeh
-  - Meema
-  - Meen
-  - Meena
-  - Meenus
-  - Meerana
-  - Meesei
-  - Meeus
-  - Mei
-  - Milah
-  - Mim
-  - Mota
-  - Mudeska
-  - Muz
-  - Na
-  - Nakuma
-  - Nam
-  - Nassa
-  - Natoo
-  - Neesha
-  - Neetizei
-  - Neetra
-  - Neeus
-  - Niima
-  - Numeen
-  - Nuralg
-  - Nush
-  - Ocheeva
-  - Okur
-  - Olank
-  - On
-  - Onasha
-  - Osheeka
-  - Pasha
-  - Ra
-  - Rana
-  - Raniur
-  - Ree
-  - Reesa
-  - Rei
-  - Sa
-  - Saak
-  - Sanax
-  - Seeba
-  - Seed
-  - Seen
-  - Shah
-  - Shahvee
-  - Shaleez
-  - Shatalg
-  - Sheer
-  - Shei
-  - Sigerthe
-  - Skaleel
-  - Sudie
-  - Tail
-  - Tar
-  - Tasha
-  - Tei
-  - Telixith
-  - Tumma
-  - Veek
-  - Wan
-  - Wazei
-  - Weedum
-  - Weewish
-  - Witseidutsei
-  - Wuja
-  - Wujeeta
-  - Wusha
-  - Xil
-  - Zish
-  - Zollassa
+    prefix: names-reptilian-female-dataset-
+    count: 163
--- a/Resources/Prototypes/Datasets/Names/reptilian_male.yml
+++ b/Resources/Prototypes/Datasets/Names/reptilian_male.yml
@@ -1,331 +1,5 @@
- type: dataset
-  id: names_reptilian_male
+- type: localizedDataset
+  id: NamesReptilianMale
  values:
-  - Abijoo
-  - Ah
-  - Ajum
-  - Am
-  - Amusei
-  - An
-  - Anoo
-  - Aojee
-  - Asum
-  - Az
-  - Azeel
-  - Azinar
-  - Azjai
-  - Baar
-  - Banka
-  - Bar
-  - Barnaxi
-  - Batar
-  - Batuus
-  - Beem
-  - Beshnus
-  - Betu
-  - Bex
-  - Bijot
-  - Bimee
-  - Binyaar
-  - Bosekus
-  - Brand
-  - Bun
-  - Bunach
-  - Bunish
-  - Busheeus
-  - Buujhan
-  - Chakuk
-  - Chalish
-  - Chalureel
-  - Chath
-  - Chee
-  - Cheedal
-  - Chilwir
-  - Chitakus
-  - Chiwish
-  - Chulz
-  - Chuna
-  - Da
-  - Dakee
-  - Dan
-  - Dar
-  - Darasken
-  - DarJee
-  - Debameel
-  - Deed
-  - Deegeeta
-  - Deeh
-  - Deekonus
-  - Deekum
-  - Deekus
-  - Deerkaza
-  - Deetum
-  - Demeepa
-  - Depasa
-  - Derkeethus
-  - Deroh
-  - Dezanu
-  - Dreet
-  - Drumarz
-  - Dum
-  - Dunaxith
-  - Effe
-  - Ei
-  - Eidu
-  - Eius
-  - Eiuus
-  - Eix
-  - Eleedal
-  - Er
-  - Esqoo
-  - Etaku
-  - Gah
-  - Gajul
-  - Gam
-  - Geeh
-  - Geel
-  - Geem
-  - Geh
-  - Gei
-  - Gih
-  - Gin
-  - Goh
-  - Gulum
-  - Haj
-  - Han
-  - Haran
-  - Hareeya
-  - Hathei
-  - Heedul
-  - Heem
-  - Hei
-  - Heir
-  - Hixeeh
-  - Huleeya
-  - Huzei
-  - Ilas
-  - Im
-  - Inee
-  - Itan
-  - J'Ram
-  - Ja
-  - Jah
-  - Jaraleet
-  - Jaree
-  - Jas
-  - Jasaiin
-  - Jaseen
-  - Jat
-  - Jee
-  - Jeela
-  - Jeelius
-  - Jeelus
-  - Jeen
-  - Jeer
-  - Jeetum
-  - Jei
-  - Jilux
-  - Jin
-  - Jon
-  - Jul
-  - Julan
-  - Junal
-  - Jush
-  - Juunei
-  - Kai
-  - Kajin
-  - Kamax
-  - Kas
-  - Keema
-  - Keer
-  - Keerasa
-  - Kepanuu
-  - Kia
-  - Kiameed
-  - Kilaya
-  - Kiurz
-  - Kur
-  - Kuz
-  - La
-  - Lah
-  - Lai
-  - Lan
-  - Lara
-  - Leem
-  - Lei
-  - Loh
-  - Lotash
-  - Luh
-  - Lurz
-  - Luteema
-  - Maahi
-  - Madesi
-  - Maheelius
-  - Mahei
-  - Maht
-  - Malz
-  - Marz
-  - Mathei
-  - Maxath
-  - Meej
-  - Meejapa
-  - Meensuda
-  - Meer
-  - Mema
-  - Mere
-  - Metaku
-  - Miharil
-  - Milos
-  - Miun
-  - Mobareed
-  - Mohimeem
-  - Mopakuz
-  - Motuu
-  - Mujeen
-  - Muranatepa
-  - Mush
-  - Muz
-  - Na
-  - Napetui
-  - Nazuux
-  - Nebutil
-  - Neeti
-  - Neetinei
-  - Neetrenaza
-  - Neetzara
-  - Neeus
-  - Nema
-  - Neposh
-  - Netapatuu
-  - Nexith
-  - Nodeeus
-  - Nomu
-  - Nosaleeth
-  - Nowajeem
-  - Noyei
-  - Nulaz
-  - Nur
-  - Obaxith
-  - Okan
-  - Okaw
-  - Okeeh
-  - Oleed
-  - Oleen
-  - Olik
-  - Olink
-  - Onuja
-  - Onurai
-  - Opatieel
-  - Otumeel
-  - Owai
-  - Pachat
-  - Pacheeva
-  - Pad
-  - Paduxi
-  - Pajeen
-  - Parash
-  - Peeradeeh
-  - Pejureel
-  - Petaxai
-  - Pideelus
-  - Pimaxi
-  - Pojeel
-  - Ra
-  - Radithax
-  - Raj
-  - Rareel
-  - Rasha
-  - Redieeus
-  - Ree
-  - Reeh
-  - Reemukeeus
-  - Reenum
-  - Reesa
-  - Reet
-  - Reezal
-  - Resari
-  - Riker
-  - Ru
-  - Rupah
-  - Sakeepa
-  - Sakeeus
-  - Sakka
-  - Saliith
-  - Sar
-  - Schiavas
-  - Seek
-  - Seewul
-  - Sei
-  - Sejaijilax
-  - Shakiis
-  - Shehs
-  - Shei
-  - Silm
-  - Skee
-  - Skeetul
-  - Sureeus
-  - Ta
-  - Taeed
-  - Tah
-  - Taleel
-  - Talen
-  - Tan
-  - Tanaka
-  - Tanan
-  - Tee
-  - Teeba
-  - Teegla
-  - Teeka
-  - Teekeeus
-  - Teemeeta
-  - Teeus
-  - Tehat
-  - Tei
-  - Teinaava
-  - Teineeja
-  - Terezeeus
-  - Tikaasi
-  - Tim
-  - Topeeth
-  - Topith
-  - Tsleeixth
-  - Tul
-  - Tulm
-  - Tun
-  - Ukatsei
-  - Ukawei
-  - Ula
-  - Ulawa
-  - Ullis
-  - Usha
-  - Usheeja
-  - Utadeek
-  - Utamukeeus
-  - Utatul
-  - Uxith
-  - Vara
-  - Veekas
-  - Veenaza
-  - Veezara
-  - Vistha
-  - Vudeelal
-  - Wanan
-  - Wanum
-  - Wayiteh
-  - Weebam
-  - Weeltul
-  - Weer
-  - Wih
-  - Wud
-  - Wuleen
-  - Wulm
-  - Wumeek
-  - Xal
-  - Xemo
-  - Yinz
-  - Yinz'r
-  - Zaw
-  - Ze
-  - Zeen
-  - Zeeus
-  - Zish
+    prefix: names-reptilian-male-dataset-
+    count: 328
--- a/Resources/Prototypes/Datasets/Names/revenant.yml
+++ b/Resources/Prototypes/Datasets/Names/revenant.yml
@@ -1,55 +1,17 @@
- type: dataset
-  id: RevenantType
+- type: localizedDataset
+  id: NamesRevenantType
  values:
-  - essence
-  - ghost
-  - phantom
-  - poltergeist
-  - revenant
-  - soul
-  - spectre
-  - spirit
+    prefix: names-revenant-type-dataset-
+    count: 8

- type: dataset
-  id: RevenantAdjective
+- type: localizedDataset
+  id: NamesRevenantAdjective
  values:
-  - abysmal
-  - abyssal
-  - brutal
-  - dark
-  - endless
-  - eternal
-  - fiery
-  - hateful
-  - hideous
-  - hilarious
-  - indifferent
-  - malevolent
-  - peaceful
-  - searing
-  - silent
-  - spiteful
-  - vicious
-  - violent
+    prefix: names-revenant-adjective-dataset-
+    count: 18

- type: dataset
-  id: RevenantTheme
+- type: localizedDataset
+  id: NamesRevenantTheme
  values:
-  - agony
-  - anger
-  - death
-  - despair
-  - desperation
-  - destruction
-  - disease
-  - grief
-  - hate
-  - hellfire
-  - laughter
-  - misery
-  - ruin
-  - salt
-  - screams
-  - sorrow
-  - suffering
-  - vengeance
+    prefix: names-revenant-theme-dataset-
+    count: 18
--- a/Resources/Prototypes/Datasets/Names/rollie.yml
+++ b/Resources/Prototypes/Datasets/Names/rollie.yml
@@ -1,42 +1,5 @@
- type: dataset
-  id: names_rollie
+- type: localizedDataset
+  id: NamesRollie
  values:
-  - "bifta"
-  - "bifter"
-  - "bird"
-  #- "blunt" Change: Blunts already exist, no need to make them roll, god forbid we get a joint called a blunt
-  - "bloint"
-  - "boof"
-  - "boofer"
-  - "bomber"
-  - "bone"
-  - "bun"
-  - "doink"
-  - "doob"
-  - "doober"
-  - "doobie"
-  - "dutch"
-  - "fatty"
-  - "hogger"
-  - "hooter"
-  - "hootie"
-  - "jay"
-  - "jimmy"
-  #- "joint" Change: Joints already exist, no need to make them roll, same reason as above but backwards
-  - "juju"
-  - "jeebie weebie"
-  - "number"
-  - "owl"
-  - "phattie"
-  - "puffer"
-  - "reef"
-  - "reefer"
-  - "rollie"
-  - "scoobie"
-  - "shorty"
-  - "spiff"
-  - "spliff"
-  - "toke"
-  - "torpedo"
-  - "zoot"
-  - "zooter"
+    prefix: names-rollie-dataset-
+    count: 37
--- a/Resources/Prototypes/Datasets/Names/skeleton_first.yml
+++ b/Resources/Prototypes/Datasets/Names/skeleton_first.yml
@@ -1,30 +1,5 @@
- type: dataset
-  id: skeletonNamesFirst
+- type: localizedDataset
+  id: NamesSkeletonFirst
  values:
-  - Sternum
-  - Ribs
-  - Vertebrae
-  - Sacrum
-  - Mandible
-  - Clavicle
-  - Scapula
-  - Humerus
-  - Radius
-  - Ulna
-  - Carpals
-  - Phalanges
-  - Pelvis
-  - Femur
-  - Tibia
-  - Fibula
-  - Marrow
-  - Tarsals
-  - Patella
-  - Tailbone
-  - Boner
-  - Rib
-  - Hyoid
-  - Coccyx
-  - Tarsus
-  - Lacrimal
-  - Bone
+    prefix: names-skeleton-first-dataset-
+    count: 27
--- a/Resources/Prototypes/Datasets/Names/syndicate.yml
+++ b/Resources/Prototypes/Datasets/Names/syndicate.yml
@@ -1,61 +1,17 @@
- type: dataset
-  id: SyndicateNamesNormal
+- type: localizedDataset
+  id: NamesSyndicateNormal
  values:
-  - Alfa
-  - Bravo
-  - Charlie
-  - Delta
-  - Echo
-  - Foxtrot
-  - Golf
-  - Hotel
-  - India
-  - Juliett
-  - Kilo
-  - Lima
-  - Mike
-  - November
-  - Oscar
-  - Papa
-  - Quebec
-  - Romeo
-  - Sierra
-  - Tango
-  - Uniform
-  - Victor
-  - Whiskey
-  - X-Ray
-  - Zulu
+    prefix: names-syndicate-normal-dataset-
+    count: 25

- type: dataset
-  id: SyndicateNamesElite
+- type: localizedDataset
+  id: NamesSyndicateElite
  values:
-  - Alpha
-  - Beta
-  - Gamma
-  - Delta
-  - Epsilon
-  - Zeta
-  - Eta
-  - Theta
-  - Iota
-  - Lambda
-  - Mu
-  - Nu
-  - Xi
-  - Omicron
-  - Pi
-  - Rho
-  - Sigma
-  - Tau
-  - Upsilon
-  - Phi
-  - Chi
-  - Psi
-  - Omega
+    prefix: names-syndicate-elite-dataset-
+    count: 23

- type: dataset
-  id: SyndicateNamesPrefix
+- type: localizedDataset
+  id: NamesSyndicatePrefix
  values:
-  - Operative
-  - Agent
+    prefix: names-syndicate-prefix-dataset-
+    count: 2
--- a/Resources/Prototypes/Datasets/Names/vox.yml
+++ b/Resources/Prototypes/Datasets/Names/vox.yml
--- a/Resources/Prototypes/Datasets/Names/wizard.yml
+++ b/Resources/Prototypes/Datasets/Names/wizard.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: NamesWizardFirst
+  values:
+    prefix: names-wizard-first-dataset-
+    count: 30
+
+- type: localizedDataset
+  id: NamesWizardLast
+  values:
+    prefix: names-wizard-last-dataset-
+    count: 46
--- a/Resources/Prototypes/Datasets/Names/wizard_first.yml
+++ b/Resources/Prototypes/Datasets/Names/wizard_first.yml
@@ -1,33 +0,0 @@
- type: dataset
-  id: names_wizard_first
-  values:
-  - Ashenzari
-  - Chancellor
-  - Cleric
-  - Circe
-  - Doctor
-  - Dithmenos
-  - Elyvilon
-  - Faustus
-  - Grimm
-  - Gozag
-  - Jim
-  - Jiyva
-  - Lirazel
-  - Lugonu
-  - Koschei
-  - Kreol
-  - Lina
-  - Merlin
-  - Morgan
-  - Nemelex
-  - Rasputin
-  - Ru
-  - Sif
-  - Trivia
-  - Trog
-  - Uskayaw
-  - Vehumet
-  - Xom
-  - Yredelemnul
-  - Zin
--- a/Resources/Prototypes/Datasets/Names/wizard_last.yml
+++ b/Resources/Prototypes/Datasets/Names/wizard_last.yml
@@ -1,49 +0,0 @@
- type: dataset
-  id: names_wizard_last
-  values:
-  - Dark
-  - Darkmagic
-  - Darko
-  - Gray
-  - Honko
-  - Inverse
-  - Shado
-  - Smith
-  - Unseen
-  - Weatherwax
-  - Whom
-  - Yagg
-  - le Fay
-  - of Void
-  - Stormbringer
-  - the All Knowing
-  - the Amazing
-  - the Bandit Killer
-  - the Benevolent
-  - the Blue
-  - the Brown
-  - the Conquerer
-  - the Deathless
-  - the Destroyer
-  - the Dragon Spooker
-  - the Emperor
-  - the Glowing One
-  - the Gray
-  - the Great
-  - the Healer
-  - the Magician
-  - the Powerful
-  - the Raven
-  - the Red
-  - the Remorseful
-  - the Seething
-  - the Shining One
-  - the Sorcelator
-  - the Spiral King
-  - the Unending
-  - the Unstoppable
-  - the Weeping
-  - the White
-  - the Wise
-  - Xobeh
-  - Ym Sagoz
--- a/Resources/Prototypes/Datasets/adjectives.yml
+++ b/Resources/Prototypes/Datasets/adjectives.yml
@@ -1,399 +1,5 @@
- type: dataset
-  id: adjectives
+- type: localizedDataset
+  id: Adjectives
  values:
-  - adorable
-  - adventurous
-  - aggressive
-  - alert
-  - attractive
-  - average
-  - beautiful
-  - blue-eyed
-  - bloody
-  - blushing
-  - bright
-  - clean
-  - clear
-  - cloudy
-  - colorful
-  - crowded
-  - cute
-  - dark
-  - drab
-  - distinct
-  - dull
-  - elegant
-  - excited
-  - fancy
-  - filthy
-  - glamorous
-  - gleaming
-  - gorgeous
-  - graceful
-  - grotesque
-  - handsome
-  - homely
-  - light
-  - long
-  - magnificent
-  - misty
-  - motionless
-  - muddy
-  - old-fashioned
-  - plain
-  - poised
-  - precious
-  - quaint
-  - shiny
-  - smoggy
-  - sparkling
-  - spotless
-  - stormy
-  - strange
-  - ugly
-  - ugliest
-  - unsightly
-  - unusual
-  - wide-eyed
-  - alive
-  - annoying
-  - bad
-  - better
-  - beautiful
-  - brainy
-  - breakable
-  - busy
-  - careful
-  - cautious
-  - clever
-  - clumsy
-  - concerned
-  - crazy
-  - curious
-  - dead
-  - different
-  - difficult
-  - doubtful
-  - easy
-  - expensive
-  - famous
-  - fragile
-  - frail
-  - gifted
-  - helpful
-  - helpless
-  - horrible
-  - important
-  - impossible
-  - inexpensive
-  - innocent
-  - inquisitive
-  - modern
-  - mushy
-  - odd
-  - open
-  - outstanding
-  - poor
-  - powerful
-  - prickly
-  - puzzled
-  - real
-  - rich
-  - shy
-  - sleepy
-  - stupid
-  - super
-  - talented
-  - tame
-  - tender
-  - tough
-  - uninterested
-  - vast
-  - wandering
-  - wild
-  - wrong
-  - angry
-  - annoyed
-  - anxious
-  - arrogant
-  - ashamed
-  - awful
-  - bad
-  - bewildered
-  - black
-  - blue
-  - bored
-  - clumsy
-  - combative
-  - condemned
-  - confused
-  - crazy,flipped-out
-  - creepy
-  - cruel
-  - dangerous
-  - defeated
-  - defiant
-  - depressed
-  - disgusted
-  - disturbed
-  - dizzy
-  - dull
-  - embarrassed
-  - envious
-  - evil
-  - fierce
-  - foolish
-  - frantic
-  - frightened
-  - grieving
-  - grumpy
-  - helpless
-  - homeless
-  - hungry
-  - hurt
-  - ill
-  - itchy
-  - jealous
-  - jittery
-  - lazy
-  - lonely
-  - mysterious
-  - nasty
-  - naughty
-  - nervous
-  - nutty
-  - obnoxious
-  - outrageous
-  - panicky
-  - repulsive
-  - scary
-  - selfish
-  - sore
-  - tense
-  - terrible
-  - testy
-  - thoughtless
-  - tired
-  - troubled
-  - upset
-  - uptight
-  - weary
-  - wicked
-  - worried
-  - agreeable
-  - amused
-  - brave
-  - calm
-  - charming
-  - cheerful
-  - comfortable
-  - cooperative
-  - courageous
-  - delightful
-  - determined
-  - eager
-  - elated
-  - enchanting
-  - encouraging
-  - energetic
-  - enthusiastic
-  - excited
-  - exuberant
-  - fair
-  - faithful
-  - fantastic
-  - fine
-  - friendly
-  - funny
-  - gentle
-  - glorious
-  - good
-  - happy
-  - healthy
-  - helpful
-  - hilarious
-  - jolly
-  - joyous
-  - kind
-  - lively
-  - lovely
-  - lucky
-  - nice
-  - obedient
-  - perfect
-  - pleasant
-  - proud
-  - relieved
-  - silly
-  - smiling
-  - splendid
-  - successful
-  - thankful
-  - thoughtful
-  - victorious
-  - vivacious
-  - witty
-  - wonderful
-  - zealous
-  - zany
-  - broad
-  - chubby
-  - crooked
-  - curved
-  - deep
-  - flat
-  - high
-  - hollow
-  - low
-  - narrow
-  - round
-  - shallow
-  - skinny
-  - square
-  - steep
-  - straight
-  - wide
-  - big
-  - colossal
-  - fat
-  - gigantic
-  - great
-  - huge
-  - immense
-  - large
-  - little
-  - mammoth
-  - massive
-  - miniature
-  - petite
-  - puny
-  - scrawny
-  - short
-  - small
-  - tall
-  - teeny
-  - teeny-tiny
-  - tiny
-  - cooing
-  - deafening
-  - faint
-  - harsh
-  - high-pitched
-  - hissing
-  - hushed
-  - husky
-  - loud
-  - melodic
-  - moaning
-  - mute
-  - noisy
-  - purring
-  - quiet
-  - raspy
-  - resonant
-  - screeching
-  - shrill
-  - silent
-  - soft
-  - squealing
-  - thundering
-  - voiceless
-  - whispering
-  - ancient
-  - brief
-  - early
-  - fast
-  - late
-  - long
-  - modern
-  - old
-  - old-fashioned
-  - quick
-  - rapid
-  - short
-  - slow
-  - swift
-  - young
-  - bitter
-  - delicious
-  - fresh
-  - juicy
-  - ripe
-  - rotten
-  - salty
-  - sour
-  - spicy
-  - stale
-  - sticky
-  - strong
-  - sweet
-  - tart
-  - tasteless
-  - tasty
-  - thirsty
-  - fluttering
-  - fuzzy
-  - greasy
-  - grubby
-  - hard
-  - hot
-  - icy
-  - loose
-  - melted
-  - nutritious
-  - plastic
-  - prickly
-  - rainy
-  - rough
-  - scattered
-  - shaggy
-  - shaky
-  - sharp
-  - shivering
-  - silky
-  - slimy
-  - slippery
-  - smooth
-  - soft
-  - solid
-  - steady
-  - sticky
-  - tender
-  - tight
-  - uneven
-  - weak
-  - wet
-  - wooden
-  - yummy
-  - boiling
-  - breezy
-  - broken
-  - bumpy
-  - chilly
-  - cold
-  - cool
-  - creepy
-  - crooked
-  - cuddly
-  - curly
-  - damaged
-  - damp
-  - dirty
-  - dry
-  - dusty
-  - filthy
-  - flaky
-  - fluffy
-  - freezing
-  - hot
-  - warm
-  - wet
-  - abundant
-  - empty
-  - few
-  - heavy
-  - light
-  - many
-  - numerous
-  - substantial
-  - capitalist
+    prefix: adjectives-dataset-
+    count: 396
--- a/Resources/Prototypes/Datasets/corporations.yml
+++ b/Resources/Prototypes/Datasets/corporations.yml
@@ -1,12 +1,5 @@
- type: dataset
+- type: localizedDataset
  id: TraitorCorporations
  values:
-  - "CyberSun Industries"
-  - "Gorlex Marauders"
-  - "MI13"
-  - "Tiger Cooperative"
-  - "S.E.L.F."
-  - "Animal Rights Consortium"
-  - "Donk Corporation"
-  - "Waffle Corporation"
-  - "Interdyne Pharmaceutics"
+    prefix: traitor-corporations-dataset-
+    count: 9
--- a/Resources/Prototypes/Datasets/ion_storm.yml
+++ b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -282,6 +282,7 @@
  - GRAVITY
  - HAPPINESS
  - HONOR
+  - HUBRIS
  - HUMANITY
  - HUMOR
  - IMAGINATION
@@ -299,7 +300,6 @@
  - PAIN
  - PHYSICS
  - POVERTY
-  - PRIDE
  - PROGRESS
  - REALITY
  - REVOLUTION
--- a/Resources/Prototypes/Datasets/news.yml
+++ b/Resources/Prototypes/Datasets/news.yml
@@ -1,85 +1,5 @@
- type: dataset
-  id: news
+- type: localizedDataset
+  id: News
  values:
-  - "Tree stuck in tajaran; firefighters baffled."
-  - "Armadillos want aardvarks removed from dictionary claims 'here first'."
-  - "Angel found dancing on pinhead ordered to stop; cited for public nuisance."
-  - "Letters claim they are better than number; 'Always have been'."
-  - "Pens proclaim pencils obsolete, 'lead is dead'."
-  - "Rock and paper sues scissors for discrimination."
-  - "Steak tell-all book reveals he never liked sitting by potato."
-  - "Woodchuck stops counting how many times he’s chucked 'Never again'."
-#  - "{{AFFECTED}} clerk first person able to pronounce '@*$%!'."
-#  - "{{AFFECTED}} delis serving boiled paperback dictionaries, 'Adjectives chewy' customers declare."
-#  - "{{AFFECTED}} weather deemed 'boring'; meteors and rad storms to be imported."
-#  - "Most {{AFFECTED}} security officers prefer cream over sugar."
-#  - "Palindrome speakers conference in {{AFFECTED}}; 'Wow!' says Otto."
-#  - "Question mark worshipped as deity by ancient {{AFFECTED}} dwellers."
-#  - "Spilled milk causes whole {{AFFECTED}} populace to cry."
-#  - "World largest carp patty at display on {{AFFECTED}}."
-  - "'Here kitty kitty' no longer preferred tajaran retrieval technique."
-  - "Man travels 7000 light years to retrieve lost hankie, 'It was my favourite'."
-  - "New bowling lane that shoots mini-meteors at bowlers very popular."
-#  - "Guy gets tattoo of Tau Ceti on chest '[pick("CentCom","star","starship","asteroid")] tickles most'."
-  - "Skrell marries computer; wedding attended by 100 modems."
-  - "Chef reports successfully using harmonica as cheese grater."
-  - "Nanotrasen invents handkerchief that says 'Bless you' after sneeze."
-  - "Clone accused of posing for other clones’s school photo."
-  - "Clone accused of stealing other clones’s employee of the month award."
-  - "Woman robs station with hair dryer; crewmen love new style."
-  - "This space for rent."
-#  - "{{AFFECTED}} Baker Wins Pickled Crumpet Toss Three Years Running"
-  - "Skrell Scientist Discovers Abacus Can Be Used To Dry Towels"
-  - "Survey: 'Cheese Louise' Voted Best Pizza Restaurant In Tau Ceti"
-#  - "I Was Framed, jokes {{AFFECTED}} artist"
-#  - "Mysterious Loud Rumbling Noises In {{AFFECTED}} Found To Be Mysterious Loud Rumblings"
-#  - "Alien ambassador becomes lost on {{AFFECTED}}, refuses to ask for directions"
-  - "Swamp Gas Verified To Be Exhalations Of Stars--Movie Stars--Long Passed"
-  - "Tainted Broccoli Weapon Of Choice For Syndicate Assassins"
-  - "Chefs Find Broccoli Effective Tool For Cutting Cheese"
-  - "Broccoli Found To Cause Grumpiness In Monkeys"
-#  - "Survey: 80% Of People on {{AFFECTED}} Love Clog-Dancing"
-  - "Giant Hairball Has Perfect Grammar But Rolls rr's Too Much, Linguists Say"
-#  - "{{AFFECTED}} Phonebooks Print All Wrong Numbers; Results In 15 New Marriages"
-#  - "Tajaran Burglar Spotted on {{AFFECTED}}, Mistaken For Dalmatian"
-  - "Gibson Gazette Updates Frequently Absurd, Poll Indicates"
-#  - "Esoteric Verbosity Culminates In Communicative Ennui, {{AFFECTED}} Academics Note"
-  - "Taj Demand Longer Breaks, Cleaner Litter, Slower Mice"
-  - "Survey: 3 Out Of 5 Skrell Loathe Modern Art"
-  - "Skrell Scientist Discovers Gravity While Falling Down Stairs"
-#  - "Boy Saves Tajaran From Tree on {{AFFECTED}}, Thousands Cheer"
-#  - "Shipment Of Apples Overturns, {{AFFECTED}} Diner Offers Applesauce Special"
-#  - "Spotted Owl Spotted on {{AFFECTED}}"
-  - "Humans Everywhere Agree: Purring Tajarans Are Happy Tajarans"
-  - "From The Desk Of Wise Guy Sammy: One Word In This Gazette Is Sdrawkcab"
-  - "From The Desk Of Wise Guy Sammy: It's Hard To Have Too Much Shelf Space"
-  - "From The Desk Of Wise Guy Sammy: Wine And Friendships Get Better With Age"
-  - "From The Desk Of Wise Guy Sammy: The Insides Of Golf Balls Are Mostly Rubber Bands"
-  - "From The Desk Of Wise Guy Sammy: You Don't Have To Fool All The People, Just The Right Ones"
-  - "From The Desk Of Wise Guy Sammy: If You Made The Mess, You Clean It Up"
-  - "From The Desk Of Wise Guy Sammy: It Is Easier To Get Forgiveness Than Permission"
-  - "From The Desk Of Wise Guy Sammy: Check Your Facts Before Making A Fool Of Yourself"
-  - "From The Desk Of Wise Guy Sammy: You Can't Outwait A Bureaucracy"
-  - "From The Desk Of Wise Guy Sammy: It's Better To Yield Right Of Way Than To Demand It"
-  - "From The Desk Of Wise Guy Sammy: A Person Who Likes Cats Can't Be All Bad"
-  - "From The Desk Of Wise Guy Sammy: Help Is The Sunny Side Of Control"
-  - "From The Desk Of Wise Guy Sammy: Two Points Determine A Straight Line"
-  - "From The Desk Of Wise Guy Sammy: Reading Improves The Mind And Lifts The Spirit"
-  - "From The Desk Of Wise Guy Sammy: Better To Aim High And Miss Then To Aim Low And Hit"
-  - "From The Desk Of Wise Guy Sammy: Meteors Often Strike The Same Place More Than Once"
-  - "Tommy B. Saif Sez: Look Both Ways Before Boarding The Shuttle"
-  - "Tommy B. Saif Sez: Hold On; Sudden Stops Sometimes Necessary"
-  - "Tommy B. Saif Sez: Keep Fingers Away From Moving Panels"
-  - "Tommy B. Saif Sez: No Left Turn, Except Shuttles"
-  - "Tommy B. Saif Sez: Return Seats And Trays To Their Proper Upright Position"
-  - "Tommy B. Saif Sez: Eating And Drinking In Docking Bays Is Prohibited"
-  - "Tommy B. Saif Sez: Accept No Substitutes, And Don't Be Fooled By Imitations"
-  - "Tommy B. Saif Sez: Do Not Remove This Tag Under Penalty Of Law"
-  - "Tommy B. Saif Sez: Always Mix Thoroughly When So Instructed"
-  - "Tommy B. Saif Sez: Try To Keep Six Month's Expenses In Reserve"
-  - "Tommy B. Saif Sez: Change Not Given Without Purchase"
-  - "Tommy B. Saif Sez: If You Break It, You Buy It"
-  - "Tommy B. Saif Sez: Reservations Must Be Cancelled 48 Hours Prior To Event To Obtain Refund"
-  - "Doughnuts: Is There Anything They Can't Do"
-  - "If Tin Whistles Are Made Of Tin, What Do They Make Foghorns Out Of?"
-  - "Broccoli discovered to be colonies of tiny aliens with murder on their minds"
+    prefix: news-dataset-
+    count: 62
--- a/Resources/Prototypes/Datasets/rat_king_commands.yml
+++ b/Resources/Prototypes/Datasets/rat_king_commands.yml
@@ -1,26 +1,23 @@
- type: dataset
+- type: localizedDataset
  id: RatKingCommandStay
  values:
-    - "Sit!"
-    - "Stay!"
-    - "Stop!"
+    prefix: rat-king-command-stay-
+    count: 3

- type: dataset
+- type: localizedDataset
  id: RatKingCommandFollow
  values:
-    - "Heel!"
-    - "Follow!"
+    prefix: rat-king-command-follow-
+    count: 2

- type: dataset
+- type: localizedDataset
  id: RatKingCommandCheeseEm
  values:
-    - "Attack!"
-    - "Sic!"
-    - "Kill!"
-    - "Cheese 'Em!"
+    prefix: rat-king-command-cheese-
+    count: 4

- type: dataset
+- type: localizedDataset
  id: RatKingCommandLoose
  values:
-    - "Free!"
-    - "Loose!"
+    prefix: rat-king-command-loose-
+    count: 2
--- a/Resources/Prototypes/Datasets/verbs.yml
+++ b/Resources/Prototypes/Datasets/verbs.yml
@@ -1,634 +1,5 @@
- type: dataset
-  id: verbs
+- type: localizedDataset
+  id: Verbs
  values:
-  - accept
-  - add
-  - admire
-  - admit
-  - advise
-  - afford
-  - agree
-  - alert
-  - allow
-  - amuse
-  - analyse
-  - announce
-  - annoy
-  - answer
-  - apologise
-  - appear
-  - applaud
-  - appreciate
-  - approve
-  - argue
-  - arrange
-  - arrest
-  - arrive
-  - ask
-  - attach
-  - attack
-  - attempt
-  - attend
-  - attract
-  - avoid
-  - back
-  - bake
-  - balance
-  - ban
-  - bang
-  - bare
-  - bat
-  - bathe
-  - battle
-  - beam
-  - beg
-  - behave
-  - belong
-  - bleach
-  - bless
-  - blind
-  - blink
-  - blot
-  - blush
-  - boast
-  - boil
-  - bolt
-  - bomb
-  - book
-  - bore
-  - borrow
-  - bounce
-  - bow
-  - box
-  - brake
-  - brake
-  - branch
-  - breathe
-  - bruise
-  - brush
-  - bubble
-  - bump
-  - burn
-  - bury
-  - buzz
-  - calculate
-  - call
-  - camp
-  - care
-  - carry
-  - carve
-  - cause
-  - challenge
-  - change
-  - charge
-  - chase
-  - cheat
-  - check
-  - cheer
-  - chew
-  - choke
-  - chop
-  - claim
-  - clap
-  - clean
-  - clear
-  - clip
-  - close
-  - coach
-  - coil
-  - collect
-  - colour
-  - comb
-  - command
-  - communicate
-  - compare
-  - compete
-  - complain
-  - complete
-  - concentrate
-  - concern
-  - confess
-  - confuse
-  - connect
-  - consider
-  - consist
-  - contain
-  - continue
-  - copy
-  - correct
-  - cough
-  - count
-  - cover
-  - crack
-  - crash
-  - crawl
-  - cross
-  - crush
-  - cry
-  - cure
-  - curl
-  - curve
-  - cycle
-  - dam
-  - damage
-  - dance
-  - dare
-  - decay
-  - deceive
-  - decide
-  - decorate
-  - delay
-  - delight
-  - deliver
-  - depend
-  - describe
-  - desert
-  - deserve
-  - destroy
-  - detect
-  - develop
-  - disagree
-  - disappear
-  - disapprove
-  - disarm
-  - discover
-  - dislike
-  - divide
-  - double
-  - doubt
-  - drag
-  - drain
-  - dream
-  - dress
-  - drip
-  - drop
-  - drown
-  - drum
-  - dry
-  - dust
-  - earn
-  - educate
-  - embarrass
-  - employ
-  - empty
-  - encourage
-  - end
-  - enjoy
-  - enter
-  - entertain
-  - escape
-  - examine
-  - excite
-  - excuse
-  - exercise
-  - exist
-  - expand
-  - expect
-  - explain
-  - explode
-  - extend
-  - face
-  - fade
-  - fail
-  - fancy
-  - fasten
-  - fax
-  - fear
-  - fence
-  - fetch
-  - file
-  - fill
-  - film
-  - fire
-  - fit
-  - fix
-  - flap
-  - flash
-  - float
-  - flood
-  - flow
-  - flower
-  - fold
-  - follow
-  - fool
-  - force
-  - form
-  - found
-  - frame
-  - frighten
-  - fry
-  - gather
-  - gaze
-  - glow
-  - glue
-  - grab
-  - grate
-  - grease
-  - greet
-  - grin
-  - grip
-  - groan
-  - guarantee
-  - guard
-  - guess
-  - guide
-  - hammer
-  - hand
-  - handle
-  - hang
-  - happen
-  - harass
-  - harm
-  - hate
-  - haunt
-  - head
-  - heal
-  - heap
-  - heat
-  - help
-  - hook
-  - hop
-  - hope
-  - hover
-  - hug
-  - hum
-  - hunt
-  - hurry
-  - identify
-  - ignore
-  - imagine
-  - impress
-  - improve
-  - include
-  - increase
-  - influence
-  - inform
-  - inject
-  - injure
-  - instruct
-  - intend
-  - interest
-  - interfere
-  - interrupt
-  - introduce
-  - invent
-  - invite
-  - irritate
-  - itch
-  - jail
-  - jam
-  - jog
-  - join
-  - joke
-  - judge
-  - juggle
-  - jump
-  - kick
-  - kill
-  - kiss
-  - kneel
-  - knit
-  - knock
-  - knot
-  - label
-  - land
-  - last
-  - laugh
-  - launch
-  - learn
-  - level
-  - license
-  - lick
-  - lie
-  - lighten
-  - like
-  - list
-  - listen
-  - live
-  - load
-  - lock
-  - long
-  - look
-  - love
-  - man
-  - manage
-  - march
-  - mark
-  - marry
-  - match
-  - mate
-  - matter
-  - measure
-  - meddle
-  - melt
-  - memorise
-  - mend
-  - messup
-  - milk
-  - mine
-  - miss
-  - mix
-  - moan
-  - moor
-  - mourn
-  - move
-  - muddle
-  - mug
-  - multiply
-  - murder
-  - nail
-  - name
-  - need
-  - nest
-  - nod
-  - note
-  - notice
-  - number
-  - obey
-  - object
-  - observe
-  - obtain
-  - occur
-  - offend
-  - offer
-  - open
-  - order
-  - overflow
-  - owe
-  - own
-  - pack
-  - paddle
-  - paint
-  - park
-  - part
-  - pass
-  - paste
-  - pat
-  - pause
-  - peck
-  - pedal
-  - peel
-  - peep
-  - perform
-  - permit
-  - phone
-  - pick
-  - pinch
-  - pine
-  - place
-  - plan
-  - plant
-  - play
-  - please
-  - plug
-  - point
-  - poke
-  - polish
-  - pop
-  - possess
-  - post
-  - pour
-  - practise
-  - pray
-  - preach
-  - precede
-  - prefer
-  - prepare
-  - present
-  - preserve
-  - press
-  - pretend
-  - prevent
-  - prick
-  - print
-  - produce
-  - program
-  - promise
-  - protect
-  - provide
-  - pull
-  - pump
-  - punch
-  - puncture
-  - punish
-  - push
-  - question
-  - queue
-  - race
-  - radiate
-  - rain
-  - raise
-  - reach
-  - realise
-  - receive
-  - recognise
-  - record
-  - reduce
-  - reflect
-  - refuse
-  - regret
-  - reign
-  - reject
-  - rejoice
-  - relax
-  - release
-  - rely
-  - remain
-  - remember
-  - remind
-  - remove
-  - repair
-  - repeat
-  - replace
-  - reply
-  - report
-  - reproduce
-  - request
-  - rescue
-  - retire
-  - return
-  - rhyme
-  - rinse
-  - risk
-  - rob
-  - rock
-  - roll
-  - rot
-  - rub
-  - ruin
-  - rule
-  - rush
-  - sack
-  - sail
-  - satisfy
-  - save
-  - saw
-  - scare
-  - scatter
-  - scold
-  - scorch
-  - scrape
-  - scratch
-  - scream
-  - screw
-  - scribble
-  - scrub
-  - seal
-  - search
-  - separate
-  - serve
-  - settle
-  - shade
-  - share
-  - shave
-  - shelter
-  - shiver
-  - shock
-  - shop
-  - shriek
-  - shrug
-  - sigh
-  - sign
-  - signal
-  - sin
-  - sip
-  - ski
-  - skip
-  - slap
-  - slip
-  - slow
-  - smash
-  - smell
-  - smile
-  - smoke
-  - snatch
-  - sneeze
-  - sniff
-  - snore
-  - snow
-  - soak
-  - soothe
-  - sound
-  - spare
-  - spark
-  - sparkle
-  - spell
-  - spill
-  - spoil
-  - spot
-  - spray
-  - sprout
-  - squash
-  - squeak
-  - squeal
-  - squeeze
-  - stain
-  - stamp
-  - stare
-  - start
-  - stay
-  - steer
-  - step
-  - stir
-  - stitch
-  - stop
-  - store
-  - strap
-  - strengthen
-  - stretch
-  - stroke
-  - stuff
-  - subtract
-  - succeed
-  - suck
-  - suffer
-  - suggest
-  - suit
-  - supply
-  - support
-  - suppose
-  - surprise
-  - surround
-  - suspect
-  - suspend
-  - switch
-  - talk
-  - tame
-  - tap
-  - taste
-  - tease
-  - telephone
-  - tempt
-  - terrify
-  - test
-  - thank
-  - thaw
-  - tick
-  - tickle
-  - tie
-  - time
-  - tip
-  - tire
-  - touch
-  - tour
-  - tow
-  - trace
-  - trade
-  - train
-  - transport
-  - trap
-  - travel
-  - treat
-  - tremble
-  - trick
-  - trip
-  - trot
-  - trouble
-  - trust
-  - try
-  - tug
-  - tumble
-  - turn
-  - twist
-  - type
-  - unfasten
-  - unite
-  - unlock
-  - unpack
-  - untidy
-  - use
-  - vanish
-  - visit
-  - wail
-  - wait
-  - walk
-  - wander
-  - want
-  - warm
-  - warn
-  - wash
-  - waste
-  - watch
-  - water
-  - wave
-  - weigh
-  - welcome
-  - whine
-  - whip
-  - whirl
-  - whistle
-  - wink
-  - wipe
-  - wish
-  - wobble
-  - wonder
-  - work
-  - worry
-  - wrap
-  - wreck
-  - wrestle
-  - wriggle
-  - yawn
-  - yell
-  - zip
-  - zoom
+    prefix: verbs-dataset-
+    count: 631
--- a/Resources/Prototypes/DeviceLinking/source_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/source_ports.yml
@@ -60,11 +60,13 @@
  id: CloningPodSender
  name: signal-port-name-pod-receiver
  description: signal-port-description-pod-sender
+  defaultLinks: [ CloningPodReceiver ]

 - type: sourcePort
  id: MedicalScannerSender
  name: signal-port-name-med-scanner-sender
  description: signal-port-description-med-scanner-sender
+  defaultLinks: [ MedicalScannerReceiver ]

 - type: sourcePort
  id: ArtifactAnalyzerSender
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -324,3 +324,17 @@
    sprite: Clothing/Head/Misc/hairflower.rsi
  - type: Clothing
    sprite: Clothing/Head/Misc/hairflower.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadPerformerWig
+  name: performer's wig
+  description: On a closer inspection, it appears that it is made from optic fiber.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/performer-wig.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/performer-wig.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
--- a/Resources/Prototypes/Entities/Clothing/Head/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/specific.yml
@@ -18,3 +18,34 @@
      interfaces:
        enum.ChameleonUiKey.Key:
          type: ChameleonBoundUserInterface
+
+- type: entity
+  parent: ClothingHeadHatFedoraBrown
+  id: ClothingHeadHatDetGadget
+  name: go go hat
+  description: A novel hat with a built in toolkit. Automatically stores and retrieves items at the say of a phrase!
+  components:
+  - type: Tag
+    tags: [] # ignore "WhitelistChameleon" tag
+  - type: TriggerOnVoice
+    keyPhrase: "go go gadget"
+    listenRange: 0
+  - type: ActiveListener
+    range: 0
+  - type: StorageVoiceControl
+    allowedSlots:
+    - HEAD
+  - type: Storage
+    showVerb: false
+    grid:
+    - 0,0,6,3
+    maxItemSize: Small
+    blacklist:
+      tags:
+      - HighRiskItem # no hiding objectives or trolling nukies
+      - FakeNukeDisk # no disk checking
+      - QuantumSpinInverter # avoid the morbillionth QSI bug
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: [ ]
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -226,6 +226,15 @@
  - type: Sprite
    sprite: Clothing/Neck/Cloaks/aro.rsi

+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakAroace
+  name: aeropilot's cloak # thank you happyman442 this was the best name idea ever
+  description: Cloak awarded to Nanotrasen's finest pilots on planets with inhabitable atmospheres.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Cloaks/aroace.rsi
+
 - type: entity
  parent: ClothingNeckBase
  id: ClothingNeckCloakBi
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -45,6 +45,17 @@
  - type: Clothing
    equippedPrefix: aro

+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckAroacePin
+  name: aroace pin
+  description: Be aroace do crime.
+  components:
+  - type: Sprite
+    state: aroace
+  - type: Clothing
+    equippedPrefix: aroace
+
 - type: entity
  parent: ClothingNeckPinBase
  id: ClothingNeckAsexualPin
--- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
@@ -153,6 +153,17 @@
  - type: Clothing
    sprite: Clothing/Neck/Scarfs/PrideScarfs/aro.rsi

+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedAroace
+  name: striped aroace scarf
+  description: A stylish striped aroace scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi
+
 - type: entity
  parent: ClothingScarfBase
  id: ClothingNeckScarfStripedBiSexual
--- a/Resources/Prototypes/Entities/Effects/mobspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml
@@ -39,6 +39,18 @@
  - type: SpawnOnDespawn
    prototype: MobIronCrab

+- type: entity
+  id: MobSpawnCrabCoal
+  parent: MobSpawnCrabQuartz
+  name: mobspawner coalcrab
+  categories: [ HideSpawnMenu, Spawner ]
+  components:
+  - type: Sprite
+    sprite: /Textures/Effects/mobspawn.rsi
+    state: crab_coal
+  - type: SpawnOnDespawn
+    prototype: MobCoalCrab
+
 - type: entity
  id: MobSpawnCrabSilver
  parent: MobSpawnCrabQuartz
@@ -51,6 +63,18 @@
  - type: SpawnOnDespawn
    prototype: MobSilverCrab

+- type: entity
+  id: MobSpawnCrabGold
+  parent: MobSpawnCrabQuartz
+  name: mobspawner goldcrab
+  categories: [ HideSpawnMenu, Spawner ]
+  components:
+  - type: Sprite
+    sprite: /Textures/Effects/mobspawn.rsi
+    state: crab_gold
+  - type: SpawnOnDespawn
+    prototype: MobGoldCrab
+
 - type: entity
  id: MobSpawnCrabUranium
  parent: MobSpawnCrabQuartz
--- a/Resources/Prototypes/Entities/Effects/wallspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml
@@ -74,6 +74,22 @@
  - type: SpawnOnDespawn
    prototype: AsteroidRockSilver

+- type: entity
+  id: WallSpawnAsteroidGoldCrab
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockGoldCrab
+
+- type: entity
+  id: WallSpawnAsteroidGold
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockGold
+
 - type: entity
  id: WallSpawnAsteroidIronCrab
  parent: WallSpawnAsteroid
@@ -88,4 +104,20 @@
  categories: [ HideSpawnMenu ]
  components:
  - type: SpawnOnDespawn
-    prototype: AsteroidRockTin
+    prototype: AsteroidRockTin
+
+- type: entity
+  id: WallSpawnAsteroidCoalCrab
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockCoalCrab
+
+- type: entity
+  id: WallSpawnAsteroidCoal
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockCoal
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
@@ -10,42 +10,60 @@
      - state: green
      - sprite: Objects/Consumable/Drinks/dr_gibb.rsi
        state: icon
-  - type: RandomSpawner
-    prototypes:
-      - DrinkColaBottleFull
-      - DrinkSpaceMountainWindBottleFull
-      - DrinkSpaceUpBottleFull
-      - DrinkWaterBottleFull
-      - DrinkColaCan
-      - DrinkIcedTeaCan
-      - DrinkLemonLimeCan
-      - DrinkLemonLimeCranberryCan
-      - DrinkGrapeCan
-      - DrinkRootBeerCan
-      - DrinkSodaWaterCan
-      - DrinkSpaceMountainWindCan
-      - DrinkSpaceUpCan
-      - DrinkStarkistCan
-      - DrinkTonicWaterCan
-      - DrinkFourteenLokoCan
-      - DrinkChangelingStingCan
-      - DrinkDrGibbCan
-      - DrinkEnergyDrinkCan
-      - DrinkShamblersJuiceCan
-      - DrinkSolDryCan
-      - DrinkPwrGameCan
-      - DrinkHotCoco
-      - DrinkHotCoffee
-      - DrinkCafeLatte
-      - DrinkTeacup
-      - DrinkGreenTea
-      - DrinkWaterCup
-      - DrinkBeerCan
-      - DrinkWineCan
-    chance: 0.8
-    offset: 0.0
-    #rare
-    rarePrototypes:
-      - DrinkNukieCan
-      - DrinkLean
-    rareChance: 0.01
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: RandomAllSodaTable
+      prob: 0.8
+
+- type: entityTable
+  id: RandomAllSodaTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomCommonSodaTable
+      weight: 0.95
+    - !type:NestedSelector
+      tableId: RandomRareSodaTable
+      weight: 0.05
+
+- type: entityTable
+  id: RandomCommonSodaTable
+  table: !type:GroupSelector
+    children:
+    - id: DrinkBeerCan
+    - id: DrinkCafeLatte
+    - id: DrinkChangelingStingCan
+    - id: DrinkColaBottleFull
+    - id: DrinkColaCan
+    - id: DrinkDrGibbCan
+    - id: DrinkEnergyDrinkCan
+    - id: DrinkFourteenLokoCan
+    - id: DrinkGrapeCan
+    - id: DrinkGreenTea
+    - id: DrinkHotCoco
+    - id: DrinkHotCoffee
+    - id: DrinkIcedTeaCan
+    - id: DrinkLemonLimeCan
+    - id: DrinkLemonLimeCranberryCan
+    - id: DrinkPwrGameCan
+    - id: DrinkRootBeerCan
+    - id: DrinkShamblersJuiceCan
+    - id: DrinkSodaWaterCan
+    - id: DrinkSolDryCan
+    - id: DrinkSpaceMountainWindBottleFull
+    - id: DrinkSpaceMountainWindCan
+    - id: DrinkSpaceUpBottleFull
+    - id: DrinkSpaceUpCan
+    - id: DrinkStarkistCan
+    - id: DrinkTeacup
+    - id: DrinkTonicWaterCan
+    - id: DrinkWaterBottleFull
+    - id: DrinkWaterCup
+    - id: DrinkWineCan
+
+- type: entityTable
+  id: RandomRareSodaTable
+  table: !type:GroupSelector
+    children:
+    - id: DrinkNukieCan
+    - id: DrinkLean
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
@@ -11,39 +11,43 @@
      - state: red
      - sprite: Objects/Consumable/Food/snacks.rsi
        state: cheesiehonkers
-  - type: RandomSpawner
-  #small item
-    prototypes:
-      - FoodSnackBoritos
-      - FoodSnackCheesie
-      - FoodSnackChips
-      - FoodSnackChocolate
-      - FoodSnackEnergy
-      - FoodSnackChocolateBar
-      - FoodSnackPopcorn
-      - FoodSnackRaisins
-      - FoodSnackSus
-      - FoodSnackSyndi
-      - FoodSnackChowMein
-      - FoodSnackDanDanNoodles
-      - FoodSnackCookieFortune
-      - FoodSnackNutribrick
-      - FoodSnackMREBrownie
-      - FoodFrozenSandwich
-      - FoodFrozenSandwichStrawberry
-      - FoodFrozenFreezy
-      - FoodFrozenSundae
-      - FoodFrozenCornuto
-      - FoodFrozenPopsicleOrange
-      - FoodFrozenPopsicleBerry
-      - FoodFrozenPopsicleJumbo
-      - FoodFrozenSnowcone
-      - FoodFrozenSnowconeBerry
-      - FoodFrozenSnowconeFruit
-      - FoodFrozenSnowconeClown
-      - FoodFrozenSnowconeMime
-      - FoodFrozenSnowconeRainbow
-      - FoodSnackPistachios
-      - FoodSnackSemki
-    chance: 0.8
-    offset: 0.0
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: RandomSnackTable
+      prob: 0.8
+
+- type: entityTable
+  id: RandomSnackTable
+  table: !type:GroupSelector
+    children:
+    - id: FoodFrozenCornuto
+    - id: FoodFrozenFreezy
+    - id: FoodFrozenPopsicleBerry
+    - id: FoodFrozenPopsicleJumbo
+    - id: FoodFrozenPopsicleOrange
+    - id: FoodFrozenSandwich
+    - id: FoodFrozenSandwichStrawberry
+    - id: FoodFrozenSnowcone
+    - id: FoodFrozenSnowconeBerry
+    - id: FoodFrozenSnowconeClown
+    - id: FoodFrozenSnowconeFruit
+    - id: FoodFrozenSnowconeMime
+    - id: FoodFrozenSnowconeRainbow
+    - id: FoodFrozenSundae
+    - id: FoodSnackBoritos
+    - id: FoodSnackCheesie
+    - id: FoodSnackChips
+    - id: FoodSnackChocolate
+    - id: FoodSnackChocolateBar
+    - id: FoodSnackChowMein
+    - id: FoodSnackCookieFortune
+    - id: FoodSnackDanDanNoodles
+    - id: FoodSnackEnergy
+    - id: FoodSnackMREBrownie
+    - id: FoodSnackNutribrick
+    - id: FoodSnackPistachios
+    - id: FoodSnackPopcorn
+    - id: FoodSnackRaisins
+    - id: FoodSnackSemki
+    - id: FoodSnackSus
+    - id: FoodSnackSyndi
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
@@ -22,7 +22,7 @@
    - AnomalyFlora
    - AnomalyShadow
    - AnomalyTech
-    #- AnomalySanta 
+    #- AnomalySanta
    rareChance: 0.3
    rarePrototypes:
    - RandomAnomalyInjectorSpawner
@@ -40,7 +40,9 @@
  - type: RandomSpawner
    prototypes:
    - AnomalyRockIron
+    - AnomalyRockCoal
    - AnomalyRockSilver
+    - AnomalyRockGold
    - AnomalyRockQuartz
    - AnomalyRockUranium
    chance: 1
@@ -69,4 +71,4 @@
    - AnomalyTrapRock
    #- AnomalyTrapSanta
    chance: 1
-  
+
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml
@@ -16,5 +16,7 @@
        - CrystalOrange
        - CrystalBlue
        - CrystalCyan
+        - CrystalYellow
+        - CrystalBlack
        - CrystalGrey
      chance: 0.7
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -104,6 +104,7 @@
        - id: ClothingNeckCloakGoliathCloak
        - id: ClothingNeckCloakAce
        - id: ClothingNeckCloakAro
+        - id: ClothingNeckCloakAroace
        - id: ClothingNeckCloakBi
        - id: ClothingNeckCloakIntersex
        - id: ClothingNeckCloakLesbian
@@ -144,6 +145,7 @@
        - id: ClothingNeckAllyPin
        - id: ClothingNeckAromanticPin
        - id: ClothingNeckAsexualPin
+        - id: ClothingNeckAroacePin
        - id: ClothingNeckBisexualPin
        - id: ClothingNeckGayPin
        - id: ClothingNeckIntersexPin
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -191,6 +191,26 @@
    - sprite: Objects/Weapons/Melee/energykatana.rsi
      state: icon

+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: BaseAntagSpawner
+  id: SpawnPointGhostParadoxClone
+  components:
+  - type: GhostRole
+    name: ghost-role-information-paradox-clone-name
+    description: ghost-role-information-paradox-clone-description
+    rules: ghost-role-information-antagonist-rules
+    mindRoles:
+    - MindRoleGhostRoleSoloAntagonist
+    raffle:
+      settings: default
+  - type: Sprite
+    layers:
+    - sprite: Markers/jobs.rsi
+      state: green
+    - sprite: Mobs/Aliens/paradox_clone.rsi
+      state: preview
+
 - type: entity
  categories: [ HideSpawnMenu, Spawner ]
  parent: BaseAntagSpawner
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
@@ -49,3 +49,53 @@
  sprites:
  - sprite: Mobs/Customization/scars.rsi
    state: scar_chest
+
+- type: marking
+  id: ScarNeck
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_neck
+
+- type: marking
+  id: ScarChestBullets
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_chest_bullets
+
+- type: marking
+  id: ScarStomachBullets
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_stomach_bullets
+
+- type: marking
+  id: ScarFace1
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_face_1
+
+- type: marking
+  id: ScarFace2
+  bodyPart: Head
+  markingCategory: Head
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_face_2
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml
@@ -0,0 +1,223 @@
+# These options are kept very sparse to not put emphasis on nudity, and to provide a base for players to feel comfortable with.
+# It's unlikely more will be added to upstream for cosmetic reasons. 
+
+- type: marking
+  id: UndergarmentBottomBoxers
+  bodyPart: UndergarmentBottom
+  markingCategory: UndergarmentBottom
+  speciesRestriction: [Arachnid, Diona, Human, Dwarf, Moth, SlimePerson]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: boxers
+
+- type: marking
+  id: UndergarmentBottomBriefs
+  bodyPart: UndergarmentBottom
+  markingCategory: UndergarmentBottom
+  speciesRestriction: [Arachnid, Diona, Human, Dwarf, Moth, SlimePerson]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: briefs
+
+- type: marking
+  id: UndergarmentBottomSatin
+  bodyPart: UndergarmentBottom
+  markingCategory: UndergarmentBottom
+  speciesRestriction: [Arachnid, Diona, Human, Dwarf, Moth, SlimePerson]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: satin
+
+- type: marking
+  id: UndergarmentTopBra
+  bodyPart: UndergarmentTop
+  markingCategory: UndergarmentTop
+  speciesRestriction: [Arachnid, Diona, Human, Dwarf, Moth, Reptilian, SlimePerson]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: classic
+
+- type: marking
+  id: UndergarmentTopSportsbra
+  bodyPart: UndergarmentTop
+  markingCategory: UndergarmentTop
+  speciesRestriction: [Arachnid, Diona, Human, Dwarf, Moth, Reptilian, SlimePerson]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: sports
+
+- type: marking
+  id: UndergarmentTopBinder
+  bodyPart: UndergarmentTop
+  markingCategory: UndergarmentTop
+  speciesRestriction: [Arachnid, Diona, Human, Dwarf, Moth, Reptilian, SlimePerson]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: binder
+
+- type: marking
+  id: UndergarmentTopTanktop
+  bodyPart: UndergarmentTop
+  markingCategory: UndergarmentTop
+  speciesRestriction: [Arachnid, Diona, Human, Dwarf, Moth, Reptilian, SlimePerson]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: tanktop
+
+- type: marking
+  id: UndergarmentBottomBoxersVox # Voxers.
+  bodyPart: UndergarmentBottom
+  markingCategory: UndergarmentBottom
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: boxers_vox
+
+- type: marking
+  id: UndergarmentBottomBriefsVox
+  bodyPart: UndergarmentBottom
+  markingCategory: UndergarmentBottom
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: briefs_vox
+
+- type: marking
+  id: UndergarmentBottomSatinVox
+  bodyPart: UndergarmentBottom
+  markingCategory: UndergarmentBottom
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: satin_vox
+
+- type: marking
+  id: UndergarmentTopBraVox
+  bodyPart: UndergarmentTop
+  markingCategory: UndergarmentTop
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: classic_vox
+
+- type: marking
+  id: UndergarmentTopSportsbraVox
+  bodyPart: UndergarmentTop
+  markingCategory: UndergarmentTop
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: sports_vox
+
+- type: marking
+  id: UndergarmentTopBinderVox
+  bodyPart: UndergarmentTop
+  markingCategory: UndergarmentTop
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: binder_vox
+
+- type: marking
+  id: UndergarmentTopTanktopVox
+  bodyPart: UndergarmentTop
+  markingCategory: UndergarmentTop
+  speciesRestriction: [Vox]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: tanktop_vox
+
+- type: marking
+  id: UndergarmentBottomBoxersReptilian
+  bodyPart: UndergarmentBottom
+  markingCategory: UndergarmentBottom
+  speciesRestriction: [Reptilian]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: boxers_reptilian
+
+- type: marking
+  id: UndergarmentBottomBriefsReptilian
+  bodyPart: UndergarmentBottom
+  markingCategory: UndergarmentBottom
+  speciesRestriction: [Reptilian]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: briefs_reptilian
+
+- type: marking
+  id: UndergarmentBottomSatinReptilian
+  bodyPart: UndergarmentBottom
+  markingCategory: UndergarmentBottom
+  speciesRestriction: [Reptilian]
+  coloring:
+    default:
+      type: null
+      fallbackColor: '#FFFFFF'
+  sprites:
+  - sprite: Mobs/Customization/undergarments.rsi
+    state: satin_reptilian
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -282,7 +282,7 @@
  components:
  - type: RandomMetadata
    nameSegments:
-      - names_borg
+    - NamesBorg
  - type: NpcFactionMember
    factions:
    - NanoTrasen
@@ -290,6 +290,8 @@
    enabled: false
    groups:
    - AllAccess
+    tags:
+    - Borg
  - type: AccessReader
    access: [["Command"], ["Research"]]
  - type: ShowJobIcons
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -157,6 +157,37 @@
      - !type:DoActsBehavior
        acts: [ "Destruction" ]

+- type: entity
+  parent: MobOreCrab
+  id: MobCoalCrab
+  description: An ore crab made from coal.
+  components:
+  - type: Sprite
+    state: coal_crab
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 2.5
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 1.0
+    baseSprintSpeed : 1.5
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          Coal1:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
 - type: entity
  parent: MobOreCrab
  id: MobUraniumCrab
@@ -221,6 +252,35 @@
      - !type:DoActsBehavior
        acts: [ "Destruction" ]

+- type: entity
+  parent: MobOreCrab
+  id: MobGoldCrab
+  name: ore crab
+  description: An ore crab made from gold.
+  components:
+  - type: Sprite
+    state: gold_crab
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 5
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 70
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          GoldOre1:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
 - type: entity
  name: reagent slime
  id: ReagentSlime
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -115,8 +115,8 @@
    price: 2500 # rat wealth
  - type: RandomMetadata
    nameSegments:
-    - RegalRatNameKingdom
-    - RegalRatNameTitle
+    - NamesRegalratKingdom
+    - NamesRegalratTitle
  - type: GuideHelp
    guides:
    - MinorAntagonists
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -73,10 +73,10 @@
  - type: RandomMetadata
    nameSegments:
    - The
-    - RevenantType
+    - NamesRevenantType
    - of
-    - RevenantAdjective
-    - RevenantTheme
+    - NamesRevenantAdjective
+    - NamesRevenantTheme
  - type: Speech
    speechVerb: Ghost
  - type: Reactive
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -31,6 +31,9 @@
  - type: NpcFactionMember
    factions:
    - SimpleNeutral
+  - type: Access
+    tags:
+    - BasicSilicon
  - type: IntrinsicRadioReceiver
  - type: ActiveRadio
    channels:
--- a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
@@ -425,7 +425,7 @@
      roleLoadout: [ RoleSurvivalClown ]
    - type: RandomMetadata
      nameSegments:
-      - names_clown
+      - NamesClown

 - type: randomHumanoidSettings
  id: VisitorJanitor
@@ -575,8 +575,8 @@
      roleLoadout: [ RoleSurvivalVoxSupport ]
    - type: RandomMetadata
      nameSegments:
-      - names_first
-      - names_last
+      - NamesFirst
+      - NamesLast

 - type: randomHumanoidSettings
  id: ChallengeVictimChiefEngineer
@@ -594,8 +594,8 @@
      roleLoadout: [ RoleSurvivalVoxSupport ]
    - type: RandomMetadata
      nameSegments:
-      - names_first
-      - names_last
+      - NamesFirst
+      - NamesLast

 - type: randomHumanoidSettings
  id: ChallengeVictimCMO
@@ -613,8 +613,8 @@
      roleLoadout: [ RoleSurvivalVoxSupport ]
    - type: RandomMetadata
      nameSegments:
-      - names_first
-      - names_last
+      - NamesFirst
+      - NamesLast

 - type: randomHumanoidSettings
  id: ChallengeVictimHeadOfPersonnel
@@ -632,8 +632,8 @@
      roleLoadout: [ RoleSurvivalVoxSupport ]
    - type: RandomMetadata
      nameSegments:
-      - names_first
-      - names_last
+      - NamesFirst
+      - NamesLast

 - type: randomHumanoidSettings
  id: ChallengeVictimHeadOfSecurity
@@ -651,8 +651,8 @@
      roleLoadout: [ RoleSurvivalVoxSupport ]
    - type: RandomMetadata
      nameSegments:
-      - names_first
-      - names_last
+      - NamesFirst
+      - NamesLast

 - type: randomHumanoidSettings
  id: ChallengeVictimResearchDirector
@@ -670,8 +670,8 @@
      roleLoadout: [ RoleSurvivalVoxSupport ]
    - type: RandomMetadata
      nameSegments:
-      - names_first
-      - names_last
+      - NamesFirst
+      - NamesLast

 - type: randomHumanoidSettings
  id: ChallengeVictimQuartermaster
@@ -689,8 +689,8 @@
      roleLoadout: [ RoleSurvivalVoxSupport ]
    - type: RandomMetadata
      nameSegments:
-      - names_first
-      - names_last
+      - NamesFirst
+      - NamesLast

 # Security
 # Following use EventHumanoidMindShielded since they are heads and probably should have mindshields
@@ -713,8 +713,8 @@
      roleLoadout: [ RoleSurvivalVoxSupport ]
    - type: RandomMetadata
      nameSegments:
-      - names_first
-      - names_last
+      - NamesFirst
+      - NamesLast

 # Engineering

--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -31,6 +31,7 @@
  - type: Access
    groups:
    - AllAccess
+    - Silicon
    tags:
    - NuclearOperative
    - SyndicateAgent
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -0,0 +1,85 @@
+# Settings for cloning bodies
+# If you add a new trait, job specific component or a component doing visual/examination changes for humanoids
+# then add it here to the correct prototype.
+# The datafields of the components are only shallow copied using CopyComp.
+# Subscribe to CloningEvent instead if that is not enough.
+
+- type: cloningSettings
+  id: BaseClone
+  components:
+  # general
+  - DetailExaminable
+  - Dna
+  - Fingerprint
+  - NpcFactionMember
+  # traits
+  # - LegsParalyzed (you get healed)
+  - LightweightDrunk
+  - Narcolepsy
+  - Pacified
+  - PainNumbness
+  - Paracusia
+  - PermanentBlindness
+  - Unrevivable
+  # job specific
+  - BibleUser
+  - CommandStaff
+  - Clumsy
+  - MindShield
+  - MimePowers
+  # accents
+  - Accentless
+  - BackwardsAccent
+  - BarkAccent
+  - BleatingAccent
+  - FrenchAccent
+  - GermanAccent
+  - LizardAccent
+  - MobsterAccent
+  - MonkeyAccent
+  - MothAccent
+  - MumbleAccent
+  - OwOAccent
+  - ParrotAccent
+  - PirateAccent
+  # - ReplacementAccent
+  # Not supported at the moment because AddAccentClothingComponent will make it permanent when cloned.
+  # TODO: AddAccentClothingComponent should use an inventory relay event.
+  # Also ZombieComponent overwrites the old replacement accent, because you can only have one at a time.
+  - RussianAccent
+  - ScrambledAccent
+  - SkeletonAccent
+  - SlurredAccent
+  - SouthernAccent
+  - SpanishAccent
+  - StutteringAccent
+  blacklist:
+    components:
+    - AttachedClothing # helmets, which are part of the suit
+    - VirtualItem
+
+- type: cloningSettings
+  id: Antag
+  parent: BaseClone
+  components:
+  - HeadRevolutionary
+  - Revolutionary
+
+- type: cloningSettings
+  id: CloningPod
+  parent: Antag
+  forceCloning: false
+  copyEquipment: null
+
+# spawner
+
+- type: entity
+  id: RandomCloneSpawner
+  name: Random Clone
+  suffix: Non-Antag
+  components:
+  - type: Sprite
+    sprite: Mobs/Aliens/paradox_clone.rsi
+    state: preview
+  - type: RandomCloneSpawner
+    settings: BaseClone
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -252,7 +252,7 @@
      prototypes: [ HoloClownGear ]
    - type: RandomMetadata
      nameSegments:
-      - names_clown
+      - NamesClown
    - type: NpcFactionMember
      factions:
        - Syndicate
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -18,7 +18,7 @@
    prototypes: [SyndicateOperativeGearExtremelyBasic]
    roleLoadout: [ RoleSurvivalSyndicate ]
  - type: RandomMetadata
-    nameSegments: [names_death_commando]
+    nameSegments: [NamesDeathCommando]
  - type: NpcFactionMember
    factions:
    - Syndicate
@@ -69,7 +69,7 @@
  - type: RandomMetadata
    nameSegments:
    - nukeops-role-operator
-    - SyndicateNamesNormal
+    - NamesSyndicateNormal
  - type: Loadout
    prototypes: [SyndicateOperativeGearFullNoUplink]

@@ -97,8 +97,8 @@
    roleLoadout: [ RoleSurvivalSyndicate ]
  - type: RandomMetadata
    nameSegments:
-    - SyndicateNamesPrefix
-    - SyndicateNamesNormal
+    - NamesSyndicatePrefix
+    - NamesSyndicateNormal
  - type: NpcFactionMember
    factions:
    - Syndicate
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -26,8 +26,8 @@
      state: icon
    - type: RandomMetadata
      nameSegments:
-        - NamesFirstMilitaryLeader
-        - NamesLastMilitary
+        - NamesMilitaryFirstLeader
+        - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: DeathSquad

@@ -49,8 +49,8 @@
      roleLoadout: [ RoleSurvivalEVA ]
    - type: RandomMetadata
      nameSegments:
-        - NamesFirstMilitaryLeader
-        - NamesLastMilitary
+        - NamesMilitaryFirstLeader
+        - NamesMilitaryLast


 ## ERT Leader
@@ -65,8 +65,8 @@
      state: ertleader
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitaryLeader
-      - NamesLastMilitary
+      - NamesMilitaryFirstLeader
+      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTLeader

@@ -87,8 +87,8 @@
      roleLoadout: [ RoleSurvivalExtended ]
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitaryLeader
-      - NamesLastMilitary
+      - NamesMilitaryFirstLeader
+      - NamesMilitaryLast

 - type: entity
  id: RandomHumanoidSpawnerERTLeaderEVA
@@ -153,8 +153,8 @@
      state: chaplain #needs an ERT variant once a good suit it made.
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTChaplain

@@ -172,8 +172,8 @@
      job: ERTChaplain
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast
    - type: Loadout
      prototypes: [ ERTChaplainGear ]
      roleLoadout: [ RoleSurvivalExtended ]
@@ -219,8 +219,8 @@
      state: ertjanitor
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTJanitor

@@ -237,8 +237,8 @@
      job: ERTJanitor
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast
    - type: Loadout
      prototypes: [ ERTJanitorGear ]
      roleLoadout: [ RoleSurvivalExtended ]
@@ -283,8 +283,8 @@
      state: ertengineer
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTEngineer

@@ -301,8 +301,8 @@
      job: ERTEngineer
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast
    - type: Loadout
      prototypes: [ ERTEngineerGear ]
      roleLoadout: [ RoleSurvivalExtended ]
@@ -347,8 +347,8 @@
      state: ertsecurity
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTSecurity

@@ -365,8 +365,8 @@
      job: ERTSecurity
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast
    - type: Loadout
      prototypes: [ ERTSecurityGear ]
      roleLoadout: [ RoleSurvivalExtended ]
@@ -434,8 +434,8 @@
      state: ertmedical
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTMedical

@@ -452,8 +452,8 @@
      job: ERTMedical
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast
    - type: Loadout
      prototypes: [ ERTMedicalGear ]
      roleLoadout: [ RoleSurvivalExtended ]
@@ -513,8 +513,8 @@
        settings: short
    - type: RandomMetadata
      nameSegments:
-      - NamesFirstMilitary
-      - NamesLastMilitary
+      - NamesMilitaryFirst
+      - NamesMilitaryLast

 ## Central Command

@@ -552,7 +552,7 @@
      sprite: Mobs/Species/Human/parts.rsi
      state: full
    - type: RandomMetadata
-      nameSegments: [ names_death_commando ]
+      nameSegments: [ NamesDeathCommando ]
    - type: RandomHumanoidSpawner
      settings: SyndicateAgent

@@ -594,8 +594,8 @@
      settings: Cluwne
    - type: RandomMetadata
      nameSegments:
-      - names_first
-      - names_last
+      - NamesFirst
+      - NamesLast

 - type: randomHumanoidSettings
  id: Cluwne
--- a/Resources/Prototypes/Entities/Mobs/Player/paradox_clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/paradox_clone.yml
@@ -0,0 +1,37 @@
+# Mob
+- type: entity
+  parent: BaseMob
+  id: MobParadox
+  name: space-time paradox
+  description: A big ball of wibbly wobbly, timey wimey stuff.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - sprite: Mobs/Aliens/paradox_clone.rsi
+      state: paradox
+      shader: unshaded
+  - type: RotationVisuals
+    horizontalRotation: 90
+  - type: Pullable
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+
+- type: entity
+  parent: MobParadox
+  id: MobParadoxTimed # visual effect when gibbing on round end
+  components:
+  - type: TimedDespawn
+    lifetime: 10
+
+# guidebook dummy
+
+- type: entity
+  id: ParadoxCloneDummy
+  categories: [ HideSpawnMenu ]
+  name: Paradox Clone
+  components:
+  - type: Sprite
+    sprite: Mobs/Aliens/paradox_clone.rsi
+    state: preview
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -430,6 +430,7 @@
  - type: Access
    groups:
    - AllAccess
+    - Silicon
  - type: Eye
    drawFov: false
  - type: Examiner
@@ -611,7 +612,7 @@
        name: power-cell-slot-component-slot-name-default
        startingItem: PowerCellHigh
  - type: RandomMetadata
-    nameSegments: [names_borg]
+    nameSegments: [NamesBorg]

 - type: entity
  id: PlayerBorgDerelictGhostRole
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -81,6 +81,8 @@
      - map: [ "enum.HumanoidVisualLayers.LArm" ]
      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      - map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
+      - map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
      - map: ["jumpsuit"]
      - map: ["enum.HumanoidVisualLayers.LFoot"]
      - map: ["enum.HumanoidVisualLayers.RFoot"]
@@ -115,6 +117,7 @@
        visible: false
  - type: Inventory
    templateId: arachnid
+    speciesId: arachnid


 - type: entity
@@ -124,6 +127,8 @@
  components:
  - type: HumanoidAppearance
    species: Arachnid
+  - type: Inventory
+    speciesId: arachnid 


 #>88w88<
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -19,6 +19,8 @@
    - map: [ "enum.HumanoidVisualLayers.LArm" ]
    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
+    - map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
    - map: ["jumpsuit"]
    - map: ["enum.HumanoidVisualLayers.LFoot"]
    - map: ["enum.HumanoidVisualLayers.RFoot"]
@@ -305,6 +307,8 @@
    - map: [ "enum.HumanoidVisualLayers.LArm" ]
    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
+    - map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
    - map: ["jumpsuit"]
    - map: ["enum.HumanoidVisualLayers.LFoot"]
    - map: ["enum.HumanoidVisualLayers.RFoot"]
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -8,7 +8,7 @@
  - type: Hunger
  - type: Thirst
  - type: Icon
-    sprite: Mobs/Species/Slime/parts.rsi # It was like this beforehand, no idea why.
+    sprite: Mobs/Species/Human/parts.rsi
    state: full
  - type: Respirator
    damage:
@@ -52,7 +52,7 @@
  - type: Speech
    speechSounds: Bass
  - type: HumanoidAppearance
-    species: Human
+    species: Dwarf
    hideLayersOnEquip:
    - Hair
    - Snout
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -83,6 +83,8 @@
      - map: [ "enum.HumanoidVisualLayers.LArm" ]
      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      - map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
+      - map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
      - map: [ "jumpsuit" ]
      - map: [ "enum.HumanoidVisualLayers.LHand" ]
      - map: [ "enum.HumanoidVisualLayers.RHand" ]
@@ -116,6 +118,7 @@
        state: "creampie_moth"
        visible: false
  - type: Inventory
+    speciesId: moth 
    femaleDisplacements:
      jumpsuit:
        sizeMaps:
@@ -132,6 +135,7 @@
  - type: HumanoidAppearance
    species: Moth
  - type: Inventory
+    speciesId: moth 
    femaleDisplacements:
      jumpsuit:
        sizeMaps:
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -11,6 +11,7 @@
    - Snout
    - HeadTop
    - HeadSide
+    undergarmentBottom: UndergarmentBottomBoxersReptilian
  - type: Hunger
  - type: Puller
    needsHands: false
@@ -90,6 +91,7 @@
    - Snout
    - HeadTop
    - HeadSide
+    undergarmentBottom: UndergarmentBottomBoxersReptilian
  - type: Inventory
    speciesId: reptilian
    femaleDisplacements:
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -11,8 +11,10 @@
  - type: Body
    prototype: Vox
    requiredLegs: 2
-  - type:  HumanoidAppearance
+  - type: HumanoidAppearance
    species: Vox
+    undergarmentTop: UndergarmentTopTanktopVox
+    undergarmentBottom: UndergarmentBottomBoxersVox
    #- type: VoxAccent # Not yet coded
  - type: Speech
    speechVerb: Vox
@@ -71,6 +73,8 @@
    - map: [ "enum.HumanoidVisualLayers.LArm" ]
    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ]
+    - map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ]
    - map: [ "jumpsuit" ]
    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
@@ -150,6 +154,8 @@
  components:
  - type: HumanoidAppearance
    species: Vox
+    undergarmentTop: UndergarmentTopTanktopVox
+    undergarmentBottom: UndergarmentBottomBoxersVox
  - type: Body
    prototype: Vox
  - type: Inventory
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1675,6 +1675,9 @@
        reagents:
        - ReagentId: Sake
          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/sakeglass.rsi
+    state: icon

 - type: entity
  parent: DrinkGlass
@@ -2280,6 +2283,182 @@
    sprite: Objects/Consumable/Drinks/xenobasher.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkCaipirinha
+  suffix: caipirinha
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Caipirinha
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/caipirinha.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkDaiquiri
+  suffix: daiquiri
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Daiquiri 
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/daiquiri.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkDeathInTheAfternoon
+  suffix: death in the afternoon
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: DeathInTheAfternoon
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/deathintheafternoon.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkEmpress75
+  suffix: empress 75
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Empress75
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/empress75.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkEspressoMartini
+  suffix: espresso martini
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: EspressoMartini
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/espressomartini.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMayojito
+  suffix: mayojito
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mayojito
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/mayojito.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMimeosa
+  suffix: mimeosa
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mimeosa
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/mimeosa.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMimosa
+  suffix: mimosa
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mimosa
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/mimosa.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMoscowMule
+  suffix: moscow mule
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: MoscowMule
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/moscowmule.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkTheSunAlsoRises
+  suffix: the sun also rises
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: TheSunAlsoRises
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/thesunalsorises.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkWhiskeySour
+  suffix: whiskey sour
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: WhiskeySour
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/whiskeysour.rsi
+    state: icon
+
 # TODO: MOVE

 - type: entity
--- a/Show More
+++ b/Show More