NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 19:01:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
40047 commits 14 branches 0 tags 2.9 GiB
Commit graph

130 commits

Author SHA1 Message Date
Dmitry
f392e9601a merge remote stable, upstream 2025-11-25 05:28:10 +07:00
slarticodefast
8c9c6dad82
Add keybinds for openening a specified component in VV (#41348) 
* quick inspect

* Update Content.Client/Commands/QuickInspectCommand.cs

Co-authored-by: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>

* documentation!!!

---------

Co-authored-by: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
 2025-11-12 23:10:48 +00:00
Dmitry
c682eb80b4 merge remote master, upstream 2025-10-26 22:31:58 +07:00
Brandon Li
545cacbcae
StyleNano removal: Palette system and Sheetlets (#29903) 
* Apply patch 1777eea9a4..6b32bb2b14

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* make red squiggly line go away

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Add todo list

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Add palette to `TextureButton`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Rename `PalettedButtonSheetlet` to `NTButtonSheetlet` and move useful methods to `ButtonSheetlet`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* migrate `ContextMenu` styles

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Update todo

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* tweak NT colors

* New stylesheet: `InterfaceStylesheet` & `InterfaceTooltipSheetlet`

* Move inheritance of `IButtonConfig` to `NanotransenStylesheet.Buttons`

* move `MenuButtonSheetlet` & actually implement `InterfaceStylesheet` correctly

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* tweak color & update todo

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* chat is this real (update chat palette)

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Update todo

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `SmallButton` and remove some obsolete things from `StyleNano`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* rename `StyleClasses` to `StyleClass` so `Stylesheets.Redux.StyleClasses` syntax is dead

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* replace `ButtonColorGreen` with `Positive`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `Placeholder`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Examine popup buttons

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* move over more things & cleanup `StyleNano` more (under 1000 lines!!!!)

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Remove some more redundant stuff

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Undo style change for chat window

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* paper editing works now

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `OptionButton` styles

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `ListContainer`, move `DefaultWindow` styles (for now) & more cleanup

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* fix `ActionButton` not having highlighting

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* remove imports of `Robust.Client.UserInterface.StylesheetHelpers` & format

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `ButtonBig` and more cleanup

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Move items inheriting from `ISheetletConfig` into their own directory

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Cleanup & move `Label` styles

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Action search box styles

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Moved, stuff is

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* rename `LabelSubtext` to `LabelSubText` & move more stuff (were almost there!!)

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* yap & move over MORE stuff (just like one thing left!!!)

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Change status classes to appropriate existing classes

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* remove remaining references to `StyleNano`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Fix some hardcoding & broken code, `GetFromControl`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Scrollbars!

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* chores

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* clean up `StyleClass.cs`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `ItemListSheetlet` refactor

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* more chores!

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Consistency w/ directory structure

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Move `MainMenuSheetlet`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `ColorPalette`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* whoopsie

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Remove most sheet-specific sheetlets

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* fix warnings, cleanup, & fix scrollbar (this is why we fix warnings boys)

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* yap

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* MASSIVE resharper skill issue

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* actually use `ISheetletConfig`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* have specific sheetlet be specific

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `GetResourceOr`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* cleanup & move / remove `IPalette`s

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* actually do specific stylesheets correctly & fix tooltips

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* cleanup & logging

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Move `FontKind` and `FontKindExtensions` to their own files

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* rename `InterfaceStylesheet` to `SystemStylesheet`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* change `ButtonHovered` etc to `PseudoHovered` etc

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* give the palettes fun names

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `StyleSpace` is no more

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* It should compile now! I am now going to bed (fr) if it fails it fails

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* make squiggly red line go away

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* add additional type restrictions to sheetlets

* `CommonStylesheet`

* minor cleanup

* Make `GetSheetletRules` not horrible

* wait this was duplicating style rules. oops!

* move some sheetlets to their associated xamls

* oh wait apparently that was important

* review pass 1

* review pass 2 (font & color stuff)

* review pass 3: remove unused stuff / filename fix

* fix warnings & "replace cast with explicit variable type"

* move `Palette` stuff to its own directory

* tweak colors (they're different now that I actually fixed the OKlab thing)

* review pass 4: little things

* make window close button grey before hovering

* refactor `HLine` to make it less terrible and allow it to be styled

* fix `NanoHeading` (it's been broken for a while whoops) and cleanup hardcoding

* band-aid missing references in `StyleNano`

* move `StyleBox` generating functions out of `IButtonSheetlet` into `StyleBoxHelper`

* remove dictionary field from `IStylesheetManager`

* Add check for unloaded sheetlets

* style tweaks to satisfy OCD

* I somehow missed this: `Caution` styleclass replaced with `negative`, refactor `PowerChargeWindow`

* tweak palettes for like the fourth time

* construct `StyleNano` / `StyleSpace` in `StylesheetManager` and mark them as obsolete

* rename `BackgroundPanel` classes for consistency

* tweak window / `ListContainer`

* oh right you use `///` not `/**`

* font system is bad, make it temporary

* acknowledge Divider funkyness

* remove use of class `Disabled`

* `ColorPalette` allow overriding colors with brace initialization

* review pass again

* tweak disabled button colors

* `StatusPalette` tweaks

* typo

* Make squiggly red line go away

* Delete `Redux`

* Remove all references to `Redux`

* make red less radioactive

* Store stylesheet name inside stylesheet class

* fix merge errors

* use RT's Oklab support instead

* shuffle around `StylesheetManager` fields

* apply stylesheets based off `StylesheetComponent`

* simplify `ColorPalette` construction

* add todo for `SheetletConfigType`

* `OptionButton` has a background color now

* fix disabled buttons

* sigh (red color palette fixed)

* make `ItemList` use primary palette

* Revert "apply stylesheets based off `StylesheetComponent`"

This reverts commit c05b147da845f6e04ff33d1cbd91a18a92c676d7.

* dead code removal

* buttons are green when pressed (we need togglebuttons)

---------

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
 2025-10-19 21:10:44 +00:00
Dmitry
76e987c7b3 merge mini-upstream 2025-10-05 03:20:56 +07:00
K-Dynamic
6661449633
Adds smart equip to pocket 1, pocket 2, and suit storage slots (#37975) 
* pockets and exosuit smartequip

* add localisation
 2025-10-04 01:33:59 +00:00
Vasilis The Pikachu
5100068a78
Revert "Admin Log Browser Improvements (#39130)" 
This reverts commit f67cebf7a4.

Per request of @Kowlin and @southbridge-fur

Check out https://github.com/space-wizards/space-station-14/issues/39960 for further information
 2025-08-31 17:50:37 +02:00
Southbridge
f67cebf7a4
Admin Log Browser Improvements (#39130) 2025-08-21 22:12:16 +02:00
Dmitry
25df03bcb1 upstream master 30.07 2025-07-30 14:35:52 +07:00
Pok
688c91b597
Add scaling filter option (Nearest/Bilinear) (#39111) 2025-07-27 20:26:17 +03:00
Dmitry
60c835f02c master 21.7 syns 2025-07-21 00:27:46 +07:00
Princess Cheeseballs
dec2d42a1d
Crawling Part 1: The Knockdownening (#36881) 
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-07-20 01:54:42 +02:00
Dmitry
4948a136f1 stable upstream syns 2025-07-17 14:36:21 +07:00
beck-thompson
14668f2414
Minor escape menu UX improvements (#38650) 2025-07-05 12:28:59 +03:00
metalgearsloth
60341cb245
Add wall-based ambient occlusion (#38276) 
* Add wall ambient occlusion

* wawawewa

* Work

* cvars

* Comment to make slart happy
 2025-06-24 17:56:14 +10:00
Dmitry
0f4b1717e0 upstream 2025-06-08 00:04:48 +07:00
vitopigno
f8d0b0cba3
Add text highlighting (#31442) 
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Hans Larsson <hanandlia@gmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
 2025-06-04 12:12:37 +02:00
Dmitry
a6ecbc3410 Merge remote-tracking branch 'upstream/master' 2025-05-24 22:35:13 +07:00
Dmitry
25c5e59248
Upstream (#3172) 
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Victor Shen <71985089+Vexerot@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Stomf <5dorkydorks@gmail.com>
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com>
Co-authored-by: PraxisMapper <praxismapper@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: abadaba695 <spacestation13thingy@gmail.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com>
Co-authored-by: Myra <vasilis@pikachu.systems>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Matthew Herber <32679887+happyrobot33@users.noreply.github.com>
Co-authored-by: Ertanic <36124833+Ertanic@users.noreply.github.com>
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: eoineoineoin <helloworld@eoinrul.es>
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com>
Co-authored-by: nikitosych <boriszyn@gmail.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com>
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Co-authored-by: 3nderall <101940324+3nderall@users.noreply.github.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: J <billsmith116@gmail.com>
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Spanky <scott@wearejacob.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: Deerstop <edainturner@gmail.com>
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Co-authored-by: archee1 <archee3@hotmail.co.uk>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: poklj <compgeek223@gmail.com>
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com>
Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com>
Co-authored-by: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Zalycon <84675130+Zalycon@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com>
 2025-05-24 11:00:17 +03:00
slarticodefast
f3c4ff8a2a
Add keybind for swapping hands in the other direction (#37588) 
add swap hands reverse
 2025-05-18 21:17:35 -04:00
Errant
fb388d2265
Role subtypes (#35359) 2025-04-16 19:04:48 +02:00
JerryImMouse
f76d1edf27 Merge remote-tracking branch 'upstream/master' into upstream 
# Conflicts:
#	Content.Shared/Humanoid/NamingSystem.cs
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
#	Resources/ServerInfo/Guidebook/Service/Botany.xml
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json
#	Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
 2025-03-27 23:01:47 +05:00
Errant
c82d531a8f
Admin Overlay stacking and ghost hiding (#35622) 
* ghostbuster mouse and overlay stacks

* variable adjustment

* use map coords for distance check

* vertical stack ordering, and cvars

* skreee

* fix stack merge 'sidedness' issue

* overlays no longer try to stack to overlays at the wrong coordinates

* options slider for stack merge distance

* admin option sliders for ghost fade/hide

* Update AdminOptionsTab.xaml.cs

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-03-25 21:15:22 +01:00
Errant
72141abf8a
Admin playerlist antag presentation rework (#35538) 
* refactor(src): Minor refactor of Draw in "AdminNameOverlay. And new info about playtime player

* fix(src): Add configure classic admin owerlay

* fix

* antag status indication rework

* the cvars are free, you can just take them

* update playerlist on cvar change

* more overlay options

* tweak(src): Use _antagLabelClassic and tweak style

* tweak(src): Add config display overlay for startingJob and playTime

* tweak(src): Vector2 is replaced by var

* tweak(src): return to the end of the list

* add new option checkboxes

* passing ConfigurationManager through constructor, some format changes

* made sorting values more futureproof

* comments

* labels

* no point commenting this out when the overlay stack PR will uncomment it again anyway

* sorting prototype

* localize symbols because why not

* symmetry

* Revert "localize symbols because why not"

This reverts commit 922d4030300285a45777d62fcfd9c74b25fe7a60.

* layout and formatting stuff

* fix errant space

---------

Co-authored-by: Schrödinger <132720404+Schrodinger71@users.noreply.github.com>
 2025-03-25 17:03:59 +01:00
Zekins
7d6f564344 Merge remote-tracking branch 'upstream/master' into upstream 2025-03-18 02:40:46 +03:00
Łukasz Mędrek
0be41cebb9
Text related keybinds can now be changed in Controls (#35630) 
* Add ability to rebind text related keybinds

* fix placement of locales
 2025-03-08 13:42:50 +11:00
SlamBamActionman
27cfc0939c
Add undergarments & "Censor Nudity" toggle to options (#33185) 
* Initial commit

* Attribution

* Review changes

* Added comment for upstream
 2025-03-05 10:14:01 +01:00
Errant
c698b163b6
Admin Options tab (#35543) 
* admin options tab initial

* make admin tab only visible to admins
 2025-02-26 23:32:42 +01:00
noirogen
263f915671
Adds new speech bubble opacity sliders to the accessibility menu. (#35346) 
* Adds new accessibility slider for speech bubble text opacity.
Adds new accessibility slider for speech bubble background opacity.
Adds new Cvars to track speech bubble text and background opacity settings.

* Adds a separate option slider for the opacity of the speaker's name on speech bubbles.

* Changes text and speaker default opacity to 100%, as it was before.

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-25 17:00:12 +01:00
lzk228
0af3e04fd8 Merge commit '3551eb04115854cdbbf1841f5960c3cdbc508583' into 02-19-upstream 
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Doors/Systems/AirlockSystem.cs
#	Content.Server/Holopad/HolopadSystem.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
#	Resources/Prototypes/Datasets/Names/borg.yml
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Maps/amber.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/convex.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/plasma.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/RTG.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png
#	Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/icon-on.png
#	Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
#	Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
#	Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
#	Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
#	Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
#	Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
#	Resources/Textures/Objects/Storage/boxes.rsi/candle.png
#	Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
#	Resources/Textures/Objects/Storage/boxes.rsi/clown.png
#	Resources/Textures/Objects/Storage/boxes.rsi/darts.png
#	Resources/Textures/Objects/Storage/boxes.rsi/disk.png
#	Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
#	Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
#	Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
#	Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
#	Resources/Textures/Objects/Storage/boxes.rsi/flare.png
#	Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
#	Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
#	Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
#	Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
#	Resources/Textures/Objects/Storage/boxes.rsi/headset.png
#	Resources/Textures/Objects/Storage/boxes.rsi/heart.png
#	Resources/Textures/Objects/Storage/boxes.rsi/holo.png
#	Resources/Textures/Objects/Storage/boxes.rsi/implant.png
#	Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
#	Resources/Textures/Objects/Storage/boxes.rsi/internals.png
#	Resources/Textures/Objects/Storage/boxes.rsi/latex.png
#	Resources/Textures/Objects/Storage/boxes.rsi/light.png
#	Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
#	Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
#	Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meson.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
#	Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
#	Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
#	Resources/Textures/Objects/Storage/boxes.rsi/pda.png
#	Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
#	Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
#	Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
#	Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
#	Resources/Textures/Objects/Storage/boxes.rsi/swab.png
#	Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
#	Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
#	Resources/Textures/Objects/Storage/boxes.rsi/vials.png
#	Resources/Textures/Objects/Storage/boxes.rsi/writing.png
#	Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
#	Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
#	Resources/Textures/Objects/Tiles/tile.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
 2025-02-19 03:00:13 +01:00
c4llv07e
4809ee25ff
Add option to disable bwoink sound. (#33782) 
* Add option to disable bwoink sound.

* Now it's working only with active admin status.

* No bwoink, only "notification sound"

* Moar changes

* Another one
 2025-01-17 10:24:50 +03:00
Morb0
721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Datasets/Names/ai.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
#	SpaceStation14.sln
 2024-08-28 16:40:36 +03:00
metalgearsloth
a89d4c750b
Power stuff (#31314) 
* Power stuff

- Add shared IsPowered
- Add shared ResolveApc
- Move PowerChangedEvent to shared for now
- Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it.

* big update

* boing
 2024-08-25 22:18:42 +10:00
Morb0
8572f60456 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
#	Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Medical/Chemist.xml
#	Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml
#	Resources/ServerInfo/Guidebook/Science/APE.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/ServerInfo/Guidebook/Survival.xml
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
 2024-08-19 08:18:59 +03:00
to4no_fix
4ee9c00200
Localization hud layout (#31013) 2024-08-16 22:04:33 -04:00
Morb0
a0bce916fb Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
#	Resources/Prototypes/Guidebook/rules.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/origin.yml
 2024-08-16 14:29:08 +03:00
slarticodefast
6a462221ff
Add keybinds for rotating and flipping objects (#30540) 
* add keybinds for rotating and flipping objects

* no popup for verbs
 2024-08-13 23:36:41 +10:00
Morb0
f1350373d4 Return TTS volume slider 2024-06-27 13:45:18 +03:00
Morb0
da333a1972 Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Options/UI/Tabs/AudioTab.xaml
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
 2024-06-27 13:40:52 +03:00
Pieter-Jan Briers
07fe1a6b5a
Rewrite the options menu (#28389) 
* Basic attempt at rewriting how the options menu works, move accessibility settings into their own tab.

* Audio tab uses the new options system.

* Rewrite Misc tab

* Clean up heading styling

* Rewrite options tab and other minor cleanup all over the place.

* Documentation comments and minor cleanup.

---------

Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-06-22 14:11:14 +10:00
Morb0
ac51af0830 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
 2024-05-26 13:10:11 +03:00
Vasilis
f1c70d69f2
Remove the network tab (#28231) 
It is useless and bloat, if a user needs to change these settings they are free to modify their cvars manually via the clientconfig.toml file or via the cvar command.
 2024-05-25 16:09:52 -04:00
Morb0
775cbf088c Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Objects/Misc/books.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
 2024-05-23 13:06:49 +03:00
YuNii
99072341eb
Add keybind option for the Emote Menu (#28083) 
* Add keybind option for the Emote Menu

* Update .editorconfig

oopsies
 2024-05-17 21:46:45 +02:00
Morb0
38506f90df Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Entities/Clothing/Hands/specific.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
 2024-04-27 13:24:36 +03:00
wafehling
8febdc5fc4
Added hotkey and controller to re-open end of round scoreboard (#25884) 
* Added keybind for scoreboard, starting work

* Fixed the window appearing

* Added loc text

* Updated namespace for ScoreboardUIController.cs

* Switched to UISystemDependency

"- UIControllers can use [Dependency] as normal for IoC services and other controllers, but must use [UISystemDependency] for entity systems, which may be null as controllers exist before entity systems do." Jezithyr — 10/12/2022 1:20 PM

* Reverted back to functional state

* Replace with UISystemDependency

* Move RoundEndSummaryWindow to ScoreboardUIController

* Convert to EntitySystem

* Clean up command bind

* Move to RoundEnd directory

* Remove Nukeops rule when no nukies

* Cleanup

* Change to toggle hotkey

* Cleanup

* Revert "Remove Nukeops rule when no nukies"

This reverts commit 5d4bbca09f45110b24a674d59b505be87b602b67.

* Cleanup

* Make the Toggle hotkey work in lobby

* Fix error

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-04-26 14:39:56 +02:00
Morb0
3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/StatusEffects/health.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
#	Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
#	Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
 2024-04-26 11:19:50 +03:00
deathride58
396c613366
Adds the option to fit the viewport to vertical screenspace (#27061) 
* Adds the option to fit your viewport to your vertical screenspace

* fixes documentation

* Removes commented-out leftover

* Hides the viewport width slider and also we dont know if the viewport width causing stretching/squishing was a bug present before but we fixed that while we were at it

* Removes commented out leftovers
 2024-04-20 16:46:02 +10:00
Arthur Asimov
0b621a7b7e Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/ClientPreferencesManager.cs
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Content.Shared/Preferences/ICharacterProfile.cs
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING-reptilian.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json
 2024-04-17 11:57:44 +03:00
metalgearsloth
4cb344cc30
Fix options menu crashing in replays (#26911) 
Not having the nullable set properly is annoying but fixing that would probably be a significant amount of work.
 2024-04-14 09:10:37 +02:00