From 1b7830a871defd70db517fbc84810a489b0b2ba5 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 24 Nov 2024 04:37:28 +0000 Subject: [PATCH] upstream merge 15/11 (#2205) * Hotfix add debug info to traitor activation (#33119) * Add debug messages to traitor activation * more debug * change ShowHealthBars and ShowHealthIcons to use protoId (#32355) use protoId * Combat and survival knife storage/inhand sprites (#33111) * Adds storage sprites for combat knife and survival knife. Replaces inhand sprites. * Fixes meta.json copyright * Delete conveyor_old.rsi (#33102) * Fix broken computer white shadows (#33103) fix broken computer white shadows * Bugfix: Wielding now uses identity system. (#33134) Make wielding system use identity * Automatic changelog update * Collapsible ghost roles menu (#32717) * Make ghost roles collapsible * Save `BodyVisible` state of each `Collapsible` box * Make ghost role collapsible only when group has more than 1 role * Make it a little prettier * Make only ghost role buttons collapsible * Apply requested changes * Typo * Small cleanup * Store in list, instead of iterating * Make unique ids more unique * Move it out of the cycle * Make _collapsibleBoxes into dictionary and use key instead of Collapsible boxes names Added TODO. So after the problem will be fixed in `GhostRolesEui`, it should be mirrored and fixed here too. * Put TODO in GhostRolesEui. I guess Issue must be made for this * Use HashSet instead of Dictionary as suggested. Invert the HashSet, so being present means it uncollapsed I decided to invert HashSet to _uncollapsedStates, because players surely will have more collapsed buttons than opened, so we optimise memory usage a little bit. * Remove extra space from ghost roles window * Add buttons stretching. Size 3:1 * Automatic changelog update * Added Popup for the Ligneous plant mutation when using hands. (#33136) * Added Popup for the Ligneous plant mutation when using hands. There was some confusion for players with the Ligneous mutation which makes the plant harvestable only with sharp tools. Adding a popup with the message "The plant is too tough." to give them a hint to use something other than just their hands. I decided to only put the message when attempting to harvest using hands, as the intent is clear that the player just wanted to harvest, but wasn't able to. Using any other tools like a crowbar or a screwdriver will not trigger the popup. * Update Resources/Locale/en-US/botany/components/plant-holder-component.ftl Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> --------- Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> * Automatic changelog update * fix: Remove duplicate light blue towel from misc loadout (#33145) remove duplicate towel from misc loadout * Made the SpeciesChange mutation no longer transfer with Sterile Swabs. (#33126) Made the SpeciesChange mutation no longer persist. There was an issue where swabbing a mutated plant species: I.e Blood Tomato to a regular Tomato sapling would transfer the species mutation. It would not actually get the effect, which is probably why it went under the radar. This change makes it so that the SpeciesChange mutation cannot be transferred via swabbing. * make emergency lights (de)constructable (#32945) * add an emergency light node to the LightFixture construction graph * add a recipe entry to the construction menu for emergency light * make emergency light entity at the emergency light node on the graph * Make emergency light destroy to 1 steel and 1 glass shard to match the construction recipe Co-authored-by: BooleanBuckeye * Automatic changelog update * Fix: Web Clothing Butcher Issues (#33121) * Make boot web cost equal to one cloth * Make boots and coat butcher into web * Remove unneeded default * Automatic changelog update * Add Silicon Law cues to Every method a Silicon can have their laws change (#32887) * Silicon Law Sound cue refactor - Added CueEntityMind to Silicon Law system to more uniformally send sounds to minds - Switch all previous MindPlaySound to instead call to the new method * Change SiliconLawEui to cue the mind * CR: TryGetComponent and Change the Documentation - Remove GetComponentOrNull for _entityManager.TryGetComponent - Change SiliconLawProviderComponent.LawUploadSound to be more general rather than just referencing lawboards * Update Content.Server/Silicons/Laws/SiliconLawEui.cs * Update Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs * Silicon-law-cue-refactor - CR: - Roll the cuing into NotifyLawsChanged via an optional variable for the cue - Modify "SetLaws" to take in an optional soundProvider for the cue - modify Emagged, Ion, Eui and SetLaws to instead send the sound cue via NotifyLawsChanged --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Fix DisplayVotes doing nothing for a vote (#33170) * Automatic changelog update * Hunger and thirst huds fix (#32832) * Hunger and thirst huds fix * delete poor caching * Automatic changelog update * Don't show Reinforcement codewords on round end (#33181) Don't show unused codeword sets * Automatic changelog update * fix artifact debug assert (#33171) * fix artifact debug assert * do the same for EffectBigIron * 1 tab less * Fix AI in Intelicard can see through walls (#33177) setdrawfov added * Automatic changelog update * remove wanted list cartridge from captain PDA (#33084) remove wanted list from captain PDA * Automatic changelog update * make admeme mouse eternally hungry and thirsty by increasing decay rate (#33153) * make admeme mouse eternally hungry and thirsty by increasing decay rate * no starving slowdown, fix unnecessary declarations * REVERTUS DELETUS * Rework the Flare Gun & add a Security Shell Gun. (#32829) * Rework flaregun and add security shell gun * Make flare gun twice as likely to appear in emergency lockers * Security shell gun can now fire lethal shells like the flare gun used to be able to. * Rebalance the sec shell gun material cost to primarily be steel instead of plastic * Define the ShellShotgunLight tag in tags.yml * Leave the no lethal shells for normal flareguns to a different PR. * Move a comment to re-run checks. * Bye bye lethal shells from plastic guns. * Fix weird whitespace issue. * Make the sec shell gun inherit the normal flare gun. * Remove the rack verb and update the sec shell gun description * Remove the ability to fire lethals from flare guns, pending blowing up the gun --------- Co-authored-by: SlamBamActionman * Automatic changelog update * Changes to "Burst" firemode; Drozd, WT550 and C20-r (#31292) * Initial commit * Change burst fire variable to be a set value rather than a multiplier * Automatic changelog update * AI can now speak once more. (#33196) Yippee * Fixes Lambordeere bolt buttons not being connected (#33065) * fix * oops, used savemap instead of savegrid * Automatic changelog update * Fix research disk crash (#33205) * Fix reserach disk crash * remove extra whitespace * removed args.handled where args are not handled * Fix cursed mask bug (#33014) * One line fix * Removed redundant using * Allocation improvement * pass Actor to cartridge messages (#33210) * pass Actor to cartridge messages * NonSerialized gaming --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * cham projector fixes/rewrite (#27111) * cant disguise to thing in a container * copy cigarette visualiser * prevent aghost throwing an error * make disguises die in space * fuck it rewrite it to not use polymorph * fix action troll * oop * add vebr * add access to the components * 2/3 * fix * relay damage from disguise to user * fix integrity * :trollface: * :trollface: * m * kill integrity * fix a bug * review * remove them from component * relay flash effect to the disguise * fix icon being weird * change method since multiple systems cant handle same network event * :trollface: * actually network Disguise real --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Stable Merge (#33218) * dark green jumpsuit recolor, casual green jumpsuits added (#31710) * green * fix material arbitrage * lighter * Automatic changelog update * Add a Walking alert (#32954) * Initial commit * Review feedback changes * ProtoId * TempCommit * First attempt to have client alerts * Review changes * The Jumpsuit Re-Detailening (#33096) * jumpsuit detailening * jumpskirt stuff * meta.json * update meta.json * meta.json fix fix * meta.json fix fix fix * Intellicards now have a doAfter. (#33198) * init * cleanup * Oops! Forgot something * addressing changes * guh * guh 2.0 * some cleanup * all bless the intellicard * Yippee * small locale thing * changes + small bugfix --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Removed bola stam damage (#32989) * tweak: weather command tooltip (#33130) clear weather tip * Automatic changelog update * Goliath rebalance (#31492) Update asteroid.yml * Fix vape use without check if doafter cancelled (#33245) vape small fix * HOTFIX: Fix Security Shell Gun being uncraftable. (#33247) * Sec Shell Gun Craftability Hotfix * Capital Fix * Make the Flare Gun & Security Shell Gun be unbolted by default. (#33248) * Automatic changelog update * BUGFIX: Fix APEs being able to be turned on without power (#32493) Add a check to see the APC is powered before turning the emitter on. * Automatic changelog update * Separate CCVars into separate files * improve BiomeDunGen (#33113) * improve BiomeDunGen * forgot lol * Update DungeonJob.PostGenBiome.cs * Update DungeonJob.PostGenBiome.cs * Make Droppers Respect Closed/Sealed Containers (#33011) * Make droppers respect closed/sealed * Combine nested * Optimize conditions a bit * Automatic changelog update * Allow editing angle of the fired projectile (#33254) Add Angle datafield to `ProjectileComponent`. It allows to change the angle of the fired projectile * Fix unban/editing role bans placed in groups. (#30659) * On editing a roleban, get all the bans with the same time. * forgoten newline * Update to check for player ID too. * Automatic changelog update * Adds new sprites for shotgun shell boxes (#33176) * Adds new sprites for shotgun shell boxes * Adds second set of mag visuals for slug and uranium casings * Fixes yaml that I messed up * Changes credit to new username before merging happens * Added the ability to microwave inert flesh anomaly cores to turn into an anomalous meat mass (#33223) * First round of anomaly core functionalities added * Added sliceTime to anom meat mass and cooked version * Adds SmokeOnUse component, system and shared system, adds new functions to inert electrical anom core * Added more functions * Final touches to branch * Cleaning up some of the metadata for sprites and component definitions * PR_Changes_v2_rev.0_Final_FINALFORREALTHISTIME.yml * Lol jk these goddamn tests why me * Quick updates based on feedback * more changes to improve * additional fixes and edits * Changed tech core functionality * added magboot functionality to grav core * fixed issue with bluespace core sizing * Reverting changes per request * extra file to be deleted * File cleanup * Update chemicals.ftl * Update cores.yml * Update cores.yml * Update meta.json * Update chemicals.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> * Update meal_recipes.yml * Update cores.yml --------- Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> * Automatic changelog update * Window sprite tweaks (#33282) * add * yes * Automatic changelog update * tag:with toolshed command (#31751) * Automatic changelog update * Ethereal Jaunt Spell for Wizard & Jaunt ECS (#33201) * Act * Adds Jaunt ECS and related prototypes * Adds jaunt sounds * Adds enter and exit sound support to polymorphs * Updates jaunt description * Adds jaunt action sprite and changes jaunt polymorph to use it * Adds Jaunt and upgrade to the wizard grimoire * Makes base mob jaunt parent off of incorporeal and basemob, adds blue ghost sprite for ethereal jaunt * Update Resources/Locale/en-US/store/spellbook-catalog.ftl Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Polymorph/PolymorphPrototype.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Polymorph/PolymorphPrototype.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * removes meta changes * removes other meta changes * adds context menu and a description to basemobjaunt * comments for jaunt component and adds on component shutdown method * Update Content.Shared/Jaunt/JauntComponent.cs * Update Content.Shared/Jaunt/JauntComponent.cs * Update Content.Shared/Jaunt/JauntComponent.cs * Update Resources/Prototypes/Catalog/spellbook_catalog.yml --------- Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Update Label workflows to use new labels (#33310) * Update labeler.yml * Update labeler-needsreview.yml * Update labeler-staging.yml * Update labeler-stable.yml * Update labeler-untriaged.yml * Create labeler-size.yml * Update labeler-size.yml * Update labeler-size.yml * Update conflict-labeler.yml * Rename conflict-labeler.yml to labeler-conflict.yml * Fix mime broken vow alert (#33303) Swap VowAlert and VowBrokenAlert on lines 149 and 150 so that the proper alerts are cleared and shown * Automatic changelog update * Borg type switching. (#32586) * Borg type switching. This allows borgs (new spawn or constructed) to select their chassis type on creation, like in SS13. This removes the need for the many different chassis types, and means round-start borgs can actually play the game immediately instead of waiting for science to unlock everything. New borgs have an additional action that allows them to select their type. This opens a nice window with basic information about the borgs and a select button. Once a type has been selected it is permanent for that borg chassis. These borg types also immediately start the borg with specific modules, so they do not need to be printed. Additional modules can still be inserted for upgrades, though this is now less critical. The built-in modules cannot be removed, but are shown in the UI. The modules that each borg type starts with: * Generic: tools * Engineering: advanced tools, construction, RCD, cable * Salvage: Grappling gun, appraisal, mining * Janitor: cleaning, light replacer * Medical: treatment * Service: music, service, clowning Specialized borgs have 3 additional module slots available on top of the ones listed above, generic borgs have 5. Borg types are specified in a new BorgTypePrototype. These prototypes specify all information about the borg type. It is assigned to the borg entity through a mix of client side, server, and shared code. Some of the involved components were made networked, others are just ensured they're set on both sides of the wire. The most gnarly change is the inventory template prototype, which needs to change purely to modify the borg hat offset. I managed to bodge this in with an API that *probably* won't explode for specifically for this use case, but it's still not the most clean of API designs. Parts for specific borg chassis have been removed (so much deleted YAML) and specialized borg modules that are in the base set of a type have been removed from the exosuit fab as there's no point to printing those. The ability to "downgrade" a borg so it can select a new chassis, like in SS13, is something that would be nice, but was not high enough priority for me to block the feature on. I did keep it in mind with some of the code, so it may be possible in the future. There is no fancy animation when selecting borg types like in SS13, because I didn't think it was high priority, and it would add a lot of complex code. * Fix sandbox failure due to collection expression. * Module tweak Fix salvage borg modules still having research/lathe recipes Engie borg has regular tool module, not advanced. * Fix inventory system breakage * Fix migrations Some things were missing * Guidebook rewordings & review * MinWidth on confirm selection button * Automatic changelog update * change labeler sizes to powers of 2 * Note expiry time is now relative instead of using timestamps (#33262) * Add the stuff * Loc fix * fixes * Change * Automatic changelog update * Prevent Digiboard recycling (#33315) * add `HighRiskItem` tag * Correct tags Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Command external airlocks (#33333) add * remove our now duplicate command airlocks * New ruin variant (#33332) add * :trollface: * cvar gaming * fix yml linter * CONFLICT LABELER CONFLICT!!! * real * fix * change secborg thing so it doesnt log errors --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Milon Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: PJBot Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: Tr1bute Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Michael Krebs Co-authored-by: Boolean-Buckeye <36829021+Boolean-Buckeye@users.noreply.github.com> Co-authored-by: BooleanBuckeye Co-authored-by: Preston Smith <92108534+thetolbean@users.noreply.github.com> Co-authored-by: Zachary Higgs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com> Co-authored-by: Baptr0b0t <152836416+Baptr0b0t@users.noreply.github.com> Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Co-authored-by: SlamBamActionman Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: PopGamer46 Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> Co-authored-by: Jezithyr Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Armok <155400926+ARMOKS@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: Shaddap1 <106589956+Shaddap1@users.noreply.github.com> Co-authored-by: leonidussaks <42278348+leonidussaks@users.noreply.github.com> Co-authored-by: Andrew Montagne Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com> Co-authored-by: August Sun <45527070+august-sun@users.noreply.github.com> Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: dffdff2423 Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: CheddaCheez Co-authored-by: Pieter-Jan Briers Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> --- ...flict-labeler.yml => labeler-conflict.yml} | 0 .github/workflows/labeler-size.yml | 21 + .github/workflows/labeler-untriaged.yml | 2 + .../Administration/UI/Notes/NoteEdit.xaml | 1 + .../Administration/UI/Notes/NoteEdit.xaml.cs | 53 +- Content.Client/Alerts/ClientAlertsSystem.cs | 15 +- .../Clothing/ClientClothingSystem.cs | 24 +- .../Commands/ShowHealthBarsCommand.cs | 4 +- .../Effects/ColorFlashEffectSystem.cs | 10 + .../Inventory/ClientInventorySystem.cs | 16 +- Content.Client/Overlays/EquipmentHudSystem.cs | 3 +- .../Overlays/ShowHealthBarsSystem.cs | 7 + .../Overlays/ShowHealthIconsSystem.cs | 7 + .../Overlays/ShowThirstIconsSystem.cs | 2 +- .../Physics/Controllers/MoverController.cs | 16 + .../Systems/ChameleonProjectorSystem.cs | 8 + .../Silicons/Borgs/BorgMenu.xaml.cs | 3 +- .../Silicons/Borgs/BorgModuleControl.xaml.cs | 3 +- .../Silicons/Borgs/BorgSelectTypeMenu.xaml | 43 + .../Silicons/Borgs/BorgSelectTypeMenu.xaml.cs | 81 + .../Borgs/BorgSelectTypeUserInterface.cs | 30 + .../Borgs/BorgSwitchableTypeSystem.cs | 85 + Content.Client/Silicons/Borgs/BorgSystem.cs | 14 + .../Controls/Roles/GhostRoleButtonsBox.xaml | 9 + ...ry.xaml.cs => GhostRoleButtonsBox.xaml.cs} | 7 +- .../Controls/Roles/GhostRoleEntryButtons.xaml | 10 +- .../Controls/Roles/GhostRoleInfoBox.xaml | 8 + .../Controls/Roles/GhostRoleInfoBox.xaml.cs | 18 + .../Ghost/Controls/Roles/GhostRolesEntry.xaml | 16 - .../Ghost/Controls/Roles/GhostRolesEui.cs | 30 +- .../Controls/Roles/GhostRolesWindow.xaml.cs | 77 +- .../Weapons/Ranged/Systems/GunSystem.cs | 2 +- .../Abilities/Mime/MimePowersSystem.cs | 4 +- .../Administration/Toolshed/TagCommand.cs | 10 + Content.Server/Alert/ServerAlertsSystem.cs | 12 + Content.Server/Antag/AntagSelectionSystem.cs | 4 + .../Botany/Systems/PlantHolderSystem.cs | 3 + .../CartridgeLoader/CartridgeLoaderSystem.cs | 1 + .../Chemistry/EntitySystems/InjectorSystem.cs | 9 +- .../Clothing/Systems/CursedMaskSystem.cs | 3 +- Content.Server/Database/ServerDbBase.cs | 23 +- .../GameTicking/Rules/TraitorRuleSystem.cs | 34 +- .../EntitySystems/SmokingSystem.Vape.cs | 3 +- .../Glimmer/PassiveGlimmerReductionSystem.cs | 4 +- .../Nyanotrasen/Psionics/PsionicsSystem.cs | 4 +- .../Polymorph/Systems/PolymorphSystem.cs | 6 + .../DungeonJob/DungeonJob.PostGenBiome.cs | 25 +- .../Research/Disk/ResearchDiskSystem.cs | 1 + .../Borgs/BorgSwitchableTypeSystem.cs | 82 + .../Silicons/Borgs/BorgSystem.Modules.cs | 39 + .../Silicons/Borgs/BorgSystem.Transponder.cs | 17 + .../Silicons/Borgs/BorgSystem.Ui.cs | 3 + Content.Server/Silicons/Borgs/BorgSystem.cs | 15 +- Content.Server/Silicons/Laws/SiliconLawEui.cs | 6 +- .../Silicons/Laws/SiliconLawSystem.cs | 22 +- .../Silicons/StationAi/StationAiSystem.cs | 20 +- .../EntitySystems/EmitterSystem.cs | 3 +- .../StationEvents/EventManagerSystem.cs | 3 +- .../Thief/Systems/ThiefBeaconSystem.cs | 1 - Content.Server/Voting/Managers/VoteManager.cs | 5 +- .../Ranged/Systems/GunSystem.AutoFire.cs | 25 +- Content.Server/Weather/WeatherSystem.cs | 4 +- Content.Shared/Alert/AlertsComponent.cs | 16 +- Content.Shared/CCVar/CCVars.Accessibility.cs | 41 + Content.Shared/CCVar/CCVars.Admin.Ahelp.cs | 39 + Content.Shared/CCVar/CCVars.Admin.Logs.cs | 42 + Content.Shared/CCVar/CCVars.Admin.Rules.cs | 18 + Content.Shared/CCVar/CCVars.Admin.cs | 163 + Content.Shared/CCVar/CCVars.Atmos.cs | 153 + Content.Shared/CCVar/CCVars.Audio.cs | 61 + Content.Shared/CCVar/CCVars.Chat.Looc.cs | 26 + Content.Shared/CCVar/CCVars.Chat.Ooc.cs | 27 + Content.Shared/CCVar/CCVars.Chat.cs | 68 + Content.Shared/CCVar/CCVars.Config.cs | 35 + Content.Shared/CCVar/CCVars.Console.cs | 15 + Content.Shared/CCVar/CCVars.Crewmanifest.cs | 24 + Content.Shared/CCVar/CCVars.Database.cs | 77 + Content.Shared/CCVar/CCVars.Discord.cs | 61 + Content.Shared/CCVar/CCVars.Events.cs | 12 + Content.Shared/CCVar/CCVars.Explosion.cs | 108 + Content.Shared/CCVar/CCVars.Game.Infolinks.cs | 54 + Content.Shared/CCVar/CCVars.Game.cs | 336 ++ Content.Shared/CCVar/CCVars.Ghost.cs | 24 + Content.Shared/CCVar/CCVars.Hud.cs | 24 + Content.Shared/CCVar/CCVars.Ic.cs | 48 + Content.Shared/CCVar/CCVars.Interactions.cs | 54 + Content.Shared/CCVar/CCVars.Interface.cs | 24 + Content.Shared/CCVar/CCVars.Mapping.cs | 24 + Content.Shared/CCVar/CCVars.Midi.cs | 18 + Content.Shared/CCVar/CCVars.Misc.cs | 97 + Content.Shared/CCVar/CCVars.NPC.cs | 16 + Content.Shared/CCVar/CCVars.Net.cs | 15 + Content.Shared/CCVar/CCVars.Parallax.cs | 15 + Content.Shared/CCVar/CCVars.Physics.cs | 27 + Content.Shared/CCVar/CCVars.Radiation.cs | 32 + Content.Shared/CCVar/CCVars.Replays.cs | 43 + Content.Shared/CCVar/CCVars.Salvage.cs | 18 + Content.Shared/CCVar/CCVars.Server.cs | 43 + Content.Shared/CCVar/CCVars.Shuttle.cs | 176 ++ Content.Shared/CCVar/CCVars.Sounds.cs | 34 + Content.Shared/CCVar/CCVars.Status.cs | 13 + Content.Shared/CCVar/CCVars.Tips.cs | 40 + Content.Shared/CCVar/CCVars.Viewport.cs | 33 + Content.Shared/CCVar/CCVars.Vote.cs | 180 ++ Content.Shared/CCVar/CCVars.Whitelist.cs | 19 + Content.Shared/CCVar/CCVars.Worldgen.cs | 18 + Content.Shared/CCVar/CCVars.cs | 2431 +------------- .../CartridgeLoader/CartridgeUiMessage.cs | 3 + .../Chemistry/Components/InjectorComponent.cs | 9 + Content.Shared/DeltaV/CCVars/DCCVars.cs | 32 + .../Components/IntellicardComponent.cs | 39 + .../Interaction/InteractionPopupSystem.cs | 22 + .../Inventory/InventoryComponent.cs | 10 +- .../Inventory/InventorySystem.Slots.cs | 49 + Content.Shared/Jaunt/JauntComponent.cs | 26 + Content.Shared/Jaunt/JauntSystem.cs | 26 + .../Systems/SharedMoverController.Input.cs | 6 +- .../Nutrition/EntitySystems/HungerSystem.cs | 14 +- .../Nutrition/EntitySystems/ThirstSystem.cs | 27 +- .../Psionics/Glimmer/GlimmerSystem.cs | 6 +- .../Overlays/ShowHealthBarsComponent.cs | 10 +- .../Overlays/ShowHealthIconsComponent.cs | 11 +- .../Parallax/Biomes/SharedBiomeSystem.cs | 2 +- .../Components/ChameleonDisguiseComponent.cs | 4 +- .../Components/ChameleonDisguisedComponent.cs | 13 +- .../Components/ChameleonProjectorComponent.cs | 19 - .../Polymorph/PolymorphPrototype.cs | 13 + .../Systems/SharedChameleonProjectorSystem.cs | 97 +- .../Procedural/PostGeneration/BiomeDunGen.cs | 7 + .../Projectiles/ProjectileComponent.cs | 6 + .../Silicons/Borgs/BorgTypePrototype.cs | 161 + .../Borgs/Components/BorgChassisComponent.cs | 15 +- .../Borgs/Components/BorgModuleComponent.cs | 8 + .../Components/BorgSwitchableTypeComponent.cs | 72 + .../Borgs/SharedBorgSwitchableTypeSystem.cs | 125 + .../Silicons/Borgs/SharedBorgSystem.cs | 9 + .../Components/SiliconLawProviderComponent.cs | 2 +- .../StationAi/SharedStationAiSystem.Held.cs | 20 +- .../StationAi/SharedStationAiSystem.cs | 77 +- .../ChamberMagazineAmmoProviderComponent.cs | 6 + .../Weapons/Ranged/Components/GunComponent.cs | 33 +- .../SharedGunSystem.ChamberMagazine.cs | 7 +- .../Weapons/Ranged/Systems/SharedGunSystem.cs | 58 +- Content.Shared/Wieldable/WieldableSystem.cs | 7 +- Resources/Audio/Magic/attributions.yml | 4 +- Resources/Audio/Magic/ethereal_enter.ogg | Bin 0 -> 36619 bytes Resources/Audio/Magic/ethereal_exit.ogg | Bin 0 -> 42980 bytes Resources/Changelog/Admin.yml | 22 + Resources/Changelog/Changelog.yml | 442 ++- Resources/ConfigPresets/DeltaV/deltav.toml | 20 + .../en-US/administration/ui/admin-notes.ftl | 14 +- Resources/Locale/en-US/alerts/alerts.ftl | 3 + Resources/Locale/en-US/borg/borg.ftl | 37 + .../components/plant-holder-component.ftl | 1 + .../chameleon-projector.ftl | 1 + .../en-US/commands/toolshed-commands.ftl | 4 +- Resources/Locale/en-US/deltav/borg/borg.ftl | 3 + .../interaction-popup-component.ftl | 5 +- Resources/Locale/en-US/ghost/ghost-gui.ftl | 1 + .../Locale/en-US/intellicard/intellicard.ftl | 3 + .../Locale/en-US/silicons/station-ai.ftl | 2 + .../Locale/en-US/store/spellbook-catalog.ftl | 6 + Resources/Locale/en-US/weather/weather.ftl | 1 + Resources/Maps/Ruins/abandoned_outpost.yml | 2786 +++++++++++++++++ .../Shuttles/ShuttleEvent/lambordeere.yml | 8 + Resources/Migrations/migration.yml | 35 + Resources/Prototypes/Actions/borgs.yml | 12 + Resources/Prototypes/Actions/polymorph.yml | 50 + Resources/Prototypes/Alerts/alerts.yml | 9 + Resources/Prototypes/Body/Parts/silicon.yml | 47 +- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 2 +- .../Inventories/clothesmate.yml | 40 +- .../Prototypes/Catalog/spellbook_catalog.yml | 33 + .../Entities/Mobs/Cyborgs/borg_chassis.yml | 59 +- .../DeltaV/Entities/Mobs/Player/silicon.yml | 18 +- .../Specific/Robotics/borg_modules.yml | 14 - .../Objects/Specific/Robotics/borg_parts.yml | 102 - .../Structures/Doors/Airlocks/access.yml | 24 +- .../DeltaV/Recipes/Lathes/robotics.yml | 50 - Resources/Prototypes/DeltaV/borg_types.yml | 60 + .../Prototypes/Entities/Clothing/Eyes/hud.yml | 6 - .../Clothing/OuterClothing/wintercoats.yml | 4 + .../Entities/Clothing/Shoes/boots.yml | 4 + .../Clothing/Uniforms/color_jumpskirts.yml | 8 +- .../Clothing/Uniforms/color_jumpsuits.yml | 8 +- .../Entities/Clothing/Uniforms/jumpskirts.yml | 30 + .../Entities/Clothing/Uniforms/jumpsuits.yml | 30 + .../Mobs/Cyborgs/base_borg_chassis.yml | 7 + .../Entities/Mobs/Cyborgs/borg_chassis.yml | 328 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 7 +- .../Entities/Mobs/NPCs/asteroid.yml | 8 +- .../Entities/Mobs/Player/jaunt_mobs.yml | 40 + .../Entities/Mobs/Player/silicon.yml | 27 +- .../Entities/Objects/Consumable/Food/meat.yml | 59 + .../Objects/Devices/chameleon_projector.yml | 5 + .../Entities/Objects/Devices/pda.yml | 2 +- .../Entities/Objects/Misc/paper.yml | 4 + .../Objects/Specific/Robotics/borg_parts.yml | 503 --- .../Specific/Robotics/endoskeleton.yml | 200 +- .../Xenoarchaeology/structure_artifacts.yml | 115 +- .../Entities/Objects/Specific/chemistry.yml | 1 + .../Weapons/Guns/Ammunition/Boxes/shotgun.yml | 95 +- .../Guns/Ammunition/Cartridges/shotgun.yml | 20 + .../Objects/Weapons/Guns/SMGs/smgs.yml | 13 +- .../Objects/Weapons/Guns/flare_gun.yml | 76 +- .../Entities/Objects/Weapons/Melee/knife.yml | 6 + .../Objects/Weapons/Throwable/bola.yml | 6 +- .../Prototypes/Entities/Stations/base.yml | 15 +- .../Structures/Doors/Airlocks/access.yml | 22 + .../Structures/Lighting/base_lighting.yml | 31 + .../Entities/Structures/Machines/lathe.yml | 53 +- .../Structures/Specific/Anomaly/cores.yml | 6 +- Resources/Prototypes/GameRules/roundstart.yml | 8 +- .../Hydroponics/randomMutations.yml | 1 + .../Prototypes/InventoryTemplates/borg.yml | 3 +- .../Prototypes/Loadouts/loadout_groups.yml | 1 - Resources/Prototypes/Polymorphs/polymorph.yml | 16 + .../Construction/Graphs/food/steak.yml | 18 +- .../Construction/Graphs/machines/cyborg.yml | 225 +- .../Graphs/structures/lighting.yml | 25 +- .../Recipes/Construction/structures.yml | 18 + .../Recipes/Cooking/meal_recipes.yml | 24 + .../Recipes/Crafting/Graphs/web.yml | 4 +- .../Prototypes/Recipes/Lathes/robotics.yml | 220 -- .../Prototypes/Recipes/Lathes/security.yml | 9 + Resources/Prototypes/Research/arsenal.yml | 2 - .../Prototypes/Research/civilianservices.yml | 3 - Resources/Prototypes/Research/industrial.yml | 3 - .../Prototypes/Roles/Jobs/Science/borg.yml | 2 +- .../XenoArch/Effects/utility_effects.yml | 7 - Resources/Prototypes/borg_types.yml | 229 ++ Resources/Prototypes/tags.yml | 102 +- .../ServerInfo/Guidebook/Science/Cyborgs.xml | 16 +- .../color.rsi/equipped-INNERCLOTHING.png | Bin 518 -> 1068 bytes .../Uniforms/Jumpskirt/color.rsi/icon.png | Bin 300 -> 429 bytes .../Jumpskirt/color.rsi/inhand-left.png | Bin 391 -> 435 bytes .../Jumpskirt/color.rsi/inhand-right.png | Bin 408 -> 424 bytes .../Uniforms/Jumpskirt/color.rsi/meta.json | 2 +- .../color.rsi/prisoner-inhand-left.png | Bin 258 -> 221 bytes .../color.rsi/prisoner-inhand-right.png | Bin 259 -> 232 bytes .../trinkets-equipped-INNERCLOTHING.png | Bin 274 -> 292 bytes .../color.rsi/equipped-INNERCLOTHING.png | Bin 540 -> 1314 bytes .../Uniforms/Jumpsuit/color.rsi/icon.png | Bin 293 -> 387 bytes .../Jumpsuit/color.rsi/inhand-left.png | Bin 391 -> 451 bytes .../Jumpsuit/color.rsi/inhand-right.png | Bin 408 -> 437 bytes .../Uniforms/Jumpsuit/color.rsi/meta.json | 2 +- .../prisoner-equipped-INNERCLOTHING.png | Bin 365 -> 413 bytes .../Jumpsuit/color.rsi/prisoner-icon.png | Bin 232 -> 188 bytes .../color.rsi/prisoner-inhand-left.png | Bin 258 -> 221 bytes .../trinkets-equipped-INNERCLOTHING.png | Bin 265 -> 295 bytes .../Jumpsuit/color.rsi/trinkets-icon.png | Bin 235 -> 206 bytes .../color.rsi/trinkets-inhand-left.png | Bin 245 -> 198 bytes .../color.rsi/trinkets-inhand-right.png | Bin 251 -> 212 bytes .../Actions/actions_borg.rsi/meta.json | 5 +- .../Actions/actions_borg.rsi/select-type.png | Bin 0 -> 408 bytes .../Interface/Alerts/walking.rsi/meta.json | 14 + .../Interface/Alerts/walking.rsi/walking.png | Bin 0 -> 15838 bytes .../Food/meat.rsi/anomalymeat-cooked.png | Bin 0 -> 618 bytes .../Consumable/Food/meat.rsi/anomalymeat.png | Bin 0 -> 642 bytes .../Consumable/Food/meat.rsi/meta.json | 8 +- .../Objects/Magic/magicactions.rsi/jaunt.png | Bin 0 -> 431 bytes .../Objects/Magic/magicactions.rsi/meta.json | 5 +- .../Ammunition/Boxes/shotgun.rsi/base.png | Bin 0 -> 356 bytes .../Ammunition/Boxes/shotgun.rsi/beanbag.png | Bin 0 -> 268 bytes .../Ammunition/Boxes/shotgun.rsi/flare.png | Bin 0 -> 229 bytes .../Boxes/shotgun.rsi/incendiary.png | Bin 0 -> 233 bytes .../Ammunition/Boxes/shotgun.rsi/lethal.png | Bin 0 -> 263 bytes .../Ammunition/Boxes/shotgun.rsi/mag-1.png | Bin 0 -> 107 bytes .../Ammunition/Boxes/shotgun.rsi/mag-2.png | Bin 0 -> 134 bytes .../Ammunition/Boxes/shotgun.rsi/mag-3.png | Bin 0 -> 142 bytes .../Ammunition/Boxes/shotgun.rsi/mag-4.png | Bin 0 -> 155 bytes .../Boxes/shotgun.rsi/mag-alt-1.png | Bin 0 -> 106 bytes .../Boxes/shotgun.rsi/mag-alt-2.png | Bin 0 -> 127 bytes .../Boxes/shotgun.rsi/mag-alt-3.png | Bin 0 -> 135 bytes .../Boxes/shotgun.rsi/mag-alt-4.png | Bin 0 -> 151 bytes .../Ammunition/Boxes/shotgun.rsi/meta.json | 62 + .../Ammunition/Boxes/shotgun.rsi/practice.png | Bin 0 -> 221 bytes .../Ammunition/Boxes/shotgun.rsi/slug.png | Bin 0 -> 257 bytes .../Boxes/shotgun.rsi/tranquilizer.png | Bin 0 -> 292 bytes .../Ammunition/Boxes/shotgun.rsi/uranium.png | Bin 0 -> 249 bytes .../flaregun.rsi/{icon.png => base.png} | Bin .../Guns/Shotguns/flaregun.rsi/meta.json | 2 +- .../Shotguns/flaregun_security.rsi/base.png | Bin 0 -> 549 bytes .../flaregun_security.rsi/bolt-open.png | Bin 0 -> 574 bytes .../flaregun_security.rsi/equipped-BELT.png | Bin 0 -> 222 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 222 bytes .../flaregun_security.rsi/inhand-left.png | Bin 0 -> 419 bytes .../flaregun_security.rsi/inhand-right.png | Bin 0 -> 413 bytes .../Shotguns/flaregun_security.rsi/meta.json | 33 + .../Melee/combat_knife.rsi/inhand-left.png | Bin 291 -> 352 bytes .../Melee/combat_knife.rsi/inhand-right.png | Bin 275 -> 349 bytes .../Weapons/Melee/combat_knife.rsi/meta.json | 5 +- .../Melee/combat_knife.rsi/storage.png | Bin 0 -> 335 bytes .../Melee/survival_knife.rsi/inhand-left.png | Bin 308 -> 273 bytes .../Melee/survival_knife.rsi/inhand-right.png | Bin 306 -> 272 bytes .../Melee/survival_knife.rsi/meta.json | 49 +- .../Melee/survival_knife.rsi/storage.png | Bin 0 -> 307 bytes .../Machines/computers.rsi/broken.png | Bin 3576 -> 3542 bytes .../Windows/clockwork_diagonal.rsi/meta.json | 2 +- .../Windows/clockwork_diagonal.rsi/state0.png | Bin 1663 -> 2836 bytes .../Windows/clockwork_diagonal.rsi/state1.png | Bin 1681 -> 2833 bytes .../Windows/clockwork_window.rsi/cwindow0.png | Bin 1065 -> 2164 bytes .../Windows/clockwork_window.rsi/cwindow1.png | Bin 1060 -> 2128 bytes .../Windows/clockwork_window.rsi/cwindow2.png | Bin 1065 -> 2164 bytes .../Windows/clockwork_window.rsi/cwindow3.png | Bin 1060 -> 2128 bytes .../Windows/clockwork_window.rsi/cwindow4.png | Bin 1075 -> 2112 bytes .../Windows/clockwork_window.rsi/cwindow5.png | Bin 983 -> 2060 bytes .../Windows/clockwork_window.rsi/cwindow6.png | Bin 1075 -> 2112 bytes .../Windows/clockwork_window.rsi/cwindow7.png | Bin 1005 -> 2065 bytes .../Windows/clockwork_window.rsi/full.png | Bin 735 -> 1714 bytes .../Windows/clockwork_window.rsi/meta.json | 2 +- .../Structures/Windows/mining.rsi/full.png | Bin 837 -> 1811 bytes .../Structures/Windows/mining.rsi/meta.json | 2 +- .../Windows/mining.rsi/mwindow0.png | Bin 3765 -> 2248 bytes .../Windows/mining.rsi/mwindow1.png | Bin 3697 -> 2196 bytes .../Windows/mining.rsi/mwindow2.png | Bin 3765 -> 2248 bytes .../Windows/mining.rsi/mwindow3.png | Bin 3697 -> 2196 bytes .../Windows/mining.rsi/mwindow4.png | Bin 3706 -> 2175 bytes .../Windows/mining.rsi/mwindow5.png | Bin 3640 -> 2215 bytes .../Windows/mining.rsi/mwindow6.png | Bin 3706 -> 2175 bytes .../Windows/mining.rsi/mwindow7.png | Bin 3269 -> 1813 bytes .../Windows/mining_diagonal.rsi/meta.json | 2 +- .../Windows/mining_diagonal.rsi/state0.png | Bin 3037 -> 1299 bytes .../Windows/mining_diagonal.rsi/state1.png | Bin 3076 -> 1333 bytes .../Windows/plasma_diagonal.rsi/meta.json | 2 +- .../Windows/plasma_diagonal.rsi/state0.png | Bin 15748 -> 1644 bytes .../Windows/plasma_diagonal.rsi/state1.png | Bin 15665 -> 1603 bytes .../Windows/plasma_window.rsi/full.png | Bin 1597 -> 2843 bytes .../Windows/plasma_window.rsi/meta.json | 2 +- .../Windows/plasma_window.rsi/pwindow0.png | Bin 2063 -> 3469 bytes .../Windows/plasma_window.rsi/pwindow1.png | Bin 1099 -> 2334 bytes .../Windows/plasma_window.rsi/pwindow2.png | Bin 2063 -> 3469 bytes .../Windows/plasma_window.rsi/pwindow3.png | Bin 1099 -> 2334 bytes .../Windows/plasma_window.rsi/pwindow4.png | Bin 1161 -> 2402 bytes .../Windows/plasma_window.rsi/pwindow5.png | Bin 1064 -> 2294 bytes .../Windows/plasma_window.rsi/pwindow6.png | Bin 1161 -> 2402 bytes .../Windows/plasma_window.rsi/pwindow7.png | Bin 247 -> 1240 bytes .../Windows/plastitanium_window.rsi/full.png | Bin 506 -> 1500 bytes .../Windows/plastitanium_window.rsi/meta.json | 2 +- .../plastitanium_window.rsi/ptwindow0.png | Bin 1190 -> 2316 bytes .../plastitanium_window.rsi/ptwindow1.png | Bin 1006 -> 2083 bytes .../plastitanium_window.rsi/ptwindow2.png | Bin 1190 -> 2316 bytes .../plastitanium_window.rsi/ptwindow3.png | Bin 1006 -> 2083 bytes .../plastitanium_window.rsi/ptwindow4.png | Bin 1008 -> 2076 bytes .../plastitanium_window.rsi/ptwindow5.png | Bin 986 -> 2114 bytes .../plastitanium_window.rsi/ptwindow6.png | Bin 1008 -> 2076 bytes .../plastitanium_window.rsi/ptwindow7.png | Bin 641 -> 1668 bytes .../meta.json | 2 +- .../state0.png | Bin 3238 -> 1375 bytes .../state1.png | Bin 3208 -> 1343 bytes .../reinforced_plasma_diagonal.rsi/meta.json | 2 +- .../reinforced_plasma_diagonal.rsi/state0.png | Bin 15911 -> 1797 bytes .../reinforced_plasma_diagonal.rsi/state1.png | Bin 15885 -> 1790 bytes .../reinforced_plasma_window.rsi/full.png | Bin 2495 -> 3504 bytes .../reinforced_plasma_window.rsi/meta.json | 2 +- .../rpwindow0.png | Bin 2930 -> 4096 bytes .../rpwindow1.png | Bin 1696 -> 2864 bytes .../rpwindow2.png | Bin 2930 -> 4096 bytes .../rpwindow3.png | Bin 1696 -> 2864 bytes .../rpwindow4.png | Bin 1745 -> 2888 bytes .../rpwindow5.png | Bin 1695 -> 3021 bytes .../rpwindow6.png | Bin 1745 -> 2888 bytes .../rpwindow7.png | Bin 910 -> 2262 bytes .../reinforced_uranium_diagonal.rsi/meta.json | 2 +- .../state0.png | Bin 15734 -> 1662 bytes .../state1.png | Bin 15695 -> 1620 bytes .../reinforced_uranium_window.rsi/full.png | Bin 2067 -> 3028 bytes .../reinforced_uranium_window.rsi/meta.json | 2 +- .../ruwindow0.png | Bin 2366 -> 3323 bytes .../ruwindow1.png | Bin 1169 -> 2130 bytes .../ruwindow2.png | Bin 2342 -> 3323 bytes .../ruwindow3.png | Bin 1138 -> 2130 bytes .../ruwindow4.png | Bin 1133 -> 2102 bytes .../ruwindow5.png | Bin 1088 -> 2084 bytes .../ruwindow6.png | Bin 1129 -> 2102 bytes .../ruwindow7.png | Bin 267 -> 1240 bytes .../Windows/reinforced_window.rsi/full.png | Bin 2063 -> 3041 bytes .../Windows/reinforced_window.rsi/meta.json | 2 +- .../reinforced_window.rsi/rwindow0.png | Bin 2229 -> 3349 bytes .../reinforced_window.rsi/rwindow1.png | Bin 1148 -> 2163 bytes .../reinforced_window.rsi/rwindow2.png | Bin 2229 -> 3349 bytes .../reinforced_window.rsi/rwindow3.png | Bin 1148 -> 2163 bytes .../reinforced_window.rsi/rwindow4.png | Bin 1130 -> 2172 bytes .../reinforced_window.rsi/rwindow5.png | Bin 1025 -> 2041 bytes .../reinforced_window.rsi/rwindow6.png | Bin 1130 -> 2172 bytes .../reinforced_window.rsi/rwindow7.png | Bin 272 -> 1239 bytes .../reinforced_window_diagonal.rsi/meta.json | 2 +- .../reinforced_window_diagonal.rsi/state0.png | Bin 16179 -> 1573 bytes .../reinforced_window_diagonal.rsi/state1.png | Bin 16152 -> 1550 bytes .../Windows/shuttle_window.rsi/full.png | Bin 707 -> 1779 bytes .../Windows/shuttle_window.rsi/meta.json | 2 +- .../Windows/shuttle_window.rsi/swindow0.png | Bin 1080 -> 2278 bytes .../Windows/shuttle_window.rsi/swindow1.png | Bin 881 -> 2146 bytes .../Windows/shuttle_window.rsi/swindow2.png | Bin 1080 -> 2278 bytes .../Windows/shuttle_window.rsi/swindow3.png | Bin 881 -> 2146 bytes .../Windows/shuttle_window.rsi/swindow4.png | Bin 912 -> 2166 bytes .../Windows/shuttle_window.rsi/swindow5.png | Bin 857 -> 2168 bytes .../Windows/shuttle_window.rsi/swindow6.png | Bin 912 -> 2166 bytes .../Windows/shuttle_window.rsi/swindow7.png | Bin 412 -> 1871 bytes .../shuttle_window_diagonal.rsi/meta.json | 2 +- .../shuttle_window_diagonal.rsi/state0.png | Bin 15523 -> 1475 bytes .../shuttle_window_diagonal.rsi/state1.png | Bin 15473 -> 1423 bytes .../Windows/tinted_window.rsi/full.png | Bin 9436 -> 3495 bytes .../Windows/tinted_window.rsi/meta.json | 2 +- .../Windows/tinted_window.rsi/twindow0.png | Bin 10814 -> 4035 bytes .../Windows/tinted_window.rsi/twindow1.png | Bin 8214 -> 2719 bytes .../Windows/tinted_window.rsi/twindow2.png | Bin 10815 -> 4035 bytes .../Windows/tinted_window.rsi/twindow3.png | Bin 8477 -> 2719 bytes .../Windows/tinted_window.rsi/twindow4.png | Bin 8217 -> 2692 bytes .../Windows/tinted_window.rsi/twindow5.png | Bin 6896 -> 2318 bytes .../Windows/tinted_window.rsi/twindow6.png | Bin 8464 -> 2692 bytes .../Windows/tinted_window.rsi/twindow7.png | Bin 4882 -> 1661 bytes .../Windows/uranium_window.rsi/full.png | Bin 1321 -> 2364 bytes .../Windows/uranium_window.rsi/meta.json | 2 +- .../Windows/uranium_window.rsi/uwindow0.png | Bin 1688 -> 2857 bytes .../Windows/uranium_window.rsi/uwindow1.png | Bin 1225 -> 2288 bytes .../Windows/uranium_window.rsi/uwindow2.png | Bin 1688 -> 2857 bytes .../Windows/uranium_window.rsi/uwindow3.png | Bin 1225 -> 2288 bytes .../Windows/uranium_window.rsi/uwindow4.png | Bin 1216 -> 2251 bytes .../Windows/uranium_window.rsi/uwindow5.png | Bin 795 -> 1872 bytes .../Windows/uranium_window.rsi/uwindow6.png | Bin 1229 -> 2251 bytes .../Windows/uranium_window.rsi/uwindow7.png | Bin 297 -> 1281 bytes .../uranium_window_diagonal.rsi/meta.json | 2 +- .../uranium_window_diagonal.rsi/state0.png | Bin 15629 -> 1572 bytes .../uranium_window_diagonal.rsi/state1.png | Bin 15604 -> 1539 bytes .../Structures/Windows/window.rsi/full.png | Bin 1224 -> 2279 bytes .../Structures/Windows/window.rsi/meta.json | 2 +- .../Structures/Windows/window.rsi/window0.png | Bin 1632 -> 2748 bytes .../Structures/Windows/window.rsi/window1.png | Bin 1183 -> 2217 bytes .../Structures/Windows/window.rsi/window2.png | Bin 1632 -> 2748 bytes .../Structures/Windows/window.rsi/window3.png | Bin 1183 -> 2217 bytes .../Structures/Windows/window.rsi/window4.png | Bin 1187 -> 2213 bytes .../Structures/Windows/window.rsi/window5.png | Bin 800 -> 1810 bytes .../Structures/Windows/window.rsi/window6.png | Bin 1187 -> 2213 bytes .../Structures/Windows/window.rsi/window7.png | Bin 301 -> 1240 bytes .../Windows/window_diagonal.rsi/meta.json | 2 +- .../Windows/window_diagonal.rsi/state0.png | Bin 15988 -> 1329 bytes .../Windows/window_diagonal.rsi/state1.png | Bin 15966 -> 1285 bytes .../conveyor_old.rsi/conveyor_loose.png | Bin 286 -> 0 bytes .../conveyor_old.rsi/conveyor_started_ccw.png | Bin 4389 -> 0 bytes .../conveyor_started_ccw_r.png | Bin 4440 -> 0 bytes .../conveyor_old.rsi/conveyor_started_cw.png | Bin 4434 -> 0 bytes .../conveyor_started_cw_r.png | Bin 4464 -> 0 bytes .../conveyor_old.rsi/conveyor_stopped_ccw.png | Bin 1687 -> 0 bytes .../conveyor_old.rsi/conveyor_stopped_cw.png | Bin 1689 -> 0 bytes .../Structures/conveyor_old.rsi/meta.json | 238 -- 447 files changed, 8712 insertions(+), 5259 deletions(-) rename .github/workflows/{conflict-labeler.yml => labeler-conflict.yml} (100%) create mode 100644 .github/workflows/labeler-size.yml create mode 100644 Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml create mode 100644 Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs create mode 100644 Content.Client/Silicons/Borgs/BorgSelectTypeUserInterface.cs create mode 100644 Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs create mode 100644 Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml rename Content.Client/UserInterface/Systems/Ghost/Controls/Roles/{GhostRolesEntry.xaml.cs => GhostRoleButtonsBox.xaml.cs} (86%) create mode 100644 Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml create mode 100644 Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml.cs delete mode 100644 Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml create mode 100644 Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs create mode 100644 Content.Shared/CCVar/CCVars.Accessibility.cs create mode 100644 Content.Shared/CCVar/CCVars.Admin.Ahelp.cs create mode 100644 Content.Shared/CCVar/CCVars.Admin.Logs.cs create mode 100644 Content.Shared/CCVar/CCVars.Admin.Rules.cs create mode 100644 Content.Shared/CCVar/CCVars.Admin.cs create mode 100644 Content.Shared/CCVar/CCVars.Atmos.cs create mode 100644 Content.Shared/CCVar/CCVars.Audio.cs create mode 100644 Content.Shared/CCVar/CCVars.Chat.Looc.cs create mode 100644 Content.Shared/CCVar/CCVars.Chat.Ooc.cs create mode 100644 Content.Shared/CCVar/CCVars.Chat.cs create mode 100644 Content.Shared/CCVar/CCVars.Config.cs create mode 100644 Content.Shared/CCVar/CCVars.Console.cs create mode 100644 Content.Shared/CCVar/CCVars.Crewmanifest.cs create mode 100644 Content.Shared/CCVar/CCVars.Database.cs create mode 100644 Content.Shared/CCVar/CCVars.Discord.cs create mode 100644 Content.Shared/CCVar/CCVars.Events.cs create mode 100644 Content.Shared/CCVar/CCVars.Explosion.cs create mode 100644 Content.Shared/CCVar/CCVars.Game.Infolinks.cs create mode 100644 Content.Shared/CCVar/CCVars.Game.cs create mode 100644 Content.Shared/CCVar/CCVars.Ghost.cs create mode 100644 Content.Shared/CCVar/CCVars.Hud.cs create mode 100644 Content.Shared/CCVar/CCVars.Ic.cs create mode 100644 Content.Shared/CCVar/CCVars.Interactions.cs create mode 100644 Content.Shared/CCVar/CCVars.Interface.cs create mode 100644 Content.Shared/CCVar/CCVars.Mapping.cs create mode 100644 Content.Shared/CCVar/CCVars.Midi.cs create mode 100644 Content.Shared/CCVar/CCVars.Misc.cs create mode 100644 Content.Shared/CCVar/CCVars.NPC.cs create mode 100644 Content.Shared/CCVar/CCVars.Net.cs create mode 100644 Content.Shared/CCVar/CCVars.Parallax.cs create mode 100644 Content.Shared/CCVar/CCVars.Physics.cs create mode 100644 Content.Shared/CCVar/CCVars.Radiation.cs create mode 100644 Content.Shared/CCVar/CCVars.Replays.cs create mode 100644 Content.Shared/CCVar/CCVars.Salvage.cs create mode 100644 Content.Shared/CCVar/CCVars.Server.cs create mode 100644 Content.Shared/CCVar/CCVars.Shuttle.cs create mode 100644 Content.Shared/CCVar/CCVars.Sounds.cs create mode 100644 Content.Shared/CCVar/CCVars.Status.cs create mode 100644 Content.Shared/CCVar/CCVars.Tips.cs create mode 100644 Content.Shared/CCVar/CCVars.Viewport.cs create mode 100644 Content.Shared/CCVar/CCVars.Vote.cs create mode 100644 Content.Shared/CCVar/CCVars.Whitelist.cs create mode 100644 Content.Shared/CCVar/CCVars.Worldgen.cs create mode 100644 Content.Shared/Intellicard/Components/IntellicardComponent.cs create mode 100644 Content.Shared/Jaunt/JauntComponent.cs create mode 100644 Content.Shared/Jaunt/JauntSystem.cs create mode 100644 Content.Shared/Silicons/Borgs/BorgTypePrototype.cs create mode 100644 Content.Shared/Silicons/Borgs/Components/BorgSwitchableTypeComponent.cs create mode 100644 Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs create mode 100644 Resources/Audio/Magic/ethereal_enter.ogg create mode 100644 Resources/Audio/Magic/ethereal_exit.ogg create mode 100644 Resources/Locale/en-US/deltav/borg/borg.ftl create mode 100644 Resources/Locale/en-US/intellicard/intellicard.ftl create mode 100644 Resources/Maps/Ruins/abandoned_outpost.yml delete mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml create mode 100644 Resources/Prototypes/DeltaV/borg_types.yml create mode 100644 Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml create mode 100644 Resources/Prototypes/borg_types.yml create mode 100644 Resources/Textures/Interface/Actions/actions_borg.rsi/select-type.png create mode 100644 Resources/Textures/Interface/Alerts/walking.rsi/meta.json create mode 100644 Resources/Textures/Interface/Alerts/walking.rsi/walking.png create mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat-cooked.png create mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat.png create mode 100644 Resources/Textures/Objects/Magic/magicactions.rsi/jaunt.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-alt-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/practice.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/slug.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/tranquilizer.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/uranium.png rename Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/{icon.png => base.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/bolt-open.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/storage.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/storage.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_loose.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw_r.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw_r.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_ccw.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_cw.png delete mode 100644 Resources/Textures/Structures/conveyor_old.rsi/meta.json diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/labeler-conflict.yml similarity index 100% rename from .github/workflows/conflict-labeler.yml rename to .github/workflows/labeler-conflict.yml diff --git a/.github/workflows/labeler-size.yml b/.github/workflows/labeler-size.yml new file mode 100644 index 00000000000..418faed79b8 --- /dev/null +++ b/.github/workflows/labeler-size.yml @@ -0,0 +1,21 @@ +name: "Labels: Size" +on: pull_request_target +jobs: + size-label: + runs-on: ubuntu-latest + steps: + - name: size-label + uses: "pascalgn/size-label-action@v0.5.5" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + with: + # Custom size configuration + # DeltaV: changed to powers of 4 + sizes: > + { + "0": "XS", + "16": "S", + "64": "M", + "256": "L", + "1024": "XL" + } diff --git a/.github/workflows/labeler-untriaged.yml b/.github/workflows/labeler-untriaged.yml index 22554d05650..ec1d194851c 100644 --- a/.github/workflows/labeler-untriaged.yml +++ b/.github/workflows/labeler-untriaged.yml @@ -3,6 +3,8 @@ on: issues: types: [opened] + pull_request_target: + types: [opened] jobs: add_label: diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml b/Content.Client/Administration/UI/Notes/NoteEdit.xaml index 506abac540c..72b2c55ce8d 100644 --- a/Content.Client/Administration/UI/Notes/NoteEdit.xaml +++ b/Content.Client/Administration/UI/Notes/NoteEdit.xaml @@ -8,6 +8,7 @@