From eaebc7b4b252cfa88f4aa0405bb8daa51e9261b9 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Tue, 16 Jan 2024 15:51:52 -0800
Subject: [PATCH] fix weird duplicates of things

---
 Content.Server/Chat/Systems/ChatSystem.cs           | 11 -----------
 Resources/Prototypes/Damage/containers.yml          |  8 --------
 .../Prototypes/Entities/Objects/Misc/paper.yml      | 13 -------------
 .../Entities/Objects/Weapons/Melee/knife.yml        |  6 ------
 4 files changed, 38 deletions(-)

diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 4cea1a9b7e..dc4e03049e 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -744,17 +744,6 @@ public string TransformSpeech(EntityUid sender, string message)
 
         return ev.Message;
     }
- 
-    public bool CheckIgnoreSpeechBlocker(EntityUid sender, bool ignoreBlocker)
-    {
-        if (ignoreBlocker)
-            return ignoreBlocker;
-
-        var ev = new CheckIgnoreSpeechBlockerEvent(sender, ignoreBlocker);
-        RaiseLocalEvent(sender, ev, true);
-
-        return ev.IgnoreBlocker;
-    }
 
     public bool CheckIgnoreSpeechBlocker(EntityUid sender, bool ignoreBlocker)
     {
diff --git a/Resources/Prototypes/Damage/containers.yml b/Resources/Prototypes/Damage/containers.yml
index 4421e9a667..87168b4818 100644
--- a/Resources/Prototypes/Damage/containers.yml
+++ b/Resources/Prototypes/Damage/containers.yml
@@ -32,14 +32,6 @@
     - Heat
     - Shock
 
-- type: damageContainer
-  id: Silicon
-  supportedGroups:
-    - Brute
-  supportedTypes:
-    - Heat
-    - Shock
-
 - type: damageContainer
   id: Shield
   supportedGroups:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 494c942655..59cee2ea1d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -261,19 +261,6 @@
 
 #TODO: I want the luxury pen to write a cool font like Merriweather in the future.
 
-- type: entity
-  name: luxury pen
-  parent: Pen
-  id: LuxuryPen
-  description: A fancy and expensive pen that you only deserve to own if you're qualified to handle vast amounts of paperwork.
-  components:
-  - type: Sprite
-    state: luxury_pen
-  - type: Item
-    heldPrefix: luxury_pen
-
-#TODO: I want the luxury pen to write a cool font like Merriweather in the future.
-
 - type: entity
   name: luxury pen
   parent: Pen
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 6520f33a94..3f18e2cf50 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -98,12 +98,6 @@
     damage:
       types:
         Slash: 10
-  - type: EmbeddableProjectile
-    sound: /Audio/Weapons/star_hit.ogg
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Slash: 10
   - type: Item
     size: 10
     sprite: Objects/Weapons/Melee/combat_knife.rsi