Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140

[MIRROR] Removes now-unnecessary obj_integrity definitions

code/game/objects/effects/effect_system/effects_foam.dm

@@ -201,7 +201,6 @@
 	name = "foamed metal"
 	desc = "A lightweight foamed metal wall."
 	gender = PLURAL
-	obj_integrity = 20
 	max_integrity = 20
 	CanAtmosPass = ATMOS_PASS_DENSITY
 
@@ -236,7 +235,6 @@
 	return !density
 
 /obj/structure/foamedmetal/iron
-	obj_integrity = 50
 	max_integrity = 50
 	icon_state = "ironfoam"
 
@@ -247,7 +245,6 @@
 	opacity = FALSE
 	icon_state = "atmos_resin"
 	alpha = 120
-	obj_integrity = 10
 	max_integrity = 10
 	layer = EDGED_TURF_LAYER
 

code/game/objects/effects/glowshroom.dm

@@ -9,7 +9,6 @@
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "glowshroom" //replaced in New
 	layer = ABOVE_NORMAL_TURF_LAYER
-	obj_integrity = 30
 	max_integrity = 30
 	var/delay = 1200
 	var/floor = 0

code/game/objects/effects/spiders.dm

@@ -5,7 +5,7 @@
 	desc = "it's stringy and sticky"
 	anchored = 1
 	density = 0
-	obj_integrity = 15
+	max_integrity = 15
 
 
 
@@ -82,7 +82,7 @@
 	icon_state = "spiderling"
 	anchored = 0
 	layer = PROJECTILE_HIT_THRESHHOLD_LAYER
-	obj_integrity = 3
+	max_integrity = 3
 	var/amount_grown = 0
 	var/grow_as = null
 	var/obj/machinery/atmospherics/components/unary/vent_pump/entry_vent
@@ -188,7 +188,7 @@
 	name = "cocoon"
 	desc = "Something wrapped in silky spider web"
 	icon_state = "cocoon1"
-	obj_integrity = 60
+	max_integrity = 60
 
 /obj/structure/spider/cocoon/Initialize()
 	icon_state = pick("cocoon1","cocoon2","cocoon3")

code/game/objects/items.dm

@@ -24,10 +24,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	var/icon/alternate_worn_icon = null//If this is set, update_icons() will find on mob (WORN, NOT INHANDS) states in this file instead, primary use: badminnery/events
 	var/alternate_worn_layer = null//If this is set, update_icons() will force the on mob state (WORN, NOT INHANDS) onto this layer, instead of it's default
 
-	obj_integrity = 200
 	max_integrity = 200
 
-
 	var/hitsound = null
 	var/usesound = null
 	var/throwhitsound = null

code/game/objects/items/devices/forcefieldprojector.dm

@@ -76,15 +76,14 @@
 	anchored = TRUE
 	density = TRUE
 	mouse_opacity = 2
-	obj_integrity = INFINITY
-	max_integrity = INFINITY
+	resistance_flags = INDESTRUCTIBLE
 	CanAtmosPass = ATMOS_PASS_DENSITY
 	armor = list(melee = 0, bullet = 25, laser = 50, energy = 50, bomb = 25, bio = 100, rad = 100, fire = 100, acid = 100)
 	var/obj/item/device/forcefield/generator
 
 /obj/structure/projected_forcefield/Initialize(mapload, obj/item/device/forcefield/origin)
+	. = ..()
 	generator = origin
-	..()
 
 /obj/structure/projected_forcefield/Destroy()
 	visible_message("<span class='warning'>[src] flickers and disappears!</span>")

code/game/objects/items/devices/instruments.dm

@@ -2,7 +2,6 @@
 /obj/item/device/instrument
 	name = "generic instrument"
 	resistance_flags = FLAMMABLE
-	obj_integrity = 100
 	max_integrity = 100
 	var/datum/song/handheld/song
 	var/instrumentId = "generic"

code/game/objects/items/stacks/medical.dm

@@ -9,7 +9,6 @@
 	throw_speed = 3
 	throw_range = 7
 	resistance_flags = FLAMMABLE
-	obj_integrity = 40
 	max_integrity = 40
 	novariants = FALSE
 	var/heal_brute = 0

code/game/objects/items/stacks/sheets/glass.dm

