From cbf6ae8511bcff0b00268e4bd92e4f7004d33559 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sun, 1 Oct 2023 16:45:06 -0700 Subject: [PATCH] Nothing --- Content.Shared/Roles/StartingGearPrototype.cs | 10 +++++----- Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml | 4 ++-- .../SimpleStation14/Entities/Objects/Fun/nothing.yml | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/nothing.yml diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs index 13354d4c33..45903c2ea3 100644 --- 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 index 70282ecd9e..010272e03d 100644 --- 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 new file mode 100644 index 0000000000..f23a35f8e1 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Fun/nothing.yml @@ -0,0 +1,4 @@ +- type: entity + parent: Error + id: Nothing + name: nothing