Vigers Ray
|
0e350ab6d3
|
Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
# Content.Client/Actions/ActionsSystem.cs
# Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
# Content.Server/GameTicking/GameTicker.GamePreset.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Actions/BaseActionComponent.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Weapons/Reflect/ReflectComponent.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs
# README.md
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/ai_factions.yml
|
2025-04-19 00:46:30 +03:00 |
|
Nemanja
|
57bbf76ec6
|
Fix inability to engage with economic Cargonia (#36668)
Fix inability to engage with cargo supremacy
|
2025-04-18 12:06:29 +10:00 |
|
Vigers Ray
|
77d4af8975
|
Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
# Content.Server/Atmos/EntitySystems/FlammableSystem.cs
# Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs
# Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs
# Content.Shared/Damage/Systems/StaminaSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Resources/Locale/en-US/_strings/chat/ui/chat-window.ftl
# Resources/Locale/en-US/_strings/damage/damage-popup-component.ftl
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/XenoArch/Effects/normal_effects.yml
# Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo.png
# Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
# Resources/migration.yml
|
2025-04-15 04:03:44 +03:00 |
|
Nemanja
|
ed3e4c7d4e
|
Fix station income instantly accumulating roundstart (#36572)
Fix station money accumulating roundstart
|
2025-04-15 01:00:34 +02:00 |
|
Vigers Ray
|
3d8b756b88
|
фиксы апстрима
|
2025-04-13 17:45:33 +03:00 |
|
Nemanja
|
12b75beeab
|
Departmental Economy (#36445)
* Cargo Accounts, Request Consoles, and lock boxes
* Funding Allocation Computer
* final changes
* test fix
* remove dumb code
* ScarKy0 review
* first cour
* second cour
* Update machines.yml
* review
---------
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
|
2025-04-13 15:22:36 +02:00 |
|