Fixing more error and the return of banhammer (#10)

code/game/objects/items/robot/robot_upgrades.dm

@@ -41,7 +41,7 @@
 	name = "robot reclassification board"
 	desc = "Used to rename a cyborg."
 	icon_state = "cyborg_upgrade1"
-	construction_cost = list(DEFAULT_WALL_MATERIAL=1000)
+//	construction_cost = list(DEFAULT_WALL_MATERIAL=1000)
 	var/heldname = "default name"
 
 /obj/item/borg/upgrade/rename/attack_self(mob/user as mob)
@@ -165,7 +165,7 @@
 /obj/item/borg/upgrade/combat
 	name = "combat cyborg module"
 	desc = "Unlocks the combat cyborg module"
-	construction_cost = list(DEFAULT_WALL_MATERIAL=10000,"glass"=15000,"gold"= 5000,"diamond" = 1000)
+//	construction_cost = list(DEFAULT_WALL_MATERIAL=10000,"glass"=15000,"gold"= 5000,"diamond" = 1000)
 	icon_state = "cyborg_upgrade3"
 	require_module = 0
 

code/game/objects/items/weapons/weaponry.dm

@@ -229,3 +229,34 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	contained_sprite = 1
+
+/obj/item/weapon/sord
+	name = "\improper SORD"
+	desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
+	icon_state = "sord"
+	item_state = "sord"
+	slot_flags = SLOT_BELT
+	force = 2
+	throwforce = 1
+	sharp = 1
+	edge = 1
+	w_class = 3
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	
+/obj/item/weapon/banhammer
+	desc = "banhammer"
+	name = "banhammer"
+	icon = 'icons/obj/items.dmi'
+	icon_state = "toyhammer"
+	slot_flags = SLOT_BELT
+	throwforce = 0
+	w_class = 2.0
+	throw_speed = 7
+	throw_range = 15
+	attack_verb = list("banned")
+	
+/obj/item/weapon/banhammer/attack(mob/M as mob, mob/user as mob)
+	M << "<font color='red'><b> You have been banned FOR NO REISIN by [user]<b></font>"
+	user << "<font color='red'> You have <b>BANNED</b> [M]</font>"
+	playsound(loc, 'sound/effects/adminhelp.ogg', 15)

code/game/objects/random/random.dm

@@ -479,8 +479,8 @@
 				/obj/item/weapon/reagent_containers/food/drinks/bottle/brandy,\
 				/obj/item/weapon/reagent_containers/food/drinks/bottle/guinnes,\
 				/obj/item/weapon/reagent_containers/food/drinks/bottle/drambuie,\
-				/obj/item/weapon/reagent_containers/food/drinks/cans/beer,\
-				/obj/item/weapon/reagent_containers/food/drinks/cans/ale)
+				/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,\
+				/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale)
 
 /obj/random/melee
 	name = "random melee weapon"

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -256,7 +256,6 @@
 		new /obj/item/clothing/under/det(src)
 		new /obj/item/clothing/under/det/grey(src)
 		new /obj/item/clothing/under/det/black(src)
-		new /obj/item/clothing/under/det/slob(src)
 		new /obj/item/clothing/suit/storage/det_suit(src)
 		new /obj/item/clothing/suit/storage/det_suit/technicolor(src)
 		new /obj/item/clothing/suit/storage/forensics/blue(src)