Commit graph

95 commits

Author SHA1 Message Date
Morb
37451fc974
Revert "Join min playtime (#604)" (#615) 2022-12-03 05:14:08 -08:00
Morbo
612d79c8fa Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Links/UILinks.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Shared/CCVar/CCVars.cs
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png
2022-12-03 07:09:10 +03:00
Pieter-Jan Briers
a6045e4538
Launcher info links. (#12781) 2022-12-02 17:23:43 -08:00
Nemanja
64f57aceb2
genericize ui fragments (#12810) 2022-12-02 16:46:58 -06:00
Morb
2409fea950
Join min playtime (#604) 2022-11-29 20:15:56 -08:00
Morb
fb3f24652e
Revert "Revert "Server join queue (#583)"" (#602) 2022-11-29 06:41:12 -08:00
Morb
e025a5ded1
Rework sponsor markings (#593) 2022-11-27 08:13:01 -08:00
Morb
97973e2ed9 Revert "Server join queue (#583)"
This reverts commit 84605eacb8.
2022-11-27 04:09:27 -08:00
Morb
84605eacb8
Server join queue (#583) 2022-11-25 23:38:46 -08:00
Morb
9c9af7567e
Sponsors markings (#552) 2022-11-15 11:22:06 -08:00
Morbo
d7d2dd96c0 Merge remote-tracking branch 'upstream/master' into upstream-sync2
# Conflicts:
#	Content.Client/PDA/PDAMenu.xaml
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Humanoid/NamingSystem.cs
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
2022-11-09 03:02:01 +03:00
Julian Giebel
e11cf969fa
PDA UI refactor and cartridges (#11335)
* Work on cartridges

* Work on PDA UI

* Work on PDA UIs program list

* Work on PDA UI borders

* Add DeviceNetworkingComponent to the pda base prototype

* Fix submodule version

* Fix cartridge loader ui key

* Fix pda menu xaml

* Implement relaying ui messages

* Finish implementing the notekeeper cartridge

* Fix submodule version

* Fix errors from merging master

* Fix test failing

* Implement setting preinstalled programs

* Add some documentation to CartridgeLoaderSystem

* Add more doc comments

* Add localization to program names

* Implement review suggestions

* Fix background programs receiving events twice when active
2022-11-08 14:00:20 -06:00
Morbo
783fd6fb2b Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-11-03 00:14:00 +03:00
Francesco
e2ac0f5322
fix: Wiki now displays the proper names and descriptions for chemistry recipes and the rest instead of the localization keys. (#12359) 2022-11-02 15:38:56 -05:00
Morbo
8ffba84896 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-10-21 19:51:57 +03:00
Kara
169ba3106b
Fix #12075 (#12118) 2022-10-21 01:54:18 -07:00
Morbo
57d8a459bb Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Shared/Humanoid/Sex.cs
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
2022-10-16 02:03:26 +03:00
Leon Friedrich
efac113469
Improve stripping UI (#9768) 2022-10-16 04:00:04 +11:00
Morbo
ae8cb2688c Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-10-14 07:21:01 +03:00
Jezithyr
571dd4e6d5
Hud refactor (#7202)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Jezithyr <jmaster9999@gmail.com>
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
2022-10-12 10:16:23 +02:00
Morb
7ae33c14b3
Sponsor cat marking reward (#437) 2022-10-09 17:59:41 -07:00
Morbo
7fa98d7e4d Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Links/UILinks.cs
#	README.md
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
2022-09-30 17:57:03 +03:00
metalgearsloth
f51248ecaa
Melee refactor (#10897)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-29 15:51:59 +10:00
Morb
55b8f54f33
Sponsor priority join (#428) 2022-09-26 19:32:39 -07:00
Morb
b49688dc01
Награды спонсорам (#402) 2022-09-19 11:16:58 -07:00
Pieter-Jan Briers
7cd0677708
Content-side changes for packaging. (#9382)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-09-14 19:39:55 +10:00
metalgearsloth
0286b88388
NPC refactor (#10122)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-06 00:28:23 +10:00
keronshb
cd78c5451d
Ensnaring Component and Bola Update (#9968) 2022-08-25 00:50:31 +10:00
Leon Friedrich
3c7c2cd7c1
Fix IoCManager test error (#10597) 2022-08-14 13:17:50 -07:00
Leon Friedrich
c535214aa2
Fix restart error (#10591) 2022-08-14 12:54:11 -07:00
wrexbe
2c13a2c93c
Ignore missing components that end with "Visuals" (#9613)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-08-08 18:50:54 +10:00
Kara
b947151d9a
Bucket solution fills + ECS SolutionContainerVisualizer (#10289) 2022-08-07 01:50:52 -07:00
Pieter-Jan Briers
e852ada6c8
Play time tracking: Job timers 3: more titles: when the (#9978)
Co-authored-by: Veritius <veritiusgaming@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-08-07 16:00:42 +10:00
Steven K
68a5fcb7f8
PlantHolderVisualizer component system refactor (#10091)
* Converted PlantHolderVisualizer to component and system.

* Cleaned up Botany folder.

* Converted initialization of HydroTrayVisualizer under PlantHolderVisualizerSystem to it's own GenericVisualizer.

* Cleaned up hydro_tray.yml.
2022-07-30 19:18:49 -07:00
ModeratelyAware
3e28b7f236
Converted FireExtinguisherVisualizer to generic visualizer (#10058) 2022-07-26 17:40:13 -07:00
metalgearsloth
aad6a22a6a
ECS NPCs (#9941)
* ECS

* A

* parity

* Remove dummy update

* abs

* thanks rider
2022-07-25 14:57:33 +10:00
Rane
188934a748
Portable scrubbers (#9417) 2022-07-15 05:46:30 -07:00
Leon Friedrich
bad837fb85
Generic morgue visualizer (#9696) 2022-07-13 22:25:44 -07:00
Nemanja
5edf2ccad5
EntityStorage ECS (#9291) 2022-07-14 09:11:59 +10:00
TekuNut
73b094c6ad
Convert Remaining Atmos Appearance Visualizers (#9582)
* Convert atmos plaque to generic visualizer

Use generic visualizer for atmos plaque. Also enables zumos plaque to
appear.

* Convert gas canister connecters

* Remove manual layer creation

* Remove gas canister visualizer

* Convert gas analyzers to generic visualizers

* Convert fire visualizer

* Fix layers on plasma and air canisters

* Remove commented out fire visualizer in barricades

* Add documentation for fire visuals component

* Remove redundant visualizer for milkalyzer

* Remove rogue item group
2022-07-10 16:51:34 +10:00
TekuNut
458d05b29b
Convert piped atmos entity visualizers (#9200) 2022-07-07 13:09:29 +10:00
TekuNut
c05cd468d8
Convert AME Visualizers (#9037)
Co-authored-by: TekuNut <3456422+TekuNut@users.noreply.github.com>
2022-06-23 05:03:28 -07:00
Jessica M
2f2670d2bb
Convert KudzuVisualizer to Visualizer Systems (#9010) 2022-06-22 16:33:45 -07:00
metalgearsloth
a18ba5c2b5
Power cell culling (#8814) 2022-06-16 18:37:07 +10:00
CrudeWax
c210239f45
Fishy swarmers: Carp content and Space Dragon! (#7395)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-06-16 14:14:06 +10:00
metalgearsloth
68a58aa0d1
Refactor magvisualizer (#8568) 2022-06-04 17:36:40 +10:00
metalgearsloth
fb943a61dc
Gun refactor (#8301)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-01 19:59:58 +10:00
Flipp Syder
d4697c000c
Surveillance cameras (#8246)
* cameras but i didn't feel like git stashing them

* Adds more functionality server-side for surveillance cameras

* rider moment

* Adds skeleton for SurveillanceCameraMonitorBoundUi on client

* whoops

* makes surveillance camera monitor UI more defined

* removes tree from SurveillanceCameraMonitorWindow

* surveillance camera active flag, other routing things

* actually sets how SurveillanceCameraMonitorSystem sends camera info to clients

* adds entity yaml, changes field

* adds the camera/monitor entities, makes the UI open

* SurveillanceCameraRouters (not implemented fully)

* subnets for cameras, server-side

* it works!

* fixes rotation in cameras

* whoops

restores surveillance cameras to ignored components
makes it so that switching cameras now lerps the other camera

* makes the UI work

* makes it so that cameras actually refresh now

* cleanup

* adds camera.rsi

* cleans up prototypes a bit

* adds camera subnet frequencies, cameras in subnets

* adds surveillance camera router subnets

* might fix testing errors

* adds the circuit board to the surveillance camera monitor

* fixes up the camera monitor (the detective will get his tv soon)

* adds heartbeat, ensures subnet data is passed into cameras to send

* fixes up a few things

* whoops

* changes to UI internals

* fixes subnet selection issue

* localized strings for UI

* changes 'test' id to 'camera' for cameras

* whoops

* missing s

* camera static!

* adds a delay to camera switching

* adjusts a few things in camera timing

* adds setup for cameras/routers, localization for frequency names

* adds setup ui for routers, makes subnet names in monitor window follow frequency name in prototype

* localization, some cleanup

* ui adjustments

* adds surveillance camera visuals

* fixes a bug when closing the UI for monitors

* adds disconnect message to UI

* adds construction graph to cameras

* adds the camera to the construction menu

* fixes network selection for setup, tweak to assembly

* adds surveillance camera router construction, fixes up surveillance camera wire cutting

* adds disconnect button to monitor UI

* switches around the status text

* tweaks monitor UI

* makes the address actually show

* might make tests pass

* UI adjustments, hard name limit

* ok, that didn't work

* adds wireless cameras

* makes the television work/look nicer

* adds tripod cameras in addition to mobile cameras

* makes wireless cameras constructable

* fixes up those prototypes

* reorganization in C#, small cleanup

* ensures that power changes deactivate some devices

* adds a component to the television, comments out a function

* actually, never mind, i forgot that wireless cameras existed/are creatable for a second

* tweaks to router construction, removes SubnetTest from prototypes

* removes it from frequencies too

* Apply suggestions from code review

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* type serializers into components

* setup window opens centered, enum is now byte

* replaces active monitor list with ActiveSurveillanceCameraMonitorComponent

* adds paused/deleted entity checks, changes how verbs are given

* removes EntitySystem.Get<T>() references

* fixes bug related to selecting network from setup, alphabet-orders network listing in setup

* rider moment

* adds minwidth to surveillance camera setup window

* addresses reviews

* should fix the issue with camera visuals not updating properly

* addresses some reviews

* addresses further review

* addresses reviews related to RSIs

* never needed a key there anyways

* changes a few things with routers to ensure that they're active

* whoops

* ensurecomp over addcomp

* whoops

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-31 18:44:57 +10:00
Pieter-Jan Briers
5f9f319d5a
Fix server update restarts when server paused. (#8509) 2022-05-30 01:09:50 -07:00
wrexbe
1e0babbd50
Make AdminLogsSystem an IoC manager (#8492)
* Make log not entity system

* Fixes
2022-05-28 23:41:17 -07:00