diff --git a/code/game/machinery/camera.dm b/code/game/machinery/camera.dm
index f16a60dfdfb..727460566ae 100644
--- a/code/game/machinery/camera.dm
+++ b/code/game/machinery/camera.dm
@@ -314,6 +314,7 @@
 			user << "\blue Dismantling camera..."
 			if(do_after(user, 20))
 				var/obj/item/weapon/chem_grenade/case = new /obj/item/weapon/chem_grenade(src.loc)
+				case.name = "Camera Assembly"
 				case.path = 2
 				case.state = 5
 				case.anchored = 1
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index bf5ba6de3bb..d852db4ca1e 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -16,7 +16,7 @@ STUN BATON
 	..()
 
 /obj/item/weapon/sword/New()
-	color = pick("red","blue")
+	color = pick("red","blue","green","purple")
 
 /obj/item/weapon/sword/attack_self(mob/user as mob)
 	if ((user.mutations & 16) && prob(50))
@@ -45,6 +45,13 @@ STUN BATON
 	src.add_fingerprint(user)
 	return
 
+/obj/item/weapon/sword/green
+	New()
+		color = "green"
+
+/obj/item/weapon/sword/red
+	New()
+		color = "red"
 
 // AXE
 
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index dfff5fbe341..13341d1eadb 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index 4acb3e07636..6fb3c604270 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 2ac1e390968..824191e47ea 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/maps/tgstation.2.0.5.dmm b/maps/tgstation.2.0.5.dmm
index 27f9a659d6b..4f5311c84eb 100644
--- a/maps/tgstation.2.0.5.dmm
+++ b/maps/tgstation.2.0.5.dmm
@@ -6025,14 +6025,14 @@
 "clS" = (/obj/machinery/igniter,/turf/simulated/floor,/area/tdome)
 "clT" = (/turf/simulated/floor,/area/tdome)
 "clU" = (/obj/disposalpipe/segment,/turf/simulated/floor,/area/tdome)
-"clV" = (/obj/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/under/color/red,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/shoes/brown,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/baton,/obj/item/weapon/baton,/obj/item/weapon/baton,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/sword,/obj/item/weapon/sword,/obj/item/weapon/sword,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome)
+"clV" = (/obj/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/under/color/red,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/shoes/brown,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/baton,/obj/item/weapon/baton,/obj/item/weapon/baton,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/sword/red,/obj/item/weapon/sword/red,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome)
 "clW" = (/obj/machinery/door/poddoor{id = "thunderdomegen"; name = "General Supply"},/turf/unsimulated/floor{icon_state = "dark"},/area/tdome)
 "clX" = (/obj/landmark{name = "tdome2"},/turf/unsimulated/floor{name = "plating"},/area/tdome/tdome2)
 "clY" = (/obj/machinery/door/poddoor{id = "thunderdome"; name = "Thunderdome Blast Door"},/turf/simulated/floor/plating,/area/tdome)
 "clZ" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/tdome)
 "cma" = (/turf/simulated/floor{icon_state = "green"; dir = 4},/area/tdome)
 "cmb" = (/obj/landmark{name = "tdome1"},/turf/unsimulated/floor{name = "plating"},/area/tdome/tdome1)
-"cmc" = (/obj/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/under/color/green,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/shoes/brown,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/baton,/obj/item/weapon/baton,/obj/item/weapon/baton,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/sword,/obj/item/weapon/sword,/obj/item/weapon/sword,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome)
+"cmc" = (/obj/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/under/color/green,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/shoes/brown,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/baton,/obj/item/weapon/baton,/obj/item/weapon/baton,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/gun/energy/laser_gun,/obj/item/weapon/sword/green,/obj/item/weapon/sword/green,/obj/item/weapon/sword/green,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome)
 "cmd" = (/obj/machinery/recharger{pixel_y = 4},/obj/landmark{name = "tdome2"},/turf/unsimulated/floor{name = "plating"},/area/tdome/tdome2)
 "cme" = (/obj/machinery/recharger{pixel_y = 4},/obj/landmark{name = "tdome1"},/turf/unsimulated/floor{name = "plating"},/area/tdome/tdome1)
 "cmf" = (/obj/machinery/camera{pixel_x = 11; pixel_y = -9; network = "thunder"; c_tag = "Red Team"},/obj/landmark{name = "tdome2"},/turf/unsimulated/floor{name = "plating"},/area/tdome/tdome2)