From 024af9c24840b54b4103b1d46924245d7d88fd9f Mon Sep 17 00:00:00 2001
From: Silverplate <118299273+silverplatedelta@users.noreply.github.com>
Date: Sun, 15 Sep 2024 23:28:49 -0400
Subject: [PATCH] Removes tech levels from high risk items (#26725)

---
 code/game/objects/items/weapons/defib.dm            | 3 ++-
 code/game/objects/items/weapons/knuckledusters.dm   | 2 +-
 code/game/objects/items/weapons/melee/melee_misc.dm | 2 +-
 code/game/objects/items/weapons/teleportation.dm    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 32a8af84687..feb1237b612 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -245,8 +245,9 @@
 	hardened = TRUE // EMP-proof (on the component), but not emag-proof.
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Objective item, better not have it destroyed.
 	heart_attack_probability = 10
+	origin_tech = null
 	/// To prevent spam from the emagging message on the advanced defibrillator.
-	var/next_emp_message 
+	var/next_emp_message
 
 /obj/item/defibrillator/compact/advanced/examine(mob/user)
 	. = ..()
diff --git a/code/game/objects/items/weapons/knuckledusters.dm b/code/game/objects/items/weapons/knuckledusters.dm
index 7d75c58660f..e8981aa5e67 100644
--- a/code/game/objects/items/weapons/knuckledusters.dm
+++ b/code/game/objects/items/weapons/knuckledusters.dm
@@ -65,7 +65,7 @@
 	icon_state = "knuckleduster_nt"
 	force = 10
 	throwforce = 5
-	origin_tech = "combat=3"
+	origin_tech = null
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Steal objectives shouldnt be easy to destroy.
 	materials = list(MAT_GOLD = 500, MAT_TITANIUM = 200, MAT_PLASMA = 200)
 	trauma = 10
diff --git a/code/game/objects/items/weapons/melee/melee_misc.dm b/code/game/objects/items/weapons/melee/melee_misc.dm
index ede849a3d35..2db79162465 100644
--- a/code/game/objects/items/weapons/melee/melee_misc.dm
+++ b/code/game/objects/items/weapons/melee/melee_misc.dm
@@ -34,7 +34,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	armour_penetration_percentage = 75
 	sharp = TRUE
-	origin_tech = "combat=5"
+	origin_tech = null
 	attack_verb = list("lunged at", "stabbed")
 	hitsound = 'sound/weapons/rapierhit.ogg'
 	materials = list(MAT_METAL = 1000)
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 6781a5ae7ec..748c7a1d54f 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -17,7 +17,7 @@
 	throw_speed = 3
 	throw_range = 5
 	materials = list(MAT_METAL=10000)
-	origin_tech = "magnets=3;bluespace=4"
+	origin_tech = null
 	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 30, RAD = 0, FIRE = 100, ACID = 100)
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	var/icon_state_inactive = "hand_tele_inactive"