Commit graph

4671 commits

Author SHA1 Message Date
Babaev
97b877e761
roadmap small update (#979)
* again

* oopsie
2024-12-31 04:45:16 +03:00
Vigers Ray
3c4b484362 HolidayClothingSwap для новогодних замен спрайтов одежды 2024-12-30 01:11:08 +03:00
Vigers Ray
bc3e3ede59 Вернул открытие роадмапа при входе 2024-12-29 19:24:10 +03:00
Vigers Ray
036210f952 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-29 19:02:59 +03:00
Babaev
ec084fb5b0
better roadmap ui (#963)
* ага

* вопросы?

* финалочка

* 2

* последний мув
2024-12-29 18:53:22 +03:00
chromiumboy
6c465153ab
UI improvements for holopads (#34055)
* Initial commit

* Minor update
2024-12-29 00:33:15 +01:00
Vigers Ray
638a7d023a Настройки специфичные для билда френдри форк и в начале 2024-12-28 22:01:08 +03:00
Vigers Ray
0bd0b81665 Блядь 2024-12-28 10:14:33 +03:00
Vigers Ray
cb00121117 Блядь, проебался с блокировкой описания. Добавил лимит клиенту 2024-12-28 07:29:15 +03:00
Vigers Ray
b40ea4c12e Revert "требует баланса (#938)"
This reverts commit 39f1e14c
2024-12-28 06:35:36 +03:00
Vigers Ray
0dd15366e8 Отображение в спонсор инфо информации о описании 2024-12-28 06:33:42 +03:00
Vigers Ray
4be5d58512 Для тупых 2024-12-28 05:36:37 +03:00
Vigers Ray
42841c0246 Описания для спонсоров 2024-12-28 05:31:26 +03:00
ThereDrD
114a51a24c
transform some strings to [] (#949) 2024-12-28 01:40:06 +03:00
haiwwkes
25b439a971
реверт чатстака на время фиксов (#947)
* Revert "a (#939)"

This reverts commit 3239865364.

* Revert "Chat Stack (#935)"

This reverts commit 79fd150bf0.
2024-12-27 18:29:14 +03:00
haiwwkes
3239865364
a (#939) 2024-12-27 02:41:35 +03:00
haiwwkes
39f1e14cb1
требует баланса (#938) 2024-12-27 00:45:08 +03:00
Vigers Ray
b8229ad40b Доработки прыжков и бхопа 2024-12-27 00:38:52 +03:00
haiwwkes
79fd150bf0
Chat Stack (#935) 2024-12-26 21:16:44 +03:00
Vigers Ray
eab23ce60f Доработка прыжков и сальто 2024-12-26 05:42:35 +03:00
Vigers Ray
4e6dbed549 Прыжки на пробел (боже зачем) 2024-12-25 03:29:18 +03:00
haiwwkes
5192d120ea
Новая панель эмоутов. (#891)
* wacky

* work

* work

* work

* work

* eff

* a
2024-12-24 23:27:09 +03:00
Vigers Ray
d8547bf089 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-24 03:31:44 +03:00
Ed
1c33073af4
Multiple items in loadouts (#33193)
* loadouts update

* Update loadout_groups.yml

* darts to candles

* Update Resources/Prototypes/Loadouts/dummy_entities.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-24 01:24:19 +01:00
Vigers Ray
67c2add5de Фикс прогрузки спонсор инфо без открытия при запуске 2024-12-24 03:16:34 +03:00
Vigers Ray
7ca4c745f9 фикс отображения гридов спонсор инфо (ебаныеневалиды) 2024-12-24 03:01:19 +03:00
Vigers Ray
b360dd1ecb Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-24 02:49:28 +03:00
Vigers Ray
efc019e6d6 Скрытие пустых гридов в спонсор инфо.
Скрытие профиля в лобби если подвязка выключена.
Не показывать спонсор инфо спонсорам.
2024-12-24 02:47:44 +03:00
Pieter-Jan Briers
f98192daff
Fix the sensor monitoring console (#34035)
Still isn't really suitable to just map but at least it doesn't outright NRE anymore.

Alternative to #34032
2024-12-23 20:23:03 +01:00
Vigers Ray
9a0f28e893 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
2024-12-23 20:56:04 +03:00
Vigers Ray
b56448c3b6
Обновление спонсорской системы (#905)
* Апдейт спонсорки

* Доработка апдейта

* упс
2024-12-23 20:45:39 +03:00
mubururu_
4ddd7d3c5f
silent footsteps for ninja (#33280)
* waow

* nice suggestion

* nullable sound

* fix stuff

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-23 15:24:09 +01: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
Babaev
28641c657b
Фикс Ночного зрения и ПНВ (#893)
* отсоси

* Update NightVisionDeviceSystem.cs
2024-12-21 18:15:58 +03:00
Babaev
3fc9fcf62a
Update LobbyUIController.cs (#886) 2024-12-21 18:09:56 +03:00
VideoKompany
4c0a1348bd
Fix communication console menu (#33655)
fix Communication console
2024-12-20 10:17:13 -06:00
ArtisticRoomba
9de569d973
Show battery level for selected devices in Power Monitoring Console (#33854)
* Use class instead of out variables

* Show battery level in power monitoring console

* Better color contrast for battery level + localized string

* Add visualization to battery percentage

* Reverts random ChatSystem.cs whitespace change

* Address review

* Show BatteryLevel stats in child view when selecting devices

---------

Co-authored-by: Crotalus <crotalus@users.noreply.github.com>
2024-12-19 01:46:36 +01:00
Vigers Ray
87b6fa1145 Возможный фикс приколов с выбранными персонажами после новой жизни. 2024-12-19 01:29:19 +03:00
Ed
18fe8b9df0
Sprite Movement working with AI movement (#33494)
* FINALLY

* Update animals.yml
2024-12-18 17:15:34 +01:00
chromiumboy
7780b867ac
Holopads (#32711)
* Initial resources commit

* Initial code commit

* Added additional resources

* Continuing to build holopad and telephone systems

* Added hologram shader

* Added hologram system and entity

* Holo calls now have a hologram of the user appear on them

* Initial implementation of holopads transmitting nearby chatter

* Added support for linking across multiple telephones/holopads/entities

* Fixed a bunch of bugs

* Tried simplifying holopad entity dependence, added support for mid-call user switching

* Replaced PVS expansion with manually networked sprite states

* Adjusted volume of ring tone

* Added machine board

* Minor features and tweaks

* Resolving merge conflict

* Recommit audio attributions

* Telephone chat adjustments

* Added support for AI interactions with holopads

* Building the holopad UI

* Holopad UI finished

* Further UI tweaks

* Station AI can hear local chatter when being projected from a holopad

* Minor bug fixes

* Added wire panels to holopads

* Basic broadcasting

* Start of emergency broadcasting code

* Fixing issues with broadcasting

* More work on emergency broadcasting

* Updated holopad visuals

* Added cooldown text to emergency broadcast and control lock out screen

* Code clean up

* Fixed issue with timing

* Broadcasting now requires command access

* Fixed some bugs

* Added multiple holopad prototypes with different ranges

* The AI no longer requires power to interact with holopads

* Fixed some additional issues

* Addressing more issues

* Added emote support for holograms

* Changed the broadcast lockout durations to their proper values

* Added AI vision wire to holopads

* Bug fixes

* AI vision and interaction wires can be added to the same wire panel

* Fixed error

* More bug fixes

* Fixed test fail

* Embellished the emergency call lock out window

* Holopads play borg sounds when speaking

* Borg and AI names are listed as the caller ID on the holopad

* Borg chassis can now be seen on holopad holograms

* Holopad returns to a machine frame when badly damaged

* Clarified some text

* Fix merge conflict

* Fixed merge conflict

* Fixing merge conflict

* Fixing merge conflict

* Fixing merge conflict

* Offset menu on open

* AI can alt click on holopads to activate the projector

* Bug fixes for intellicard interactions

* Fixed speech issue with intellicards

* The UI automatically opens for the AI when it alt-clicks on the holopad

* Simplified shader math

* Telephones will auto hang up 60 seconds after the last person on a call stops speaking

* Added better support for AI requests when multiple AI cores are on the station

* The call controls pop up for the AI when they accept a summons from a holopad

* Compatibility mode fix for the hologram shader

* Further shader fixes for compatibility mode

* File clean up

* More cleaning up

* Removed access requirements from quantum holopads so they can used by nukies

* The title of the holopad window now reflects the name of the device

* Linked telephones will lose their connection if both move out of range of each other
2024-12-17 20:18:15 +01:00
chromiumboy
27e59d35fb
Atmospheric network monitor (#32294)
* Updated to latest master version

* Added gas pipe analyzer

* Completed prototype

* Playing with UI display

* Refinement of the main UI

* Renamed gas pipe analyzer to gas pipe sensor

* Added focus network highlighting and map icons for gas pipe sensors

* Added construction graph for gas pipe sensor

* Improved efficiency of atmos pipe and focus pipe network data storage

* Added gas pipe sensor variants

* Fixed gas pipe sensor nav map icon not highlighting on focus

* Rendered pipe lines now get merged together

* Set up appearance handling for the gas pipe sensor, but setting the layers is bugged

* Gas pipe sensor lights turn off when the device is unpowered

* Renamed console

* The gas pipe sensor is now a pipe. Redistributed components between it and its assembly

* AtmosMonitors can now optionally monitor their internal pipe network instead of the surrounding atmosphere

* Massive code clean up

* Added delta states to handle pipe net updates, fixed entity deletion handling

* Nav map blip data has been replaced with prototypes

* Nav map blip fixes

* Nav map colors are now set by the console component

* Made the nav map more responsive to changes in focus

* Updated nav map icons

* Reverted unnecessary namespace changes

* Code tidy up

* Updated sprites and construction graph for gas pipe sensor

* Updated localization files

* Misc bug fixes

* Added missing comment

* Fixed issue with the circuit board for the monitor

* Embellished the background of the console network entries

* Updated console to account for PR #32273

* Removed gas pipe sensor

* Fixing merge conflict

* Update

* Addressing reviews part 1

* Addressing review part 2

* Addressing reviews part 3

* Removed unnecessary references

* Side panel values will be grayed out if there is no gas present in the pipe network

* Declaring colors at the start of some files

* Added a colored stripe to the side of the atmos network entries

* Fixed an issue with pipe sensor blip coloration

* Fixed delay that occurs when toggling gas sensors on/off
2024-12-17 04:53:17 +01:00
Vigers Ray
6e1df58447 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-16 21:46:10 +03:00
Intoxicating-Innocence
2ccd471388
Chem master UI (#33328)
* chemmaster buffer has colors now

* I have saved chemists everywhere

* implimented panelcontainers instead of labels, slight visual rework

* added UI changes to input buffer

* fixed some unsightly indentation on brackets and removed redundant minheight specification from verticalstretch elements

* Formatting and code cleanup

* pills still not rendering correctly

* more tinkering, entities finally display correctly

* entities display correctly, pill fields default to max now

* fixed stripes

* fixed excess pillCount bug

* removed cache, fixed tab swapping

---------

Co-authored-by: Saphire <lattice@saphi.re>
2024-12-16 18:17:06 +01:00
Vigers Ray
28484c893c Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Damage/modifier_sets.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
#	Resources/migration.yml
2024-12-16 18:50:05 +03:00
Plykiya
a4d6f09a4f
Cluster grenade refactor and contra markings (#31108)
* Cluster grenade refactor

* oopsies on the name

* Solve client-side errors

* reviews addressed

* filling scattering grenades is now predicted

* reviews addressed
2024-12-16 13:08:07 +01:00
TGRCDev
1266b05b02
Bug fixes for Store UIs with multiple currencies (#33565)
Fixed stores with multiple currencies having bad formatting and non-functional withdraw screens
2024-12-16 14:57:11 +03:00
Vigers Ray
6f1366814f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
2024-12-14 21:22:31 +03:00
Southbridge
7eb714d38f
Monospace Support for Rich Text (#33830)
* Initial Commit

* Moved all this to SS14 on it's own

* Added prototype validation
2024-12-13 15:24:34 +01:00
Vigers Ray
da19a63c83 Фикс спавна за нежелаемые роли 2024-12-13 03:36:48 +03:00
Vigers Ray
7c376e48f1 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
2024-12-12 02:27:31 +03:00