Enforces TRUE/FALSE for edge (#11495)

2026-01-03 22:12:38 +00:00 · 2021-03-23 22:20:12 -05:00
parent 4c10c1d84f
commit 00d6879aff
22 changed files with 94 additions and 43 deletions
--- a/code/game/objects/items/weapons/material/knives.dm
+++ b/code/game/objects/items/weapons/material/knives.dm
@@ -12,7 +12,7 @@
 	desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
 	flags = CONDUCT
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	var/active = 1 // For butterfly knives
 	force_divisor = 0.15 // 9 when wielded with hardness 60 (steel)
 	matter = list(DEFAULT_WALL_MATERIAL = 12000)
@@ -122,7 +122,7 @@

 /obj/item/material/knife/butterfly/update_force()
 	if(active)
-		edge = 1
+		edge = TRUE
 		sharp = 1
 		..() //Updates force.
 		throwforce = max(3,force-3)
@@ -133,7 +133,7 @@
 		attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	else
 		force = 3
-		edge = 0
+		edge = FALSE
 		sharp = 0
 		hitsound = initial(hitsound)
 		icon_state = initial(icon_state)
--- a/code/game/objects/items/weapons/material/material_weapons.dm
+++ b/code/game/objects/items/weapons/material/material_weapons.dm
@@ -8,7 +8,7 @@
 	throw_range = 7
 	w_class = ITEMSIZE_NORMAL
 	sharp = 0
-	edge = 0
+	edge = FALSE
 	icon = 'icons/obj/weapons.dmi'

 	var/use_material_name = TRUE // Does the finished item put the material name in front of it?
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -1,7 +1,7 @@
 /obj/item/material/harpoon
 	name = "harpoon"
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	desc = "Tharr she blows!"
 	icon_state = "harpoon"
 	item_state = "harpoon"
@@ -38,7 +38,7 @@
 	thrown_force_divisor = 0.75 // 15 with weight 20 (steel)
 	w_class = ITEMSIZE_SMALL
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
 	attack_verb = list("chopped", "torn", "cut")
 	applies_material_colour = 0
@@ -81,7 +81,7 @@
 		slot_r_hand_str = 'icons/mob/items/righthand_kitchen.dmi',
 		)
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	force_divisor = 0.25

 /obj/item/material/minihoe // -- Numbers
@@ -110,7 +110,7 @@
 	force_divisor = 0.275 // 16 with hardness 60 (steel)
 	thrown_force_divisor = 0.25 // 5 with weight 20 (steel)
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	throw_speed = 1
 	throw_range = 3
 	w_class = ITEMSIZE_LARGE
--- a/code/game/objects/items/weapons/material/shards.dm
+++ b/code/game/objects/items/weapons/material/shards.dm
@@ -7,7 +7,7 @@
 	icon_state = "large"
 	randpixel = 8
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	recyclable = TRUE
 	w_class = ITEMSIZE_SMALL
 	force_divisor = 0.2 // 6 with hardness 30 (glass)
--- a/code/game/objects/items/weapons/material/swords.dm
+++ b/code/game/objects/items/weapons/material/swords.dm
@@ -11,7 +11,7 @@
 	force_divisor = 0.7 // 42 when wielded with hardnes 60 (steel)
 	thrown_force_divisor = 0.5 // 10 when thrown with weight 20 (steel)
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	can_embed = 0
--- a/code/game/objects/items/weapons/material/thrown.dm
+++ b/code/game/objects/items/weapons/material/thrown.dm
@@ -8,7 +8,7 @@
 	throw_speed = 10
 	throw_range = 15
 	sharp = 1
-	edge =  1
+	edge = TRUE
 	w_class = ITEMSIZE_SMALL

 /obj/item/material/star/New()
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -194,7 +194,7 @@
 	unwielded_force_divisor = 0.25
 	force_divisor = 0.7 // 10/42 with hardness 60 (steel) and 0.25 unwielded divisor
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 	force_wielded = 30
@@ -236,7 +236,7 @@
 	force_divisor = 0.35 // 21 damage for steel (hardness 60)
 	unwielded_force_divisor = 0.2 // 12 damage for steel (hardness 60)
 	thrown_force_divisor = 1.2 // 24 damage for steel (weight 20)
