Removes the need for specifying obj_integrity

2017-07-06 09:24:27 -05:00
parent db1e15f83a
commit d859f05d5c
2 changed files with 3 additions and 2 deletions
@@ -8,7 +8,7 @@
 	var/force = 0

 	var/list/armor
-	var/obj_integrity = 500
+	var/obj_integrity	//defaults to max_integrity
 	var/max_integrity = 500
 	var/integrity_failure = 0 //0 if we have no special broken behavior

@@ -41,6 +41,8 @@
 	. = ..()
 	if (!armor)
 		armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+	if(obj_integrity == null)
+		obj_integrity = max_integrity
 	if(on_blueprints && isturf(loc))
 		var/turf/T = loc
 		if(force_blueprints)
@@ -50,7 +50,6 @@

 /obj/structure/window/Initialize(mapload, direct)
 	..()
-	obj_integrity = max_integrity
 	if(direct)
 		setDir(direct)
 	if(reinf && anchored)