diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 83c3695da98..b326f0fcbfe 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -13,7 +13,7 @@
 
 /obj/item/weapon/shield/riot
 	name = "riot shield"
-	desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
+	desc = "A shield adept at blocking blunt objects."
 	icon = 'weapons.dmi'
 	icon_state = "riot"
 	flags = FPRINT | TABLEPASS| CONDUCT| ONBACK
@@ -29,7 +29,7 @@
 	IsShield()
 		return 1
 
-/obj/item/weapon/sord
+/*/obj/item/weapon/sord
 	name = "SORD"
 	desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
 	icon_state = "sord"
@@ -37,11 +37,11 @@
 	flags = FPRINT | ONBELT | TABLEPASS
 	force = 2
 	throwforce = 1
-	w_class = 3
+	w_class = 3	*/
 
 /obj/item/weapon/claymore
 	name = "claymore"
-	desc = "what are you standing around staring at this for? get to killing!"
+	desc = "BLOOD FOR THE BLOOD GOD."	//SKULLS FOR THE SKULL THRONE. --SkyMarshal
 	icon_state = "claymore"
 	item_state = "claymore"
 	flags = FPRINT | ONBELT | TABLEPASS
@@ -54,7 +54,7 @@
 
 /obj/item/weapon/bodybag
 	name = "body bag"
-	desc = "Bag mixed with a bit of body."
+	desc = "A bag used to deal with a corpse."
 	icon = 'closet.dmi'
 	icon_state = "bodybag"
 	flags = FPRINT | TABLEPASS| CONDUCT
@@ -170,7 +170,7 @@
 
 /obj/item/weapon/melee/baton
 	name = "Stun Baton"
-	desc = "A stun baton for hitting people with."
+	desc = "The police baton of the future."
 	icon_state = "stunbaton"
 	item_state = "baton"
 	flags = FPRINT | ONBELT | TABLEPASS
@@ -182,7 +182,7 @@
 	var/status = 0
 	origin_tech = "combat=2"
 
-/obj/item/weapon/melee/chainofcommand
+/*/obj/item/weapon/melee/chainofcommand
 	name = "Chain of Command"
 	desc = "The Captain is first and all other heads are last."
 	icon_state = "chainofcommand"
@@ -194,7 +194,7 @@
 	var/charges = 50.0
 	var/maximum_charges = 50.0
 	var/status = 1
-	origin_tech = "combat=4"
+	origin_tech = "combat=4"	*/
 
 /obj/item/weapon/melee/energy
 	var/active = 0
@@ -214,7 +214,7 @@
 /obj/item/weapon/melee/energy/sword
 	var/color
 	name = "energy sword"
-	desc = "May the force be within you."
+	desc = "It cuts AND cooks at the same time!."
 	icon_state = "sword0"
 	force = 3.0
 	throwforce = 5.0
@@ -272,7 +272,7 @@
 	icon_state = "soapnt"
 
 /obj/item/weapon/soap/deluxe
-	desc = "A deluxe Waffle Co. brand bar of soap. Smells of comdoms."
+	desc = "A deluxe Waffle Co. brand bar of soap." //What is this I don't even. "Smells of comdoms." --SkyMarshal
 	icon_state = "soapdeluxe"
 
 /obj/item/weapon/soap/syndie
@@ -443,7 +443,7 @@
 	data = "Clown Land"
 
 /obj/item/weapon/card/emag
-	desc = "An identification card. No shit. Seems to have some funny chip on it, though."
+	desc = "An identification card. Seems to have some funny chip on it, though."
 	name = "identification card"
 	icon_state = "emag"
 	item_state = "card-id"
@@ -451,7 +451,7 @@
 
 /obj/item/weapon/card/id
 	name = "identification card"
-	desc = "An identification card. No shit."
+	desc = "An identification card."
 	icon_state = "id"
 	item_state = "card-id"
 	var/access = list()
@@ -619,7 +619,7 @@
 /obj/item/weapon/fireaxe  // DEM AXES MAN, marker -Agouri
 	icon_state = "fireaxe0"
 	name = "Fire axe"
