Nothing

Simple-Station · Oct 1, 2023 · cbf6ae8 · cbf6ae8
1 parent e28b29f
commit cbf6ae8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -82,17 +82,17 @@ public string GetGear(string slot, HumanoidCharacterProfile? profile)
 
                 // Handles custom underwear per role.
 
-                if (slot == "underpants" && profile.Clothing != ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_underpants) && _underpants != "Error")
+                if (slot == "underpants" && profile.Clothing != ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_underpants) && _underpants != "Nothing")
                     return _underpants;
-                if (slot == "underpants" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_underpantsskirt) && _underpantsskirt != "Error")
+                if (slot == "underpants" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_underpantsskirt) && _underpantsskirt != "Nothing")
                     return _underpantsskirt;
 
-                if (slot == "undershirt" && profile.Clothing != ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_undershirt) && _undershirt != "Error")
+                if (slot == "undershirt" && profile.Clothing != ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_undershirt) && _undershirt != "Nothing")
                     return _undershirt;
-                if (slot == "undershirt" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_undershirtskirt) && _undershirtskirt != "Error")
+                if (slot == "undershirt" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_undershirtskirt) && _undershirtskirt != "Nothing")
                     return _undershirtskirt;
 
-                if (slot == "socks" && !string.IsNullOrEmpty(_undersocks) && _undersocks != "Error")
+                if (slot == "socks" && !string.IsNullOrEmpty(_undersocks) && _undersocks != "Nothing")
                     return _undersocks;
             }
 

diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
@@ -34,6 +34,6 @@
   duffelbag: ClothingBackpackDuffelFilled
   underpants: ClothingUnderboxers_assblastusa
   underpantsskirt: ClothingUnderboxers_assblastusa
-  undershirt: Error
+  undershirt: Nothing
   undershirtskirt: ClothingUnderbra_binder
-  undersocks: Error
+  undersocks: Nothing
diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/nothing.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/nothing.yml
@@ -0,0 +1,4 @@
+- type: entity
+  parent: Error
+  id: Nothing
+  name: nothing