@@ -35,7 +35,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 /obj/item/stack/sheet/glass/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.glass_recipes
 	return ..()
-	
+
 /obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)
 	if(istype(W, /obj/item/stack/cable_coil))
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
 /obj/item/stack/sheet/plasmaglass/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.pglass_recipes
 	return ..()
-	
+
 /obj/item/stack/sheet/plasmaglass/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)
 
@@ -156,7 +156,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
 /obj/item/stack/sheet/rglass/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.reinforced_glass_recipes
 	return ..()
-	
+
 GLOBAL_LIST_INIT(prglass_recipes, list ( \
 	new/datum/stack_recipe("directional reinforced window", /obj/structure/window/plasma/reinforced/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
 	new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/plasma/reinforced/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
@@ -192,7 +192,6 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	resistance_flags = ACID_PROOF
 	armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
-	obj_integrity = 40
 	max_integrity = 40
 	var/cooldown = 0
 	sharpness = IS_SHARP

code/game/objects/items/stacks/sheets/mineral.dm

@@ -152,7 +152,6 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
 	origin_tech = "plasmatech=2;materials=2"
 	sheettype = "plasma"
 	resistance_flags = FLAMMABLE
-	obj_integrity = 100
 	max_integrity = 100
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
 

code/game/objects/items/toys.dm

@@ -584,7 +584,6 @@
 
 /obj/item/toy/cards
 	resistance_flags = FLAMMABLE
-	obj_integrity = 50
 	max_integrity = 50
 	var/parentdeck = null
 	var/deckstyle = "nanotrasen"

code/game/objects/items/weapons/grenades/grenade.dm

@@ -10,7 +10,6 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	resistance_flags = FLAMMABLE
-	obj_integrity = 40
 	max_integrity = 40
 	var/active = 0
 	var/det_time = 50

code/game/objects/items/weapons/melee/energy.dm

@@ -9,7 +9,6 @@
 	sharpness = IS_SHARP
 	var/w_class_on = WEIGHT_CLASS_BULKY
 	heat = 3500
-	obj_integrity = 200
 	max_integrity = 200
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
 	resistance_flags = FIRE_PROOF

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

@@ -11,7 +11,6 @@
 	item_state = "paintcan"
 	w_class = WEIGHT_CLASS_NORMAL
 	resistance_flags = FLAMMABLE
-	obj_integrity = 100
 	max_integrity = 100
 	var/paintleft = 10
 

code/game/objects/items/weapons/storage/backpack.dm

@@ -20,7 +20,6 @@
 	max_combined_w_class = 21
 	storage_slots = 21
 	resistance_flags = 0
-	obj_integrity = 300
 	max_integrity = 300
 
 /*

code/game/objects/items/weapons/storage/belt.dm

@@ -6,7 +6,6 @@
 	item_state = "utility"
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
-	obj_integrity = 300
 	max_integrity = 300
 
 /obj/item/weapon/storage/belt/update_icon()

code/game/objects/items/weapons/storage/briefcase.dm

@@ -12,7 +12,6 @@
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
 	resistance_flags = FLAMMABLE
-	obj_integrity = 150
 	max_integrity = 150
 	var/folder_path = /obj/item/weapon/folder //this is the path of the folder that gets spawned in New()
 
@@ -43,7 +42,6 @@
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
 	resistance_flags = FLAMMABLE
-	obj_integrity = 150
 	max_integrity = 150
 
 /obj/item/weapon/storage/briefcase/sniperbundle/PopulateContents()

code/game/objects/items/weapons/tanks/watertank.dm

@@ -9,7 +9,6 @@
 	slot_flags = SLOT_BACK
 	slowdown = 1
 	actions_types = list(/datum/action/item_action/toggle_mister)
-	obj_integrity = 200
 	max_integrity = 200
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
 	resistance_flags = FIRE_PROOF

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

@@ -209,7 +209,6 @@
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharpness = IS_SHARP
-	obj_integrity = 200
 	max_integrity = 200
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
 	resistance_flags = FIRE_PROOF
@@ -258,7 +257,6 @@
 	light_color = "#00ff00"//green
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 75
-	obj_integrity = 200
 	max_integrity = 200
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70)
 	resistance_flags = FIRE_PROOF
@@ -418,7 +416,6 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 	sharpness = IS_SHARP
-	obj_integrity = 200
 	max_integrity = 200
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
 	var/obj/item/weapon/grenade/explosive = null
@@ -568,7 +565,6 @@
 	attack_verb = list("attacked", "impaled", "pierced")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharpness = IS_SHARP
-	obj_integrity = 200
 	max_integrity = 200
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
 	resistance_flags = FIRE_PROOF

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

@@ -11,7 +11,6 @@
 	throw_speed = 3
 	throw_range = 7
 	attack_verb = list("banned")
-	obj_integrity = 200
 	max_integrity = 200
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70)
 	resistance_flags = FIRE_PROOF
@@ -56,7 +55,6 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 50
 	sharpness = IS_SHARP
-	obj_integrity = 200
 	max_integrity = 200
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
 	resistance_flags = FIRE_PROOF
@@ -201,7 +199,6 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 50
 	sharpness = IS_SHARP
-	obj_integrity = 200
 	max_integrity = 200
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
 	resistance_flags = FIRE_PROOF

code/game/objects/structures/ai_core.dm

@@ -4,7 +4,6 @@
 	name = "\improper AI core"
 	icon = 'icons/mob/ai.dmi'
 	icon_state = "0"
-	obj_integrity = 500
 	max_integrity = 500
 	var/state = 0
 	var/datum/ai_laws/laws = new()

code/game/objects/structures/aliens.dm

@@ -9,7 +9,6 @@
 
 /obj/structure/alien
 	icon = 'icons/mob/alien.dmi'
-	obj_integrity = 100
 	max_integrity = 100
 
 /obj/structure/alien/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
@@ -59,7 +58,6 @@
 	opacity = 1
 	anchored = 1
 	canSmoothWith = list(/obj/structure/alien/resin)
-	obj_integrity = 200
 	max_integrity = 200
 	smooth = SMOOTH_TRUE
 	var/resintype = null
@@ -92,7 +90,6 @@
 	icon = 'icons/obj/smooth_structures/alien/resin_membrane.dmi'
 	icon_state = "membrane0"
 	opacity = 0
-	obj_integrity = 160
 	max_integrity = 160
 	resintype = "membrane"
 	canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane)
@@ -119,7 +116,6 @@
 	density = 0
 	layer = TURF_LAYER
 	icon_state = "weeds"
-	obj_integrity = 15
 	max_integrity = 15
 	canSmoothWith = list(/obj/structure/alien/weeds, /turf/closed/wall)
 	smooth = SMOOTH_MORE
@@ -220,7 +216,6 @@
 	icon_state = "egg_growing"
 	density = FALSE
 	anchored = TRUE
-	obj_integrity = 100
 	max_integrity = 100
 	integrity_failure = 5
 	var/status = GROWING	//can be GROWING, GROWN or BURST; all mutually exclusive

code/game/objects/structures/artstuff.dm

@@ -10,7 +10,6 @@
 	icon_state = "easel"
 	density = 1
 	resistance_flags = FLAMMABLE
-	obj_integrity = 60
 	max_integrity = 60
 	var/obj/item/weapon/canvas/painting = null
 

code/game/objects/structures/barsigns.dm

@@ -4,7 +4,6 @@
 	icon = 'icons/obj/barsigns.dmi'
 	icon_state = "empty"
 	req_access = list(GLOB.access_bar)
-	obj_integrity = 500
 	max_integrity = 500
 	integrity_failure = 250
 	armor = list(melee = 20, bullet = 20, laser = 20, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
@@ -16,12 +15,8 @@
 	var/prev_sign = ""
 	var/panel_open = 0
 
-
-
-
-/obj/structure/sign/barsign/New()
-	..()
-
+/obj/structure/sign/barsign/Initialize()
+	. = ..()
 
 //filling the barsigns list
 	for(var/bartype in subtypesof(/datum/barsign))
@@ -29,12 +24,9 @@
 		if(!signinfo.hidden)
 			barsigns += signinfo
 
-
 //randomly assigning a sign
 	set_sign(pick(barsigns))
 
-
-
 /obj/structure/sign/barsign/proc/set_sign(datum/barsign/sign)
 	if(!istype(sign))
 		return
@@ -45,8 +37,6 @@
 	else
 		desc = "It displays \"[name]\"."
 
-
-
 /obj/structure/sign/barsign/obj_break(damage_flag)
 	if(!broken && !(flags & NODECONSTRUCT))
 		broken = 1

code/game/objects/structures/beds_chairs/alien_nest.dm

@@ -5,7 +5,6 @@
 	desc = "It's a gruesome pile of thick, sticky resin shaped like a nest."
 	icon = 'icons/obj/smooth_structures/alien/nest.dmi'
 	icon_state = "nest"
-	obj_integrity = 120
 	max_integrity = 120
 	smooth = SMOOTH_TRUE
 	can_be_unanchored = 0

code/game/objects/structures/beds_chairs/bed.dm

@@ -16,7 +16,6 @@
 	can_buckle = 1
 	buckle_lying = 1
 	resistance_flags = FLAMMABLE
-	obj_integrity = 100
 	max_integrity = 100
 	integrity_failure = 30
 	var/buildstacktype = /obj/item/stack/sheet/metal

code/game/objects/structures/beds_chairs/chair.dm

@@ -7,7 +7,6 @@
 	can_buckle = 1
 	buckle_lying = 0 //you sit in a chair, not lay
 	resistance_flags = 0
-	obj_integrity = 250
 	max_integrity = 250
 	integrity_failure = 25
 	var/buildstacktype = /obj/item/stack/sheet/metal
@@ -119,7 +118,6 @@
 	name = "wooden chair"
 	desc = "Old is never too old to not be in fashion."
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 	buildstacktype = /obj/item/stack/sheet/mineral/wood
 	buildstackamount = 3
@@ -141,7 +139,6 @@
 	icon_state = "comfychair"
 	color = rgb(255,255,255)
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 	buildstackamount = 2
 	var/mutable_appearance/armrest
@@ -314,7 +311,6 @@
 	icon_state = "wooden_chair_toppled"
 	item_state = "woodenchair"
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 	hitsound = 'sound/weapons/genhit1.ogg'
 	origin_type = /obj/structure/chair/wood

code/game/objects/structures/bedsheet_bin.dm

@@ -242,7 +242,6 @@ LINEN BINS
 	icon_state = "linenbin-full"
 	anchored = 1
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 	var/amount = 10
 	var/list/sheets = list()

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

@@ -12,7 +12,6 @@
 	var/locked = FALSE
 	var/large = TRUE
 	var/wall_mounted = 0 //never solid (You can always pass over it)
-	obj_integrity = 200
 	max_integrity = 200
 	integrity_failure = 50
 	armor = list(melee = 20, bullet = 10, laser = 10, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 60)

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -5,7 +5,6 @@
 	icon_state = "cardboard"
 	mob_storage_capacity = 1
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 	integrity_failure = 0
 	can_weld_shut = 0
@@ -61,7 +60,7 @@
 	name = "large metal box"
 	desc = "THE COWARDS! THE FOOLS!"
 	icon_state = "metalbox"
-	obj_integrity = 500
+	max_integrity = 500
 	mob_storage_capacity = 5
 	resistance_flags = 0
 	move_speed_multiplier = 2

code/game/objects/structures/crates_lockers/closets/gimmick.dm

@@ -3,7 +3,6 @@
 	desc = "Old will forever be in fashion."
 	icon_state = "cabinet"
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 
 /obj/structure/closet/acloset

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -126,7 +126,6 @@
 	desc = "It's a burial receptacle for the dearly departed."
 	icon_state = "coffin"
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 	horizontal = TRUE
 	delivery_icon = "deliverycrate"

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

@@ -3,7 +3,6 @@
 	req_access = list(GLOB.access_bar)
 	icon_state = "cabinet"
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 
 /obj/structure/closet/secure_closet/bar/PopulateContents()

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

@@ -24,7 +24,6 @@
 /obj/structure/closet/secure_closet/personal/cabinet
 	icon_state = "cabinet"
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 
 /obj/structure/closet/secure_closet/personal/cabinet/PopulateContents()

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

@@ -3,7 +3,6 @@
 	desc = "It's a card-locked storage unit."
 	locked = 1
 	icon_state = "secure"
-	obj_integrity = 250
 	max_integrity = 250
 	armor = list(melee = 30, bullet = 50, laser = 50, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
 	secure = 1

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

@@ -162,7 +162,6 @@
 	req_access = list(GLOB.access_forensics_lockers)
 	icon_state = "cabinet"
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 
 /obj/structure/closet/secure_closet/detective/PopulateContents()

code/game/objects/structures/crates_lockers/crates/secure.dm

@@ -4,7 +4,6 @@
 	icon_state = "securecrate"
 	secure = 1
 	locked = 1
-	obj_integrity = 500
 	max_integrity = 500
 	armor = list(melee = 30, bullet = 50, laser = 50, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
 	var/tamperproof = 0

code/game/objects/structures/destructible_structures.dm

@@ -1,6 +1,5 @@
 /obj/structure/destructible //a base for destructible structures
 	max_integrity = 100
-	obj_integrity = 100
 	var/break_message = "<span class='warning'>The strange, admin-y structure breaks!</span>" //The message shown when a structure breaks
 	var/break_sound = 'sound/magic/clockwork/invoke_general.ogg' //The sound played when a structure breaks
 	var/list/debris = null //Parts left behind when a structure breaks, takes the form of list(path = amount_to_spawn)

code/game/objects/structures/displaycase.dm

@@ -7,7 +7,6 @@
 	anchored = 1
 	resistance_flags = ACID_PROOF
 	armor = list(melee = 30, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 100)
-	obj_integrity = 200
 	max_integrity = 200
 	integrity_failure = 50
 	var/obj/item/showpiece = null

code/game/objects/structures/door_assembly.dm

@@ -5,7 +5,6 @@
 	var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
 	anchored = 0
 	density = 1
-	obj_integrity = 200
 	max_integrity = 200
 	var/state = 0
 	var/mineral = null

code/game/objects/structures/extinguisher.dm

@@ -5,7 +5,6 @@
 	icon_state = "extinguisher_closed"
 	anchored = 1
 	density = 0
-	obj_integrity = 200
 	max_integrity = 200
 	integrity_failure = 50
 	var/obj/item/weapon/extinguisher/stored_extinguisher

code/game/objects/structures/false_walls.dm

@@ -14,7 +14,6 @@
 	var/opening = 0
 	density = 1
 	opacity = 1
-	obj_integrity = 100
 	max_integrity = 100
 
 	canSmoothWith = list(
@@ -220,7 +219,6 @@
 	mineral = /obj/item/stack/sheet/mineral/diamond
 	walltype = /turf/closed/wall/mineral/diamond
 	canSmoothWith = list(/obj/structure/falsewall/diamond, /turf/closed/wall/mineral/diamond)
-	obj_integrity = 800
 	max_integrity = 800
 
 /obj/structure/falsewall/plasma

code/game/objects/structures/fireaxe.dm

@@ -9,7 +9,6 @@
 	armor = list(melee = 50, bullet = 20, laser = 0, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 90, acid = 50)
 	var/locked = 1
 	var/open = 0
-	obj_integrity = 150
 	max_integrity = 150
 	integrity_failure = 50
 

code/game/objects/structures/flora.dm

@@ -1,6 +1,5 @@
 /obj/structure/flora
 	resistance_flags = FLAMMABLE
-	obj_integrity = 150
 	max_integrity = 150
 	anchored = 1
 

code/game/objects/structures/girders.dm

@@ -7,7 +7,6 @@
 	var/state = GIRDER_NORMAL
 	var/girderpasschance = 20 // percentage chance that a projectile passes through the girder.
 	var/can_displace = TRUE //If the girder can be moved around by wrenching it
-	obj_integrity = 200
 	max_integrity = 200
 
 /obj/structure/girder/examine(mob/user)
@@ -306,7 +305,6 @@
 	anchored = 0
 	state = GIRDER_DISPLACED
 	girderpasschance = 25
-	obj_integrity = 120
 	max_integrity = 120
 
 /obj/structure/girder/reinforced
@@ -314,7 +312,6 @@
 	icon_state = "reinforced"
 	state = GIRDER_REINF
 	girderpasschance = 0
-	obj_integrity = 350
 	max_integrity = 350
 
 

code/game/objects/structures/grille.dm

@@ -9,7 +9,6 @@
 	pressure_resistance = 5*ONE_ATMOSPHERE
 	layer = BELOW_OBJ_LAYER
 	armor = list(melee = 50, bullet = 70, laser = 70, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 0, acid = 0)
-	obj_integrity = 50
 	max_integrity = 50
 	integrity_failure = 20
 	var/rods_type = /obj/item/stack/rods

code/game/objects/structures/holosign.dm

@@ -5,7 +5,6 @@
 	name = "holo sign"
 	icon = 'icons/effects/effects.dmi'
 	anchored = 1
-	obj_integrity = 1
 	max_integrity = 1
 	armor = list(melee = 0, bullet = 50, laser = 50, energy = 50, bomb = 0, bio = 0, rad = 0, fire = 20, acid = 20)
 	var/obj/item/weapon/holosign_creator/projector
@@ -46,7 +45,6 @@
 	icon_state = "holosign_sec"
 	pass_flags = LETPASSTHROW
 	density = 1
-	obj_integrity = 20
 	max_integrity = 20
 	var/allow_walk = 1 //can we pass through it on walk intent
 
@@ -89,7 +87,6 @@
 	name = "Energy Field"
 	desc = "A fragile energy field that blocks movement. Excels at blocking lethal projectiles."
 	density = 1
-	obj_integrity = 10
 	max_integrity = 10
 	allow_walk = 0
 
@@ -103,7 +100,6 @@
 /obj/structure/holosign/barrier/cyborg/hacked
 	name = "Charged Energy Field"
 	desc = "A powerful energy field that blocks movement. Energy arcs off it"
-	obj_integrity = 20
 	max_integrity = 20
 	var/shockcd = 0
 

code/game/objects/structures/kitchen_spike.dm

@@ -8,7 +8,6 @@
 	desc = "The frame of a meat spike."
 	density = 1
 	anchored = 0
-	obj_integrity = 200
 	max_integrity = 200
 
 /obj/structure/kitchenspike_frame/attackby(obj/item/I, mob/user, params)
@@ -51,7 +50,6 @@
 	anchored = 1
 	buckle_lying = 0
 	can_buckle = 1
-	obj_integrity = 250
 	max_integrity = 250
 
 

code/game/objects/structures/lattice.dm

@@ -6,7 +6,6 @@
 	density = 0
 	anchored = 1
 	armor = list(melee = 50, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 50)
-	obj_integrity = 50
 	max_integrity = 50
 	layer = LATTICE_LAYER //under pipes
 	var/number_of_rods = 1

code/game/objects/structures/manned_turret.dm

@@ -8,7 +8,6 @@
 	can_buckle = TRUE
 	density = TRUE
 	max_integrity = 100
-	obj_integrity = 100
 	buckle_lying = FALSE
 	layer = ABOVE_MOB_LAYER
 	var/view_range = 10

code/game/objects/structures/mineral_doors.dm

@@ -14,7 +14,6 @@
 	var/state = 0 //closed, 1 == open
 	var/isSwitchingStates = 0
 	var/close_delay = -1 //-1 if does not auto close.
-	obj_integrity = 200
 	max_integrity = 200
 	armor = list(melee = 10, bullet = 0, laser = 0, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 50, acid = 50)
 	var/sheetType = /obj/item/stack/sheet/metal
@@ -144,14 +143,12 @@
 
 /obj/structure/mineral_door/iron
 	name = "iron door"
-	obj_integrity = 300
 	max_integrity = 300
 
 /obj/structure/mineral_door/silver
 	name = "silver door"
 	icon_state = "silver"
 	sheetType = /obj/item/stack/sheet/mineral/silver
-	obj_integrity = 300
 	max_integrity = 300
 
 /obj/structure/mineral_door/gold
@@ -163,7 +160,6 @@
 	name = "uranium door"
 	icon_state = "uranium"
 	sheetType = /obj/item/stack/sheet/mineral/uranium
-	obj_integrity = 300
 	max_integrity = 300
 	light_range = 2
 
@@ -171,7 +167,6 @@
 	name = "sandstone door"
 	icon_state = "sandstone"
 	sheetType = /obj/item/stack/sheet/mineral/sandstone
-	obj_integrity = 100
 	max_integrity = 100
 
 /obj/structure/mineral_door/transparent
@@ -207,7 +202,6 @@
 	name = "diamond door"
 	icon_state = "diamond"
 	sheetType = /obj/item/stack/sheet/mineral/diamond
-	obj_integrity = 1000
 	max_integrity = 1000
 
 /obj/structure/mineral_door/wood
@@ -217,7 +211,6 @@
 	closeSound = 'sound/effects/doorcreaky.ogg'
 	sheetType = /obj/item/stack/sheet/mineral/wood
 	resistance_flags = FLAMMABLE
-	obj_integrity = 200
 	max_integrity = 200
 
 /obj/structure/mineral_door/paperframe
@@ -228,7 +221,6 @@
 	sheetType = /obj/item/stack/sheet/paperframes
 	sheetAmount = 3
 	resistance_flags = FLAMMABLE
-	obj_integrity = 20
 	max_integrity = 20
 
 /obj/structure/mineral_door/paperframe/Initialize()

code/game/objects/structures/mirror.dm

@@ -6,7 +6,6 @@
 	icon_state = "mirror"
 	density = 0
 	anchored = 1
-	obj_integrity = 200
 	max_integrity = 200
 	integrity_failure = 100
 

code/game/objects/structures/morgue.dm

@@ -18,7 +18,6 @@
 	icon_state = "morgue1"
 	density = 1
 	anchored = 1
-	obj_integrity = 400
 	max_integrity = 400
 
 	var/obj/structure/tray/connected = null
@@ -251,7 +250,6 @@ GLOBAL_LIST_EMPTY(crematoriums)
 	var/obj/structure/bodycontainer/connected = null
 	anchored = 1
 	pass_flags = LETPASSTHROW
-	obj_integrity = 350
 	max_integrity = 350
 
 /obj/structure/tray/Destroy()

code/game/objects/structures/noticeboard.dm

@@ -5,7 +5,6 @@
 	icon_state = "nboard00"
 	density = 0
 	anchored = 1
-	obj_integrity = 150
 	max_integrity = 150
 	var/notices = 0
 

code/game/objects/structures/petrified_statue.dm

@@ -4,7 +4,6 @@
 	icon_state = "human_male"
 	density = 1
 	anchored = 1
-	obj_integrity = 200
 	max_integrity = 200
 	var/timer = 240 //eventually the person will be freed
 	var/mob/living/petrified_mob

code/game/objects/structures/signs.dm

@@ -4,7 +4,6 @@
 	opacity = 0
 	density = 0
 	layer = SIGN_LAYER
-	obj_integrity = 100
 	max_integrity = 100
 	armor = list(melee = 50, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
 	var/buildable_sign = 1 //unwrenchable and modifiable
@@ -113,7 +112,6 @@
 /obj/structure/sign/map
 	name = "station map"
 	desc = "A framed picture of the station."
-	obj_integrity = 500
 	max_integrity = 500
 
 /obj/structure/sign/map/left

code/game/objects/structures/statues.dm

@@ -8,7 +8,6 @@
 	icon_state = ""
 	density = 1
 	anchored = 0
-	obj_integrity = 100
 	max_integrity = 100
 	var/oreAmount = 5
 	var/material_drop_type = /obj/item/stack/sheet/metal
@@ -96,7 +95,7 @@
 ////////////////////////uranium///////////////////////////////////
 
 /obj/structure/statue/uranium
-	obj_integrity = 300
+	max_integrity = 300
 	light_range = 2
 	material_drop_type = /obj/item/stack/sheet/mineral/uranium
 	var/last_event = 0
@@ -141,7 +140,7 @@
 ////////////////////////////plasma///////////////////////////////////////////////////////////////////////
 
 /obj/structure/statue/plasma
-	obj_integrity = 200
+	max_integrity = 200
 	material_drop_type = /obj/item/stack/sheet/mineral/plasma
 	desc = "This statue is suitably made from plasma."
 
@@ -192,7 +191,7 @@
 //////////////////////gold///////////////////////////////////////
 
 /obj/structure/statue/gold
-	obj_integrity = 300
+	max_integrity = 300
 	material_drop_type = /obj/item/stack/sheet/mineral/gold
 	desc = "This is a highly valuable statue made from gold."
 
@@ -219,7 +218,7 @@
 //////////////////////////silver///////////////////////////////////////
 
 /obj/structure/statue/silver
-	obj_integrity = 300
+	max_integrity = 300
 	material_drop_type = /obj/item/stack/sheet/mineral/silver
 	desc = "This is a valuable statue made from silver."
 
@@ -246,7 +245,7 @@
 /////////////////////////diamond/////////////////////////////////////////
 
 /obj/structure/statue/diamond
-	obj_integrity = 1000
+	max_integrity = 1000
 	material_drop_type = /obj/item/stack/sheet/mineral/diamond
 	desc = "This is a very expensive diamond statue"
 
@@ -265,7 +264,7 @@
 ////////////////////////bananium///////////////////////////////////////
 
 /obj/structure/statue/bananium
-	obj_integrity = 300
+	max_integrity = 300
 	material_drop_type = /obj/item/stack/sheet/mineral/bananium
 	desc = "A bananium statue with a small engraving:'HOOOOOOONK'."
 	var/spam_flag = 0
@@ -300,7 +299,7 @@
 /////////////////////sandstone/////////////////////////////////////////
 
 /obj/structure/statue/sandstone
-	obj_integrity = 50
+	max_integrity = 50
 	material_drop_type = /obj/item/stack/sheet/mineral/sandstone
 
 /obj/structure/statue/sandstone/assistant
@@ -318,7 +317,7 @@
 /////////////////////snow/////////////////////////////////////////
 
 /obj/structure/statue/snow
-	obj_integrity = 50
+	max_integrity = 50
 	material_drop_type = /obj/item/stack/sheet/mineral/snow
 
 /obj/structure/statue/snow/snowman

code/game/objects/structures/table_frames.dm

@@ -17,7 +17,6 @@
 	density = 0
 	anchored = 0
 	layer = PROJECTILE_HIT_THRESHHOLD_LAYER
-	obj_integrity = 100
 	max_integrity = 100
 	var/framestack = /obj/item/stack/rods
 	var/framestackamount = 2

code/game/objects/structures/tables_racks.dm

@@ -29,7 +29,6 @@
 	var/buildstackamount = 1
 	var/framestackamount = 2
 	var/deconstruction_ready = 1
-	obj_integrity = 100
 	max_integrity = 100
 	integrity_failure = 30
 	smooth = SMOOTH_TRUE
@@ -162,7 +161,6 @@
 	icon_state = "glass_table"
 	buildstack = /obj/item/stack/sheet/glass
 	canSmoothWith = null
-	obj_integrity = 70
 	max_integrity = 70
 	resistance_flags = ACID_PROOF
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 100)
@@ -244,7 +242,6 @@
 	framestack = /obj/item/stack/sheet/mineral/wood
 	buildstack = /obj/item/stack/sheet/mineral/wood
 	resistance_flags = FLAMMABLE
-	obj_integrity = 70
 	max_integrity = 70
 	canSmoothWith = list(/obj/structure/table/wood,
 		/obj/structure/table/wood/poker,
@@ -296,7 +293,6 @@
 	deconstruction_ready = 0
 	buildstack = /obj/item/stack/sheet/plasteel
 	canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table)
-	obj_integrity = 200
 	max_integrity = 200
 	integrity_failure = 50
 	armor = list(melee = 10, bullet = 30, laser = 30, energy = 100, bomb = 20, bio = 0, rad = 0, fire = 80, acid = 70)
@@ -409,7 +405,6 @@
 	density = 1
 	anchored = 1
 	pass_flags = LETPASSTHROW //You can throw objects over this, despite it's density.
-	obj_integrity = 20
 	max_integrity = 20
 
 /obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0)

code/game/objects/structures/tank_dispenser.dm

@@ -7,7 +7,6 @@
 	icon_state = "dispenser"
 	density = 1
 	anchored = 1
-	obj_integrity = 300
 	max_integrity = 300
 	var/oxygentanks = TANK_DISPENSER_CAPACITY
 	var/plasmatanks = TANK_DISPENSER_CAPACITY
@@ -25,7 +24,7 @@
 	for(var/i in 1 to plasmatanks)
 		new /obj/item/weapon/tank/internals/plasma(src)
 	update_icon()
-	
+
 /obj/structure/tank_dispenser/update_icon()
 	cut_overlays()
 	switch(oxygentanks)