Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Added nullable to most Content.Shared files (#3238)

Browse Source 
* Add nullable to some Content.Shared files.

* Use [NotNullWhen(true)]

* Undo adding now redundant !'s

* Forgot one

* Add a ton more nullable

* You can guess

* Fix some issues

* It actually compiles now

* Auto stash before merge of "null2" and "origin/master"

* I lied

* enable annotations -> enable

* Revert ActionBlockerSystem.cs to original

* Fix ActionBlockerSystem.cs

* More nullable

* Undo some added exclamation marks

* Fix issues

* Update Content.Shared/Maps/ContentTileDefinition.cs

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

* Resolve some issues

* Remove unused method

* Fix more issues

* Fix more issues

* Fix more issues

* Fix more issues

* Fix issue, rollback SharedGhostComponent.cs

* Update submodule

* Fix issue, invert some if-statements to reduce nesting

* Revert RobustToolbox

* FIx things broken by merge

* Some fixes

- Replaced with string.Empty
- Remove some exclamation marks
- Revert file

* Some fixes

* Trivial #nullable enable

* Fix null ables

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
Visne
2021-02-27 04:12:09 +01:00
committed by GitHub
parent 2f45e5e044
commit 9b94d5c195
377 changed files with 1048 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Shared/Roles/JobPrototype.cs
View File

@@ -1,3 +1,4 @@
#nullable enable
using System;
using System.Collections.Generic;
using Robust.Shared.Localization;
@@ -13,12 +14,12 @@ namespace Content.Shared.Roles
[Prototype("job")]
public class JobPrototype : IPrototype
{
public string ID { get; private set; }
public string ID { get; private set; } = string.Empty;
/// <summary>
/// The name of this job as displayed to players.
/// </summary>
public string Name { get; private set; }
public string Name { get; private set; } = string.Empty;
/// <summary>
/// Whether this job is a head.
@@ -36,14 +37,14 @@ namespace Content.Shared.Roles
/// </summary>
public int TotalPositions { get; private set; }
public string StartingGear { get; private set; }
public string StartingGear { get; private set; } = string.Empty;
public string Icon { get; private set; }
public string Icon { get; private set; } = string.Empty;
public JobSpecial Special { get; private set; }
public JobSpecial? Special { get; private set; } = null;
public IReadOnlyCollection<string> Departments { get; private set; }
public IReadOnlyCollection<string> Access { get; private set; }
public IReadOnlyCollection<string> Departments { get; private set; } = Array.Empty<string>();
public IReadOnlyCollection<string> Access { get; private set; } = Array.Empty<string>();
public void LoadFrom(YamlMappingNode mapping)
{
@@ -57,7 +58,7 @@ namespace Content.Shared.Roles
srz.DataField(this, p => p.SpawnPositions, "spawnPositions", TotalPositions);
srz.DataField(this, p => p.IsHead, "head", false);
srz.DataField(this, p => p.Access, "access", Array.Empty<string>());
srz.DataField(this, p => p.Icon, "icon", null);
srz.DataField(this, p => p.Icon, "icon", string.Empty);
srz.DataField(this, p => p.Special, "special", null);
}
}