Commit graph

11 commits

Author SHA1 Message Date
iertis
a700c7628e
Fix "ыыыы" (#3516) 2025-12-26 17:44:36 +03:00
DerKurait
2c7bafcc65
Добавить возможность выключать пищание мониторинга (#3079)
Co-authored-by: Vitaliy_Merzun <dunoquas487@gmail.com>
2025-09-26 23:46:53 +03:00
Vigers Ray
e1b8d682ff Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Server/PDA/PdaSystem.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
#	Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
2025-04-19 16:33:37 +03:00
metalgearsloth
63dfd21b14
Predict dumping (#32394)
* Predict dumping

- This got soaped really fucking hard.
- Dumping is predicted, this required disposals to be predicte.d
- Disposals required mailing (because it's tightly coupled), and a smidge of other content systems.
- I also had to fix a compnetworkgenerator issue at the same time so it wouldn't mispredict.

* Fix a bunch of stuff

* nasty merge

* Some reviews

* Some more reviews while I stash

* Fix merge

* Fix merge

* Half of review

* Review

* re(h)f

* lizards

* feexes

* feex
2025-04-19 16:20:40 +10:00
Vigers Ray
c4281b75cb Вобля 2025-02-12 20:03:00 +03:00
Vigers Ray
8d72f3ca48 Фикс атмос консоли 2025-02-12 19:08:39 +03:00
Vigers Ray
53711110c3 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Locale/en-US/_strings/administration/commands/announce-command.ftl
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
2025-02-12 18:46:28 +03:00
SpaceManiac
4122310735
Fix 38 non-obsolete warnings (#33794) 2025-02-11 20:59:50 +11:00
pacable
903b4f1401
Портативная консоль атмосферных угроз всем инженерам и атмосам. (#754)
* base prototype

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* консоль пикает

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* боргу

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* более тихий звук

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* норм название и перевод

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* спрайт

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* лоадаут для этого

Signed-off-by: pacable <igor.mamaev1@gmail.com>

* role loadouts

* locale

---------

Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-12-02 08:04:52 +03:00
chromiumboy
d2216835d8
Visualized regions for NavMapControl (#31910)
* Atmospheric alerts computer

* Moved components, restricted access to them

* Minor tweaks

* The screen will now turn off when the computer is not powered

* Bug fix

* Adjusted label

* Updated to latest master version

* Initial commit

* Tidy up

* Add firelocks to the nav map

* Add nav map regions to atmos alerts computer

* Added support for multiple region overlay sets per grid

* Fixed issue where console values were not updating correctly

* Fixing merge conflict

* Fixing merge conflicts

* Finished all major features

* Removed station map regions (to be re-added in a separate PR)

* Improved clarity

* Adjusted the color saturation of the regions displayed on the atmos alerts computer
2024-10-23 14:49:58 +02:00
chromiumboy
63ba0f61ea
Atmospheric alerts computer (#25938)
* Atmospheric alerts computer

* Moved components, restricted access to them

* Minor tweaks

* The screen will now turn off when the computer is not powered

* Bug fix

* Adjusted label

* Updated to latest master version
2024-09-04 21:13:17 -04:00