A bunch of Initialize()s now have return values
This commit is contained in:
@@ -106,7 +106,7 @@ Difficulty: Very Hard
|
||||
var/target
|
||||
|
||||
/obj/effect/overlay/temp/at_shield/Initialize(mapload, new_target)
|
||||
..()
|
||||
. = ..()
|
||||
target = new_target
|
||||
INVOKE_ASYNC(src, /atom/movable/proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE)
|
||||
|
||||
@@ -628,7 +628,7 @@ Difficulty: Very Hard
|
||||
var/heal_power = 5
|
||||
|
||||
/mob/living/simple_animal/hostile/lightgeist/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
verbs -= /mob/living/verb/pulled
|
||||
verbs -= /mob/verb/me_verb
|
||||
var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
|
||||
|
||||
@@ -54,7 +54,7 @@ Difficulty: Medium
|
||||
death_sound = 'sound/magic/demon_dies.ogg'
|
||||
|
||||
/mob/living/simple_animal/hostile/megafauna/dragon/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
internal = new/obj/item/device/gps/internal/dragon(src)
|
||||
|
||||
/mob/living/simple_animal/hostile/megafauna/dragon/ex_act(severity, target)
|
||||
@@ -97,7 +97,7 @@ Difficulty: Medium
|
||||
pixel_z = 500
|
||||
|
||||
/obj/effect/overlay/temp/fireball/Initialize(loc)
|
||||
..()
|
||||
. = ..()
|
||||
animate(src, pixel_z = 0, time = 12)
|
||||
|
||||
/obj/effect/overlay/temp/target
|
||||
@@ -122,7 +122,7 @@ Difficulty: Medium
|
||||
return
|
||||
|
||||
/obj/effect/overlay/temp/target/Initialize(loc)
|
||||
..()
|
||||
. = ..()
|
||||
INVOKE_ASYNC(src, .proc/fall)
|
||||
|
||||
/obj/effect/overlay/temp/target/proc/fall()
|
||||
|
||||
@@ -74,7 +74,7 @@ Difficulty: Hard
|
||||
death_sound = 'sound/magic/Repulse.ogg'
|
||||
|
||||
/mob/living/simple_animal/hostile/megafauna/hierophant/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
internal = new/obj/item/device/gps/internal/hierophant(src)
|
||||
spawned_beacon = new(loc)
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ Difficulty: Medium
|
||||
mouse_opacity = 1
|
||||
|
||||
/mob/living/simple_animal/hostile/megafauna/legion/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
internal = new/obj/item/device/gps/internal/legion(src)
|
||||
|
||||
/mob/living/simple_animal/hostile/megafauna/legion/AttackingTarget()
|
||||
|
||||
@@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
|
||||
|
||||
|
||||
/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
swarmer_caps = GLOB.AISwarmerCapsByType //for admin-edits
|
||||
internal = new/obj/item/device/gps/internal/swarmer_beacon(src)
|
||||
for(var/ddir in GLOB.cardinal)
|
||||
@@ -109,7 +109,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
|
||||
|
||||
|
||||
/mob/living/simple_animal/hostile/swarmer/ai/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
ToggleLight() //so you can see them eating you out of house and home/shooting you/stunlocking you for eternity
|
||||
LAZYINITLIST(GLOB.AISwarmersByType[type])
|
||||
GLOB.AISwarmers += src
|
||||
@@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
|
||||
|
||||
|
||||
/mob/living/simple_animal/hostile/swarmer/ai/resource/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
sharedWanted = typecacheof(sharedWanted)
|
||||
sharedIgnore = typecacheof(sharedIgnore)
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
gold_core_spawnable = 1
|
||||
|
||||
/mob/living/simple_animal/hostile/retaliate/frog/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
if(prob(1))
|
||||
name = "rare frog"
|
||||
desc = "It seems a little smug."
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
var/random = TRUE //if you want random names for ghosts or not
|
||||
|
||||
/mob/living/simple_animal/hostile/retaliate/ghost/Initialize()
|
||||
..()
|
||||
. = ..()
|
||||
if(!random)
|
||||
give_hair()
|
||||
else
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
diff a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm (rejected hunks)
|
||||
@@ -92,7 +92,7 @@
|
||||
create_reagents(100)
|
||||
set_colour(new_colour)
|
||||
grant_language(/datum/language/slime)
|
||||
- ..()
|
||||
+ . = ..()
|
||||
|
||||
/mob/living/simple_animal/slime/proc/set_colour(new_colour)
|
||||
colour = new_colour
|
||||
Reference in New Issue
Block a user