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