-	desc = "Truly, the tool of a madman. Who would possibly think to fight fire with an axe?"
+	desc = "A tool for breaking down those obstructions that stop you from fighting that fire."  //Less ROBUST. --SkyMarshal
 	force = 5
 	w_class = 4.0
 	flags = ONBACK
@@ -629,7 +629,7 @@
 
 /obj/item/weapon/cane
 	name = "cane"
-	desc = "A cane used by a true gentlemen. Or a clown."
+	desc = "A cane used by a true gentlemen."
 	icon = 'weapons.dmi'
 	icon_state = "cane"
 	flags = FPRINT | TABLEPASS| CONDUCT
@@ -662,7 +662,7 @@
 
 /obj/item/weapon/extinguisher
 	name = "fire extinguisher"
-	desc = "Contains water....dangit..."
+	desc = "Contains water..."
 	icon = 'items.dmi'
 	icon_state = "fire_extinguisher0"
 	var/last_use = 1.0
@@ -793,7 +793,7 @@
 
 
 /obj/item/weapon/mop
-	desc = "The world of janitalia wouldn't be complete without a mop."
+	desc = "The world of the janitor wouldn't be complete without a mop."
 	name = "mop"
 	icon = 'janitor.dmi'
 	icon_state = "mop"
@@ -926,7 +926,7 @@
 	throw_range = 15
 
 /obj/item/weapon/pen/sleepypen
-	desc = "It's a normal black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
+	desc = "It's a normal black ink pen with a sharp point."
 	flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER
 	origin_tech = "materials=2;biotech=1;syndicate=7"
 
@@ -1256,7 +1256,7 @@
 
 /obj/item/weapon/kitchen/rollingpin
 	name = "rolling pin"
-	desc = "Used to knock out the Bartender."
+	desc = "Used to flatten dough."
 	icon_state = "rolling_pin"
 	force = 8.0
 	throwforce = 10.0
@@ -1282,7 +1282,7 @@
 	name = "Butcher's Cleaver"
 	icon = 'kitchen.dmi'
 	icon_state = "butch"
-	desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
+	desc = "A huge thing used for chopping and chopping up meat."
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
 	w_class = 2.0
@@ -1510,6 +1510,13 @@
 	icon_state = "mousetraparmed"
 	armed = 1
 
+/obj/item/weapon/dice/d4 // -- SkyMarshal
+	name = "d4"
+	desc = "A dice with four sides."
+	sides = 4
+	icon_state = "d20"
+	item_state = "dice"
+
 /obj/item/weapon/dice // -- TLE
 	name = "d6"
 	desc = "A dice with six sides."
@@ -1517,6 +1524,20 @@
 	icon_state = "dice"
 	item_state = "dice"
 
+/obj/item/weapon/dice/d8 // -- SkyMarshal
+	name = "d8"
+	desc = "A dice with eight sides."
+	sides = 8
+	icon_state = "d20"
+	item_state = "dice"
+
+/obj/item/weapon/dice/d12 // -- SkyMarshal
+	name = "d12"
+	desc = "A dice with twelve sides."
+	sides = 12
+	icon_state = "d20"
+	item_state = "dice"
+
 /obj/item/weapon/dice/d20 // -- TLE
 	name = "d20"
 	desc = "A dice with...hell that is many sides."
diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm
index 6cc9a07920c..726b1420b8d 100644
--- a/maps/tgstation.2.0.8.dmm
+++ b/maps/tgstation.2.0.8.dmm
@@ -2344,7 +2344,7 @@
 "aTd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/crew_quarters/captain)
 "aTe" = (/obj/item/weapon/pinpointer,/obj/item/weapon/disk/nuclear,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "aTf" = (/obj/item/weapon/camera_test,/obj/item/weapon/storage/photo_album{pixel_y = -10},/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
-"aTg" = (/obj/machinery/recharger{pixel_y = 4},/obj/item/weapon/melee/chainofcommand,/obj/structure/table/woodentable,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
+"aTg" = (/obj/machinery/recharger{pixel_y = 4},/obj/structure/table/woodentable,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "aTh" = (/obj/machinery/ai_status_display{pixel_y = 32},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "aTi" = (/obj/machinery/requests_console{department = "Captain's Quarters"; departmentType = 5; pixel_y = 30},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
 "aTj" = (/obj/machinery/status_display{pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)