From e938a693a1d811ccbf96ac1f3eecc1e4a45142e4 Mon Sep 17 00:00:00 2001 From: blue3212 Date: Tue, 11 Jun 2024 19:18:01 -0400 Subject: [PATCH] Squashed commit of the following: commit c7d7e7b5dda1799982ea813b4654e17ee257b179 Author: FrontierATC Date: Tue Jun 11 22:04:03 2024 +0000 Automatic Changelog (#1437) commit 0937facc784acfc31e8524734a1d9d969a93ee11 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Wed Jun 12 01:03:34 2024 +0300 Cats Carp Suit (#1437) * SuitUp * Fix * Fix * Update pets.yml * Update pets.yml * Update pets.yml * Update pets.yml commit 27356d529d9b3d282a55421aa42af8ecefbde018 Author: FrontierATC Date: Tue Jun 11 19:18:08 2024 +0000 Automatic Changelog (#1500) commit f2076bb3af442ceb39d26e9fac945a6ddee7aac6 Author: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Date: Tue Jun 11 21:17:43 2024 +0200 Pen signing rework (#1500) * Port pen signing from Sector-Umbra/Sector-Umbra#47 * Remove stampedBorderless references in maps from old signing system * Remove the existence of PenComponent commit 4d053b716f68f4f6b3da13d5716665bcdcc642f4 Author: FrontierATC Date: Tue Jun 11 18:52:32 2024 +0000 Automatic Changelog (#1487) commit 3d61b186153c7316ca2b7ac58f4e6130242d35ef Author: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Tue Jun 11 21:52:05 2024 +0300 Construction Bag (#1487) * initial commit * Un Tag * fixes * no tickets * research thingy * inflatable walls, shared.comp --------- Co-authored-by: Dvir commit df97e8bd91c215ad730fc18f89827d531796a8b6 Author: FrontierATC Date: Tue Jun 11 18:12:07 2024 +0000 Automatic Changelog (#1491) commit 48392279fbc9cd892bc012ca0b0d73b711ca6418 Author: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Tue Jun 11 14:11:38 2024 -0400 Loadouts: add overrides for name, description, and preview entity (#1491) * Add loadout name, desc, preview entity overrides * Fix for nullable fields * Add survival box * Update survival.yml * More edits --------- Co-authored-by: Dvir commit 32df6dce4f9320e2b8680c10c4bdf9e13ba1007f Author: FrontierATC Date: Mon Jun 10 15:37:29 2024 +0000 Automatic Changelog (#1497) commit 328edff61cbcab9e2d5fb614b323abc6c4c607b0 Author: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Mon Jun 10 17:37:03 2024 +0200 Fix artifact fragment spawn rate (#1497) commit a120ab254bc1449303db55a046199448327fa9d4 Merge: d4b5016c13 2707d95260 Author: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Mon Jun 10 10:51:22 2024 +0200 Merge pull request #1431 from dvir001/2024-05-28-HTNSystem Update HTNSystem.cs commit d4b5016c13642e859074cdddfc9bb75c35e88a6e Author: FrontierATC Date: Sun Jun 9 17:53:33 2024 +0000 Automatic Changelog (#1214) commit 55c772fe1a5588d5bb2163220092af44859899b4 Author: Tych0 <151581207+Tych0theSynth@users.noreply.github.com> Date: Sun Jun 9 18:53:08 2024 +0100 NSF Broadhead (New) - Medium Detective NSFD Vessel (#1214) * Adds the NSF Broadhead, a new medium size detective-oriented NSFD shuttle. * Update Broadhead after review * Removed old files after relocating them to the correct dir * Security thrusters/gyro are now NFSD versions * Updates to new prototype names * Made requested changes and some other stuff --------- Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> commit 4792913cd5e1cdade38c8c9a505781a41e697ef6 Author: FrontierATC Date: Sat Jun 8 22:02:00 2024 +0000 Automatic Changelog (#1493) commit de69cf9774d6ce864703b5e2a68bdcc1ffe8cffa Author: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Sat Jun 8 18:01:36 2024 -0400 Add wanted status, job icon, health icon to Brigmedic HUD (#1493) * Brigmedic HUD: inherit from NFSD HUD * Brigmedic: reparent under med & nfsd huds commit 73ecff4bdd1f905d1b73d070ed7a56c787a3bb8c Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat Jun 8 20:55:09 2024 +0300 Fix mech codes to stop AI abuse (#1492) * Fix Mechs * Update Content.Server/Mech/Systems/MechSystem.cs Was Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Content.Server/Mech/Systems/MechSystem.cs Sure Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Content.Shared/Mech/EntitySystems/SharedMechSystem.cs Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> commit a8c22c7fb35b250b365e652933ca5e3abc21f735 Author: FrontierATC Date: Sat Jun 8 14:41:07 2024 +0000 Automatic Changelog (#1490) commit e9c2534c3fecd92552cd360b2d3b859778fd19a3 Author: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Sat Jun 8 10:40:33 2024 -0400 Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709) (#1490) * Update DevourSystem.cs * Update DevourSystem.cs * Update Content.Server/Devour/DevourSystem.cs --------- Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> commit 0ad77b43e1be24da8e75f63a02c9652acc68cf5f Author: FrontierATC Date: Fri Jun 7 21:53:26 2024 +0000 Automatic Changelog (#1305) commit 8342e264c74cef333628141be492bc8b67ef4949 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat Jun 8 00:52:59 2024 +0300 Mail Truck (Update) (#1305) * Mail * Update mailtruck.yml * Update mailtruck.yml * Update mailtruck.yml commit de8a049bc95b858be7ed4cbd42027501776c4731 Author: FrontierATC Date: Fri Jun 7 17:10:44 2024 +0000 Automatic Changelog (#1473) commit 53dd0316c87bb72ce2c8de5133f4248cc6e385e5 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri Jun 7 20:10:14 2024 +0300 Mail Buff (#1473) * MailUp * Update base_mail.yml * Update base_mail.yml * Update MailTeleporterComponent.cs * Update MailComponent.cs * Update base_mail.yml * Update base_mail.yml * Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml Sure Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> commit 7e0de7c6fc7fb292742e3bcb50b18b50e98318e9 Author: Hamblinius Date: Fri Jun 7 16:35:20 2024 +0100 Brown Flat Cap in Loadouts (#1483) * Brown Flat Cap in Loadouts This PR adds the brown flat cap to the loadouts for the contractor, pilot, and mercenary. The grey flat cap is available in the loadouts but the brown one was conspicuously absent (and I need a cool hat that matches my outfit). ![](https://files.catbox.moe/unsvyu.png) ![](https://files.catbox.moe/vi8osp.png) * Update stationrep_loadout_groups.yml --------- Co-authored-by: Dvir commit 2eb75fe1bc743e509bbb22adf04b47b212703e05 Author: SirMcSlushers <74610984+SirMcSlushers@users.noreply.github.com> Date: Fri Jun 7 10:59:47 2024 -0400 Nonlethal Vending Machine (Practice Rounds & Etc) (#1352) * Nonlethal Vending Machine (Practice Rounds & Etc) * Updated * Updated * Added the Restocking * Update meta.json * Cleanup * Update eject-unshaded.png * Fixup --------- Co-authored-by: Dvir commit c8eee327f69abf8351cfb08a49ebf6d4770360fb Author: FrontierATC Date: Fri Jun 7 10:59:04 2024 +0000 Automatic Changelog (#1474) commit 4ebccb13dd3f7a22f94cdac47a85a9e43e752aa8 Author: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri Jun 7 06:58:39 2024 -0400 Restore rubber rounds to nfsd techfab, r&d server (#1474) commit 7ed77cdba11e691063e4db6f6b88883397c0bdba Author: FrontierATC Date: Fri Jun 7 09:53:41 2024 +0000 Automatic Changelog (#1445) commit 280e6be07f2d473f9556b65f43fbd8a2c23cba3c Author: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Fri Jun 7 04:53:14 2024 -0500 Private Security Hardsuit and New Merc Loadout Options (#1445) * phase 1 * Suit and extra loadout options for merc * inhand update * Update mercenary_loadout_groups.yml * Update hardsuit-helmets.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir commit d502a41fde9191edff23a3ec59106e89e6ab1de3 Author: FrontierATC Date: Fri Jun 7 07:50:39 2024 +0000 Automatic Changelog (#1485) commit 74d4232e244e6af13806f54f05c26c3d201285e3 Author: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Fri Jun 7 03:50:15 2024 -0400 mining crab and golem rebalance (#1485) commit 0dbdf75fec427c715bc8bde8faf10690c5767858 Author: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Thu Jun 6 18:39:08 2024 -0400 anchor trade station into place (#1484) commit 0e7107b741c39f347046b865f10e0b052ad3e1b4 Author: whatston3 <166147148+whatston3@users.noreply.github.com> Date: Thu Jun 6 02:23:33 2024 -0400 Non-lethal Mosin: inherit mag size from parent (#1479) commit c928f0fd6d0995920d2d496d6cd4cd5c81474d54 Author: FrontierATC Date: Thu Jun 6 00:23:25 2024 +0000 Automatic Changelog (#1454) commit 5dbdb0ca079af936ac2d70af4177d8478d9a65c6 Author: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Thu Jun 6 03:22:52 2024 +0300 Military Jumpsuits (#1454) * initial commit * update * fixes * loadouts * name change * fix * moved new jumpsuits behind T3 time lock commit 7f318fe20a55c89f9112f02397c2613fc4249771 Author: FrontierATC Date: Thu Jun 6 00:19:36 2024 +0000 Automatic Changelog (#1468) commit f2a26bea5ac26f10dfc425d9a3567e238c9e5cc0 Author: whatston3 <166147148+whatston3@users.noreply.github.com> Date: Wed Jun 5 20:18:23 2024 -0400 Loadouts: fix Lawyer, Janitor slot names, remove Chaplain loadout (#1468) * Janitor, Lawyer, Chaplain NF loadouts * role_loadouts.yml: fix chaplain outer clothing * Remove chaplain loadout files, no job pref listing commit b4274c1fdcab5e02c88c0e2cb4bbdde8642fe371 Author: FrontierATC Date: Thu Jun 6 00:17:12 2024 +0000 Automatic Changelog (#1432) commit 63477587734cac48e773a014aea5bc6d12523f8b Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu Jun 6 03:16:47 2024 +0300 PDA Bank Data (#1432) * Bank data * Data * Update Content.Client/PDA/PdaMenu.xaml.cs Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com> commit 2e9494981dcc32ac7d14077ba11dc9d97d54ccea Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu Jun 6 02:53:15 2024 +0300 Canisters Sprites (Update) (#1409) * Canisters * Liquid * Update meta.json * Update gas_canisters.yml * Update meta.json * Fix * Create gas_canisters.yml * Update gas_canisters.yml * Update gas_canisters.yml commit 58f6678b6ced4c2c55ff6ed79f245a968de80264 Author: FrontierATC Date: Wed Jun 5 23:49:21 2024 +0000 Automatic Changelog (#1466) commit 3df62039a937281af07cbb5dae33463eb93e42cf Author: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Wed Jun 5 18:48:58 2024 -0500 Trade Outpost (New POI) (#1466) * Trade phase 1 * Trade Phase 2, clean station * Phase 3 - new signs * Update whitelist.yml --------- Co-authored-by: Dvir commit 0bdc032122590fe1d8f608a7d811ea9afab8dce3 Author: FrontierATC Date: Wed Jun 5 23:29:54 2024 +0000 Automatic Changelog (#1316) commit c89fbf7ed7f820869af8f61b1e3e99ad398351c3 Author: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu Jun 6 02:29:28 2024 +0300 The Bird, the Vulp and the Un-Cloneable (#1316) * Vision filter accessibility option (#889) * Add option to disable vision filters * Remove DefaultVision in favor of the setting * Clean DeltaTab.xaml.cs * Fixing Vulps * Unclonable * Species vision fixes (#1150) Species vision fixes: no losing vision on nearby species vision haver getting gibbed, fix construction overlay * Update DCCVars.cs * Update OptionsMenu.xaml.cs * DeltaV * update * Update vulpkanin.yml --------- Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> commit 517a3d0aa7e7464a2b86d689e35d076a3a67412f Author: FrontierATC Date: Wed Jun 5 23:27:46 2024 +0000 Automatic Changelog (#1391) commit 8c93948db2526acb4b506355c434fa82f649099b Author: VividPups <150621839+VividPups@users.noreply.github.com> Date: Wed Jun 5 18:27:21 2024 -0500 Mosin Rework (#1391) * Testing? Mosin rework * Update snipers.yml * Update 2 * update 3 * Update snipers.yml * Update snipers.yml * Dumb updates updates do be dumb sometimes * WOULD THIS WORK? FUCK FUCK FU commit 652b8e99b8dab5de1950068fcd89abd8cf9cdfff Author: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Wed Jun 5 19:23:48 2024 -0400 Mini Auth (#1465) * initial commit * IOC * no lists in toml * maybe * hm * dependent * undo * no tolerance * maybe no instantiate * double * maybe strings * patch * proper string handling * go back * redo * lets try this way eh * auth cmon * test logging * whoops * our own record * put it inside the if * eh * the worlds a stage * or not * hu * cleanup * rearrange the try catch to include the initial connection call as well * shorten it up try to simplify * no jack * locale commit 1622c31b8089dc2e659ff2c237a0a2995de3b517 Merge: c1b06010c3 41055f2a28 Author: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Thu Jun 6 00:54:00 2024 +0200 Merge pull request #1471 from dvir001/2024-06-05-FixIssues Argenti And Ammo Fixup commit 41055f2a28a3c489f4dcf6fc7190995abe38c346 Author: Dvir Date: Thu Jun 6 00:44:13 2024 +0300 Update pistol.yml commit fe167faa7915c390143e197b8e17ba5929c46cd3 Author: Dvir Date: Wed Jun 5 01:35:06 2024 +0300 Fixing commit 2707d9526037b98d72a584fc3c48292d2775bce9 Author: Dvir Date: Tue May 28 23:21:46 2024 +0300 Update HTNSystem.cs commit 1ba8f1e9a7cc853286acfa2daa12aa10a9d5da30 Author: Dvir Date: Tue May 28 23:20:56 2024 +0300 Update HTNSystem.cs commit 18e6a82b6fb9e8bcc3ba976f2136c4cc4e3a6398 Author: Dvir Date: Tue May 28 01:24:11 2024 +0300 Update HTNSystem.cs https://github.com/FireNameFN/corvax-frontier-14/commits/bd773f58ceb5569c652a56077ad4ea8ea25b01a7/Content.Server/NPC/HTN/HTNSystem.cs --- .github/mapchecker/whitelist.yml | 1 + .../DeltaV/Options/UI/Tabs/DeltaTab.xaml | 23 + .../DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs | 46 + .../DeltaV/Overlays/UltraVisionOverlay.cs | 23 +- .../DeltaV/Overlays/UltraVisionSystem.cs | 36 +- .../Nyanotrasen/Overlays/DogVisionOverlay.cs | 51 + .../{Overlays => }/DogVisionSystem.cs | 40 +- .../Overlays/Overlays/DogVisionOverlay.cs | 45 - Content.Client/Options/UI/OptionsMenu.xaml | 2 + Content.Client/Options/UI/OptionsMenu.xaml.cs | 1 + Content.Client/PDA/PdaMenu.xaml | 3 + Content.Client/PDA/PdaMenu.xaml.cs | 12 +- Content.Client/Paper/UI/PaperWindow.xaml.cs | 5 +- Content.Client/Paper/UI/StampWidget.xaml.cs | 20 +- .../Preferences/UI/LoadoutContainer.xaml.cs | 19 +- .../UI/LoadoutGroupContainer.xaml.cs | 2 +- Content.Client/RCD/RCDMenu.xaml.cs | 8 +- Content.Server.Database/Model.cs | 1 + Content.Server/Administration/ServerApi.cs | 4 +- Content.Server/Cloning/CloningSystem.cs | 13 + .../Connection/ConnectionManager.cs | 20 + Content.Server/Devour/DevourSystem.cs | 12 + Content.Server/Entry/EntryPoint.cs | 2 + Content.Server/IoC/ServerContentIoC.cs | 3 + Content.Server/Mech/Systems/MechSystem.cs | 17 + Content.Server/NPC/HTN/HTNSystem.cs | 27 + .../Mail/Components/MailComponent.cs | 2 +- .../Components/MailTeleporterComponent.cs | 10 +- Content.Server/Nyanotrasen/Mail/MailSystem.cs | 4 +- Content.Server/PDA/PdaSystem.cs | 9 +- Content.Server/Paper/PaperSystem.cs | 236 +- Content.Server/Paper/PenComponent.cs | 16 - .../Traits/Assorted/UncloneableComponent.cs | 10 + Content.Server/_NF/Auth/Auth.cs | 88 + .../_NF/GameRule/NfAdventureRuleSystem.cs | 18 +- .../VulpLangaugeListenerComponent.cs | 7 - .../VulpLanguageSpeakerComponent.cs | 7 - .../VulpLanguage/VulpTranslatorComponent.cs | 7 - Content.Shared/CCVar/CCVars.cs | 5 + Content.Shared/Chat/SharedChatSystem.cs | 8 +- .../DeltaV/Abilities/UltraVisionComponent.cs | 2 +- Content.Shared/DeltaV/CCVars/DCCVars.cs | 24 + .../Mech/EntitySystems/SharedMechSystem.cs | 10 + .../Components/NpcFactionMemberComponent.cs | 3 +- Content.Shared/PDA/PdaUpdateState.cs | 3 + Content.Shared/Paper/PenComponent.cs | 29 - Content.Shared/Paper/StampComponent.cs | 11 +- .../Preferences/Loadouts/LoadoutPrototype.cs | 22 + .../Station/SharedStationSpawningSystem.cs | 1 - .../ConstructionMaterialsComponent.cs | 7 + .../VulpGiveTranslatorComponent.cs | 7 - Resources/Changelog/Changelog.yml | 144 + .../Locale/en-US/_NF/adventure/adventure.ftl | 1 + .../_NF/navmap-beacons/station-beacons.ftl | 17 + .../en-US/_NF/paper/paper-component.ftl | 6 + .../Locale/en-US/_NF/pda/pda-component.ftl | 1 + .../en-US/_NF/research/technologies.ftl | 1 + .../en-US/deltav/escape-menu/options-menu.ftl | 4 + .../Locale/en-US/deltav/traits/traits.ftl | 7 + Resources/Locale/en-US/nyanotrasen/mail.ftl | 2 +- Resources/Maps/_NF/Outpost/frontier.yml | 6 +- Resources/Maps/_NF/POI/nfsd.yml | 3 +- Resources/Maps/_NF/POI/trade.yml | 39985 ++++++++++++++++ .../Maps/_NF/Shuttles/Nfsd/broadhead.yml | 5117 ++ .../Maps/_NF/Shuttles/Nfsd/opportunity.yml | 3 +- Resources/Maps/_NF/Shuttles/bookworm.yml | 10 +- Resources/Maps/_NF/Shuttles/bulker.yml | 13 +- Resources/Maps/_NF/Shuttles/hauler.yml | 6 +- Resources/Maps/_NF/Shuttles/lyrae.yml | 5 +- Resources/Maps/_NF/Shuttles/mailtruck.yml | 1875 +- Resources/Maps/_NF/Shuttles/vagabond.yml | 3 +- .../VendingMachines/Inventories/vendomat.yml | 1 - .../DeltaV/Damage/modifier_sets.yml | 2 +- .../DeltaV/Entities/Mobs/Player/vulpkanin.yml | 12 +- .../Entities/Mobs/Species/vulpkanin.yml | 55 +- .../Objects/Devices/vulptranslator.yml | 14 - .../Prototypes/DeltaV/Traits/altvision.yml | 7 + .../Entities/Clothing/OuterClothing/suits.yml | 3 + .../Entities/Mobs/NPCs/elemental.yml | 4 +- .../Entities/Objects/Materials/materials.yml | 6 + .../Entities/Objects/Materials/parts.yml | 1 + .../Entities/Objects/Misc/paper.yml | 2 - .../Objects/Tools/inflatable_wall.yml | 2 + .../Guns/Ammunition/Magazines/pistol.yml | 2 +- .../Objects/Weapons/Guns/Snipers/snipers.yml | 55 +- .../Entities/Objects/Weapons/Guns/turrets.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 10 +- .../Storage/Canisters/gas_canisters.yml | 192 +- .../Prototypes/Loadouts/role_loadouts.yml | 12 +- .../Nyanotrasen/Entities/Mobs/NPCs/dogs.yml | 2 +- .../Objects/Specific/Mail/base_mail.yml | 9 +- .../Entities/Structures/Machines/lathe.yml | 50 +- Resources/Prototypes/Research/arsenal.yml | 4 + .../Roles/Jobs/Civilian/chaplain.yml | 1 + Resources/Prototypes/Traits/disabilities.yml | 9 +- .../_NF/Catalog/Cargo/cargo_vending.yml | 10 + .../_NF/Catalog/Fills/Boxes/emergency.yml | 41 +- .../_NF/Catalog/Fills/Crates/npc.yml | 3 +- .../_NF/Catalog/Fills/Crates/vending.yml | 11 + .../Catalog/Fills/Lockers/suit_storage.yml | 16 + .../Inventories/cuddlycritter.yml | 2 +- .../Inventories/lesslethalvend.yml | 23 +- .../Inventories/nonlethalvend.yml | 23 + .../_NF/Entities/Clothing/Eyes/hud.yml | 5 +- .../Clothing/Head/hardsuit-helmets.yml | 14 + .../Clothing/OuterClothing/hardsuits.yml | 13 + .../Clothing/Uniforms/military_jumpsuits.yml | 2083 + .../Entities/Mobs/NPCs/artifact_construct.yml | 2 +- .../_NF/Entities/Mobs/NPCs/elemental.yml | 68 +- .../Mobs/NPCs/emotionalsupportanimals.yml | 23 + .../_NF/Entities/Mobs/NPCs/pets.yml | 43 +- .../Objects/Devices/station_beacon.yml | 107 +- .../_NF/Entities/Objects/Fun/darts.yml | 13 + .../Specific/Engineering/construction_bag.yml | 80 + .../Service/vending_machine_restock.yml | 17 + .../Weapons/Ammunition/Boxes/pistol.yml | 14 - .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 17 + .../Ammunition/Cartridges/pistol.yml | 18 +- .../Ammunition/Magazines/pistol.yml | 22 +- .../Ammunition/Projectiles/chem.yml | 0 .../Ammunition/Projectiles/pistol.yml | 1 + .../Ammunition/SpeedLoaders/heavy_rifle.yml | 0 .../Guns/Ammunition/SpeedLoaders/pistol.yml | 1 + .../{ => Guns}/Ammunition/explosives.yml | 0 .../Objects/Weapons/Guns/Snipers/snipers.yml | 6 +- .../Structures/Doors/Airlocks/access.yml | 20 +- .../Structures/Machines/vending_machines.yml | 33 + .../Storage/Canisters/gas_canisters.yml | 23 + .../Structures/Wallmounts/Signs/signs.yml | 63 + .../Entities/Structures/Wallmounts/switch.yml | 7 + ...emotionalsupportpet_inventory_template.yml | 11 + .../nfsdpet_inventory_template.yml | 11 + .../_NF/Loadouts/Jobs/Contractor/belt.yml | 21 + .../_NF/Loadouts/Jobs/Contractor/fun.yml | 4 + .../_NF/Loadouts/Jobs/Contractor/head.yml | 13 + .../_NF/Loadouts/Jobs/Contractor/jumpsuit.yml | 443 + .../_NF/Loadouts/Jobs/Contractor/survival.yml | 4 + .../_NF/Loadouts/Jobs/Janitor/gloves.yml | 26 + .../_NF/Loadouts/Jobs/Janitor/head.yml | 8 + .../_NF/Loadouts/Jobs/Janitor/jumpsuit.yml | 17 + .../_NF/Loadouts/Jobs/Janitor/outer.yml | 8 + .../_NF/Loadouts/Jobs/Lawyer/jumpsuit.yml | 89 + .../_NF/Loadouts/Jobs/Lawyer/neck.yml | 8 + .../Loadouts/Jobs/MailCarrier/jumpsuit.yml | 13 + .../_NF/Loadouts/Jobs/Mercenary/belt.yml | 10 + .../_NF/Loadouts/Jobs/Mercenary/face.yml | 10 + .../_NF/Loadouts/Jobs/Mercenary/jumpsuit.yml | 112 + .../_NF/Loadouts/Jobs/Nfsd/belt.yml | 3 + .../_NF/Loadouts/Jobs/Nfsd/survival.yml | 2 + .../_NF/Loadouts/Jobs/Pilot/jumpsuit.yml | 40 + .../_NF/Loadouts/Jobs/StationRep/jumpsuit.yml | 13 + .../Loadouts/contractor_loadout_groups.yml | 35 + .../_NF/Loadouts/janitor_loadout_groups.yml | 29 + .../_NF/Loadouts/lawyer_loadout_groups.yml | 21 + .../Loadouts/mail_carrier_loadout_groups.yml | 1 + .../_NF/Loadouts/mercenary_loadout_groups.yml | 91 + .../_NF/Loadouts/pilot_loadout_groups.yml | 36 + .../Loadouts/stationrep_loadout_groups.yml | 2 + Resources/Prototypes/_NF/Maps/POI/trade.yml | 14 + .../Prototypes/_NF/Palettes/frontier.yml | 6 + .../Prototypes/_NF/Recipes/Lathes/devices.yml | 10 + .../Prototypes/_NF/Recipes/Lathes/eva.yml | 12 + .../Prototypes/_NF/Recipes/Lathes/misc.yml | 9 + .../_NF/Recipes/Lathes/security.yml | 38 +- Resources/Prototypes/_NF/Research/arsenal.yml | 1 + .../Prototypes/_NF/Research/industrial.yml | 12 + .../_NF/Shipyard/Nfsd/broadhead.yml | 28 + .../Prototypes/_NF/Shipyard/mailtruck.yml | 2 +- .../Prototypes/_NF/Traits/disabilities.yml | 5 - .../equipped-OUTERCLOTHING-cat.png | Bin 0 -> 1096 bytes .../Suits/carpsuit.rsi/meta.json | 4 + .../creampie.rsi/creampie_vulpkanin.png | Bin 0 -> 522 bytes .../DeltaV/Effects/creampie.rsi/meta.json | 1 + .../Devices/vulp_translator.rsi/icon.png | Bin 236 -> 0 bytes .../Devices/vulp_translator.rsi/meta.json | 14 - .../private_security.rsi/icon-flash.png | Bin 0 -> 3183 bytes .../Hardsuits/private_security.rsi/icon.png | Bin 0 -> 3155 bytes .../Hardsuits/private_security.rsi/meta.json | 25 + .../off-equipped-HELMET.png | Bin 0 -> 3557 bytes .../on-equipped-HELMET.png | Bin 0 -> 3615 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 4387 bytes .../Hardsuits/private_security.rsi/icon.png | Bin 0 -> 3405 bytes .../private_security.rsi/inhand-left.png | Bin 0 -> 3512 bytes .../private_security.rsi/inhand-right.png | Bin 0 -> 3568 bytes .../Hardsuits/private_security.rsi/meta.json | 26 + .../military.rsi/equipped-base-bottom.png | Bin 0 -> 1044 bytes .../equipped-base-top-jumpsuit-tac.png | Bin 0 -> 1200 bytes .../equipped-base-top-jumpsuit.png | Bin 0 -> 1182 bytes .../equipped-base-top-turtleneck-alt.png | Bin 0 -> 975 bytes .../equipped-base-top-turtleneck.png | Bin 0 -> 1186 bytes .../military.rsi/equipped-belt-buckle.png | Bin 0 -> 622 bytes .../Jumpsuit/military.rsi/equipped-belt.png | Bin 0 -> 671 bytes .../equipped-decor-contractor-tac.png | Bin 0 -> 1051 bytes .../equipped-decor-contractor.png | Bin 0 -> 999 bytes .../equipped-decor-department-head.png | Bin 0 -> 748 bytes .../equipped-decor-department.png | Bin 0 -> 1038 bytes .../military.rsi/equipped-decor-epaulets.png | Bin 0 -> 689 bytes .../equipped-decor-shoulder-patch.png | Bin 0 -> 687 bytes .../military.rsi/icon-base-bottom.png | Bin 0 -> 702 bytes .../military.rsi/icon-base-top-jumpsuit.png | Bin 0 -> 824 bytes .../military.rsi/icon-base-top-turtleneck.png | Bin 0 -> 821 bytes .../military.rsi/icon-belt-buckle.png | Bin 0 -> 598 bytes .../Jumpsuit/military.rsi/icon-belt.png | Bin 0 -> 619 bytes .../icon-decor-contractor-tac.png | Bin 0 -> 750 bytes .../military.rsi/icon-decor-contractor.png | Bin 0 -> 745 bytes .../icon-decor-department-head.png | Bin 0 -> 619 bytes .../military.rsi/icon-decor-department.png | Bin 0 -> 678 bytes .../military.rsi/icon-decor-epaulets.png | Bin 0 -> 598 bytes .../icon-decor-shoulder-patch.png | Bin 0 -> 613 bytes .../military.rsi/inhand-left-base-bottom.png | Bin 0 -> 717 bytes .../inhand-left-base-top-jumpsuit.png | Bin 0 -> 824 bytes .../inhand-left-base-top-turtleneck.png | Bin 0 -> 849 bytes .../military.rsi/inhand-left-belt-buckle.png | Bin 0 -> 610 bytes .../military.rsi/inhand-left-belt.png | Bin 0 -> 642 bytes .../inhand-left-decor-contractor-tac.png | Bin 0 -> 804 bytes .../inhand-left-decor-contractor.png | Bin 0 -> 786 bytes .../inhand-left-decor-department-head.png | Bin 0 -> 638 bytes .../inhand-left-decor-department.png | Bin 0 -> 757 bytes .../inhand-left-decor-epaulets.png | Bin 0 -> 618 bytes .../inhand-left-decor-shoulder-patch.png | Bin 0 -> 632 bytes .../military.rsi/inhand-right-base-bottom.png | Bin 0 -> 727 bytes .../inhand-right-base-top-jumpsuit.png | Bin 0 -> 835 bytes .../inhand-right-base-top-turtleneck.png | Bin 0 -> 862 bytes .../military.rsi/inhand-right-belt-buckle.png | Bin 0 -> 606 bytes .../military.rsi/inhand-right-belt.png | Bin 0 -> 649 bytes .../inhand-right-decor-contractor-tac.png | Bin 0 -> 814 bytes .../inhand-right-decor-contractor.png | Bin 0 -> 799 bytes .../inhand-right-decor-department-head.png | Bin 0 -> 639 bytes .../inhand-right-decor-department.png | Bin 0 -> 768 bytes .../inhand-right-decor-epaulets.png | Bin 0 -> 612 bytes .../inhand-right-decor-shoulder-patch.png | Bin 0 -> 632 bytes .../Jumpsuit/military.rsi/mask_null.png | Bin 0 -> 109 bytes .../Uniforms/Jumpsuit/military.rsi/meta.json | 188 + ...uipped-BELT-bluespace-overlay-unshaded.png | Bin 0 -> 7156 bytes .../equipped-BELT-bluespace-overlay.png | Bin 0 -> 848 bytes .../construction_bag.rsi/equipped-BELT.png | Bin 0 -> 7190 bytes .../icon-bluespace-overlay-unshaded.png | Bin 0 -> 9094 bytes .../icon-bluespace-overlay.png | Bin 0 -> 11007 bytes .../Engineering/construction_bag.rsi/icon.png | Bin 0 -> 1176 bytes ...inhand-left-bluespace-overlay-unshaded.png | Bin 0 -> 8158 bytes .../inhand-left-bluespace-overlay.png | Bin 0 -> 8390 bytes .../construction_bag.rsi/inhand-left.png | Bin 0 -> 7049 bytes ...nhand-right-bluespace-overlay-unshaded.png | Bin 0 -> 8144 bytes .../inhand-right-bluespace-overlay.png | Bin 0 -> 8352 bytes .../construction_bag.rsi/inhand-right.png | Bin 0 -> 6924 bytes .../construction_bag.rsi/meta.json | 106 + .../vending_machine_restock.rsi/meta.json | 7 +- .../refill_nonlethal.png | Bin 0 -> 793 bytes .../nonlethalvend.rsi/broken.png | Bin 0 -> 1660 bytes .../nonlethalvend.rsi/deny-unshaded.png | Bin 0 -> 990 bytes .../nonlethalvend.rsi/eject-unshaded.png | Bin 0 -> 1072 bytes .../nonlethalvend.rsi/meta.json | 44 + .../nonlethalvend.rsi/normal-unshaded.png | Bin 0 -> 886 bytes .../VendingMachines/nonlethalvend.rsi/off.png | Bin 0 -> 1213 bytes .../nonlethalvend.rsi/panel.png | Bin 0 -> 255 bytes .../Structures/Storage/canister.rsi/air-1.png | Bin 0 -> 914 bytes .../Structures/Storage/canister.rsi/air.png | Bin 0 -> 961 bytes .../Storage/canister.rsi/ammonia-1.png | Bin 0 -> 1079 bytes .../Storage/canister.rsi/ammonia.png | Bin 0 -> 1064 bytes .../Storage/canister.rsi/black-1.png | Bin 329 -> 0 bytes .../Structures/Storage/canister.rsi/black.png | Bin 340 -> 0 bytes .../Storage/canister.rsi/blue-1.png | Bin 377 -> 0 bytes .../Structures/Storage/canister.rsi/blue.png | Bin 394 -> 0 bytes .../Storage/canister.rsi/can-connector.png | Bin 269 -> 560 bytes .../Storage/canister.rsi/can-o0.png | Bin 206 -> 170 bytes .../Storage/canister.rsi/can-o1.png | Bin 114 -> 119 bytes .../Storage/canister.rsi/can-o2.png | Bin 112 -> 123 bytes .../Storage/canister.rsi/can-o3.png | Bin 114 -> 119 bytes .../Storage/canister.rsi/can-oa1.png | Bin 144 -> 0 bytes .../Storage/canister.rsi/can-open.png | Bin 143 -> 196 bytes .../Storage/canister.rsi/carbon-1.png | Bin 0 -> 923 bytes .../Storage/canister.rsi/carbon.png | Bin 0 -> 947 bytes .../Storage/canister.rsi/carbon_liquid-1.png | Bin 0 -> 1033 bytes .../Storage/canister.rsi/carbon_liquid.png | Bin 0 -> 1034 bytes .../Storage/canister.rsi/darkblue-1.png | Bin 377 -> 0 bytes .../Storage/canister.rsi/darkblue.png | Bin 491 -> 0 bytes .../Storage/canister.rsi/frezon-1.png | Bin 377 -> 997 bytes .../Storage/canister.rsi/frezon.png | Bin 394 -> 1009 bytes .../Storage/canister.rsi/green-1.png | Bin 768 -> 0 bytes .../Structures/Storage/canister.rsi/green.png | Bin 688 -> 0 bytes .../Storage/canister.rsi/greenys-1.png | Bin 8022 -> 0 bytes .../Storage/canister.rsi/greenys.png | Bin 7818 -> 0 bytes .../Storage/canister.rsi/grey-1.png | Bin 324 -> 0 bytes .../Structures/Storage/canister.rsi/grey.png | Bin 341 -> 0 bytes .../Storage/canister.rsi/locked.png | Bin 4821 -> 118 bytes .../Structures/Storage/canister.rsi/meta.json | 61 +- .../Storage/canister.rsi/nitrogen-1.png | Bin 0 -> 987 bytes .../Storage/canister.rsi/nitrogen.png | Bin 0 -> 991 bytes .../canister.rsi/nitrogen_liquid-1.png | Bin 0 -> 1036 bytes .../Storage/canister.rsi/nitrogen_liquid.png | Bin 0 -> 1092 bytes .../Storage/canister.rsi/nitrous_oxide-1.png | Bin 0 -> 992 bytes .../Storage/canister.rsi/nitrous_oxide.png | Bin 0 -> 1010 bytes .../Storage/canister.rsi/orange-1.png | Bin 351 -> 0 bytes .../Storage/canister.rsi/orange.png | Bin 359 -> 0 bytes .../Storage/canister.rsi/oxygen-1.png | Bin 0 -> 996 bytes .../Storage/canister.rsi/oxygen.png | Bin 0 -> 980 bytes .../Storage/canister.rsi/oxygen_liquid-1.png | Bin 0 -> 1043 bytes .../Storage/canister.rsi/oxygen_liquid.png | Bin 0 -> 1080 bytes .../Storage/canister.rsi/plasma-1.png | Bin 0 -> 1108 bytes .../Storage/canister.rsi/plasma.png | Bin 0 -> 1161 bytes .../Structures/Storage/canister.rsi/red-1.png | Bin 352 -> 0 bytes .../Structures/Storage/canister.rsi/red.png | Bin 358 -> 0 bytes .../Storage/canister.rsi/redws-1.png | Bin 378 -> 0 bytes .../Structures/Storage/canister.rsi/redws.png | Bin 403 -> 0 bytes .../canister.rsi/scrubber-connector.png | Bin 303 -> 0 bytes .../Storage/canister.rsi/scrubber-open.png | Bin 138 -> 0 bytes .../Storage/canister.rsi/storage-1.png | Bin 0 -> 1093 bytes .../Storage/canister.rsi/storage.png | Bin 0 -> 1104 bytes .../Storage/canister.rsi/tritium-1.png | Bin 0 -> 1180 bytes .../Storage/canister.rsi/tritium.png | Bin 0 -> 1174 bytes .../Storage/canister.rsi/unlocked.png | Bin 4836 -> 118 bytes .../Storage/canister.rsi/water_vapor-1.png | Bin 329 -> 947 bytes .../Storage/canister.rsi/water_vapor.png | Bin 483 -> 983 bytes .../Storage/canister.rsi/yellow-1.png | Bin 367 -> 0 bytes .../Storage/canister.rsi/yellow.png | Bin 386 -> 0 bytes .../Wallmounts/signs.rsi/direction_cb1.png | Bin 0 -> 464 bytes .../Wallmounts/signs.rsi/direction_cb2.png | Bin 0 -> 473 bytes .../Wallmounts/signs.rsi/direction_cb3.png | Bin 0 -> 477 bytes .../Wallmounts/signs.rsi/direction_cb4.png | Bin 0 -> 475 bytes .../Wallmounts/signs.rsi/direction_nfsd.png | Bin 0 -> 462 bytes .../Wallmounts/signs.rsi/direction_shop.png | Bin 0 -> 477 bytes .../Wallmounts/signs.rsi/direction_vend.png | Bin 0 -> 510 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 128 +- 323 files changed, 51927 insertions(+), 1364 deletions(-) create mode 100644 Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml create mode 100644 Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs create mode 100644 Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs rename Content.Client/Nyanotrasen/Overlays/{Overlays => }/DogVisionSystem.cs (63%) delete mode 100644 Content.Client/Nyanotrasen/Overlays/Overlays/DogVisionOverlay.cs delete mode 100644 Content.Server/Paper/PenComponent.cs create mode 100644 Content.Server/Traits/Assorted/UncloneableComponent.cs create mode 100644 Content.Server/_NF/Auth/Auth.cs delete mode 100644 Content.Server/_NF/VulpLanguage/VulpLangaugeListenerComponent.cs delete mode 100644 Content.Server/_NF/VulpLanguage/VulpLanguageSpeakerComponent.cs delete mode 100644 Content.Server/_NF/VulpLanguage/VulpTranslatorComponent.cs create mode 100644 Content.Shared/DeltaV/CCVars/DCCVars.cs delete mode 100644 Content.Shared/Paper/PenComponent.cs create mode 100644 Content.Shared/_NF/Materials/Components/ConstructionMaterialsComponent.cs delete mode 100644 Content.Shared/_NF/VulpLangauge/VulpGiveTranslatorComponent.cs create mode 100644 Resources/Locale/en-US/_NF/navmap-beacons/station-beacons.ftl create mode 100644 Resources/Locale/en-US/_NF/paper/paper-component.ftl create mode 100644 Resources/Locale/en-US/_NF/pda/pda-component.ftl create mode 100644 Resources/Locale/en-US/deltav/escape-menu/options-menu.ftl create mode 100644 Resources/Maps/_NF/POI/trade.yml create mode 100644 Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml delete mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Devices/vulptranslator.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Uniforms/military_jumpsuits.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/Engineering/construction_bag.yml delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Boxes/pistol.yml rename Resources/Prototypes/_NF/Entities/Objects/Weapons/{ => Guns}/Ammunition/Cartridges/pistol.yml (96%) rename Resources/Prototypes/_NF/Entities/Objects/Weapons/{ => Guns}/Ammunition/Magazines/pistol.yml (97%) rename Resources/Prototypes/_NF/Entities/Objects/Weapons/{ => Guns}/Ammunition/Projectiles/chem.yml (100%) rename Resources/Prototypes/_NF/Entities/Objects/Weapons/{ => Guns}/Ammunition/Projectiles/pistol.yml (94%) rename Resources/Prototypes/_NF/{ => Entities}/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml (100%) rename Resources/Prototypes/_NF/Entities/Objects/Weapons/{ => Guns}/Ammunition/explosives.yml (100%) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Storage/Canisters/gas_canisters.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Wallmounts/switch.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Janitor/gloves.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Janitor/head.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Janitor/jumpsuit.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Janitor/outer.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Lawyer/jumpsuit.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Lawyer/neck.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/janitor_loadout_groups.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/lawyer_loadout_groups.yml create mode 100644 Resources/Prototypes/_NF/Maps/POI/trade.yml create mode 100644 Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml delete mode 100644 Resources/Prototypes/_NF/Traits/disabilities.yml create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/equipped-OUTERCLOTHING-cat.png create mode 100644 Resources/Textures/DeltaV/Effects/creampie.rsi/creampie_vulpkanin.png create mode 100644 Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Devices/vulp_translator.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Devices/vulp_translator.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon-flash.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/private_security.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/private_security.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-base-bottom.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-base-top-jumpsuit-tac.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-base-top-jumpsuit.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-base-top-turtleneck-alt.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-base-top-turtleneck.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-belt-buckle.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-belt.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-decor-contractor-tac.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-decor-contractor.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-decor-department-head.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-decor-department.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-decor-epaulets.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/equipped-decor-shoulder-patch.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-base-bottom.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-base-top-jumpsuit.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-base-top-turtleneck.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-belt-buckle.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-belt.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-decor-contractor-tac.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-decor-contractor.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-decor-department-head.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-decor-department.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-decor-epaulets.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/icon-decor-shoulder-patch.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-base-bottom.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-base-top-jumpsuit.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-base-top-turtleneck.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-belt-buckle.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-belt.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-decor-contractor-tac.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-decor-contractor.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-decor-department-head.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-decor-department.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-decor-epaulets.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-left-decor-shoulder-patch.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-base-bottom.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-base-top-jumpsuit.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-base-top-turtleneck.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-belt-buckle.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-belt.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-decor-contractor-tac.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-decor-contractor.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-decor-department-head.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-decor-department.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-decor-epaulets.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/inhand-right-decor-shoulder-patch.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/mask_null.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/military.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay-unshaded.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay-unshaded.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay-unshaded.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay-unshaded.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/air-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/air.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/ammonia-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/ammonia.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/black-1.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/black.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/blue-1.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/blue.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/can-oa1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon_liquid-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/carbon_liquid.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue-1.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/green-1.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/green.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys-1.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/grey-1.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/grey.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen_liquid-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrogen_liquid.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrous_oxide-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/nitrous_oxide.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/orange-1.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/orange.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen_liquid-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/oxygen_liquid.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/plasma-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/plasma.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/red-1.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/red.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/redws-1.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/redws.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-connector.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/storage-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/storage.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/tritium-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/tritium.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow-1.png delete mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_cb1.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_cb2.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_cb3.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_cb4.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_nfsd.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_shop.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_vend.png diff --git a/.github/mapchecker/whitelist.yml b/.github/mapchecker/whitelist.yml index 4c1374f6f6a..074857ab784 100644 --- a/.github/mapchecker/whitelist.yml +++ b/.github/mapchecker/whitelist.yml @@ -4,6 +4,7 @@ Nfsd: true LPBravo: true Cove: true Lodge: true +Trade: true #Cove: # - WallPlastitanium diff --git a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml b/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml new file mode 100644 index 00000000000..f1dae68077d --- /dev/null +++ b/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml @@ -0,0 +1,23 @@ + + + + + +