Remuchi
0b2238b57a
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/Administration/Commands/AdminWhoCommand.cs
# Content.Server/Bed/Sleep/SleepingSystem.cs
# Content.Server/Body/Components/BloodstreamComponent.cs
# Content.Server/Body/Components/RespiratorComponent.cs
# Content.Server/Body/Systems/InternalsSystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Chat/Managers/IChatManager.cs
# Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
# Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
# Content.Server/Electrocution/ElectrocutionSystem.cs
# Content.Server/Holosign/HolosignProjectorComponent.cs
# Content.Server/Holosign/HolosignSystem.cs
# Content.Server/Remotes/DoorRemoteSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Bed/Sleep/SleepEmitSoundComponent.cs
# Content.Shared/Cuffs/SharedCuffableSystem.cs
# Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
# Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/box.yml
# Resources/Maps/centcomm.yml
# Resources/Maps/cluster.yml
# Resources/Maps/europa.yml
# Resources/Maps/marathon.yml
# Resources/Maps/meta.yml
# Resources/Maps/omega.yml
# Resources/Maps/origin.yml
# Resources/Maps/packed.yml
# Resources/Maps/reach.yml
# Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
# Resources/Prototypes/Entities/Clothing/Hands/colored.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
# Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
# Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
# Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
# Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
# Resources/Prototypes/Entities/Structures/Holographic/projections.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json
2024-03-30 10:36:17 +07:00
Remuchi
5e74f6ae53
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
...
# Conflicts:
# Content.Client/Administration/Managers/ClientAdminManager.cs
# Content.Client/Administration/Systems/BwoinkSystem.cs
# Content.Client/Alerts/ClientAlertsSystem.cs
# Content.Client/Audio/BackgroundAudioSystem.cs
# Content.Client/CardboardBox/CardboardBoxSystem.cs
# Content.Client/Chemistry/UI/InjectorStatusControl.cs
# Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
# Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs
# Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
# Content.Client/Decals/Overlays/DecalOverlay.cs
# Content.Client/DoAfter/DoAfterOverlay.cs
# Content.Client/Doors/AirlockSystem.cs
# Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
# Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/MainMenu/UI/MainMenuControl.xaml
# Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml
# Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs
# Content.Client/MassMedia/Ui/NewsWriteMenu.xaml
# Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs
# Content.Client/Options/UI/Tabs/MiscTab.xaml
# Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
# Content.Client/Outline/InteractionOutlineSystem.cs
# Content.Client/Overlays/ShowSecurityIconsSystem.cs
# Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
# Content.Client/Popups/PopupOverlay.cs
# Content.Client/Popups/PopupSystem.cs
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/StatusIcon/StatusIconOverlay.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
# Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
# Content.Server/Access/Systems/IdCardConsoleSystem.cs
# Content.Server/Administration/Commands/BanCommand.cs
# Content.Server/Administration/Notes/AdminMessageEui.cs
# Content.Server/Administration/Notes/AdminNotesSystem.cs
# Content.Server/Administration/Notes/IAdminNotesManager.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Administration/UI/PermissionsEui.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
# Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
# Content.Server/Database/DatabaseRecords.cs
# Content.Server/Database/ServerDbBase.cs
# Content.Server/Database/ServerDbManager.cs
# Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
# Content.Server/Doors/Systems/DoorSystem.cs
# Content.Server/Execution/ExecutionSystem.cs
# Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
# Content.Server/Fax/FaxSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
# Content.Server/GameTicking/GameTicker.Replays.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
# Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
# Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
# Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
# Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
# Content.Server/Hands/Systems/HandsSystem.cs
# Content.Server/Holosign/HolosignSystem.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Content.Server/Info/InfoSystem.cs
# Content.Server/Kitchen/EntitySystems/SharpSystem.cs
# Content.Server/Magic/MagicSystem.cs
# Content.Server/MagicMirror/MagicMirrorSystem.cs
# Content.Server/Mapping/MappingSystem.cs
# Content.Server/MassMedia/Systems/NewsSystem.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
# Content.Server/Medical/CryoPodSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Remotes/DoorRemoteSystem.cs
# Content.Server/Resist/EscapeInventorySystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
# Content.Server/Species/Systems/NymphSystem.cs
# Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
# Content.Server/StationEvents/EventManagerSystem.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Server/Strip/StrippableSystem.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Administration/AdminFlags.cs
# Content.Shared/Administration/SharedBwoinkSystem.cs
# Content.Shared/Anomaly/SharedAnomalySystem.cs
# Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
# Content.Shared/Buckle/SharedBuckleSystem.Strap.cs
# Content.Shared/Chat/ChatChannel.cs
# Content.Shared/Chemistry/Components/InjectorComponent.cs
# Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
# Content.Shared/Chemistry/SharedReagentDispenser.cs
# Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
# Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs
# Content.Shared/Cuffs/SharedCuffableSystem.cs
# Content.Shared/Doors/Systems/SharedDoorSystem.cs
# Content.Shared/Friction/TileFrictionController.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Implants/SharedImplanterSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
# Content.Shared/Nutrition/Components/OpenableComponent.cs
# Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs
# Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/ICharacterProfile.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
# Content.Shared/Security/SecurityStatus.cs
# Content.Shared/Security/Systems/DeployableBarrierSystem.cs
# Content.Shared/Slippery/SlipperySystem.cs
# Content.Shared/Species/Systems/ReformSystem.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Content.Shared/StatusIcon/StatusIconPrototype.cs
# Content.Shared/Store/ListingPrototype.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# README.md
# Resources/Audio/Ambience/Antag/pirate_start.ogg
# Resources/Changelog/Changelog.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/en-US/criminal-records/criminal-records.ftl
# Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
# Resources/Locale/en-US/medical/components/health-analyzer-component.ftl
# Resources/Locale/en-US/reagents/meta/biological.ftl
# Resources/Locale/en-US/reagents/meta/fun.ftl
# Resources/Locale/en-US/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/seeds/seeds.ftl
# Resources/Locale/en-US/wires/wire-names.ftl
# Resources/Maps/Shuttles/cargo_fland.yml
# Resources/Maps/core.yml
# Resources/Maps/europa.yml
# Resources/Maps/fland.yml
# Resources/Maps/origin.yml
# Resources/Maps/saltern.yml
# Resources/Maps/train.yml
# Resources/Prototypes/Actions/diona.yml
# Resources/Prototypes/Atmospherics/gases.yml
# Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
# Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
# Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
# Resources/Prototypes/Catalog/Cargo/cargo_security.yml
# Resources/Prototypes/Catalog/Cargo/cargo_service.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Catalog/Fills/Boxes/general.yml
# Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
# Resources/Prototypes/Catalog/Fills/Crates/engines.yml
# Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
# Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
# Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Hands/colored.yml
# Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
# Resources/Prototypes/Entities/Clothing/Head/hats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/slime.yml
# Resources/Prototypes/Entities/Mobs/Species/vox.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
# Resources/Prototypes/Entities/Objects/Devices/nuke.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Fun/toys.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
# Resources/Prototypes/Entities/Objects/Materials/parts.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Misc/implanters.yml
# Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
# Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
# Resources/Prototypes/Entities/Objects/Shields/shields.yml
# Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
# Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
# Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
# Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
# Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
# Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
# Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
# Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
# Resources/Prototypes/Entities/Structures/Walls/grille.yml
# Resources/Prototypes/Entities/Structures/Walls/walls.yml
# Resources/Prototypes/Entities/Structures/Windows/window.yml
# Resources/Prototypes/Entities/Structures/stairs.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Hydroponics/seeds.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/Prototypes/Reagents/biological.yml
# Resources/Prototypes/Reagents/fun.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
# Resources/Prototypes/Recipes/Construction/weapons.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/Recipes/Reactions/fun.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/Prototypes/Species/human.yml
# Resources/Prototypes/Species/vox.yml
# Resources/Prototypes/Stacks/Materials/materials.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/Tiles/plating.yml
# Resources/Prototypes/Voice/speech_emote_sounds.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/explosion.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/Textures/Clothing/Belt/emt.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
# Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
# Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
# Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
# Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
# Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
# Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/slayer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Interface/emotions.svg.192dpi.png.yml
# Resources/Textures/LobbyScreens/dead-in-space.png.yml
# Resources/Textures/LobbyScreens/doomed.webp.yml
# Resources/Textures/LobbyScreens/pharmacy.png.yml
# Resources/Textures/LobbyScreens/pharmacy.webp.yml
# Resources/Textures/LobbyScreens/robotics.webp.yml
# Resources/Textures/LobbyScreens/supermatter.png.yml
# Resources/Textures/LobbyScreens/susstation.png.yml
# Resources/Textures/LobbyScreens/warden.png.yml
# Resources/Textures/LobbyScreens/warden.webp.yml
# Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
# Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_40.png
# Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_40.png
# Resources/Textures/Objects/Devices/nuke.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
# Resources/Textures/Objects/Misc/books.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
# Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/bolt.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png
# Resources/Textures/Structures/Doors/Windoors/plasma.rsi/emergency_unlit.png
# Resources/Textures/Structures/Doors/Windoors/uranium.rsi/emergency_unlit.png
# Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/locked.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/shuttleblue.png
# Resources/Textures/Tiles/shuttleorange.png
# Resources/Textures/Tiles/shuttlepurple.png
# Resources/Textures/Tiles/shuttlered.png
# Resources/Textures/Tiles/shuttlewhite.png
# Resources/Textures/White/Fluff/DOOMMAX/cap_cap.rsi/meta.json
# Resources/Textures/White/Fluff/HSKveez/hardsuit.rsi/meta.json
# Resources/Textures/White/Fluff/Vtergot/strictgloves.rsi/meta.json
# Resources/clientCommandPerms.yml
# Resources/migration.yml
2024-03-26 15:52:23 +07:00
Luminight
92ab9a8a01
Unswap small and tall wodden fence gates ( #26409 )
2024-03-24 17:55:01 -07:00
Pieter-Jan Briers
89db4409a4
Remove CRLF, enforce with workflow ( #26401 )
...
* Check for CRLF in actions workflow
Make emisse weep
* Copy paste bottom text
* I would like to thank StackOverflow for this spite PR.
* Mention file name in message because the workflow tab doesn't display it.
* dos2unix everything
2024-03-24 22:06:17 +01:00
Ko4ergaPunk
909b2aaa2d
New wooden furniture ( #26182 )
...
* ю
* Fences
* bench, stairs and fence shadow
* small gate desc
* empty
* empty
* destructible
* price fix
2024-03-18 00:18:58 +03:00
ThereDrD0
d856995b39
add: add our sprites for rust all rust walls types ( #191 )
2024-03-13 01:00:24 +03:00
MACMAN2003
f0e8695a91
Clockwork structures and furniture ( #24673 )
...
* sprites
something something strength and certainty of steel (except this is brass)
* test1
* commas it was commas
* commas and brackets
* LET THERE BE BRASS
* brass-glass-etc-windows-thindows-floors-lattice
* ALL THE STRUCTURES!!
"Which structures did you add?"
"all."
* buyable brass
and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe
* Update windoor.yml
i forgor 💀
* Update tiles.ftl
* i hate random capital letters
* linter fix 1
whew, thank god for linters
* fix 2
* maybe this
shot in the dark, idk what the hell i'm doing hopefully this fixes it?
* fix attempt 1
weather to true, maybe the thingy got confused?
* remove clockwork lattice
it's fixed the test fail... but at what cost?
* changes 1
* fix clockwork windoor
* FLOORS
HAHAHA LET THERE BE FLOORS
* try linter fix 1
i love linters they find things i'd never catch myself
* tweaks fixes 1
fixes merge conflict and does more stuff part two later because i'm tired
* tweaks fixes 2
i should probably do this stuff during the day when i have more energy but eh
* Update assembly.yml
* Update chairs.yml
* fix door sprites
somehow the deny_unlit was broken for all the clockwork doors
* fix glass.yml
2024-03-06 03:25:59 +03:00
Zadeon
133bd0353a
Adds minable salt "ore" ( #25324 )
...
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.
* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json
* Added chlorine to the list of solutions salt gives when used in the grinder.
* Gave salt ore and salt rock overlay unique sprites.
* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition
* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.
2024-02-26 16:34:15 -07:00
Aviu00
d3cd3c430a
Upstream upstream
2024-01-27 09:34:07 +03:00
Flareguy
1abbf37832
Better rusty wall sprites ( #24471 )
...
* makes rusty walls use their /tg/ sprites
* my furniture. is. broken
* robocop
2024-01-24 18:08:46 -07:00
SonicHDC
b5013fecdd
Reinforced diagonal ( #24393 )
...
* Textures
* Protowall
2024-01-22 17:53:19 +03:00
Valtos
0fac822545
fix diagonal walls
2024-01-19 11:39:26 +03:00
Valtos
475d183491
yes
2024-01-18 09:35:03 +03:00
rhailrake
0bd2ad5e38
[sprites] Walls, windows and shit
2024-01-14 06:46:00 +03:00
Velcroboy
3cf058f9f4
Add coal distribution to progen ( #22755 )
...
* Add coal distribution to progen
* Add sprite
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com >
2023-12-20 16:46:20 -07:00
Velcroboy
a698a85f34
Make shuttle walls/windows constructable ( #19255 )
2023-11-20 17:20:24 -08:00
brainfood1183
5af97da997
diagonal window glass and pirate shuttle improvements ( #21174 )
...
* shuttle and priate improvements
* fix
* fix damn ubuntu
* darkened syndi airlocks
* fix
* fix ruranium
* added prison cell to pirate ship
2023-11-05 19:38:02 -07:00
Ed
82627cab15
Orewall and cobblestone wall pack ( #21034 )
...
* start work
* remove crafting things
* remove
* fix yml
* remove all pebbles
add sand stone
add sand cobblestone wall
add asteroid cobblestone wall
resprite basaltand snow walls
* add new walls
* :trollface:
2023-10-20 17:00:24 -04:00
brainfood1183
d4ed37d266
Rock Anomaly ( #20635 )
2023-10-05 12:53:53 -07:00
NULL882
c2771c24fa
Necropolis and mine walls ( #20578 )
2023-09-28 10:07:12 -07:00
Alekshhh
f658970f3e
U-Shape Rails ( #19485 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2023-09-20 18:26:16 +10:00
Flareguy
743063e4f0
Ports /vg/station barricade sprites & slightly buffs them ( #19840 )
2023-09-16 05:50:48 -07:00
VelonacepsCalyxEggs
9bf20c7f9b
Random Grille Spawner for mappers. ( #19416 )
...
* random grille textures
* random grille prototype
2023-08-21 22:21:45 -04:00
PixelTK
f189b73fe5
Arachnid rework ( #18631 )
...
* Merge before I fuck up anything again
* craft whitelist
* Sericulture
* Spider
* gone
* quickly fixed
* and coders taketh away
* And we take more away
* sericulture improvements
* arachnid
* better webbed
* OH WAIT
* test fail
2023-08-13 01:38:05 -06:00
Kara
baddcf1b26
Chain link fencing ( #18956 )
2023-08-11 00:16:25 +10:00
Flareguy
45c69f127d
Replaces CEV-Eris style rocks with SS13 ones, adds Ironrock ( #18898 )
...
* replaces CEV=eris rock sprites with /tg/ ones, removes mountainrock, adds ironrock
* phew... good thing i'm purple
* Update Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
Co-authored-by: Vordenburg <114301317+Vordenburg@users.noreply.github.com >
---------
Co-authored-by: Vordenburg <114301317+Vordenburg@users.noreply.github.com >
2023-08-08 22:00:27 -06:00
metalgearsloth
9cec3238b8
Add basalt walls for lavaland ( #17709 )
2023-06-28 22:57:40 +10:00
metalgearsloth
4fefd8b8b7
Add snow rocks to planets ( #17692 )
2023-06-28 21:32:01 +10:00
Nemanja
0b5ccf3395
Artifact Fragments ( #17420 )
2023-06-19 00:56:45 +10:00
Nemanja
9946bd1f61
Sheet-meister 2000 ( #16686 )
2023-06-15 10:49:23 +10:00
Puro
2fcf48de1e
[Sprite] Diagonal walls ( #15973 )
2023-05-06 20:36:39 -04:00
brainfood1183
2fba2b18ab
Adds Bananium ( #14663 )
2023-04-29 15:38:09 +10:00
metalgearsloth
f96fc1be41
Ore veins ( #14011 )
...
* Ore veins
I dislike rocks just providing generic drops and this factors into mining more.
* fixes
* descriptions
* comment
* every flipping time
2023-02-12 12:40:57 +00:00
metalgearsloth
9b0e0ad71d
Add smoothing for diagonal walls ( #13259 )
2023-01-27 00:03:42 -04:00
metalgearsloth
945101e5e4
Fix a bunch of invalid rsi files ( #13104 )
2022-12-20 09:36:59 +01:00
Vordenburg
e17e08f344
Add mountain wall recolor of asteroid rock for mappers. ( #11729 )
2022-10-09 12:49:53 -07:00
metalgearsloth
b77e94f36c
Add plastitanium walls ( #10572 )
2022-08-14 15:04:46 +10:00
Peptide90
bc19f52aa6
removes metal walls, adds rusted walls ( #8416 )
...
* removes metal walls, adds rusted walls
* removes 2 metal walls in bagel
* remove metal walls from pillar
* Remove icon from rust wall
* Made welding work
* removes old prototype
2022-07-04 02:11:47 -05:00
Tomeno
73d2e9043f
Icon smoothing for asteroid rocks ( #8058 )
...
Co-authored-by: Tomeno <tomeno@lulzsec.co.uk >
2022-05-09 17:41:28 -07:00
Peptide90
ec11a7562e
Vault Walls (alien, sandstone and rock) ( #7799 )
2022-05-02 15:38:06 -07:00
metalgearsloth
6dfa4c0fef
Shuttle walls ( #7219 )
2022-03-28 16:11:39 -07:00
Lamrr
951bdabcd0
Removes LowWall. ( #6063 )
2022-01-11 18:03:27 +11:00
Delete69
80753a70ea
Add small railing corner ( #6036 )
2022-01-05 18:51:41 -07:00
Stanbery Trask
cd4af34849
Railings ( #5732 )
2021-12-12 22:03:21 -07:00
Swept
e34888373a
Respriting the codebase ( #4820 )
...
* Walls
* Airlocks mostly ported
* Disposal Unit
* Tiles
* Lighting
* Catwalk
* Windows
* Some vending machine work
* More Vending Machines
* Rest of vending machine sprites ported
* Fixes to vending machines
* Tables (This took a lot of work)
* Fixes low walls being required for window smoothing
- Also replaces window damage visualization
* Plasma Window
* APC
* SMES + Reorganized parts.yml
* Furniture and Organization and Removed Shelf
* Renamed seats.yml to chairs.yml
* Dispensers
* Lazy-fixed the glass airlocks
* Don't need this no more
* Tilez
* blue circuit my fucking beloved
* Switches lights to cev one
* Conveyors and Switch
* Reorients lights
* !ALERT! MAP CHANGES !ALERT!
Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com >
2021-10-15 11:58:40 +02:00
Vera Aguilera Puerto
09d40b386a
Added simple grilles with construction, deconstruction and destruction. ( #4801 )
2021-10-09 10:54:56 +02:00
Swept
5f9ba812ca
Reorganizes Resources/Constructible ( #4252 )
2021-07-15 18:30:50 +00:00
