Removes now-unnecessary obj_integrity definitions

This commit is contained in:
CitadelStationBot
2017-07-09 19:44:48 -05:00
parent 6e646c44cf
commit 90c2a4f867
168 changed files with 41 additions and 269 deletions
-1
View File
@@ -3,7 +3,6 @@
icon = 'icons/mob/blob.dmi'
icon_state = "blank_blob"
desc = "A huge, pulsating yellow mass."
obj_integrity = 400
max_integrity = 400
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 75, acid = 90)
explosion_block = 6
@@ -3,7 +3,6 @@
icon = 'icons/mob/blob.dmi'
icon_state = "blob_factory"
desc = "A thick spire of tendrils."
obj_integrity = 200
max_integrity = 200
health_regen = 1
point_return = 25
-1
View File
@@ -3,7 +3,6 @@
icon = 'icons/mob/blob.dmi'
icon_state = "blank_blob"
desc = "A large, pulsating yellow mass."
obj_integrity = 200
max_integrity = 200
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 65, acid = 90)
health_regen = 3
@@ -3,7 +3,6 @@
icon = 'icons/mob/blob.dmi'
icon_state = "blob_resource"
desc = "A thin spire of slightly swaying tendrils."
obj_integrity = 60
max_integrity = 60
point_return = 15
var/resource_delay = 0
-1
View File
@@ -3,7 +3,6 @@
icon = 'icons/mob/blob.dmi'
icon_state = "blob_shield"
desc = "A solid wall of slightly twitching tendrils."
obj_integrity = 150
max_integrity = 150
brute_resist = 0.25
explosion_block = 3
+1 -2
View File
@@ -9,7 +9,6 @@
anchored = 1
layer = BELOW_MOB_LAYER
var/point_return = 0 //How many points the blob gets back when it removes a blob of that type. If less than 0, blob cannot be removed.
obj_integrity = 30
max_integrity = 30
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 70)
var/health_regen = 2 //how much health this blob regens when pulsed
@@ -326,7 +325,7 @@
name = "normal blob"
icon_state = "blob"
light_range = 0
obj_integrity = 21
obj_integrity = 21 //doesn't start at full health
max_integrity = 25
health_regen = 1
brute_resist = 0.25
@@ -3,7 +3,6 @@
name = "ark of the Clockwork Justicar"
desc = "A massive, thrumming rip in spacetime."
clockwork_desc = "A portal to the Celestial Derelict. Massive and intimidating, it is the only thing that can both transport Ratvar and withstand the massive amount of energy he emits."
obj_integrity = 500
max_integrity = 500
mouse_opacity = 2
icon = 'icons/effects/clockwork_effects.dmi'
@@ -9,7 +9,6 @@
unanchored_icon = "obelisk_unwrenched"
construction_value = 20
max_integrity = 150
obj_integrity = 150
break_message = "<span class='warning'>The obelisk falls to the ground, undamaged!</span>"
debris = list(/obj/item/clockwork/alloy_shards/small = 4, \
/obj/item/clockwork/alloy_shards/medium = 2, \
@@ -4,7 +4,6 @@
desc = "A flickering, glowing purple ring around a target."
clockwork_desc = "A binding ring around a target, preventing them from taking action while they're being converted."
max_integrity = 25
obj_integrity = 25
light_range = 2
light_power = 0.5
light_color = "#AF0AAF"
@@ -10,7 +10,6 @@
construction_value = 20
break_message = "<span class='warning'>The antenna break off, leaving a pile of shards!</span>"
max_integrity = 100
obj_integrity = 100
light_color = "#AF0AAF"
debris = list(/obj/item/clockwork/alloy_shards/large = 2, \
/obj/item/clockwork/alloy_shards/small = 2, \
@@ -5,7 +5,6 @@
clockwork_desc = "A fragile turret which will automatically attack nearby unrestrained non-Servants that can see it."
icon_state = "ocular_warden"
unanchored_icon = "ocular_warden_unwrenched"
obj_integrity = 25
max_integrity = 25
construction_value = 15
layer = WALL_OBJ_LAYER
@@ -9,7 +9,6 @@
unanchored_icon = "prolonging_prism_unwrenched"
construction_value = 20
max_integrity = 125
obj_integrity = 125
break_message = "<span class='warning'>The prism falls to the ground with a heavy thud!</span>"
debris = list(/obj/item/clockwork/alloy_shards/small = 3, \
/obj/item/clockwork/alloy_shards/medium = 1, \
@@ -5,7 +5,6 @@
clockwork_desc = "A cloud of purple smoke that confuses and knocks down non-Servants that enter it."
gender = PLURAL
max_integrity = 5
obj_integrity = 5
density = 1
color = list("#AF0AAF", "#AF0AAF", "#AF0AAF", rgb(0,0,0))
icon = 'icons/effects/effects.dmi'
@@ -9,7 +9,6 @@
construction_value = 10
break_message = "<span class='warning'>The cache's fire winks out before it falls in on itself!</span>"
max_integrity = 80
obj_integrity = 80
light_color = "#C2852F"
var/wall_generation_cooldown
var/turf/closed/wall/clockwork/linkedwall //if we've got a linked wall and are producing
@@ -8,7 +8,6 @@
inactive_icon = "tinkerers_daemon"
unanchored_icon = "tinkerers_daemon_unwrenched"
max_integrity = 100
obj_integrity = 100
construction_value = 20
break_message = "<span class='warning'>The daemon shatters into millions of pieces, leaving only a disc of metal!</span>"
debris = list(/obj/item/clockwork/alloy_shards/medium = 1, \
@@ -5,7 +5,6 @@
unanchored_icon = "wall_gear"
climbable = TRUE
max_integrity = 100
obj_integrity = 100
layer = BELOW_OBJ_LAYER
construction_value = 3
desc = "A massive brass gear. You could probably secure or unsecure it with a wrench, or just climb over it."
-1
View File
@@ -11,7 +11,6 @@
anchored = 1
layer = HIGH_OBJ_LAYER
max_integrity = 300
obj_integrity = 300
integrity_failure = 100
armor = list(melee = 20, bullet = 50, laser = 50, energy = 50, bomb = 10, bio = 100, rad = 100, fire = 10, acid = 70)
var/datum/gang/gang
@@ -527,7 +527,6 @@
layer = MOB_LAYER
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
light_color = LIGHT_COLOR_CYAN
obj_integrity = 30
max_integrity = 30
anchored = TRUE
var/lon_range = 1
@@ -550,7 +549,6 @@
name = "swarmer trap"
desc = "A quickly assembled trap that electrifies living beings and overwhelms machine sensors. Will not retain its form if damaged enough."
icon_state = "trap"
obj_integrity = 10
max_integrity = 10
density = 0
@@ -594,7 +592,6 @@
desc = "A quickly assembled energy blockade. Will not retain its form if damaged enough, but disabler beams and swarmers pass right through."
icon_state = "barricade"
light_range = 1
obj_integrity = 50
max_integrity = 50
/obj/structure/swarmer/blockade/CanPass(atom/movable/O)
@@ -495,7 +495,6 @@ This is here to make the tiles around the station mininuke change when it's arme
desc = "Better keep this safe."
icon_state = "nucleardisk"
persistence_replacement = /obj/item/weapon/disk/fakenucleardisk
obj_integrity = 250
max_integrity = 250
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 30, bio = 0, rad = 0, fire = 100, acid = 100)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-1
View File
@@ -455,7 +455,6 @@
var/obj/item/link = null
var/cooldown_time = 30 //3s
var/cooldown = 0
obj_integrity = 10
max_integrity = 10
resistance_flags = FLAMMABLE