-	edge = 1
+	edge = TRUE
 	sharp = 0
 	mob_throw_hit_sound =  'sound/weapons/pierce.ogg'
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
@@ -530,7 +530,7 @@
 	force = 5
 	unwielded_force_divisor = 0.2
 	force_divisor = 0.3
-	edge = 1
+	edge = TRUE
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
 	attack_verb = list("attacked", "poked", "jabbed", "gored", "stabbed")
@@ -624,7 +624,7 @@
 	force_wielded = 30
 	unwielded_force_divisor = 1
 	thrown_force_divisor = 0.75
-	edge = 1
+	edge = TRUE
 	sharp = 1
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	default_material = "steel"
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -4,7 +4,7 @@
 	var/active_throwforce
 	var/active_w_class
 	sharp = 0
-	edge = 0
+	edge = FALSE
 	armor_penetration = 10
 	flags = NOBLOODY
 	can_embed = 0//No embedding pls
@@ -24,7 +24,7 @@
 	force = active_force
 	throwforce = active_throwforce
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	w_class = active_w_class
 	playsound(user, 'sound/weapons/saberon.ogg', 50, 1)

@@ -147,7 +147,7 @@
 	origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_MATERIAL = 7, TECH_ILLEGAL = 4)
 	attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	slot_flags = SLOT_BACK
 	base_reflectchance = 0
 	base_block_chance = 0 //cannot be used to block guns
@@ -196,7 +196,7 @@
 	origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4)
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	base_reflectchance = 0
 	base_block_chance = 0 //cannot be used to block guns
 	shield_power = 0
@@ -235,7 +235,7 @@
 	flags = NOBLOODY
 	origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	var/blade_color
 	shield_power = 75

@@ -363,7 +363,7 @@
 	active_force = 40 //Normal attacks deal very high damage - about the same as wielded fire axe
 	armor_penetration = 100
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	anchored = 1    // Never spawned outside of inventory, should be fine.
 	throwforce = 1  //Throwing or dropping the item deletes it.
 	throw_speed = 1
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -30,7 +30,7 @@
 	throwforce = 7
 	w_class = ITEMSIZE_LARGE
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	origin_tech = list(TECH_COMBAT = 5)
 	attack_verb = list("chopped", "sliced", "shredded", "slashed", "cut", "ripped")
 	hitsound = 'sound/weapons/bladeslice.ogg'
@@ -175,7 +175,7 @@
 	throwforce = 5
 	w_class = ITEMSIZE_LARGE
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	can_embed = 0
 	origin_tech = list(TECH_COMBAT = 4)
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -10,7 +10,7 @@
 	slot_flags = SLOT_BELT
 	force = 5
 	sharp = 0
-	edge = 0
+	edge = FALSE
 	throwforce = 7
 	w_class = ITEMSIZE_NORMAL
 	drop_sound = 'sound/items/drop/metalweapon.ogg'
--- a/code/game/objects/items/weapons/surgery_tools.dm
+++ b/code/game/objects/items/weapons/surgery_tools.dm
@@ -88,7 +88,7 @@
 	flags = CONDUCT
 	force = 10.0
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	throwforce = 5.0
@@ -148,7 +148,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 20000, MATERIAL_GLASS = 10000)
 	attack_verb = list("attacked", "slashed", "sawed", "cut")
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	drop_sound = 'sound/items/drop/accessory.ogg'
 	pickup_sound = 'sound/items/pickup/accessory.ogg'

--- a/code/game/objects/items/weapons/vaurca_items.dm
+++ b/code/game/objects/items/weapons/vaurca_items.dm
@@ -90,7 +90,7 @@
 	flags = CONDUCT | NOBLOODY
 	attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	contained_sprite = 1


