Remuchi
297cfd23ad
пара фиксов
2024-03-30 11:33:13 +07:00
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
Tayrtahn
b1ba6b5bb6
Arcade machine improvements ( #24200 )
...
* Give 'em something to talk about
* Wire panel visuals
* Wire graphics tweak
* More ads and thanks
* More ads for a noisy arcade
* New screen for space villain machines
* Implement EmitSoundIntervalComponent and a bunch of arcade noises
* Require power for sounds
* Allow earlier startup intervals
* Orange glow
* Audio attributions
* Include the PR link
* Replace EmitSoundInterval with expanded SpamEmitSound
* Remove pacman-themed arcade sounds
* Documentation good.
* Updated methods to use Entity<T>
* Refactored SpamEmitSound to get rid of accumulator and chance.
* Fixed prewarm logic
* Moved stuff to Shared
* Fix outdated YAML
* Better prediction, auto pause handling
* Make enable/disable reset the timer instead of trying to save it.
2024-03-28 17:28:45 +11: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
lzk
3b3b874dd9
Snore is a trait now ( #26322 )
2024-03-22 18:00:57 +11:00
nikthechampiongr
22e9d6562f
Fix SCRAM implant not working while cuffed. Incidentally fix freedom implant working while dead/crit ( #25978 )
...
* Fix SCRAM implant not being usable while in cuffs. Also fix freedom implant from working while dead/crit as a side effect
* Move check up to apply to all actions and do thing I forgor to do before
* Change check into an ActionBlocker check that also checks whether the user is sleeping.
* Make checking for Consciousness the default for actions
Went through and chose what I believe to be sensible defaults for actions that had CheckCanInteract.
* Fix typos my beloved
I had an unbelievable skill issue
* Fix major skill issue
2024-03-18 23:35:46 +01:00
ThereDrD0
3f005b158b
Ремув попапа сна ( #146 )
...
* remove: remove ZZZ popup
* fix: client popup for target doll
2024-03-11 02:07:37 +03:00
Aviu00
a411d14461
Revenant stuff ( #110 )
...
* - add: Chaplain cult shield immune.
* - add: Revenant stuff.
2024-02-23 16:06:24 +00:00
LordCarve
c77eb8691d
DamageSpecifier Total => GetTotal ( #24160 )
...
* DamageSpecifier [Obsolete] Total => GetTotal()
* Remove obsolete Total member from DamageSpecifier.
2024-01-21 18:59:14 -07:00
metalgearsloth
269c93245d
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2023-11-27 22:12:34 +11:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11:00
DrSmugleaf
e4c4d9b0a4
Fix sleeping action not working ( #20813 )
2023-10-07 15:11:02 -04:00
Leon Friedrich
684b334806
Action container rejig ( #20260 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2023-09-23 18:49:39 +10:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components ( #19900 )
2023-09-08 18:16:05 -07:00
Slava0135
2eb6689834
clown mimimi sleeping sound ( #18127 )
...
* clown mimimi sleeping sound
* make its own component
* different sound (with attribution)
* oopsie
* back to mimimi (with attribution)
2023-07-19 02:55:50 -06:00
jicksaw
415eca285c
Remove stun and knockdown status effects before applying sleep ( #15460 )
2023-04-22 21:06:45 +10:00
Vasilis The Pikachu
65aca01895
Strip menu will no longer open when trying to wake sleeping players ( #14319 )
2023-03-12 23:29:26 -04:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
metalgearsloth
222e011006
Don't log resolve for waking ( #13435 )
2023-01-18 19:56:33 +11:00
Jezithyr
eeb5b17b34
Mobstate Refactor ( #13389 )
...
Refactors mobstate and moves mob health thresholds to their own component
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com >
2023-01-13 16:57:10 -08:00
metalgearsloth
e79d822206
Fix sleep wake spam ( #13047 )
2023-01-10 22:46:58 +11:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Errant
e9e6255684
Fix dead mobs falling asleep ( #12917 )
...
* Dead or zombie mobs can no longer sleep
* Removed zombie fix
* Moved dead-checks to OnEvent
* Cleanup
2022-12-15 15:34:43 -06:00
keronshb
71b2cf221f
Fixes sleepwalking ( #12522 )
...
closes https://github.com/space-wizards/space-station-14/issues/12404
2022-11-13 14:36:32 +11:00
keronshb
84413f2a4c
Box fixes and Stealth Box in uplink ( #12194 )
2022-11-04 14:16:23 +11:00
Francesco
635057fb7a
fix: Adds a cooldown when attempting to wake up someone else ( #11847 )
2022-10-14 23:13:24 -05:00
Rane
1e62627ecb
improve sleeping mob state changes ( #11083 )
2022-09-06 21:37:32 -07:00
Leon Friedrich
c7ad6b709e
Audio System Rejig ( #9635 )
2022-07-29 12:13:12 +10:00
Rane
1c8bdaf7c4
Sleeping ( #9793 )
2022-07-26 21:46:24 -07:00
