The Most Non-Edgey PR Ever

2026-07-19 19:13:30 +01:00 · 2017-07-01 19:48:43 -04:00
parent 52af2d8c0e
commit 05a24da2e8
56 changed files with 66 additions and 145 deletions
@@ -100,7 +100,6 @@
 	slot_flags = SLOT_BACK|SLOT_BELT
 	block_chance = 30
 	sharp = 1
-	edge = 1
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")

@@ -187,7 +186,6 @@
 	armour_penetration = 35
 	slot_flags = SLOT_BACK
 	sharp = 1
-	edge = 1
 	attack_verb = list("chopped", "sliced", "cut", "reaped")
 	hitsound = 'sound/weapons/rapierhit.ogg'

@@ -266,7 +264,6 @@
 	w_class = WEIGHT_CLASS_HUGE
 	flags = NODROP | ABSTRACT
 	sharp = 1
-	edge = 1
 	attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
 	hitsound = 'sound/weapons/chainsaw.ogg'

@@ -278,7 +275,6 @@
 	desc = "Used for absolutely hilarious sacrifices."
 	hitsound = 'sound/items/bikehorn.ogg'
 	sharp = 1
-	edge = 1
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut", "honked")

 /obj/item/weapon/nullrod/whip
@@ -324,7 +320,6 @@
 	flags = ABSTRACT | NODROP
 	w_class = WEIGHT_CLASS_HUGE
 	sharp = 1
-	edge = 1

 /obj/item/weapon/nullrod/carp
 	name = "carp-sie plushie"
@@ -354,7 +349,6 @@
 	block_chance = 40
 	slot_flags = SLOT_BACK
 	sharp = 0
-	edge = 0
 	hitsound = "swing_hit"
 	attack_verb = list("smashed", "slammed", "whacked", "thwacked")
 	icon = 'icons/obj/weapons.dmi'
@@ -368,7 +362,6 @@
 	w_class = WEIGHT_CLASS_HUGE
 	desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
 	sharp = 1
-	edge = 1
 	slot_flags = null
 	flags = HANDSLOW
 	hitsound = 'sound/weapons/bladeslice.ogg'
@@ -394,7 +387,6 @@
 	attack_verb = list("poked", "impaled", "pierced", "jabbed")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharp = 1
-	edge = 1

 /obj/item/weapon/nullrod/rosary
 	name = "prayer beads"
@@ -100,7 +100,6 @@
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	no_embed = 1
 	sharp = 1
