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/Maps/ContentTileDefinition.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
#nullable enable
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using Robust.Shared.Map;
@@ -14,17 +15,17 @@ namespace Content.Shared.Maps
{
string IPrototype.ID => Name;
public string Name { get; private set; }
public string Name { get; private set; } = string.Empty;
public ushort TileId { get; private set; }
public string DisplayName { get; private set; }
public string SpriteName { get; private set; }
public string DisplayName { get; private set; } = string.Empty;
public string SpriteName { get; private set; } = string.Empty;
public bool IsSubFloor { get; private set; }
public List<string> BaseTurfs { get; private set; }
public List<string> BaseTurfs { get; private set; } = new();
public bool CanCrowbar { get; private set; }
public string FootstepSounds { get; private set; }
public string FootstepSounds { get; private set; } = string.Empty;
public float Friction { get; set; }
public float ThermalConductivity { get; set; }
public string ItemDropPrototypeName { get; private set; }
public string ItemDropPrototypeName { get; private set; } = string.Empty;
public bool IsSpace { get; private set; }
public void AssignTileId(ushort id)
@@ -43,7 +44,7 @@ namespace Content.Shared.Maps
IsSubFloor = node.AsBool();
}
if (mapping.TryGetNode("base_turfs", out YamlSequenceNode baseTurfNode))
if (mapping.TryGetNode("base_turfs", out YamlSequenceNode? baseTurfNode))
BaseTurfs = baseTurfNode.Select(i => i.ToString()).ToList();
else
BaseTurfs = new List<string>();