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

[MIRROR] Removes now-unnecessary obj_integrity definitions
2017-07-09 23:06:13 -05:00
parent 5f54d006da 90c2a4f867
commit ff0c889a29
168 changed files with 41 additions and 269 deletions
@@ -76,7 +76,6 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
 	icon_state = "marker"
 	layer = BELOW_OPEN_DOOR_LAYER
 	armor = list(melee = 50, bullet = 75, laser = 75, energy = 75, bomb = 25, bio = 100, rad = 100, fire = 25, acid = 0)
-	obj_integrity = 50
 	max_integrity = 50
 	anchored = TRUE
 	light_range = 2