From 2d0eb63116ebe967edf96f77b62a798c35cc3939 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 21 Nov 2024 22:44:59 -0300 Subject: [PATCH 1/5] Add the pills + canisters --- .../Objects/Specific/Medical/healing.yml | 278 ++++++++++++++++++ 1 file changed, 278 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml new file mode 100644 index 00000000000..bf8f807a163 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml @@ -0,0 +1,278 @@ +- type: entity + suffix: Serenitol 10u + parent: Pill + id: PillSerenitol + components: + - type: Pill + pillType: 9 + - type: Sprite + state: pill10 + - type: Label + currentLabel: serenitol 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Serenitol + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterSerenitol + suffix: Serenitol 10u, 5 + components: + - type: Label + currentLabel: serenitol 10u + - type: StorageFill + contents: + - id: PillSerenitol + amount: 5 + +- type: entity + suffix: Neurozenium 10u + parent: Pill + id: PillNeurozenium + components: + - type: Pill + pillType: 7 + - type: Sprite + state: pill8 + - type: Label + currentLabel: neurozenium 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Neurozenium + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterNeurozenium + suffix: Neurozenium 10u, 5 + components: + - type: Label + currentLabel: neurozenium 10u + - type: StorageFill + contents: + - id: PillNeurozenium + amount: 5 + +- type: entity + suffix: Equilibrazine 5u + parent: Pill + id: PillEquilibrazine + components: + - type: Pill + pillType: 1 + - type: Sprite + state: pill2 + - type: Label + currentLabel: equilibrazine 5u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Equilibrazine + Quantity: 5 + +- type: entity + parent: PillCanister + id: PillCanisterEquilibrazine + suffix: Equilibrazine 5u, 5 + components: + - type: Label + currentLabel: equilibrazine 5u + - type: StorageFill + contents: + - id: PillEquilibrazine + amount: 5 + +- type: entity + suffix: Blissifylovene 5u + parent: Pill + id: PillBlissifylovene + components: + - type: Pill + pillType: 6 + - type: Sprite + state: pill7 + - type: Label + currentLabel: blissifylovene 5u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Blissifylovene + Quantity: 5 + +- type: entity + parent: PillCanister + id: PillCanisterBlissifylovene + suffix: Blissifylovene 5u, 5 + components: + - type: Label + currentLabel: blissifylovene 5u + - type: StorageFill + contents: + - id: PillBlissifylovene + amount: 5 + +- type: entity + suffix: Calmafluxine 10u + parent: Pill + id: PillCalmafluxine + components: + - type: Pill + pillType: 14 + - type: Sprite + state: pill15 + - type: Label + currentLabel: calmafluxine 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Calmafluxine + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterCalmafluxine + suffix: Calmafluxine 10u, 5 + components: + - type: Label + currentLabel: calmafluxine 10u + - type: StorageFill + contents: + - id: PillCalmafluxine + amount: 5 + +- type: entity + suffix: Tranquinase 10u + parent: Pill + id: PillTranquinase + components: + - type: Pill + pillType: 15 + - type: Sprite + state: pill16 + - type: Label + currentLabel: tranquinase 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Tranquinase + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterTranquinase + suffix: Tranquinase 10u, 5 + components: + - type: Label + currentLabel: tranquinase 10u + - type: StorageFill + contents: + - id: PillTranquinase + amount: 5 + +- type: entity + suffix: Stubantazine 10u + parent: Pill + id: PillStubantazine + components: + - type: Pill + pillType: 2 + - type: Sprite + state: pill3 + - type: Label + currentLabel: stubantazine 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Stubantazine + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterStubantazine + suffix: Stubantazine 10u, 5 + components: + - type: Label + currentLabel: stubantazine 10u + - type: StorageFill + contents: + - id: PillStubantazine + amount: 5 + +- type: entity + suffix: Soretizone 5u + parent: Pill + id: PillSoretizone + components: + - type: Pill + pillType: 17 + - type: Sprite + state: pill18 + - type: Label + currentLabel: soretizone 5u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Soretizone + Quantity: 5 + +- type: entity + parent: PillCanister + id: PillCanisterSoretizone + suffix: Soretizone 5u, 5 + components: + - type: Label + currentLabel: soretizone 5u + - type: StorageFill + contents: + - id: PillSoretizone + amount: 5 + +- type: entity + suffix: agonolexyne 5u + parent: Pill + id: PillAgonolexyne + components: + - type: Pill + pillType: 19 + - type: Sprite + state: pill20 + - type: Label + currentLabel: agonolexyne 5u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Agonolexyne + Quantity: 5 + +- type: entity + parent: PillCanister + id: PillCanisterAgonolexyne + suffix: Agonolexyne 5u, 5 + components: + - type: Label + currentLabel: agonolexyne 5u + - type: StorageFill + contents: + - id: PillAgonolexyne + amount: 5 From e4ed00b0ef8e0abe6de77f443ea74b170c1f2c69 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Fri, 22 Nov 2024 21:56:41 -0300 Subject: [PATCH 2/5] less evil YAML --- .../Objects/Specific/Medical/healing.yml | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml index bf8f807a163..87fade0c85e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml @@ -1,12 +1,12 @@ - type: entity - suffix: Serenitol 10u parent: Pill id: PillSerenitol + suffix: Serenitol 10u components: - - type: Pill - pillType: 9 - type: Sprite state: pill10 + - type: Pill + pillType: 9 - type: Label currentLabel: serenitol 10u - type: SolutionContainerManager @@ -30,14 +30,14 @@ amount: 5 - type: entity - suffix: Neurozenium 10u parent: Pill id: PillNeurozenium + suffix: Neurozenium 10u components: - - type: Pill - pillType: 7 - type: Sprite state: pill8 + - type: Pill + pillType: 7 - type: Label currentLabel: neurozenium 10u - type: SolutionContainerManager @@ -61,14 +61,14 @@ amount: 5 - type: entity - suffix: Equilibrazine 5u parent: Pill id: PillEquilibrazine + suffix: Equilibrazine 5u components: - - type: Pill - pillType: 1 - type: Sprite state: pill2 + - type: Pill + pillType: 1 - type: Label currentLabel: equilibrazine 5u - type: SolutionContainerManager @@ -92,14 +92,14 @@ amount: 5 - type: entity - suffix: Blissifylovene 5u parent: Pill id: PillBlissifylovene + suffix: Blissifylovene 5u components: - - type: Pill - pillType: 6 - type: Sprite state: pill7 + - type: Pill + pillType: 6 - type: Label currentLabel: blissifylovene 5u - type: SolutionContainerManager @@ -123,14 +123,14 @@ amount: 5 - type: entity - suffix: Calmafluxine 10u parent: Pill id: PillCalmafluxine + suffix: Calmafluxine 10u components: - - type: Pill - pillType: 14 - type: Sprite state: pill15 + - type: Pill + pillType: 14 - type: Label currentLabel: calmafluxine 10u - type: SolutionContainerManager @@ -154,14 +154,14 @@ amount: 5 - type: entity - suffix: Tranquinase 10u parent: Pill id: PillTranquinase + suffix: Tranquinase 10u components: - - type: Pill - pillType: 15 - type: Sprite state: pill16 + - type: Pill + pillType: 15 - type: Label currentLabel: tranquinase 10u - type: SolutionContainerManager @@ -185,14 +185,14 @@ amount: 5 - type: entity - suffix: Stubantazine 10u parent: Pill id: PillStubantazine + suffix: Stubantazine 10u components: - - type: Pill - pillType: 2 - type: Sprite state: pill3 + - type: Pill + pillType: 2 - type: Label currentLabel: stubantazine 10u - type: SolutionContainerManager @@ -216,14 +216,14 @@ amount: 5 - type: entity - suffix: Soretizone 5u parent: Pill id: PillSoretizone + suffix: Soretizone 5u components: - - type: Pill - pillType: 17 - type: Sprite state: pill18 + - type: Pill + pillType: 17 - type: Label currentLabel: soretizone 5u - type: SolutionContainerManager @@ -247,14 +247,14 @@ amount: 5 - type: entity - suffix: agonolexyne 5u parent: Pill id: PillAgonolexyne + suffix: agonolexyne 5u components: - - type: Pill - pillType: 19 - type: Sprite state: pill20 + - type: Pill + pillType: 19 - type: Label currentLabel: agonolexyne 5u - type: SolutionContainerManager From 6dee3bfd4708d6bd690b4ffeb08c970e3da4846a Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 24 Nov 2024 10:28:32 -0300 Subject: [PATCH 3/5] Merge conflict --- .../Objects/Specific/Medical/healing.yml | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml index 87fade0c85e..bd0bfd5f580 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml @@ -1,3 +1,34 @@ +- type: entity + parent: Pill + id: PillSoretizone + suffix: Soretizone 10u + components: + - type: Pill + pillType: 14 + - type: Sprite + state: pill15 + - type: Label + currentLabel: soretizone 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Soretizone + Quantity: 10 + +- type: entity + parent: PillCanister + id: PillCanisterSoretizone + suffix: Soretizone 10u, 5 + components: + - type: Label + currentLabel: soretizone 10u + - type: StorageFill + contents: + - id: PillSoretizone + amount: 5 + - type: entity parent: Pill id: PillSerenitol @@ -215,37 +246,6 @@ - id: PillStubantazine amount: 5 -- type: entity - parent: Pill - id: PillSoretizone - suffix: Soretizone 5u - components: - - type: Sprite - state: pill18 - - type: Pill - pillType: 17 - - type: Label - currentLabel: soretizone 5u - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Soretizone - Quantity: 5 - -- type: entity - parent: PillCanister - id: PillCanisterSoretizone - suffix: Soretizone 5u, 5 - components: - - type: Label - currentLabel: soretizone 5u - - type: StorageFill - contents: - - id: PillSoretizone - amount: 5 - - type: entity parent: Pill id: PillAgonolexyne From 895223fbf247980a59761734400c1e5ddd777c60 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 24 Nov 2024 13:19:59 -0300 Subject: [PATCH 4/5] Revert "True merge conflict?" --- ...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 +- Content.IntegrationTests/Tests/CargoTest.cs | 1 + .../Minds/MindTest.DeleteAllThenGhost.cs | 1 + .../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 + .../Power/Components/ChargerComponent.cs | 12 + .../Power/EntitySystems/ChargerSystem.cs | 25 +- .../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 +- .../Whitelist/EntityWhitelistSystem.cs | 14 + 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/Changelog/DeltaVChangelog.yml | 165 +- Resources/ConfigPresets/DeltaV/deltav.toml | 20 + Resources/Credits/GitHub.txt | 2 +- .../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 + .../communications-console-component.ftl | 1 + .../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 +- .../Catalog/Fills/Lockers/heads.yml | 2 +- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 2 +- .../Inventories/clothesmate.yml | 40 +- .../Prototypes/Catalog/spellbook_catalog.yml | 33 + Resources/Prototypes/Damage/modifier_sets.yml | 2 +- .../Markers/Spawners/Random/solar.yml | 15 + .../Entities/Mobs/Cyborgs/borg_chassis.yml | 59 +- .../DeltaV/Entities/Mobs/Player/silicon.yml | 16 +- .../DeltaV/Entities/Objects/Misc/books.yml | 3 +- .../Objects/Specific/Medical/healing.yml | 30 - .../Specific/Robotics/borg_modules.yml | 14 - .../Objects/Specific/Robotics/borg_parts.yml | 102 - .../Weapons/Guns/Battery/battery_guns.yml | 4 +- .../Structures/Doors/Airlocks/access.yml | 24 +- .../DeltaV/Recipes/Lathes/robotics.yml | 50 - .../Prototypes/DeltaV/Traits/disabilities.yml | 1 + Resources/Prototypes/DeltaV/borg_types.yml | 62 + .../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 | 29 +- .../Prototypes/Entities/Mobs/Species/moth.yml | 2 +- .../Entities/Objects/Consumable/Food/meat.yml | 59 + .../Syndicate_Gadgets/war_declarator.yml | 1 + .../Objects/Devices/chameleon_projector.yml | 5 + .../Entities/Objects/Devices/pda.yml | 2 +- .../Entities/Objects/Misc/paper.yml | 4 + .../Objects/Power/portable_recharger.yml | 38 + .../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 + .../Machines/Computers/computers.yml | 4 +- .../Entities/Structures/Machines/lathe.yml | 55 +- .../Structures/Specific/Anomaly/cores.yml | 6 +- Resources/Prototypes/GameRules/events.yml | 2 + 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 | 30 +- Resources/Prototypes/Research/arsenal.yml | 7 +- .../Prototypes/Research/civilianservices.yml | 3 - Resources/Prototypes/Research/industrial.yml | 3 - Resources/Prototypes/Roles/Antags/nukeops.yml | 4 +- .../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 .../Objects/Misc/books.rsi/icon_kiss.png | Bin 0 -> 2817 bytes .../DeltaV/Objects/Misc/books.rsi/meta.json | 14 + .../Generation/solar_panel.rsi/meta.json | 14 + .../solar_panel.rsi/random_solar.png | Bin 0 -> 554 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 +- .../charging-equipped-BACKPACK.png | Bin 0 -> 1886 bytes .../portable_recharger.rsi/charging-unlit.png | Bin 0 -> 539 bytes .../Power/portable_recharger.rsi/charging.png | Bin 0 -> 964 bytes .../portable_recharger.rsi/inhand-left.png | Bin 0 -> 714 bytes .../portable_recharger.rsi/inhand-right.png | Bin 0 -> 735 bytes .../Power/portable_recharger.rsi/meta.json | 92 + .../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 -- .../_EE/Effects/footprints.rsi/dragging-1.png | Bin 591 -> 427 bytes .../_EE/Effects/footprints.rsi/dragging-2.png | Bin 563 -> 317 bytes .../_EE/Effects/footprints.rsi/dragging-3.png | Bin 615 -> 698 bytes .../_EE/Effects/footprints.rsi/dragging-4.png | Bin 504 -> 263 bytes .../_EE/Effects/footprints.rsi/dragging-5.png | Bin 558 -> 329 bytes .../_EE/Effects/footprints.rsi/meta.json | 2 +- .../mail.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1472 bytes .../Weapons/Guns/Launchers/mail.rsi/meta.json | 12 + .../mail.rsi/wielded-inhand-left.png | Bin 0 -> 8961 bytes .../mail.rsi/wielded-inhand-right.png | Bin 0 -> 8985 bytes 488 files changed, 9071 insertions(+), 5393 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/deltav/communications/communications-console-component.ftl create mode 100644 Resources/Locale/en-US/intellicard/intellicard.ftl create mode 100644 Resources/Maps/Ruins/abandoned_outpost.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/solar.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 create mode 100644 Resources/Prototypes/Entities/Objects/Power/portable_recharger.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/DeltaV/Objects/Misc/books.rsi/icon_kiss.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/books.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi/random_solar.png 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/Power/portable_recharger.rsi/charging-equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Power/portable_recharger.rsi/charging-unlit.png create mode 100644 Resources/Textures/Objects/Power/portable_recharger.rsi/charging.png create mode 100644 Resources/Textures/Objects/Power/portable_recharger.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Power/portable_recharger.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Power/portable_recharger.rsi/meta.json 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 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-right.png 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 @@