Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140
[MIRROR] Removes now-unnecessary obj_integrity definitions
This commit is contained in:
@@ -20,7 +20,6 @@
|
||||
tint = 3
|
||||
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
|
||||
layer = MOB_LAYER
|
||||
obj_integrity = 100
|
||||
max_integrity = 100
|
||||
|
||||
var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
|
||||
|
||||
@@ -626,7 +626,6 @@
|
||||
/obj/structure/cloth_pile
|
||||
name = "pile of bandages"
|
||||
desc = "It emits a strange aura, as if there was still life within it..."
|
||||
obj_integrity = 50
|
||||
max_integrity = 50
|
||||
armor = list(melee = 90, bullet = 90, laser = 25, energy = 80, bomb = 50, bio = 100, fire = -50, acid = -50)
|
||||
icon = 'icons/obj/items.dmi'
|
||||
|
||||
@@ -170,7 +170,6 @@
|
||||
desc = "A floating bubble containing leaper venom, the contents are under a surprising amount of pressure."
|
||||
icon = 'icons/obj/projectiles.dmi'
|
||||
icon_state = "leaper"
|
||||
obj_integrity = 10
|
||||
max_integrity = 10
|
||||
density = FALSE
|
||||
|
||||
|
||||
@@ -730,7 +730,7 @@ Difficulty: Very Hard
|
||||
icon_state = null //This shouldn't even be visible, so if it DOES show up, at least nobody will notice
|
||||
density = 1
|
||||
anchored = 1
|
||||
obj_integrity = 999
|
||||
resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
|
||||
var/mob/living/simple_animal/holder_animal
|
||||
|
||||
/obj/structure/closet/stasis/process()
|
||||
@@ -740,8 +740,8 @@ Difficulty: Very Hard
|
||||
holder_animal.gib()
|
||||
return
|
||||
|
||||
/obj/structure/closet/stasis/New()
|
||||
..()
|
||||
/obj/structure/closet/stasis/Initialize(mapload)
|
||||
. = ..()
|
||||
if(isanimal(loc))
|
||||
holder_animal = loc
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
Reference in New Issue
Block a user