diff --git a/Content.Server/White/AntiCringeSystem/AntiCringeComponent.cs b/Content.Server/White/AntiCringeSystem/AntiCringeComponent.cs new file mode 100644 index 0000000000..1d38b84dfa --- /dev/null +++ b/Content.Server/White/AntiCringeSystem/AntiCringeComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Server.White.AntiCringeSystem; + +[RegisterComponent] +public sealed class AntiCringeComponent : Component +{ + +} diff --git a/Content.Server/White/AntiCringeSystem/AntiCringeSystem.cs b/Content.Server/White/AntiCringeSystem/AntiCringeSystem.cs new file mode 100644 index 0000000000..78d0f68609 --- /dev/null +++ b/Content.Server/White/AntiCringeSystem/AntiCringeSystem.cs @@ -0,0 +1,16 @@ +namespace Content.Server.White.AntiCringeSystem; + + +public sealed class AntiCringeSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnComponentInit); + } + + private void OnComponentInit(EntityUid uid, AntiCringeComponent component, ComponentInit args) + { + Del(uid); + } +} diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl index 116adc0e4f..4ce1533c7d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl @@ -1,27 +1,27 @@ -ent-ClothingNeckLGBTPin = LGBT pin - .desc = be gay do crime +ent-ClothingNeckLGBTPin = pin + .desc = pin .suffix = { "" } -ent-ClothingNeckAromanticPin = aromantic pin - .desc = be aro do crime +ent-ClothingNeckAromanticPin = pin + .desc = pin .suffix = { "" } -ent-ClothingNeckAsexualPin = asexual pin - .desc = be ace do crime +ent-ClothingNeckAsexualPin = pin + .desc = pin .suffix = { "" } -ent-ClothingNeckBisexualPin = bisexual pin - .desc = be bi do crime +ent-ClothingNeckBisexualPin = pin + .desc = pin .suffix = { "" } -ent-ClothingNeckIntersexPin = intersex pin - .desc = be intersex do crime +ent-ClothingNeckIntersexPin = pin + .desc = pin .suffix = { "" } -ent-ClothingNeckLesbianPin = lesbian pin - .desc = be lesbian do crime +ent-ClothingNeckLesbianPin = pin + .desc = pin .suffix = { "" } -ent-ClothingNeckNonBinaryPin = non-binary pin - .desc = 01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101 +ent-ClothingNeckNonBinaryPin = pin + .desc = pin .suffix = { "" } -ent-ClothingNeckPansexualPin = pansexual pin - .desc = be pan do crime +ent-ClothingNeckPansexualPin = pin + .desc = pin .suffix = { "" } -ent-ClothingNeckTransPin = transgender pin - .desc = be trans do crime +ent-ClothingNeckTransPin = pin + .desc = pin .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml index 2a79df3ed0..7a19389b0e 100644 --- a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml +++ b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml @@ -470,104 +470,6 @@ categories: - MeatyOreGlasses -#personal -- type: listing - id: MeatyClothingNeckLGBTPin - productEntity: ClothingNeckLGBTPin - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckAromanticPin - productEntity: ClothingNeckAromanticPin - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckAsexualPin - productEntity: ClothingNeckAsexualPin - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckBisexualPin - productEntity: ClothingNeckBisexualPin - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckIntersexPin - productEntity: ClothingNeckIntersexPin - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckLesbianPin - productEntity: ClothingNeckLesbianPin - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckNonBinaryPin - productEntity: ClothingNeckNonBinaryPin - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckPansexualPin - productEntity: ClothingNeckPansexualPin - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckTransPin - productEntity: ClothingNeckTransPin - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckCloakHerald - productEntity: ClothingNeckCloakHerald - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckCloakNanotrasen - productEntity: ClothingNeckCloakNanotrasen - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -- type: listing - id: MeatyClothingNeckCloakTrans - productEntity: ClothingNeckCloakTrans - cost: - MeatyOreCoin: 1 - categories: - - MeatyOrePersonal - -#suits #uniforms diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index 0d22a653db..dd341879f4 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -4,7 +4,9 @@ abstract: true name: pin description: be nothing do crime + noSpawn: true components: + - type: AntiCringe - type: Item size: Tiny @@ -13,6 +15,7 @@ id: ClothingNeckLGBTPin name: LGBT pin description: be gay do crime + noSpawn: true components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -29,6 +32,7 @@ id: ClothingNeckAromanticPin name: aromantic pin description: be aro do crime + noSpawn: true components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -45,6 +49,7 @@ id: ClothingNeckAsexualPin name: asexual pin description: be ace do crime + noSpawn: true components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -61,6 +66,7 @@ id: ClothingNeckBisexualPin name: bisexual pin description: be bi do crime + noSpawn: true components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -77,6 +83,7 @@ id: ClothingNeckIntersexPin name: intersex pin description: be intersex do crime + noSpawn: true components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -93,6 +100,7 @@ id: ClothingNeckLesbianPin name: lesbian pin description: be lesbian do crime + noSpawn: true components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -109,6 +117,7 @@ id: ClothingNeckNonBinaryPin name: non-binary pin description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101" + noSpawn: true components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -125,6 +134,7 @@ id: ClothingNeckPansexualPin name: pansexual pin description: be pan do crime + noSpawn: true components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -141,6 +151,7 @@ id: ClothingNeckTransPin name: transgender pin description: be trans do crime + noSpawn: true components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 3125c00140..c574b0a533 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -35,15 +35,6 @@ - PonderingOrb - Skub - DrinkMugDog - - ClothingNeckLGBTPin - - ClothingNeckAromanticPin - - ClothingNeckAsexualPin - - ClothingNeckBisexualPin - - ClothingNeckIntersexPin - - ClothingNeckLesbianPin - - ClothingNeckNonBinaryPin - - ClothingNeckPansexualPin - - ClothingNeckTransPin - CluwneHorn - ClothingMaskRat - MysteryFigureBox