/atom New() => Initialize() [MDB IGNORE]

This commit is contained in:
MistakeNot4892
2021-11-14 03:09:51 -05:00
committed by VirgoBot
parent 47c8115916
commit 3f9af78f3a
587 changed files with 12315 additions and 2669 deletions
+1
View File
@@ -150,6 +150,7 @@ var/list/blob_cores = list()
overmind.blob_type.on_core_process(src)
/obj/structure/blob/core/proc/create_overmind(client/new_overmind, override_delay)
set waitfor = FALSE
if(overmind_get_delay > world.time && !override_delay)
return
if(!ai_controlled) // Do we want a bona fide player blob?
+2 -2
View File
@@ -9,8 +9,8 @@ var/list/blob_nodes = list()
health_regen = 3
point_return = 50
/obj/structure/blob/node/New(var/newloc)
..()
/obj/structure/blob/node/Initialize()
. = ..()
blob_nodes += src
START_PROCESSING(SSobj, src)
update_icon()
+2 -3
View File
@@ -23,9 +23,8 @@
/obj/item/weapon/blobcore_chunk/is_open_container()
return 1
/obj/item/weapon/blobcore_chunk/New(var/atom/newloc, var/datum/blob_type/parentblob = null)
..(newloc)
/obj/item/weapon/blobcore_chunk/Initialize(var/ml, var/datum/blob_type/parentblob = null)
. = ..(ml)
create_reagents(120)
setup_blobtype(parentblob)
+5 -1
View File
@@ -30,11 +30,15 @@
melee_damage_lower = 1
melee_damage_upper = 2
<<<<<<< HEAD
/mob/living/simple_mob/hostile/blob/spore/New(var/newloc, var/obj/structure/blob/factory/my_factory)
=======
/mob/living/simple_animal/hostile/blob/spore/Initialize(var/ml, var/obj/structure/blob/factory/my_factory)
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
if(istype(my_factory))
factory = my_factory
factory.spores += src
..(newloc)
. = ..(ml)
/mob/living/simple_mob/hostile/blob/spore/Destroy()
if(factory)