diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm
index 69c805dcef4..8d2339af756 100644
--- a/code/game/objects/items/weapons/material/swords.dm
+++ b/code/game/objects/items/weapons/material/swords.dm
@@ -4,6 +4,7 @@
 	icon_state = "claymore"
 	item_state = "claymore"
 	slot_flags = SLOT_BELT|SLOT_BACK
+	w_class = 4
 	force_divisor = 0.7 // 42 when wielded with hardnes 60 (steel)
 	thrown_force_divisor = 0.5 // 10 when thrown with weight 20 (steel)
 	sharp = 1
@@ -28,3 +29,35 @@
 /obj/item/weapon/material/sword/katana/suicide_act(mob/user)
 	viewers(user) << "<span class='danger'>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</span>"
 	return(BRUTELOSS)
+
+/obj/item/weapon/material/sword/rapier
+	name = "rapier"
+	desc = "A slender, fancy and sharply pointed sword."
+	icon_state = "rapier"
+	item_state = "claymore"
+	slot_flags = SLOT_BELT
+	attack_verb = list("attacked", "stabbed", "prodded", "poked", "lunged")
+
+/obj/item/weapon/material/sword/longsword
+	name = "longsword"
+	desc = "A double-edged large blade."
+	icon_state = "longsword"
+	item_state = "claymore"
+	slot_flags = SLOT_BELT | SLOT_BACK
+	
+/obj/item/weapon/material/sword/trench
+	name = "trench knife"
+	desc = "A military knife used to slash and stab enemies in close quarters."
+	force_divisor = 0.4
+	icon_state = "trench"
+	item_state = "knife"
+	w_class = 3
+	flags = NOSHIELD
+	slot_flags = SLOT_BELT
+	
+/obj/item/weapon/material/sword/sabre
+	name = "sabre"
+	desc = "A sharp curved backsword."
+	icon_state = "sabre"
+	item_state = "katana"
+	slot_flags = SLOT_BELT
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index c5efdae1fb1..250133a98d6 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -14,3 +14,40 @@
 	suicide_act(mob/user)
 		viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
 		return (OXYLOSS)
+
+/obj/item/weapon/melee/chainsword
+	name = "chainsword"
+	desc = "A deadly chainsaw in the shape of a sword."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "chainswordoff"
+	flags = CONDUCT
+	slot_flags = SLOT_BELT
+	force = 15
+	throwforce = 7
+	w_class = 4
+	sharp = 1
+	edge = 1
+	origin_tech = "combat=5"
+	attack_verb = list("chopped", "sliced", "shredded", "slashed", "cut", "ripped")
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	var/active = 0
+
+/obj/item/weapon/melee/chainsword/attack_self(mob/user)
+	active= !active
+	if(active)
+		playsound(user, 'sound/weapons/circsawhit.ogg', 50, 1)
+		user << "\blue \The [src] rumbles to life."
+		force = 35
+		hitsound = 'sound/weapons/circsawhit.ogg'
+		icon_state = "chainswordon"
+		slot_flags = null
+	else
+		user << "\blue \The [src] slowly powers down."
+		force = initial(force)
+		hitsound = initial(hitsound)
+		icon_state = initial(icon_state)
+		slot_flags = initial(slot_flags)
+		
+/obj/item/weapon/melee/chainsword/suicide_act(mob/user)
+	viewers(user) << "\red <b>[user] is slicing \himself apart with the [src.name]! It looks like \he's trying to commit suicide.</b>"
+	return (BRUTELOSS|OXYLOSS)
diff --git a/html/changelogs/alberyk-PR-534.yml b/html/changelogs/alberyk-PR-534.yml
new file mode 100644
index 00000000000..7857157bc47
--- /dev/null
+++ b/html/changelogs/alberyk-PR-534.yml
@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Alberyk
+
+# 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: 
+  - rscadd: "Added a chainsword."
+  - rscadd: "Added new flavors of swords; rapiers, sabers, trench knives and etc."
+  - tweak: "You can't hide claymore and katanas inside bags anymore."
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index a6bbf29f60c..319b9cf7116 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