diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm
index aa5094d2449..bf5d43c0742 100644
--- a/code/game/objects/items/weapons/material/material_weapons.dm
+++ b/code/game/objects/items/weapons/material/material_weapons.dm
@@ -14,13 +14,13 @@
 	var/use_material_name = TRUE // Does the finished item put the material name in front of it?
 	var/use_material_sound = TRUE
 	var/use_material_shatter = TRUE // If it has a custom shatter message.
-	var/applies_material_colour = 1
+	var/applies_material_colour = TRUE
 	var/unbreakable
 	var/force_divisor = 0.5
 	var/thrown_force_divisor = 0.5
 	var/default_material = DEFAULT_WALL_MATERIAL
 	var/material/material
-	var/drops_debris = 1
+	var/drops_debris = TRUE
 
 /obj/item/material/Initialize(var/newloc, var/material_key)
 	. = ..()
diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm
index a4353e3ebe0..b795715160a 100644
--- a/code/game/objects/items/weapons/material/shards.dm
+++ b/code/game/objects/items/weapons/material/shards.dm
@@ -16,7 +16,7 @@
 	attack_verb = list("stabbed", "slashed", "sliced", "cut")
 	default_material = "glass"
 	unbreakable = 1 //It's already broken.
-	drops_debris = 0
+	drops_debris = FALSE
 	drop_sound = 'sound/effects/glass_step.ogg'
 
 /obj/item/material/shard/set_material(var/new_material)
diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm
index 0f628f72fb3..6981142b609 100644
--- a/code/game/objects/items/weapons/material/swords.dm
+++ b/code/game/objects/items/weapons/material/swords.dm
@@ -143,6 +143,10 @@
 	icon_state = "amohdan_sword"
 	item_state = "amohdan_sword"
 	slot_flags = SLOT_BELT
+	use_material_name = FALSE
+	applies_material_colour = FALSE
+	unbreakable = TRUE //amohdan steel is the finest in the spur
+
 
 // improvised sword
 /obj/item/material/sword/improvised_sword
diff --git a/html/changelogs/omicega-fdokpsifoidsjkfijorftrew990.yml b/html/changelogs/omicega-fdokpsifoidsjkfijorftrew990.yml
new file mode 100644
index 00000000000..d33196dd62f
--- /dev/null
+++ b/html/changelogs/omicega-fdokpsifoidsjkfijorftrew990.yml
@@ -0,0 +1,13 @@
+# Your name.
+author: Omicega
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - tweak: "The Amohdan blade is now unbreakable and uses its proper naming convention and base sprite."