Commit graph

10 commits

Author SHA1 Message Date
Morb0
b982da58c5 Fix emitter unlocked state name 2024-02-17 13:02:12 +03:00
Morb0
92bd0148fe Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Resources/Locale/en-US/chat/sanitizer-replacements.ftl
#	Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
2024-02-17 12:43:04 +03:00
MilenVolf
c7870882f6
LockVisualizer (#25224)
* LockVisualizer

* Fix state

* Clean some code

* Make it component, fix tests fail

* Fix for StateUnlocked

Now it is possible to manually set the unlocked state and it will work!

* Optimize LockVisualizer, add check for unlocked state

* No todo I guess
2024-02-16 16:52:31 -07:00
Morb0
c333fc2b20 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
2023-12-24 20:02:16 +03:00
chromiumboy
1de682e23f
Power monitoring console overhaul (#20927)
* Prototyping whole station wire map

* More prototyping

* Added icons for the different power distributors and toggleable cable displays

* Power cable layouts are now only sent to the client when the power monitor is open

* UI prototyping

* Power monitors can now see the sprites of distant entities, long entity names are truncated

* Updated how network devices are added to the player's PVS

* More feature prototypes

* Added source / load symbols

* Final prototype! Time to actually code it properly...

* Start of code clean up

* Continuing code clean up

* Fixed UI appearance

* Code clean up complete

* Removed unnecessary changes

* Updated how power values are calculated, added UI warnings for power sinks and power net checks

* Updated how power values are calculated again, added support for portable generators

* Removed unnecessary files

* Map beacons start toggled off, console map now works outside the station, fixed substation icon

* Made some of Sloth's requested changes. Power distributors don't blink anymore, unless selected

* Moved a number of static variables in PowerMonitoringHelper to sensible places in the main files. Added a NavMapTrackableComponent so that you can specify how individual entities appear on the navmap

* Updated the colors/positions of HV cables and SMESes to improve contrast

* Fixed SMES color in map legend

* Partially fixed auto-scrolling on device selection, made sublists alphabetical

* Changed how auto-scroll is handled

* Changed the font color of the console warning messages

* Reduced the font size of beacon labels

* Added the station name to the console

* Organized references

* Removed unwanted changes to RobustToolbox

* Fix merge conflict

* Fix merge conflict, maybe

* Fix merge conflict

* Updated outdated reference

* Fixed portable_generator.yml

* Implemented a number of requested changes, move bit masks to a shared component

* Navigate listings via the navmap

* First attempt at improving efficiency

* Second attempt at optimization, entity grouping added for solar panels

* Finished solar panel entity joining

* Finished major revisions, code clean up needed

* Finializing optimizations

* Made requested changes

* Bug fix, removed obsolete code

* Bug fixes

* Bug fixes

* STarted revisions

* Further revisions

* More revision

* Finalizing revisions. Need to make RT PR

* Code tidying

* More code tidying

* Trying to avoid merge conflicts

* Trying to avoid merge conflicts

* Removed use of PVS

* Improving efficiency

* Addressed a bunch of outstanding issues

* Clear old data on console refresh

* UI adjustments

* Made node comparison more robust. More devices can be combined into one entry

* Added missing component 'dirty'
2023-12-24 17:07:41 +11:00
Morb0
3b66b6f44f Update radiation collector sprites 2023-10-15 18:11:25 +03:00
Morb0
55a91108c1 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
2023-10-15 17:52:02 +03:00
chromiumboy
4c630d0b17
Radiation collector sprite update (#20956) 2023-10-13 19:08:00 -04:00
Morber
61951a84f1
[Resprite] Singularity stuff (#320)
* Update containment field sprite

* Update 1 level singularity sprite

* Update 3 level singularity sprite

* Fix sprite sizes

* Fix sprite state name

* Update 4 level singularity sprite

* Fix sprite size

* Update 5 level singularity sprite

* Update level 6 singularity sprite

* Remove 6 level sprite of singularity

* Remove 6 level meta.json

* Add level 6 singularity custom sprite

* Update containment generator sprites

* Remake emitter with new sprites

* Update collector sprites

* New emitter sprite files

* Update level 6 singularity sprite

* Update license singularity level 6

* Decrease singularity to 20 fps
2022-07-26 20:56:02 +03:00
Swept
5f9ba812ca
Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00