iertis
a700c7628e
Fix "ыыыы" ( #3516 )
2025-12-26 17:44:36 +03:00
Vigers Ray
2da8b9f545
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Changelog/ChangelogTab.xaml.cs
# Content.Client/Chemistry/UI/ChemMasterWindow.xaml
# Content.Client/Entry/EntryPoint.cs
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Paper/UI/PaperWindow.xaml.cs
# Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
# Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
# Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.IntegrationTests/Tests/Power/StationPowerTests.cs
# Content.Packaging/ServerPackaging.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
# Content.Server/Atmos/TileAtmosphere.cs
# Content.Server/Bible/BibleSystem.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Content.Server.csproj
# Content.Server/Discord/DiscordLink/DiscordLink.cs
# Content.Server/GameTicking/GameTicker.LobbyBackground.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/Kitchen/Components/MicrowaveComponent.cs
# Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
# Content.Server/Mech/Systems/MechSystem.cs
# Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
# Content.Server/Medical/DefibrillatorSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Radio/EntitySystems/HeadsetSystem.cs
# Content.Server/Remotes/DoorRemoteSystem.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
# Content.Server/Tips/TipsSystem.cs
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Bed/BedSystem.cs
# Content.Shared/Blocking/BlockingSystem.User.cs
# Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
# Content.Shared/Chat/SharedSuicideSystem.cs
# Content.Shared/Chemistry/Components/HyposprayComponent.cs
# Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
# Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
# Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
# Content.Shared/Chemistry/Events/HyposprayEvents.cs
# Content.Shared/Content.Shared.csproj
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Friction/TileFrictionController.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Content.Shared/Interaction/InteractHand.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Medical/Healing/HealingSystem.cs
# Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
# Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
# Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
# Content.Shared/Throwing/ThrowingSystem.cs
# Content.Shared/Trigger/Systems/TriggerOnHitscanSystem.cs
# Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs
# Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs
# Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
# Content.Shared/Zombies/ZombieComponent.cs
# Content.Shared/_Sunrise/Lobby/LobbyBackgroundPrototype.cs
# README.md
# Resources/Locale/en-US/_strings/borg/borg.ftl
# Resources/Locale/en-US/_strings/chemistry/components/hypospray-component.ftl
# Resources/Locale/en-US/_strings/chemistry/components/injector-component.ftl
# Resources/Locale/en-US/_strings/commands/pauseatmos-command.ftl
# Resources/Locale/en-US/_strings/commands/quick-inspect-command.ftl
# Resources/Locale/en-US/_strings/commands/show-wallmounts-command.ftl
# Resources/Locale/en-US/_strings/commands/substepatmos-command.ftl
# Resources/Locale/en-US/_strings/fluids/components/equip-spray-component.ftl
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-revolutionary.ftl
# Resources/Locale/en-US/_strings/job/job-names.ftl
# Resources/Locale/en-US/_strings/lobby/lobby-state-background.ftl
# Resources/Locale/en-US/_strings/reagents/meta/medicine.ftl
# Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/_strings/silicons/borg-module.ftl
# Resources/Locale/en-US/_strings/store/changeling-catalog.ftl
# Resources/Locale/en-US/_strings/store/currency.ftl
# Resources/Locale/en-US/_strings/store/store.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Body/Organs/slime.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Crates/antag.yml
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Crates/botany.yml
# Resources/Prototypes/Catalog/Fills/Crates/fun.yml
# Resources/Prototypes/Catalog/Fills/Crates/medical.yml
# Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
# Resources/Prototypes/Catalog/Fills/Crates/security.yml
# Resources/Prototypes/Catalog/Fills/Crates/service.yml
# Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
# Resources/Prototypes/Catalog/Fills/Items/belt.yml
# Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
# Resources/Prototypes/Catalog/Fills/Items/firstaidkits.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/theater.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
# Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
# Resources/Prototypes/Entities/Debugging/debug_sweps.yml
# Resources/Prototypes/Entities/Debugging/stress_test.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
# Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
# Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
# Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
# Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Entities/Objects/Materials/parts.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Shields/shields.yml
# Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
# Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
# Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
# Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
# Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
# Resources/Prototypes/Entities/Structures/Walls/walls.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/GameRules/unknown_shuttles.yml
# Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/oasis.yml
# Resources/Prototypes/Maps/reach.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Reactions/medicine.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/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
# Resources/Prototypes/Roles/play_time_trackers.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/Prototypes/Species/species_weights.yml
# Resources/Prototypes/Store/presets.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/borg_types.yml
# Resources/Prototypes/explosion.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/Prototypes/silicon-laws.yml
# Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png
# Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_chassis.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness+o.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness.png
# Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
# Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
# Resources/Textures/Structures/Storage/canister.rsi/meta.json
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
# Resources/migration.yml
# RobustToolbox
# SECURITY.md
# SpaceStation14.sln
2025-12-26 04:19:27 +01:00
slarticodefast
e2ff167062
Predict powercells, chargers and PowerCellDraw ( #41379 )
...
* cleanup
* fix fixtures
* prediction
* fix test
* review
* fix svalinn visuals
* fix chargers
* fix portable recharger and its unlit visuals
* fix borgs
* oomba review
* fix examination prediction
2025-11-24 16:52:11 +00:00
slarticodefast
7155d0d291
Cleanup BatterySystem ( #41298 )
...
* cleanup
* fix fixtures
* this belongs into the next PR
* review
* misc
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-11-08 20:55:02 +00:00
Connor Huffine
050dae8aa7
Remove unused dependencies ( #41213 )
2025-10-31 10:37:10 +00:00
Hannah Giovanna Dawson
cdbe92d37d
Update DamageableSystem to modern standards ( #39417 )
...
* Update DamageableSystem to modern standards
* DamageContainerId -> DamageContainerID with lint flag
* Replace strings with protoids
* Make CVar subscription declarations all consistently whitespaced
* ChangeDamage -> TryChangeDamage, cope with C# jank
* Revert event signature changes
* Restore a comment
* Re-add two queries
* Init the queries
* Use appearanceQuery in DamageChanged
* Use damageableQuery in TryChangeDamage
* Use damageableQuery in SetDamageModifierSetId
* Final cleanup, fix sandboxing
* Rectify ExplosionSystem:::ProcessEntity's call to TryChangeDamage
* Re-organize DamageableSystem
* first big fuck you breaking change.
* THATS A LOT OF DAMAGE!!!
* Fix test fails
* test fixes 2
* push it
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-10-27 19:53:04 +00:00
VigersRay
bbd0b285a5
фиксы апстрима
2025-10-27 02:35:00 +01:00
VigersRay
30b17dc371
Revert hitscan are entities
2025-10-26 23:57:54 +01:00
slarticodefast
1469b9484d
Add virtual chat API methods in Shared ( #40895 )
...
* move chat stuff to shared
* refactor: using cleanup +whitespaces + xml-doc
* review
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-10-19 19:08:27 +00:00
VigersRay
6c158e6f0b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# .github/ISSUE_TEMPLATE/config.yml
# .github/ISSUE_TEMPLATE/issue_report.md
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs
# Content.Server/Atmos/EntitySystems/FlammableSystem.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Destructible/Thresholds/DamageThreshold.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.cs
# Content.Server/GuideGenerator/ReagentEntry.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/VomitSystem.cs
# Content.Server/Radio/EntitySystems/HeadsetSystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Armor/SharedArmorSystem.cs
# Content.Shared/Bed/Sleep/SleepingSystem.cs
# Content.Shared/Cabinet/ItemCabinetSystem.cs
# Content.Shared/Chat/SharedChatSystem.Emote.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/Clothing/EntitySystems/MaskSystem.cs
# Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
# Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/IoC/SharedContentIoC.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Ninja/Components/NinjaSuitComponent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Revenant/Components/RevenantComponent.cs
# Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
# Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Weapons/Ranged/HitscanPrototype.cs
# Content.Shared/Xenoarchaeology/Artifact/XAT/BaseQueryUpdateXATSystem.cs
# README.md
# Resources/Audio/Weapons/attributions.yml
# Resources/Locale/en-US/_strings/ghost/make-ghost-gui.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/conditions.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/effects.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/healthchange.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/statuseffects.ftl
# Resources/Locale/en-US/_strings/job/job-description.ftl
# Resources/Locale/en-US/_strings/medical/components/crew-monitoring-component.ftl
# Resources/Locale/en-US/_strings/npc/hugbot.ftl
# Resources/Locale/en-US/_strings/npc/npc-debug.ftl
# Resources/Locale/en-US/_strings/speech/speech-triggers.ftl
# Resources/Locale/en-US/_strings/ui/stat-values.ftl
# Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
# Resources/Locale/en-US/guidebook/chemistry/effects.ftl
# Resources/Locale/en-US/guidebook/chemistry/healthchange.ftl
# Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
# Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
# Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
# Resources/Maps/Shuttles/cargo_relic.yml
# Resources/Maps/_Sunrise/Station/bagel.yml
# Resources/Maps/_Sunrise/Station/barratry.yml
# Resources/Maps/_Sunrise/Station/fland.yml
# Resources/Maps/_Sunrise/Station/marathon.yml
# Resources/Maps/_Sunrise/Station/oasis.yml
# Resources/Maps/_Sunrise/Station/packed.yml
# Resources/Maps/_Sunrise/Station/plasma.yml
# Resources/Maps/_Sunrise/Station/relic.yml
# Resources/Maps/_Sunrise/event/clon_mine.yml
# Resources/Maps/_Sunrise/event/void.yml
# Resources/Prototypes/Body/Prototypes/vox.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Crates/fun.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/Belt/belts.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
# Resources/Prototypes/Recipes/Lathes/Packs/security.yml
# Resources/Prototypes/Recipes/Lathes/biogen.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/thief.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/wizard.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
# Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.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/Prototypes/Stacks/Materials/crystals.yml
# Resources/Prototypes/Stacks/floor_tile_stacks.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/moth3.png
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png
# Resources/migration.yml
# RobustToolbox
2025-10-19 17:38:04 +02:00
beck-thompson
492a1aa9c3
Hitscans are now entities ( #38035 )
...
* Hitscans are now entities
* Cleanup
* Cleanup
* Silly mistakes but stop sign testing helps :)
* Address most of the review
* Reviews
* perry :(
* Final reviews
* Add comments
* Split event up
* better comment
* cleanup
2025-10-18 05:42:08 +00:00
slarticodefast
a6dce11566
Predict damage examine ( #40168 )
...
* predict damage examine
* .
* required true
* nits
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-10-10 23:23:26 +00:00
slarticodefast
5227489360
Predict EMPs ( #39802 )
...
* predicted emps
* fixes
* fix
* review
2025-10-04 11:24:42 +00:00
Vigers Ray
923845021b
фикс апстрима
2025-08-25 04:03:10 +03:00
Vigers Ray
5e89b697f6
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
# Resources/Maps/_Sunrise/Station/marathon.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
2025-08-25 03:48:48 +03:00
FungiFellow
ed7bea8e01
Inflatable Module ( #35100 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-08-23 15:15:28 -07:00
pacable
37a41a9177
Various workflows fix ( #2775 )
2025-08-15 14:01:42 +03:00
Vigers Ray
c9709e38f1
Добби свободен
2025-08-13 16:00:32 +03:00
Vigers Ray
5465aa5084
оно закончилось, но впереди еще линтер (жокерфейс)
2025-08-13 13:58:04 +03:00
Vigers Ray
a1b752728a
мда, бесконечные ошибки
2025-08-13 03:05:05 +03:00
Vigers Ray
b52f640b5a
Порт стрельбы со старлайна ( #2640 )
...
Co-authored-by: KaiserMaus <kaiser.ratte@gmail.com>
2025-08-08 22:25:02 +03:00
Kyle Tyo
ca18576625
Predict base and damage examines of cartridge ammo. ( #39401 )
...
* commit
* requested changes +
2025-08-06 16:29:57 +02:00
Vigers Ray
d6c0a011b7
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
# Content.Client/Fax/UI/FaxWindow.xaml
# Content.Client/Ghost/GhostSystem.cs
# Content.Client/Holiday/HolidaySystem.cs
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/Mech/MechSystem.cs
# Content.Client/Stealth/StealthSystem.cs
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
# Content.Server/Bed/BedSystem.cs
# Content.Server/Body/Systems/BodySystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Communications/CommunicationsConsoleComponent.cs
# Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
# Content.Server/EntityEffects/Effects/MakeSentient.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
# Content.Server/EntityEffects/Effects/PlantMutateGases.cs
# Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Nutrition/EntitySystems/FoodSystem.cs
# Content.Server/Power/EntitySystems/PowerNetSystem.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Bed/Components/HealOnBuckleComponent.cs
# Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
# Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Wieldable/SharedWieldableSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/atmos/plaque-component.ftl
# Resources/Locale/en-US/_strings/chat/chat-channel.ftl
# Resources/Locale/en-US/_strings/components/screen-component.ftl
# Resources/Locale/en-US/_strings/inventory/components/slot-block-component.ftl
# Resources/Locale/en-US/_strings/mass-media/news-discord.ftl
# Resources/Locale/en-US/_strings/objectives/commands/stripall.ftl
# Resources/Locale/en-US/_strings/salvage/job-board.ftl
# Resources/Locale/en-US/_strings/ui/spray-painter-window.ftl
# Resources/Locale/en-US/_strings/ui/turret-controls.ftl
# Resources/Maps/_Sunrise/Station/box.yml
# Resources/Prototypes/Access/misc.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/service.yml
# Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
# Resources/Prototypes/Entities/Clothing/Head/helmets.yml
# Resources/Prototypes/Entities/Clothing/Masks/masks.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Recipes/Lathes/Packs/science.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/alien3.png
# Resources/Textures/Effects/speech.rsi/alienroyal3.png
# Resources/Textures/Effects/speech.rsi/default3.png
# Resources/Textures/Effects/speech.rsi/guardian3.png
# Resources/Textures/Effects/speech.rsi/holo3.png
# Resources/Textures/Effects/speech.rsi/lawyer3.png
# Resources/Textures/Effects/speech.rsi/lizard3.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/moth3.png
# Resources/Textures/Effects/speech.rsi/robot3.png
# Resources/Textures/Effects/speech.rsi/slime3.png
# Resources/Textures/Effects/speech.rsi/spider3.png
# Resources/Textures/Effects/speech.rsi/syndibot3.png
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
# Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_f.png
# Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_m.png
# Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/steel_dirty.png
# Resources/migration.yml
# runclient-Tools.bat
# runclient.bat
2025-05-27 03:41:41 +03:00
slarticodefast
fef4187995
Move PriceCalculationEvent and EstimatedPriceCalculationEvent to shared ( #37782 )
...
* moce PriceCalculationEvent to shared
* Update Content.Shared/Cargo/PriceCalculationEvent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-05-24 19:36:38 +02:00
metalgearsloth
0d4f9640b5
CompFactory updates ( #37559 )
2025-05-20 01:08:55 -04:00
Princess Cheeseballs
9c165cb5a0
StaminaSystem to SharedStaminaSystem ( #37199 )
...
* Init Commit
* Partial class
* Hands system slipped through
2025-05-06 12:39:05 -04:00
Vigers Ray
95b86d7a4b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Construction/UI/ConstructionMenu.xaml
# Content.Client/Construction/UI/ConstructionMenu.xaml.cs
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Server/Warps/WarpPointSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
# Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs
# Resources/Locale/en-US/_strings/plants/mutations.ftl
# Resources/Locale/en-US/_strings/stack/stacks.ftl
# Resources/Locale/en-US/_strings/teleportation/teleportation-menu-gui.ftl
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
# Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Objects/Power/powercells.yml
# Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/nuke.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml
# Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/vim_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/station_maps.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
# Resources/Prototypes/Recipes/Construction/structures.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/cleanbot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/firebot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/medibot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
# Resources/Prototypes/Recipes/Reactions/medicine.yml
# Resources/Prototypes/Roles/Jobs/CentComm/official.yml
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json
2025-05-04 23:13:12 +03:00
Kirus59
8c38aa3742
BatteryWeaponPowerCell tweaks ( #33500 )
...
* BatteryWeaponPowerCell tweaks
* add update ammo ev & shuttle guns tweaks
* MilonPL requested changes
* revert changes in OnPowerCellChanged
* Add events to get charge info & change current charge
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-28 21:12:25 -04:00
Vigers Ray
6844adcc9e
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Shared/Doors/Systems/SharedDoorSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
2025-04-19 05:02:40 +03:00
metalgearsloth
8ab0e59db6
Refactor disarms ( #36546 )
...
* Refactor disarms
- Move client stuff to shared
- Cleanup a bunch of stuff
- Ref events
- Fix the swing sound mispredict (I noticed it on target dummies).
* Revert this change
* minor review
* Rebiew
---------
Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-19 11:38:22 +10:00
Vigers Ray
6020a6fd5b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Zombies/SharedZombieSystem.cs
# Content.Shared/Zombies/ZombieComponent.cs
# Resources/Locale/en-US/_strings/research/technologies.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
# Resources/Prototypes/Polymorphs/polymorph.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/Prototypes/Research/experimental.yml
2025-04-17 00:07:59 +03:00
Tayrtahn
a0d5d85019
Cleanup warnings in GunSystem ( #36629 )
...
* Cleanup warnings in GunSystem
* Remove _transform and use shared's TransformSystem instead
* Missed one
2025-04-16 21:01:54 +02:00
Vigers Ray
93868501af
Улучшение стрельбы по лежачим сущностям
2025-04-15 03:48:21 +03:00
Vigers Ray
d405f534c5
Обновление проклятых конструкций культа
2025-04-03 04:18:09 +03:00
Vigers Ray
014e6ac131
Культ крови ( #847 )
...
Signed-off-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: Babaev <129369024+babaevlsdd@users.noreply.github.com>
2025-03-29 14:46:54 +03:00
Vigers Ray
8b0cadaf1e
Фиксы апстрима
2025-02-19 14:13:11 +03:00
Vigers Ray
ed0a30bb64
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Resources/Locale/en-US/_strings/actions/actions/dna-scrambler.ftl
# Resources/Locale/en-US/_strings/administration/commands/change-cvar-command.ftl
# Resources/Locale/en-US/discord/vote-notifications.ftl
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Voice/speech_emotes.yml
2025-02-19 13:16:37 +03:00
SlamBamActionman
3200ba88a5
Add ability for +VVEDIT users to scale damage/healing in the game ( #35255 )
...
* Initial commit
* Add universal modifier for all damage/heals, make guidebooks work.
* help text
2025-02-18 08:28:42 +01:00
Leon Friedrich
ca9479fe69
Fix hitscan visuals ( #34515 )
...
* Fix hitscan visuals
* remove unnecessary changes
* rename `mapDirection`
2025-02-16 17:14:04 +01:00
Vigers Ray
3355febe9b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/StatusIcon/StatusIconSystem.cs
# Content.Server/Implants/ImplantedSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/markings/ears.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Mobs/Player/observer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
# Resources/manifest.yml
# Resources/migration.yml
# RobustToolbox
2025-02-09 22:17:22 +03:00
Vasilis The Pikachu
36e42fb4b2
Merge branch 'master' of ssh://github.com/space-wizards/space-station-14 into staging
2025-02-06 01:11:50 +01:00
Plykiya
0d9f9e9615
Make hacking energy swords predicted ( #34877 )
...
* Make hacking energy swords predicted
* Fix up component, add dirty call
* access
* Dirty Entity<T>
* false
2025-02-05 20:48:28 +01:00
SlamBamActionman
f25720124a
Fix hitting through directional windows (and more!) ( #34793 )
2025-02-02 23:03:31 +01:00
Vigers Ray
85ee9ebbc6
Борги боевые лошади
2025-01-10 03:52:27 +03:00
Vigers Ray
0619ac9206
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/workflows/build-test-debug.yml
# Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
# Resources/Locale/en-US/_strings/atmos/gases.ftl
# Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl
# Resources/Locale/en-US/_strings/tools/components/tool-component.ftl
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Research/industrial.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/ai_factions.yml
# Resources/toolshedEngineCommandPerms.yml
2024-12-21 18:51:37 +03:00
metalgearsloth
9f4aa1ebe0
Implement some field-level deltas ( #28242 )
...
* Update GasTileOverlayState
* Update DecalGridState
* Update NavMapState
* poke
* poke2
* poke3
* Implement field deltas for guns
* Content done
* Update
---------
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2024-12-21 15:54:11 +11:00
Vigers Ray
e24b72018f
Ой, бесконечные патроны.
2024-12-07 08:23:03 +03:00
Vigers Ray
67a1903332
Смена клавиши для взаимодействия с затвором и магазинами
2024-12-07 07:40:41 +03:00
Vigers Ray
3ea76c6a45
Фикс осмотра урона боеприпасов и указание типа модификатора
2024-12-07 07:38:35 +03:00
Vigers Ray
27d04c106f
Доработки хитскана
2024-12-05 14:54:08 +03:00
