Vigers Ray
7eee898afc
Merge remote-tracking branch 'space-sunrise/master'
...
# Conflicts:
# Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
# Content.Client/_Sunrise/MentorHelp/MentorHelpControl.xaml.cs
# Content.Packaging/ServerPackaging.cs
# Content.Server/Content.Server.csproj
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
# Content.Server/Fax/FaxSystem.cs
# Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
# Content.Server/_Sunrise/Biocode/Systems/BiocodeDeactivationSystem.cs
# Content.Shared/CCVar/CCVars.Atmos.cs
# Content.Shared/Repairable/RepairableSystem.cs
# Content.Shared/_Sunrise/FleshCult/CauseFleshCultInfection.cs
# Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
# Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
# Resources/Locale/en-US/_strings/medical/components/crew-monitoring-component.ftl
# Resources/Locale/en-US/_strings/reagents/meta/medicine.ftl
# Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
# Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/mech/mechs.ftl
# Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
# Resources/Locale/ru-RU/_strings/_sunrise/markings/vulpkanin.ftl
# Resources/Locale/ru-RU/_strings/_sunrise/mentor-help/mentor-help-ui.ftl
# Resources/Locale/ru-RU/_strings/reagents/meta/medicine.ftl
# Resources/Maps/Nonstations/nukieplanet.yml
# Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml
# Resources/Prototypes/Catalog/Fills/Items/belt.yml
# Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
# Resources/Prototypes/Damage/containers.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
# Resources/Prototypes/Reagents/fun.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
# Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/Prototypes/Store/currency.yml
# Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
# Resources/Prototypes/_Sunrise/Chemistry/medicine.yml
# Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
# Resources/Prototypes/_Sunrise/Entities/Mobs/Player/eviltwin.yml
# Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_brains.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Tools/biocode.yml
# Resources/Prototypes/_Sunrise/GameRules/events.yml
# Resources/Prototypes/_Sunrise/Reagents/gases.yml
# Resources/Prototypes/_Sunrise/Reagents/narcotics.yml
# Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield_officer.yml
# Resources/Prototypes/_Sunrise/Roles/Jobs/Security/senior_officer.yml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/meta.json
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalert.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalertdirect.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalertnull.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonclose.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirect.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectlarge.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectsmall.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectxtrlarge.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonfar.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonmedium.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonnull.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinpointer_bloodcult.png
# Resources/manifest.yml
2025-12-29 18:37:56 +01: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
A-Mironov
885bd26937
Солянка обнов № 4 ( #151 )
...
* mangleness adjustment
* stable
* empty fix
* перебаламс
* Обнова описаний
* stable
* Голо работабт как надо
* fix
* Fix fax
* Update medicine.yml
* Update blood_magic.yml
* Update humanoid.yml
* Update medicine.yml
* Update ghost_roles.yml
* Update mechs.yml
* Update toxins.yml
* Fish comments
* F
* Update hypospray.yml
* Update hypospray.yml
* Update hypospray.yml
* фикс мозгов
* истощение!!!
* Обнова наборов медиков ОБР и ЯО
* Частичный откат фикса факса
* ФИКСЫ ПНТ
* Ещё один нерф культа плоти? В этой экономике? А вообще исправлен баг бесконечных мясников
* Автокрио вернулось на 15 минут, минимум для мажоров опущен до 35 игроков
* Истощение теперь живёт у санрайза
* Не работают комменты там
* Возвращаем бугурт комментов + требование 100 часов СБ на ЭС
* фикс линтера
* Update hypospray.ftl
* Update hypospray.yml
* Считать не умею, фикс боевого медипена
2025-12-19 01:11:18 +02:00
A-Mironov
488682ed5c
Фиксы истощения + обнова ЭС ( #145 )
...
* z
* z
* z
* stable
* z
* med edits
* fixes
* Слишком сильно
* oops
* fix
* Update masks.yml
* В аплинк добавлена импульска и аннигилятор, но вне бюджета ОБР
2025-12-02 23:32:14 +02:00
A-Mironov
cc457713a9
Реворк истощения ( #141 )
...
* Z
* z
* Z
* fix
* fix
* Z
* hm
* q
* z
* z
* z
* ready
* Update medicine.yml
* forgot this
* update
* z
2025-11-30 00:08:00 +02: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
Vigers Ray
e67f4a6672
Merge remote-tracking branch 'space-wizards/master'
2025-09-27 03:54:27 +03:00
A-Mironov
1107d4350c
QOL мед отдела ( #3176 )
2025-09-27 00:48:54 +03:00
LordCarve
a3ddba6f42
Cleanup - Use RemoveAllChildren() over DisposeAllChildren() ( #39848 )
...
* Content - change the (should-be-obsolete) DisposeAllChildren into the more robust RemoveAllChildren.
* Remove duplicate calls.
---------
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2025-09-23 15:40:48 +12:00
Saphire Lattice
a95c8baf28
Add health analyzer unrevivability warning ( #32636 )
...
* Add health analyzer unrevivability warning
* Remove errornous comment
2024-10-26 19:22:08 +02:00
goet
24ed1f71f6
Fix medical PDA/health analyzer long range intel bug ( #31879 )
...
* hide spriteview from health analyzer while inactive
* add out of range indicator if analyzer becomes inactive
* hide out of range icon if there is no patient data
2024-09-21 15:54:48 +10:00
Thomas
250628f805
New Health Analyzer UI ( #30834 )
...
* WIP: first prototype
* Change text slightly
* Allow names to wrap
* Add label for the scan mode
* Remove ugly text
* Readd bleeding message
* Update code
* Allow for the Health Analyzer UI to grow vertically
2024-08-27 16:57:36 +02:00
metalgearsloth
edb05e36bb
Reapply "Remove some BUI boilerplate" ( #30214 ) ( #30219 )
...
* Reapply "Remove some BUI boilerplate" (#30214 )
This reverts commit cb0ba66be3
2024-07-21 14:48:13 +10:00
Nemanja
cb0ba66be3
Revert "Remove some BUI boilerplate" ( #30214 )
...
Revert "Remove some BUI boilerplate (#28399 )"
This reverts commit cbf329a82d
2024-07-20 20:42:27 -04:00
metalgearsloth
cbf329a82d
Remove some BUI boilerplate ( #28399 )
...
* Remove some BUI boilerplate
- The disposals overrides got removed due to the helper method handling it.
- Replace window creation with CreateWindow helper.
- Fixed some stinky code which would cause exceptions.
* More
* moar
* weh
* done
* More BUIs
* More updates
* weh
* moar
* look who it is
* weh
* merge
* weh
* fixes
2024-07-20 15:40:16 +10:00
KrasnoshchekovPavel
3fcbbc0732
Added localization of groups and types: damage, metabolism ( #27368 )
...
* Added localization of groups and types: damage, metabolism (displayed in the guide book). The text for the health analyzer, weapon damage inspection is now taken from damage prototypes
* fix damage tests
* fix damage test yml
* fix damage test prototypes
* Update Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs
* Update Content.Shared/Damage/Prototypes/DamageTypePrototype.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-28 14:48:19 +10:00
TsjipTsjip
998bf45368
Health analyzer UI unit correction ( #26903 )
...
Correct Kelvin displayed on health analyzer UI, use T0C constant.
2024-04-12 16:47:44 -04:00
Whisper
ff65cb7b0c
Whisper bleed update v3 ( #25434 )
...
* Whisper bleed update v3
* missed a few
* Add bleeding message to health analyzer.
* Fix bleed notification not updating.
* Apparently this either doesnt exist
2024-02-26 16:26:46 -07:00
Rainfey
4129c77a5b
Make Health Analysers UI continuously update ( #22449 )
2024-02-06 09:20:09 -04:00
Pieter-Jan Briers
c25ddfd638
Health analyzers now show if somebody is starving ( #24789 )
...
"why are they getting cold damage" THERE YOU GO
2024-02-01 17:28:17 +11:00
Krunklehorn
f9c43567ea
Health analyzers and cryopods also show temperature in Kelvin ( #24643 )
...
Health analyzers and cryopods also show temperature in kelvin
2024-01-28 20:32:54 -05:00
Artjom
6ce75ccec9
Health analyzer UI improve ( #17280 )
2023-10-28 16:54:18 +11:00
Whisper
8fb9d6e9b3
Remove empty damage values from health analyzer UI ( #20366 )
2023-09-25 20:37:22 -08:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
MilenVolf
3f20fb625a
add temperature&bloodLevel locale ( #18266 )
...
Adds temperature&bloodLevel locale to Health Analyzer
2023-07-24 15:39:09 -07:00
Whisper
301fbffcfd
adds both blood level and body temp to analyzers and cryo ( #16778 )
...
* Ports temperature scanning from mining station 14
* Added blood level to analyzer
* adds body temp and blood level to health analyzers and cryo
* Blood and temperature will show N/A if not available
2023-07-18 15:13:26 -06:00
TemporalOroboros
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
metalgearsloth
0e81cb4319
Remove diseases ( #15684 )
2023-05-07 17:50:37 +10:00
DrSmugleaf
f474171451
Remove health analyzer component references ( #15322 )
2023-04-11 17:11:02 -07:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
Leon Friedrich
921e2ee57d
BUI changes required for Engine PR ( #10608 )
2022-08-21 03:38:30 +10:00
metalgearsloth
45bd1edd5b
Revert "Update submodule to 0.34.0.0 ( #10356 )" ( #10359 )
2022-08-06 16:48:21 +10:00
Leon Friedrich
e06ea56eb2
Content BUI changes for engine PR ( #10308 )
2022-08-06 14:59:02 +10:00
Rinkashikachi
0a64eb98cf
Added damage type localization for health analyzer ( #10249 )
2022-08-02 07:04:10 -07:00
Leon Friedrich
c7ad6b709e
Audio System Rejig ( #9635 )
2022-07-29 12:13:12 +10:00
Kara
2d5ec7f85c
Id[entity] 2.0 (real) ( #9612 )
...
* starter API
* network ID cards
* Port more stuff from old identity
* Re-implement identity representation + name updating
* move
* proper name returning for `IdentityName`
* move everything important to server, give in to temptation
* shared / server / client split sadly. move ensure to shared and spawn to server
* identity update queueing + identityblocker
* fixes
* and just like that it's usable for admins
* huge identity pass
* pass dos
* jesus christ
* figs :D
* fuck u
* fix bad merge.
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-07-10 20:36:53 -05:00
Rane
bb9ad4259c
Diseases ( #7057 )
...
* Disease system first pass
* Renamed HealthChange
* First working version of diseases (wtf???)
* Fix the cursed yaml initialization
* Pop-Up effect
* Generic status effect
* Create copy of prototype
* CureDiseaseEffect
* Disease resistance
* Spaceacillin
* Nerf spaceacillin now that we know it works
* Sneezing, Coughing, Snoughing
* Fix queuing, prevent future issues
* Disease protection
* Disease outbreak event
* Disease Reagent Cure
* Chem cause disease effect
* Disease artifacts
* Try infect when interacting with diseased
* Diseases don't have to be infectious
* Talking without a mask does a snough
* Temperature cure
* Bedrest
* DiseaseAdjustReagent
* Tweak how disease statuses work to be a bit less shit
* A few more diseases
* Natural immunity (can't get the same disease twice)
* Polished up some diseases, touched up spaceacillin production
* Rebalanced transmission
* Edit a few diseases, make disease cures support a minimum value
* Nitrile gloves, more disease protection sources
* Health scanner shows diseased status
* Clean up disease system
* Traitor item
* Mouth swabs
* Disease diagnoser machine
* Support for clean samples
* Vaccines + fixes
* Pass on disease resistant clothes
* More work on non-infectious diseases & vaccines
* Handle dead bodies
* Added the relatively CBT visualizer
* Pass over diseases and their populators
* Comment stuff
* Readability cleanup
* Add printing sound to diagnoser, fix printing bug
* vaccinator sound, seal up some classes
* Make disease protection equip detection not shit (thanks whoever wrote addaccentcomponent)
* Mirror review
* More review stuff
* More mirror review stuff
* Refactor snoughing
* Redid report creator
* Fix snough messages, new vaccinator sound
* Mirror review naming
* Woops, forgot the artifact
* Add recipes and fills
* Rebalance space cold and robovirus
* Give lizarb disease interaction stuff
* Tweak some stuff and move things around
* Add diseases to mice (since animal vectors are interesting and can be used to make vaccines)
* Remove unused reagent
2022-03-13 20:02:55 -05:00
Fishfish458
7f43f38cc7
Add health analyzer and medical scanner ECS ( #6907 )
...
Co-authored-by: fishfish458 <fishfish458>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-03-08 14:45:52 +11:00
