effect/blob to structure/blob

This commit is contained in:
davipatury
2017-03-27 18:41:19 -03:00
parent 9ebb84ea5e
commit 550fdd3ae3
16 changed files with 108 additions and 108 deletions

View File

@@ -1,4 +1,4 @@
/obj/effect/blob/core
/obj/structure/blob/core
name = "blob core"
icon = 'icons/mob/blob.dmi'
icon_state = "blank_blob"
@@ -11,7 +11,7 @@
var/is_offspring = null
var/selecting = 0
/obj/effect/blob/core/New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2, offspring)
/obj/structure/blob/core/New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2, offspring)
blob_cores += src
processing_objects.Add(src)
poi_list |= src
@@ -26,7 +26,7 @@
..(loc, h)
/obj/effect/blob/core/adjustcolors(var/a_color)
/obj/structure/blob/core/adjustcolors(var/a_color)
overlays.Cut()
color = null
var/image/I = new('icons/mob/blob.dmi', "blob")
@@ -36,7 +36,7 @@
overlays += C
/obj/effect/blob/core/Destroy()
/obj/structure/blob/core/Destroy()
blob_cores -= src
if(overmind)
overmind.blob_core = null
@@ -45,10 +45,10 @@
poi_list.Remove(src)
return ..()
/obj/effect/blob/core/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
/obj/structure/blob/core/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return
/obj/effect/blob/core/update_icon()
/obj/structure/blob/core/update_icon()
if(health <= 0)
qdel(src)
return
@@ -57,10 +57,10 @@
overmind.update_health()
return
/obj/effect/blob/core/RegenHealth()
/obj/structure/blob/core/RegenHealth()
return // Don't regen, we handle it in Life()
/obj/effect/blob/core/Life()
/obj/structure/blob/core/Life()
if(!overmind)
create_overmind()
else
@@ -79,9 +79,9 @@
for(var/b_dir in alldirs)
if(!prob(5))
continue
var/obj/effect/blob/normal/B = locate() in get_step(src, b_dir)
var/obj/structure/blob/normal/B = locate() in get_step(src, b_dir)
if(B)
B.change_to(/obj/effect/blob/shield)
B.change_to(/obj/structure/blob/shield)
if(B && overmind)
B.color = overmind.blob_reagent_datum.color
else
@@ -90,7 +90,7 @@
..()
/obj/effect/blob/core/proc/create_overmind(var/client/new_overmind, var/override_delay)
/obj/structure/blob/core/proc/create_overmind(var/client/new_overmind, var/override_delay)
if(overmind_get_delay > world.time && !override_delay)
return