Skip to content

Commit

Permalink
Merge Upstream. (space-wizards#348)
Browse files Browse the repository at this point in the history
* Fix double label on chem jugs (space-wizards#29137)

* Automatic changelog update

* Fix DresserFilled storagefill rarely causing an error (space-wizards#29135)

Add ClothingUniformJumpskirtColorPink to an OrGroup

* Fix female reptilians not having gasp sounds (space-wizards#29143)

inital

* clean up weather systems (space-wizards#28792)

* clean up weather systems

* Update WeatherComponent.cs

* Update SharedWeatherSystem.cs

* some fix

* Update SharedWeatherSystem.cs

* Update WeatherComponent.cs

* Update WeatherComponent.cs

* revert autoPause

* Update SharedWeatherSystem.cs

* Implement vital chef's hat functionality (space-wizards#25950)

* Implement crucial chef's hat functionality

* Unified stopping code and added events.

* Added documentation to events

* Rerun tests

* Made review changes, and fixed potential desync bug.

* Update whitelist

* Automatic changelog update

* Add cvar to disable round end pvs overrides (space-wizards#29151)

* Update submodule to 226.1.0 (space-wizards#29159)

* Fix conveyor mispredicts (space-wizards#28157)

* Fix conveyor mispredicts

Instead of tracking active conveyors we instead track the conveyed entities. This also handles things like stacking conveyors more gracely.

* Fix ActiveConveyor

* Fix lerping

* Automatic changelog update

* Replace StationRandomTransform (space-wizards#29149)

* Revert "Rotate and Offset station CCVar nuke (space-wizards#26175)"

This reverts commit 44b20f6.

# Conflicts:
#	Content.Server/Station/Systems/StationSystem.cs
#	Resources/Prototypes/Maps/europa.yml

* Fix

* Review

* Add warning cones to engivend (space-wizards#29085)

Add cones to engivend

* Automatic changelog update

* arachnid inventory layout fix (space-wizards#29165)

arachnid inventory layout fixC

* Automatic changelog update

* Turn interaction related attempt events into structs (space-wizards#29168)

* Turn InteractionAttemptEvent into a struct event

* readonly

* GettingInteractedWithAttemptEvent

* ConsciousAttemptEvent

* Add the most anticipated gun in the game. Foam Force. (space-wizards#29103)

* Foam Force

* make it available somewhere

* add clumsyproof and nuke dev item

* reorganize

* oopsy files

* Strap!

* woopsie layering

* fix grammar to rerun tests for rogue unrelated test fail.

* cleanup

* I eepy layer forgetti spaghetti

* For real last necessary commit

* Oops I broke the law! feexed

* Decided to just change it to the same source as the poster source in our repo for consistency.

* Automatic changelog update

* Fix material storage going BRRT (space-wizards#29167)

If the volume hits 0 we just remove it.

* Automatic changelog update

* Fix air alarms (space-wizards#29172)

Broken by space-wizards#28272

* Automatic changelog update

* Hidden loadout groups (space-wizards#29170)

* loadout hiding

* department of redundancy department

* Upgrade rsi-diff's changed files action | Make it only return rsi and png changes (space-wizards#29185)

It was brought up to me in space-wizards#29179 (comment) (and from a dm from them) that space bars can cause issues with the rsi bot.

Upon investigation its case we use "space-delimited" on the "get changes files" check. Which returns ALL changed files. Even if the change has nothing to do with png's or rsi's (example a downstream merging upstream)

* unhardcode thief MaxSelectedSets (space-wizards#29175)

* unhardcode thief MaxSelectedSets

* we do a little copy paste :trollface:

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* PullingController cooldown change (space-wizards#29177)

* Revert "Automatic changelog update"

This reverts commit 3358aef.

* Revert "Revert "Automatic changelog update""

This reverts commit 3d0b6a7.

* Removal of the throw cooldown as it felt sluggish and unresponsive before.

* Decrease meteor frequency (space-wizards#29194)

* Automatic changelog update

* Security Resprite (space-wizards#29082)

* security resprite

* hos cap fix

* i forgor

* further fixes

* my furniture is broken

* fedora update

* Automatic changelog update

* Make Hamlet a valid chef's hat pilot (space-wizards#29191)

* Fix Underwing wings (space-wizards#29092)

* add

* tweak thickness of stripe

* Add some happier medibot messages! (space-wizards#29147)

* Happy!

* opps

* one more

* Automatic changelog update

* shorten short raffle (space-wizards#28685)

* Automatic changelog update

* Fix some lathe recipe textures showing up blank (space-wizards#28683)

* Update lathes to use entity prototype

* ScrollContainer my hero

* gets rid of excess newlines

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* Grammar fix to medibot! (space-wizards#29197)

fixed

* Restore default panic bunker and tweak baby jail (space-wizards#29198)

restore default panic bunker

* Fixed cartridges installing more than once (space-wizards#29187)

* fixed cartridges installing more than once

* replaced prototypes with CartridgeComponent

* relocated checks from InstallProgram to InstallCartridge

* Automatic changelog update

* Musician's skirt (space-wizards#29203)

* Sprites&Meta

* Changing prototypes

* Adding to Theater vend

* Sprite_Change

* Sprite_Change

* Prototype_Changes

Is this exactly how it should be?...

* FUCKING FIX

* weh

---------

Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>

* Automatic changelog update

* hos cap resprite (space-wizards#29208)

* hos cap resprite

* 1. 2. 3 4 Oh

* Automatic changelog update

* Rejig device link sink & source startup & shutdown (space-wizards#29035)

* Fix DeviceLinkSinkComponent not updating sources on shutdown

* Log error

* Misc link changes & fixes

* Fix core

* Add prediction for Tech Disks, cleanup (space-wizards#29061)

* Add prediction for Tech Disks, cleanup

* Remove IsServer check in OnMapInit

* Use HashSet for techs, remove LINQ

* Code cleanup: radio jammer (space-wizards#29052)

* Code cleanup for radio jammer

* More Entity<T> for the people, and fix an accidental variable reuse

* Partial buckling refactor (space-wizards#29031)

* partial buckling refactor

* git mv test

* change test namespace

* git mv test

* Update test namespace

* Add pulling test

* Network BuckleTime

* Add two more tests

* smelly

* Fix documentation typo (space-wizards#29209)

Fix everything.

* Emergency toolbox fill rework (space-wizards#29202)

* emergency toolbox fill rework

* Fuck

* Add wet floor sign & warning cone to autolathe (space-wizards#29205)

* Add wet floor sign & warning cone to autolathe

* removing

* Automatic changelog update

* Tools batch files (space-wizards#29179)

* Tools batch files

* fine

* Fix terrible portable scrubber unlit layers (space-wizards#29232)

Jesus fucking christ man

* Prevent fly-by fixture from powering containment field generator (space-wizards#29225)

* Prevent fly-by fixture from powering containment field generator

* Update according to review

* Automatic changelog update

* Hide moth antenna and lizard frills with hardsuit helmets, fix lizard snouts not being hidden (space-wizards#29214)

* inital

* Update ClothingSystem.cs

* Update helmets.yml

* Automatic changelog update

* Fix and enable TestEmptyLoadout (space-wizards#29228)

* Fix and enabled TestEmptyLoadout

* Fine, have a real name

* Fix brokey code :)

* Fix entities getting stuck red (space-wizards#28981)

* Automatic changelog update

* Update submodule to 226.2.0 (space-wizards#29247)

* add a type specifier where one was forgor (space-wizards#29250)

* add a type specifier where one was forgor

* Fix other way because degub conditions

* okay this feels kinda dumb but it does fix it.

* Update Content.Client/Effects/ColorFlashEffectSystem.cs

---------

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

* Make winter coat hood hide certain markings (space-wizards#29238)

Update base_clothinghead.yml

* Fix ERT becoming sleeper agents and add sleeper agent preferences (space-wizards#27817)

* b

* Update antags.ftl

* m

* ok

* Update events.yml

* antag

* a

* Create InitialInfectedExemptComponent.cs

* Delete InitialInfectedExemptComponent.cs

* yes

* Delete InitialInfectedExemptComponent.cs

* Create AntagImmuneComponent.cs

* Automatic changelog update

* fixed Syndicate smokes pack being half-filled (space-wizards#28371)

* Automatic changelog update

* Buff cube boxes (space-wizards#29251)

* Automatic changelog update

* moves explosive tech to T1 (space-wizards#29227)

moves explo tech to T1

* Automatic changelog update

* made cup ramen eatable with anything with the fork component (space-wizards#27826)

* made cup ramen eatable with anything with the fork component

* removed extra png

* made cupramen fillable with water, and made hot ramen dry ramen.

---------

Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>

* Automatic changelog update

* Survival Box Loadouts, Nitrogen Emergency tanks (space-wizards#29131)

* Nitrogen survival boxes

* Zero-setup workaround

* clown box

* cleanup and universal tanks

* cleanup

* more cleanup

* hide loadoutgroups

* remaining survival boxes

* space ninja

* Revert "space ninja"

This reverts commit a650f41.

* weh

* weh

* undo appearance change of syndicate survival boxes

* indentation fix and missing label

* You can now pry multiple tiles at once (space-wizards#29231)

* You can now pry multiple tiles at once

* More advanced do after duplicate checking.

Instead of just saying "lol tile prying can raise duplicates", we now have a system so tile prying can properly distinguish events on 2 different tiles. This is achieved with a virtual function on DoAfterEvent.

* Automatic changelog update

* Fix prying speed & log (space-wizards#29210)

* cleanup prototypes with `PryingComponent` & fix jaws of life prying speed

* Minor cleanup for tools and prying systems

Remove some obsolete methods.

* Fix doafter continues when not held & log

* Modifiy delays for floor prying

* Fix test fail

* Automatic changelog update

* golden plunger (space-wizards#29043)

* golden plunger

* Add wood material (the handle is still wood)

* 52 hours

---------

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

* Rate limit ahelps (space-wizards#29219)

* Make chat rate limits a general-purpose system.

Intending to use this with ahelps next.

* Rate limt ahelps

Fixes space-wizards#28762

* Review comments

* return empty string for invalid identity (space-wizards#29274)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Make Loadout MinLimit not count failed attempts (space-wizards#29264)

Loadout MinLimit doesn't count failed attempts

* Add logging to SharedStorageSystem prototype indexing failure (space-wizards#29273)

* Fix null exceptions in SurveillanceCameraMonitorSystem (space-wizards#29275)

* Add IsNullOrEmpty checks before indexing KnownSubnets

* actor

* Make stasis bed power toggleable (space-wizards#29268)

Stasis bed is now power toggleable

* Automatic changelog update

* Replace BlockSolutionAccessComponent with an attempt event (space-wizards#26988)

* BlockSolutionAccessComponent now only blocks one specified solution.

* Significant overhaul
Separated spilling when worn functionality into its own component/system.
Removed BlockSolutionAccessComponent.
Added an event for solution access.

* fix initial infected icons and add a briefing to the character menu (space-wizards#29259)

* Automatic changelog update

* feat: update cyborg parts naming for them to be ordered consistently,… (space-wizards#29272)

feat: update cyborg parts naming for them to be ordered consistently, closes space-wizards#29270

* Ghostrole rule updates (space-wizards#29249)

* First batch of ghostrole rule updates

* Second pass

* Re-word free agent

* Apply review comments

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* You heard it here first folks

God rules are weird to write.

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Honkbot -> Free Agent

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Mimebot -> Free Agent

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Jonkbot -> Free Agent

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Softer blue

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Automatic changelog update

* Fix some buckle interactions (space-wizards#29293)

* Automatic changelog update

* Implement BlacklistedRange exempt flag (space-wizards#29258)

* Implement a new kind of ip range ban that only applies to new players

* Put determining whether a player record exists to its own function

* Make BlacklistedRange bans get bypassed by any ban exemption

* Stop trying to get another DbGuard while already having one

This does break with convention on the functions in that area but
considering the use of this function it's probably fine?
I could alternatively just move the place it's called from.

Also I was suppossed to wait for tests to finish locally just to be
sure, but nah. I am pushing this now

* Automatic changelog update

* Add time index to connection log (space-wizards#29281)

* Add time index to connection log

Queries go nyoom.

* Don't let me code shit at 5 AM

* Fix SSD indicator for scaled humanoids (space-wizards#29310)

Fix ssd

* Automatic changelog update

* Fix noticeboard drawdepth (space-wizards#29262)

darwdepth added

* Fix pistols not displaying ammo count in-hand (space-wizards#29289)

* Make Drozd and C-20r not unwield on use

* Fix wielding mispredict

* add AmmoCounter to pistols

* Rewrite the options menu (space-wizards#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>

* Update submodule to 226.3.0 (space-wizards#29323)

* AME Deconstruction Changes (space-wizards#29317)

* AME deconstruction complexity

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* Move air sensor components into abstract base prototype (space-wizards#29261)

* Pacifist messages use target's identity name instead of entity name (space-wizards#29325)

* Fix comments (space-wizards#29330)

* Fix for missing survival boxes (space-wizards#29336)

storagefill order fix

* Automatic changelog update

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
Co-authored-by: Vasilis <vasilis@pikachu.systems>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: HS <81934438+HolySSSS@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: Truoizys <153248924+Truoizys@users.noreply.github.com>
Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com>
Co-authored-by: neutrino <67447925+neutrino-laser@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: Redfire1331 <125223432+Redfire1331@users.noreply.github.com>
Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Alex Pavlenko <diraven@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Alex Evgrashin <aevgrashin@yandex.ru>
Co-authored-by: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com>
Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: ArkiveDev <95712736+ArkiveDev@users.noreply.github.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 67 changed files with 5,424 additions and 1,136 deletions.
6 changes: 6 additions & 0 deletions Content.Client/Options/UI/OptionDropDown.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Control xmlns="https://spacestation14.io">
<BoxContainer Orientation="Horizontal">
<Label Name="NameLabel" MinWidth="400" />
<OptionButton Name="Button" Access="Public" />
</BoxContainer>
</Control>
21 changes: 21 additions & 0 deletions Content.Client/Options/UI/OptionDropDown.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;

namespace Content.Client.Options.UI;

/// <summary>
/// Standard UI control used for drop-downs in the options menu. Intended for use with <see cref="OptionsTabControlRow"/>.
/// </summary>
/// <seealso cref="OptionsTabControlRow.AddOptionDropDown{T}"/>
[GenerateTypedNameReferences]
public sealed partial class OptionDropDown : Control
{
/// <summary>
/// The text describing what this drop-down controls.
/// </summary>
public string? Title
{
get => NameLabel.Text;
set => NameLabel.Text = value;
}
}
7 changes: 7 additions & 0 deletions Content.Client/Options/UI/OptionSlider.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Control xmlns="https://spacestation14.io">
<BoxContainer Orientation="Horizontal">
<Label Name="NameLabel" MinWidth="400" />
<Slider Name="Slider" Access="Public" HorizontalExpand="True" />
<Label Name="ValueLabel" Access="Public" Margin="8 0 4 0" MinWidth="48" Align="Right" />
</BoxContainer>
</Control>
22 changes: 22 additions & 0 deletions Content.Client/Options/UI/OptionSlider.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;

namespace Content.Client.Options.UI;

/// <summary>
/// Standard UI control used for sliders in the options menu. Intended for use with <see cref="OptionsTabControlRow"/>.
/// </summary>
/// <seealso cref="OptionsTabControlRow.AddOptionSlider"/>
/// <seealso cref="OptionsTabControlRow.AddOptionPercentSlider"/>
[GenerateTypedNameReferences]
public sealed partial class OptionSlider : Control
{
/// <summary>
/// The text describing what this slider controls.
/// </summary>
public string? Title
{
get => NameLabel.Text;
set => NameLabel.Text = value;
}
}
1 change: 1 addition & 0 deletions Content.Client/Options/UI/OptionsMenu.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
<tabs:GraphicsTab Name="GraphicsTab" />
<tabs:KeyRebindTab Name="KeyRebindTab" />
<tabs:AudioTab Name="AudioTab" />
<tabs:AccessibilityTab Name="AccessibilityTab" />
</TabContainer>
</DefaultWindow>
9 changes: 5 additions & 4 deletions Content.Client/Options/UI/OptionsMenu.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.IoC;
using Content.Client.Options.UI.Tabs;


namespace Content.Client.Options.UI
{
Expand All @@ -19,13 +16,17 @@ public OptionsMenu()
Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-graphics"));
Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls"));
Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio"));
Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-accessibility"));

UpdateTabs();
}

public void UpdateTabs()
{
GraphicsTab.UpdateProperties();
GraphicsTab.Control.ReloadValues();
MiscTab.Control.ReloadValues();
AccessibilityTab.Control.ReloadValues();
AudioTab.Control.ReloadValues();
}
}
}
18 changes: 18 additions & 0 deletions Content.Client/Options/UI/OptionsTabControlRow.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Control xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
<controls:StripeBack HasBottomEdge="False">
<BoxContainer Orientation="Horizontal" Align="End" Margin="2">
<Button Name="DefaultButton"
Text="{Loc 'ui-options-default'}"
TextAlign="Center"
Margin="8 0" />

<Button Name="ResetButton"
Text="{Loc 'ui-options-reset-all'}"
StyleClasses="Caution" />
<Button Name="ApplyButton"
Text="{Loc 'ui-options-apply'}"
StyleClasses="OpenLeft" />
</BoxContainer>
</controls:StripeBack>
</Control>
Loading

0 comments on commit 314d57a

Please sign in to comment.