Vigers Ray
8e6bef725d
фиксы_апстрима
2025-12-29 19:23:57 +01:00
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
iertis
a700c7628e
Fix "ыыыы" ( #3516 )
2025-12-26 17:44:36 +03: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
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
Vigers Ray
e67f4a6672
Merge remote-tracking branch 'space-wizards/master'
2025-09-27 03:54:27 +03:00
Pieter-Jan Briers
0c97520276
Fix usages of TryIndex() ( #39124 )
...
* Fix usages of TryIndex()
Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115 )
This then resulted in TryIndex() getting modified to log errors (94f98073b0#39098 )
This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.
Fixes #39115
Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.
* fix tests
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-09 18:17:56 +02:00
Vigers Ray
939076ff99
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/publish.yml
# Content.Client/Administration/UI/BanPanel/BanPanel.xaml
# Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Hands/Systems/HandsSystem.cs
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
# Content.Client/Options/UI/EscapeMenu.xaml
# Content.Client/Stealth/StealthSystem.cs
# Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
# Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
# Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
# Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Administration/Commands/AdminWhoCommand.cs
# Content.Server/Administration/Commands/PardonCommand.cs
# Content.Server/Administration/Commands/RoleUnbanCommand.cs
# Content.Server/Administration/Commands/SetOutfitCommand.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
# Content.Server/Body/Components/BloodstreamComponent.cs
# Content.Server/Body/Systems/BloodstreamSystem.cs
# Content.Server/Body/Systems/MetabolizerSystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Server/Chat/Systems/ChatSystem.Emote.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/CrewManifest/CrewManifestSystem.cs
# Content.Server/Emp/EmpSystem.cs
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
# Content.Server/Fax/FaxSystem.cs
# Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
# Content.Server/GameTicking/Commands/ForceMapCommand.cs
# Content.Server/GameTicking/Commands/ForcePresetCommand.cs
# Content.Server/GameTicking/Presets/GamePresetPrototype.cs
# Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs
# Content.Server/GameTicking/Rules/Components/ChangelingRuleComponent.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/Implants/Components/ScramImplantComponent.cs
# Content.Server/Implants/SubdermalImplantSystem.cs
# Content.Server/Materials/ProduceMaterialExtractorSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
# Content.Server/NPC/Systems/NPCSystem.cs
# Content.Server/Polymorph/Systems/PolymorphSystem.cs
# Content.Server/Radio/EntitySystems/HeadsetSystem.cs
# Content.Server/Repairable/RepairableSystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
# Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
# Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
# Content.Server/Speech/EntitySystems/MothAccentSystem.cs
# Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/Stunnable/Components/StunOnCollideComponent.cs
# Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Bed/SharedBedSystem.cs
# Content.Shared/Blocking/BlockingSystem.cs
# Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
# Content.Shared/Chemistry/Components/SolutionRegenerationComponent.cs
# Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
# Content.Shared/Construction/Conditions/TileNotBlocked.cs
# Content.Shared/Cuffs/SharedCuffableSystem.cs
# Content.Shared/Doors/Systems/SharedDoorSystem.cs
# Content.Shared/Emoting/EmoteAttemptEvent.cs
# Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs
# Content.Shared/Eye/VisibilityFlags.cs
# Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Interaction/SmartEquipSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
# Content.Shared/Medical/Healing/HealingSystem.cs
# Content.Shared/Medical/HealingComponent.cs
# Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
# Content.Shared/Slippery/SlipperySystem.cs
# Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
# Content.Shared/Standing/StandingStateComponent.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Content.Shared/Station/SharedStationSpawningSystem.cs
# Content.Shared/Stunnable/SharedStunSystem.cs
# Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
# Content.Shared/VendingMachines/VendingMachineComponent.cs
# Content.Shared/Warps/WarpPointSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Content.Shared/Wieldable/SharedWieldableSystem.cs
# Resources/Audio/Ambience/Antag/attributions.yml
# Resources/Audio/Ambience/Antag/changeling_start.ogg
# Resources/Audio/Effects/attributions.yml
# Resources/Audio/Lobby/attributions.yml
# Resources/Audio/Machines/attributions.yml
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Locale/en-US/_strings/administration/antag.ftl
# Resources/Locale/en-US/_strings/administration/commands/camera.ftl
# Resources/Locale/en-US/_strings/administration/commands/dsay-command.ftl
# Resources/Locale/en-US/_strings/administration/commands/follow-command.ftl
# Resources/Locale/en-US/_strings/administration/smites.ftl
# Resources/Locale/en-US/_strings/administration/ui/admin-camera-window.ftl
# Resources/Locale/en-US/_strings/administration/ui/role-bans.ftl
# Resources/Locale/en-US/_strings/alerts/alerts.ftl
# Resources/Locale/en-US/_strings/atmos/gas-pressure-regulator-system.ftl
# Resources/Locale/en-US/_strings/bonk/components/bonkable-component.ftl
# Resources/Locale/en-US/_strings/commands/add-body-part-command.ftl
# Resources/Locale/en-US/_strings/commands/admin-logs-command.ftl
# Resources/Locale/en-US/_strings/commands/admin-who-command.ftl
# Resources/Locale/en-US/_strings/commands/asay-command.ftl
# Resources/Locale/en-US/_strings/commands/crew-manifest-command.ftl
# Resources/Locale/en-US/_strings/commands/deadmin-command.ftl
# Resources/Locale/en-US/_strings/commands/delete-component-command.ftl
# Resources/Locale/en-US/_strings/commands/destroy-mechanism-command.ftl
# Resources/Locale/en-US/_strings/commands/dirty-command.ftl
# Resources/Locale/en-US/_strings/commands/dsay-command.ftl
# Resources/Locale/en-US/_strings/commands/dump-reagent-guide-text-command.ftl
# Resources/Locale/en-US/_strings/commands/eye-commands.ftl
# Resources/Locale/en-US/_strings/commands/follow-command.ftl
# Resources/Locale/en-US/_strings/commands/force-map-command.ftl
# Resources/Locale/en-US/_strings/commands/force-preset-command.ftl
# Resources/Locale/en-US/_strings/commands/ghost-kick-command.ftl
# Resources/Locale/en-US/_strings/commands/ghost-visibility-commands.ftl
# Resources/Locale/en-US/_strings/commands/go-lobby-command.ftl
# Resources/Locale/en-US/_strings/commands/grid-drag-command.ftl
# Resources/Locale/en-US/_strings/commands/is-afk-command.ftl
# Resources/Locale/en-US/_strings/commands/makesentient-command.ftl
# Resources/Locale/en-US/_strings/commands/map-commands.ftl
# Resources/Locale/en-US/_strings/commands/mapping-client-side-setup-command.ftl
# Resources/Locale/en-US/_strings/commands/mappingclientsidesetup-command.ftl
# Resources/Locale/en-US/_strings/commands/me-command.ftl
# Resources/Locale/en-US/_strings/commands/mind-info-command.ftl
# Resources/Locale/en-US/_strings/commands/node-vis-commands.ftl
# Resources/Locale/en-US/_strings/commands/npc-command.ftl
# Resources/Locale/en-US/_strings/commands/nukecodes-command.ftl
# Resources/Locale/en-US/_strings/commands/ooc-command.ftl
# Resources/Locale/en-US/_strings/commands/pardon-command.ftl
# Resources/Locale/en-US/_strings/commands/powerstat-command.ftl
# Resources/Locale/en-US/_strings/commands/promote-host-command.ftl
# Resources/Locale/en-US/_strings/commands/radiation-command.ftl
# Resources/Locale/en-US/_strings/commands/readmin-command.ftl
# Resources/Locale/en-US/_strings/commands/remove-extra-components-command.ftl
# Resources/Locale/en-US/_strings/commands/role-commands.ftl
# Resources/Locale/en-US/_strings/commands/say-command.ftl
# Resources/Locale/en-US/_strings/commands/set-battery-percent-command.ftl
# Resources/Locale/en-US/_strings/commands/show-ambient-command.ftl
# Resources/Locale/en-US/_strings/commands/show-gun-spread-command.ftl
# Resources/Locale/en-US/_strings/commands/show-htn-command.ftl
# Resources/Locale/en-US/_strings/commands/showrules-command.ftl
# Resources/Locale/en-US/_strings/commands/spawn-entity-list-command.ftl
# Resources/Locale/en-US/_strings/commands/start-singularity-command.ftl
# Resources/Locale/en-US/_strings/commands/tile-pry-command.ftl
# Resources/Locale/en-US/_strings/commands/toggle-decals-command.ftl
# Resources/Locale/en-US/_strings/commands/toggle-disallow-late-join-command.ftl
# Resources/Locale/en-US/_strings/commands/unlocknode-command.ftl
# Resources/Locale/en-US/_strings/commands/whisper-command.ftl
# Resources/Locale/en-US/_strings/components/gas-pressure-regulator-component.ftl
# Resources/Locale/en-US/_strings/engineer-painter/engineer-painter.ftl
# Resources/Locale/en-US/_strings/game-ticking/forcemap-command.ftl
# Resources/Locale/en-US/_strings/interaction/interaction-popup-component.ftl
# Resources/Locale/en-US/_strings/markings/vox_tattoos.ftl
# Resources/Locale/en-US/_strings/materials/material-extractor.ftl
# Resources/Locale/en-US/_strings/movement/eye.ftl
# Resources/Locale/en-US/_strings/nutrition/components/food-component.ftl
# Resources/Locale/en-US/_strings/nutrition/components/ingestion-system.ftl
# Resources/Locale/en-US/_strings/nutrition/components/sealable-component.ftl
# Resources/Locale/en-US/_strings/radiation/radiation-command.ftl
# Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/_strings/research/technologies.ftl
# Resources/Locale/en-US/_strings/seeds/seeds.ftl
# Resources/Locale/en-US/_strings/weapons/grenades/timer-trigger.ftl
# Resources/Locale/en-US/_strings/weapons/grenades/voice-trigger.ftl
# Resources/Locale/en-US/commands/mapping-client-side-setup-command.ftl
# Resources/Locale/en-US/recipes/tags.ftl
# Resources/Maps/_Sunrise/Station/bagel.yml
# Resources/Maps/_Sunrise/Station/barratry.yml
# Resources/Maps/_Sunrise/Station/box.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/amber.yml
# Resources/Maps/centcomm.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/Fills/Lockers/service.yml
# Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
# Resources/Prototypes/Entities/Clothing/Belt/belts.yml
# Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
# Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Head/hats.yml
# Resources/Prototypes/Entities/Clothing/Head/helmets.yml
# Resources/Prototypes/Entities/Clothing/Head/hoods.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Entities/Mobs/Player/clone.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Fun/toys.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Shields/shields.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
# Resources/Prototypes/Entities/Objects/Tools/matches.yml
# Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
# Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.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/Projectiles/grenade.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
# Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
# Resources/Prototypes/Entities/Structures/Furniture/beds.yml
# Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
# Resources/Prototypes/Entities/Structures/Power/debug_power.yml
# Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
# Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
# Resources/Prototypes/GameRules/subgamemodes.yml
# Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
# Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
# Resources/Prototypes/Recipes/Lathes/categories.yml
# Resources/Prototypes/Recipes/Reactions/chemicals.yml
# Resources/Prototypes/Roles/Antags/changeling.yml
# Resources/Prototypes/name_identifier_groups.yml
# Resources/Prototypes/tool_qualities.yml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
# Resources/ServerInfo/Guidebook/Command.xml
# Resources/ServerInfo/Guidebook/Glossary.xml
# Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.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/Hardsuits/wizard.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
# Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
# Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
# Resources/engineCommandPerms.yml
# Resources/keybinds.yml
# Resources/migration.yml
2025-08-10 01:49:23 +03:00
Tayrtahn
c565b44965
Replace ValidatePrototypeId uses with ProtoId or EntProtoId ( #38814 )
...
* The easy ones
* For certain values of easy
* Easy test
* Hair
* Fix sandbox violations
* Sort usings
2025-07-07 21:57:05 +02:00
Vigers Ray
f71f04558f
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
# Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
2025-04-17 23:48:59 +03:00
metalgearsloth
9b7af5dfcf
Fix hunger + thirst mispredicts ( #36549 )
...
* Fix hunger + thirst mispredicts
* Review
2025-04-17 21:43:16 +10:00
Vigers Ray
29cfd1b2d7
Фикс траты еды и воды
2025-02-14 05:50:37 +03:00
Vigers Ray
170b987f2b
Истинные дворфы и урон жаждой
2025-02-14 03:18: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
24679aff6d
фиксы апстрима
2024-11-14 03:38:28 +03:00
Vigers Ray
38889342ad
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Shared/Weapons/Ranged/Components/GunComponent.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
2024-11-13 04:35:52 +03:00
Kirus59
cb59826dcb
Hunger and thirst huds fix ( #32832 )
...
* Hunger and thirst huds fix
* delete poor caching
2024-11-05 17:58:23 +01:00
haiwwkes
99851de785
ayo ( #545 )
2024-10-30 10:42:02 +03:00
slarticodefast
e0d30aff4e
Add tooltips to the agent ID job icons and improve status icon prototypes ( #28575 )
...
* add tooltips to agentid job icons
* forgot to stage this
* make StatusIconPrototype abstract
* minor visual improvements
* cleanup
* use currentculture to sort job names
* review
2024-08-09 16:14:07 +10:00
Nemanja
8a95cb186c
Remove AlertType and AlertCategory ( #27933 )
2024-05-23 22:43:04 -04:00
Krunklehorn
460b588de5
Refactor status icons take 2, cyborgs don't see criminal status ( #26207 )
...
* Initial commit.
* review
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-18 13:20:44 +10:00
LordCarve
eeaea6c25b
Unify Content's EntitySystem logging ( #26216 )
...
Use Log with generated sawmill name rather than explicitly named one for all non rule-based Content EntitySystems.
2024-03-18 07:30:27 +11:00
Pieter-Jan Briers
e00f74505c
Use new ComponentPauseGenerator ( #25183 )
...
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
2024-02-26 14:36:19 +11:00
Leon Friedrich
c348582e04
Fix thirst errors in tests ( #20481 )
2023-09-24 18:07:31 -07:00
Slava0135
c4f3f5177a
Fix thirst ( #20472 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-09-24 12:50:41 -07:00
PrPleGoo
1a13884961
Task/food hud ( #19312 )
...
* security HUD now shows a job icon on entities with a body
* thirst goggles
* set starting hud gear
* fix build
* remove from starting gear
* remove
* replace
* fix thirst and hunger icons
* update icons
* space
* space
* ]
* ]
* fix build
* fix comments
* fix
* spacing
* field
* move more namespaces
* use AutoGenerateComponentState
* comments
* fix build
* not all fields
* comments
* unpaused
* fix Dirty warning
---------
Co-authored-by: Slava0135 <super.novalskiy_0135@inbox.ru>
2023-09-23 16:14:06 +03:00
Visne
ee4809a222
Revert "Hunger and thirst HUDs" ( #18125 )
2023-07-18 17:28:28 +02:00
PrPleGoo
67e4b626c1
Hunger and thirst HUDs ( #18066 )
...
* security HUD now shows a job icon on entities with a body
* thirst goggles
* set starting hud gear
2023-07-18 00:01:22 -06:00