@@ -360,7 +360,7 @@
 	flags = CONDUCT | NOBLOODY
 	attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	contained_sprite = 1
 	base_reflectchance = 40
 	base_block_chance = 60
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -120,7 +120,7 @@
 	throwforce = 5
 	w_class = ITEMSIZE_LARGE
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	contained_sprite = TRUE
@@ -138,7 +138,7 @@
 	force = 2
 	throwforce = 1
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	w_class = ITEMSIZE_NORMAL
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -11,7 +11,7 @@
 	var/throwforce = 1
 	var/list/attack_verb //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/edge = FALSE	// 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
 	var/force = 0
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -231,7 +231,7 @@
 	punch_force = 10
 	clipped = 1
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	drop_sound = 'sound/items/drop/toolbox.ogg'
 	pickup_sound = 'sound/items/pickup/toolbox.ogg'

@@ -373,4 +373,4 @@
 		item_state = "tesla_glove"
 	if(ismob(src.loc))
 		var/mob/M = src.loc
-		M.update_inv_gloves()
+		M.update_inv_gloves()
--- a/code/modules/mob/living/carbon/human/unarmed_attack.dm
+++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm
@@ -9,7 +9,7 @@ var/global/list/sparring_attack_cache = list()
 	var/miss_sound = /decl/sound_category/punchmiss_sound
 	var/shredding = 0 // Calls the old attack_alien() behavior on objects/mobs when on harm intent.
 	var/sharp = 0
-	var/edge = 0
+	var/edge = FALSE

 	var/damage_type = BRUTE
 	var/sparring_variant_type = /datum/unarmed_attack/light_strike
@@ -129,7 +129,7 @@ var/global/list/sparring_attack_cache = list()
 	shredding = 0
 	damage = 0
 	sharp = 0
-	edge = 0
+	edge = FALSE
 	attack_name = "bite"

 /datum/unarmed_attack/bite/is_usable(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone)
@@ -294,5 +294,5 @@ var/global/list/sparring_attack_cache = list()
 	shredding = 0
 	damage = 0
 	sharp = 0
-	edge = 0
+	edge = FALSE
 	attack_name = "light hit"
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -314,7 +314,7 @@
 	burst_delay = 1
 	fire_delay = 30
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	anchored = 0
 	armor_penetration = 40
 	flags = NOBLOODY
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -67,7 +67,7 @@
 	damage = 50
 	check_armor = "bullet"
 	sharp = 1
-	edge = 1
+	edge = TRUE

 /obj/item/projectile/bullet/gyro/on_impact(var/atom/A)
 	explosion(A, -1, 0, 2)
@@ -200,7 +200,7 @@
 	damage = 75
 	check_armor = "bomb"
 	sharp = 1
-	edge = 1
+	edge = TRUE

 /obj/item/projectile/bullet/trod/on_impact(var/atom/A)
 	explosion(A, 0, 0, 4)
@@ -300,4 +300,4 @@
 	icon_state= "icer_bolt"
 	damage = 15
 	damage_type = BRUTE
-	check_armor = "energy"
+	check_armor = "energy"
--- a/code/modules/psionics/equipment/psipower_blade.dm
+++ b/code/modules/psionics/equipment/psipower_blade.dm
@@ -2,7 +2,7 @@
 	name = "psychokinetic slash"
 	force = 10
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	maintain_cost = 1
 	icon_state = "psiblade_short"
 	hitsound = 'sound/weapons/psisword.ogg'
@@ -14,7 +14,7 @@
 /obj/item/psychic_power/psiblade/master
 	force = 20
 	maintain_cost = 2
-	
+
 /obj/item/psychic_power/psiblade/master/grand
 	force = 30
 	maintain_cost = 3
--- a/code/modules/spell_system/artifacts/items/rune_sword.dm
+++ b/code/modules/spell_system/artifacts/items/rune_sword.dm
@@ -18,7 +18,7 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharp = 1
-	edge = 1
+	edge = TRUE
 	base_reflectchance = 60
 	base_block_chance = 60
 	can_block_bullets = 1