Merge branch 'edgy' into hot_or_not

Conflicts:
	code/__HELPERS/unsorted.dm

code/modules/clothing/glasses/glasses.dm

@@ -29,6 +29,7 @@
 	throw_speed = 4
 	attack_verb = list("sliced")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	sharpness = IS_SHARP
 
 /obj/item/clothing/glasses/science
 	name = "Science Goggles"
@@ -103,6 +104,7 @@
 	throw_speed = 4
 	attack_verb = list("sliced")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	sharpness = IS_SHARP
 
 /obj/item/clothing/glasses/sunglasses/garb/supergarb
 	desc = "Believe in us humans."
@@ -122,6 +124,7 @@
 	throw_speed = 4
 	attack_verb = list("sliced")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	sharpness = IS_SHARP
 
 /obj/item/clothing/glasses/sunglasses/gar/supergar
 	desc = "We evolve past the person we were a minute before. Little by little we advance with each turn. That's how a drill works!"
@@ -247,7 +250,7 @@
 				name = "sunglasses"
 				icon_state = "sun"
 				item_state = "sunglasses"
-			if("Medical HUD")	
+			if("Medical HUD")
 				name = "Health Scanner HUD"
 				desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
 				icon_state = "healthhud"
@@ -257,11 +260,11 @@
 				desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
 				icon_state = "meson"
 				item_state = "meson"
-			if("Science Goggles")	
+			if("Science Goggles")
 				name = "Science Goggles"
 				desc = "A pair of snazzy goggles used to protect against chemical spills."
 				icon_state = "purple"
-				item_state = "glasses"	
+				item_state = "glasses"
 			if("Glasses")
 				name = "Prescription Glasses"
 				desc = "Made by Nerd. Co."
@@ -287,4 +290,4 @@
 				name = "gar glasses"
 				icon_state = "gar"
 				item_state = "gar"
-				
+

code/modules/clothing/glasses/hud.dm

@@ -85,6 +85,7 @@
 	throw_speed = 4
 	attack_verb = list("sliced")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	sharpness = IS_SHARP
 
 /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars
 	name = "giga HUD gar glasses"

code/modules/events/spacevine.dm

@@ -362,7 +362,7 @@
 				qdel(B)
 		qdel(src)
 
-	else if(is_sharp(W))
+	else if(W.is_sharp())
 		qdel(src)
 
 	else if(istype(W, /obj/item/weapon/weldingtool))

code/modules/food&drinks/drinks/drinks/bottle.dm

@@ -144,6 +144,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("stabbed", "slashed", "attacked")
 	var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
+	sharpness = IS_SHARP
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/gin
 	name = "Griffeater Gin"

code/modules/food&drinks/food/snacks.dm

@@ -150,9 +150,9 @@
 			var/obj/item/weapon/reagent_containers/food/snacks/customizable/C = new custom_food_type(get_turf(src))
 			C.initialize_custom_food(src, S, user)
 			return 0
-	if(is_sharp(W))
-		var/sharpness = is_sharp(W)
-		if(slice(sharpness, W, user))
+	var/sharp = W.is_sharp()
+	if(sharp)
+		if(slice(sharp, W, user))
 			return 1
 
 //Called when you finish tablecrafting a snack.
@@ -176,7 +176,7 @@
 		return 1
 
 	var/slices_lost = 0
-	if (accuracy > 1)
+	if (accuracy >= IS_SHARP_ACCURATE)
 		user.visible_message( \
 			"[user] slices [src].", \
 			"<span class='notice'>You slice [src].</span>" \
@@ -278,7 +278,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/store/attackby(obj/item/weapon/W, mob/user, params)
 	..()
 	if(W.w_class <= 2 & !istype(W, /obj/item/weapon/reagent_containers/food/snacks)) //can't slip snacks inside, they're used for custom foods.
-		if(is_sharp(W))
+		if(W.is_sharp())
 			return 0
 		if(stored_item)
 			return 0

code/modules/hydroponics/grown.dm

@@ -487,7 +487,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
-	if(is_sharp(W))
+	if(W.is_sharp())
 		user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
 		new /obj/item/clothing/head/hardhat/pumpkinhead (user.loc)
 		qdel(src)

code/modules/hydroponics/growninedible.dm

@@ -302,7 +302,7 @@
 
 /obj/item/weapon/grown/corncob/attackby(obj/item/weapon/grown/W, mob/user, params)
 	..()
-	if(is_sharp(W))
+	if(W.is_sharp())
 		user << "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>"
 		new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
 		user.unEquip(src)

code/modules/hydroponics/hydroitemdefines.dm

@@ -87,6 +87,7 @@
 	origin_tech = "materials=2;combat=1"
 	attack_verb = list("chopped", "torn", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	sharpness = IS_SHARP
 
 /obj/item/weapon/hatchet/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is chopping at \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>")

code/modules/mining/mine_items.dm

@@ -136,6 +136,7 @@
 	materials = list(MAT_METAL=50)
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
+	sharpness = IS_SHARP
 
 /obj/item/weapon/shovel/spade
 	name = "spade"

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -366,7 +366,7 @@
 
 	if((butcher_results) && (stat == DEAD))
 		user.changeNext_move(CLICK_CD_MELEE)
-		var/sharpness = is_sharp(O)
+		var/sharpness = O.is_sharp()
 		if(sharpness)
 			user << "<span class='notice'>You begin to butcher [src]...</span>"
 			playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)

code/modules/surgery/tools.dm

@@ -61,6 +61,7 @@
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	sharpness = IS_SHARP_ACCURATE
 
 /obj/item/weapon/scalpel/suicide_act(mob/user)
 	user.visible_message(pick("<span class='suicide'>[user] is slitting \his wrists with [src]! It looks like \he's trying to commit suicide.</span>", \
@@ -85,6 +86,7 @@
 	materials = list(MAT_METAL=10000, MAT_GLASS=6000)
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "slashed", "sawed", "cut")
+	sharpness = IS_SHARP
 
 /obj/item/weapon/surgical_drapes
 	name = "surgical drapes"