-	edge = 1

 /obj/item/weapon/kitchen/knife/suicide_act(mob/user)
 	user.visible_message(pick("<span class='suicide'>[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.</span>", \
@@ -114,7 +113,6 @@
 	icon_state = "pknife"
 	item_state = "knife"
 	sharp = 0
-	edge = 0

 /obj/item/weapon/kitchen/knife/ritual
 	name = "ritual knife"
@@ -70,7 +70,6 @@
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	attack_verb_on = list()
 	sharp = 1
-	edge = 1

 /obj/item/weapon/melee/energy/axe/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.</span>")
@@ -89,7 +88,6 @@
 	origin_tech = "combat=3;magnets=4;syndicate=4"
 	block_chance = 50
 	sharp = 1
-	edge = 1
 	var/hacked = 0
 	var/blade_color

@@ -121,7 +119,6 @@
 	force_on = 30
 	force = 18 //About as much as a spear
 	sharp = 1
-	edge = 1
 	hitsound = 'sound/weapons/circsawhit.ogg'
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "esaw_0"
@@ -202,7 +199,6 @@
 	icon_state = "blade"
 	force = 30
 	sharp = 1
-	edge = 1
 	throwforce = 1//Throwing or dropping the item deletes it.
 	throw_speed = 3
 	throw_range = 1
@@ -32,7 +32,6 @@
 	block_chance = 50
 	armour_penetration = 75
 	sharp = 1
-	edge = 1
 	origin_tech = "combat=5"
 	attack_verb = list("lunged at", "stabbed")
 	hitsound = 'sound/weapons/rapierhit.ogg'
@@ -5,7 +5,6 @@
 	item_state = "scissor"
 	force = 5
 	sharp = 1
-	edge = 1
 	w_class = WEIGHT_CLASS_SMALL
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("slices", "cuts", "stabs", "jabs")
@@ -117,7 +116,7 @@
 				playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
 				user.visible_message("<span class='danger'>[user] abruptly stops cutting [M]'s hair and slices their throat!</span>", "<span class='danger'>You stop cutting [M]'s hair and slice their throat!</span>") //Just a little off the top.
 				H.AdjustLoseBreath(10) //30 Oxy damage over time
-				H.apply_damage(18, BRUTE, "head", sharp =1, edge =1, used_weapon = "scissors")
+				H.apply_damage(18, BRUTE, "head", sharp =1, used_weapon = "scissors")
 				var/turf/location = get_turf(H)
 				if(istype(location, /turf/simulated))
 					location.add_blood(H)
@@ -5,7 +5,6 @@
 	icon = 'icons/obj/shards.dmi'
 	icon_state = "large"
 	sharp = 1
-	edge = 1
 	desc = "Could probably be used as ... a throwing weapon?"
 	w_class = WEIGHT_CLASS_TINY
 	force = 5.0
@@ -228,7 +228,6 @@
 	hitsound = 'sound/items/Wirecutter.ogg'
 	usesound = 'sound/items/Wirecutter.ogg'
 	sharp = 1
-	edge = 1
 	toolspeed = 1

 /obj/item/weapon/wirecutters/New(loc, param_color = null)
@@ -162,7 +162,6 @@
 	force = 5
 	throwforce = 15
 	sharp = 1
-	edge = 1
 	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BACK
 	force_unwielded = 5
@@ -209,7 +208,6 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 75
 	sharp = 1
-	edge = 1
 	no_embed = 1 // Like with the single-handed esword, this shouldn't be embedding in people.

 /obj/item/weapon/twohanded/dualsaber/New()
@@ -297,7 +295,6 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 	sharp = 1
-	edge = 1
 	no_spin_thrown = 1
 	var/obj/item/weapon/grenade/explosive = null
 	var/war_cry = "AAAAARGH!!!"
@@ -442,7 +439,6 @@
 	attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered")
 	hitsound = "swing_hit"
 	sharp = 1
-	edge = 1
 	actions_types = list(/datum/action/item_action/startchainsaw)
 	var/on = 0

@@ -499,7 +495,6 @@
 	origin_tech = "materials=6;syndicate=4"
 	attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered")
 	sharp = 1
-	edge = 1
 	no_embed = 1

 /obj/item/weapon/twohanded/chainsaw/update_icon()
@@ -718,7 +713,6 @@
 	force = 5
 	throwforce = 15
 	sharp = 1
-	edge = 1
 	w_class = WEIGHT_CLASS_HUGE
 	armour_penetration = 20
 	slot_flags = SLOT_BACK
@@ -43,7 +43,6 @@
 	force = 40
 	throwforce = 10
 	sharp = 1
-	edge = 1
 	w_class = WEIGHT_CLASS_NORMAL
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 50
@@ -67,7 +66,6 @@
 	force = 40
 	throwforce = 10
 	sharp = 1
-	edge = 1
 	w_class = WEIGHT_CLASS_NORMAL
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -83,7 +81,6 @@
 /obj/item/weapon/harpoon
 	name = "harpoon"
 	sharp = 1
-	edge = 0
 	desc = "Tharr she blows!"
 	icon_state = "harpoon"
 	item_state = "harpoon"
@@ -19,7 +19,7 @@
 	if(I.force >= max || I.throwforce >= max)//no esword sharpening
 		to_chat(user, "<span class='notice'>[I] is much too powerful to sharpen further.</span>")
 		return
-	if(requires_sharpness && !I.edge)
+	if(requires_sharpness && !I.sharp)
 		to_chat(user, "<span class='notice'>You can only sharpen items that are already sharp, such as knives.</span>")
 		return
 	if(istype(I, /obj/item/weapon/twohanded))//some twohanded items should still be sharpenable, but handle force differently. therefore i need this stuff
@@ -39,7 +39,6 @@
 		return
 	user.visible_message("<span class='notice'>[user] sharpens [I] with [src]!</span>", "<span class='notice'>You sharpen [I], making it much more deadly than before.</span>")
 	if(!requires_sharpness)
-		I.edge = 1
 		I.sharp = 1
 	I.force = Clamp(I.force + increment, 0, max)
 	I.throwforce = Clamp(I.throwforce + increment, 0, max)
@@ -8,7 +8,6 @@
 	var/throwforce = 1
 	var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
 	var/sharp = 0		// whether this object cuts
-	var/edge = 0		// whether this object is more likely to dismember
 	var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!

 	var/damtype = "brute"