diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 14481772b88..299ff81fd65 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -325,7 +325,7 @@ Turf and target are seperate in case you want to teleport some distance from a t var/mob/M = old_list[named] if(issilicon(M)) AI_list |= M - else if(isobserver(M) || M.stat == 2) + else if(isobserver(M) || M.stat == DEAD) Dead_list |= M else if(M.key && M.client) keyclient_list |= M @@ -359,7 +359,7 @@ Turf and target are seperate in case you want to teleport some distance from a t namecounts[name] = 1 if(M.real_name && M.real_name != M.name) name += " \[[M.real_name]\]" - if(M.stat == 2) + if(M.stat == DEAD) if(istype(M, /mob/dead/observer/)) name += " \[ghost\]" else @@ -1838,7 +1838,7 @@ var/global/list/g_fancy_list_of_types = null namecounts[name] = 1 if (M.real_name && M.real_name != M.name) name += " \[[M.real_name]\]" - if (M.stat == 2) + if (M.stat == DEAD) if(istype(M, /mob/dead/observer/)) name += " \[ghost\]" else diff --git a/code/modules/mining/lavaland/colossus_loot.dm b/code/modules/mining/lavaland/colossus_loot.dm index d680edd4def..22b66b9f2cb 100644 --- a/code/modules/mining/lavaland/colossus_loot.dm +++ b/code/modules/mining/lavaland/colossus_loot.dm @@ -283,7 +283,7 @@ if(..()) for(var/i in range(1, src)) if(isturf(i)) - PoolOrNew(/obj/effect/overlay/temp/cult/sparks, i) + new /obj/effect/overlay/temp/cult/sparks(i) continue if(ishuman(i)) var/mob/living/carbon/human/H = i @@ -366,7 +366,7 @@ var/mob/living/L = target if(L.stat < DEAD) L.heal_overall_damage(heal_power, heal_power) - PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(target), "#80F5FF")) + new /obj/effect/overlay/temp/heal(get_turf(target), "#80F5FF") /mob/living/simple_animal/hostile/lightgeist/ghostize() if(..()) @@ -387,7 +387,7 @@ if(..()) var/list/L = list() var/turf/T = get_step(src, dir) - PoolOrNew(/obj/effect/overlay/temp/emp/pulse,T) + new /obj/effect/overlay/temp/emp/pulse(T) for(var/i in T) if(istype(i, /obj/item) && !is_type_in_typecache(i, banned_items_typecache)) var/obj/item/W = i diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 84636fdf4fd..a47cac51431 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -261,7 +261,7 @@ if(!istype(T)) return if(!istype(T, turf_type)) - var/obj/effect/overlay/temp/lavastaff/L = PoolOrNew(/obj/effect/overlay/temp/lavastaff, T) + var/obj/effect/overlay/temp/lavastaff/L = new /obj/effect/overlay/temp/lavastaff(T) L.alpha = 0 animate(L, alpha = 255, time = create_delay) user.visible_message("[user] points [src] at [T]!") @@ -468,7 +468,7 @@ timer = world.time + cooldown_time if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one! chaser_timer = world.time + chaser_cooldown - PoolOrNew(/obj/effect/overlay/temp/hierophant/chaser, list(get_turf(user), user, target, 1.5, friendly_fire_check)) + new /obj/effect/overlay/temp/hierophant/chaser(get_turf(user), user, target, 1.5, friendly_fire_check) add_logs(user, target, "fired a chaser at", src) else spawn(0) @@ -493,7 +493,7 @@ if(do_after(user, 50, target = user)) var/turf/T = get_turf(user) playsound(T,'sound/magic/Blind.ogg', 200, 1, -4) - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(T, user)) + new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, user) var/obj/effect/hierophant/H = new/obj/effect/hierophant(T) rune = H user.update_action_buttons_icon() @@ -523,8 +523,8 @@ to_chat(user, "The rune is blocked by something, preventing teleportation!") user.update_action_buttons_icon() return - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, user)) - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(source, user)) + new /obj/effect/overlay/temp/hierophant/telegraph(T, user) + new /obj/effect/overlay/temp/hierophant/telegraph(source, user) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1) playsound(source,'sound/magic/blink.ogg', 200, 1) @@ -540,13 +540,13 @@ user.update_action_buttons_icon() return add_logs(user, rune, "teleported self from ([source.x],[source.y],[source.z]) to") - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(T, user)) - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(source, user)) + new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, user) + new /obj/effect/overlay/temp/hierophant/telegraph/teleport(source, user) for(var/t in RANGE_TURFS(1, T)) - var/obj/effect/overlay/temp/hierophant/blast/B = PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, user, TRUE)) //blasts produced will not hurt allies + var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies B.damage = 30 for(var/t in RANGE_TURFS(1, source)) - var/obj/effect/overlay/temp/hierophant/blast/B = PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, user, TRUE)) //but absolutely will hurt enemies + var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies B.damage = 30 for(var/mob/living/L in range(1, source)) spawn(0) @@ -585,11 +585,11 @@ /obj/item/weapon/hierophant_staff/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay if(!T) return - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/cardinal, list(T, user)) + new /obj/effect/overlay/temp/hierophant/telegraph/cardinal(T, user) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) - PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, user, friendly_fire_check)) + new /obj/effect/overlay/temp/hierophant/blast(T, user, friendly_fire_check) for(var/d in cardinal) spawn(0) blast_wall(T, d, user) @@ -603,16 +603,16 @@ for(var/i in 1 to range) if(!J) return - PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(J, user, friendly_fire_check)) + new /obj/effect/overlay/temp/hierophant/blast(J, user, friendly_fire_check) previousturf = J J = get_step(previousturf, dir) /obj/item/weapon/hierophant_staff/proc/aoe_burst(turf/T, mob/living/user) //make a 3x3 blast around a target if(!T) return - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, user)) + new /obj/effect/overlay/temp/hierophant/telegraph(T, user) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) for(var/t in RANGE_TURFS(1, T)) - PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, user, friendly_fire_check)) \ No newline at end of file + new /obj/effect/overlay/temp/hierophant/blast(t, user, friendly_fire_check) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 4876aa60b7b..f9315966d27 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -83,12 +83,12 @@ message = "[src] pings at [param]." else message = "[src] pings." - playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) + playsound(loc, 'sound/machines/ping.ogg', 50, 0) m_type = 2 if("buzz2") message = "[src] emits an irritated buzzing sound." - playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) + playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0) m_type = 2 if("buzz", "buzzes") @@ -105,7 +105,7 @@ message = "[src] buzzes at [param]." else message = "[src] buzzes." - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0) m_type = 2 if("beep", "beeps") @@ -122,7 +122,7 @@ message = "[src] beeps at [param]." else message = "[src] beeps." - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) + playsound(loc, 'sound/machines/twobeep.ogg', 50, 0) m_type = 2 if("drone", "drones", "hum", "hums", "rumble", "rumbles") @@ -139,7 +139,7 @@ message = "[src] drones at [param]." else message = "[src] rumbles." - playsound(src.loc, 'sound/voice/DraskTalk.ogg', 50, 0) + playsound(loc, 'sound/voice/DraskTalk.ogg', 50, 0) m_type = 2 if("squish", "squishes") @@ -156,7 +156,7 @@ message = "[src] squishes at [param]." else message = "[src] squishes." - playsound(src.loc, 'sound/effects/slime_squish.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound. + playsound(loc, 'sound/effects/slime_squish.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound. m_type = 2 if("yes") @@ -173,7 +173,7 @@ message = "[src] emits an affirmative blip at [param]." else message = "[src] emits an affirmative blip." - playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0) + playsound(loc, 'sound/machines/synth_yes.ogg', 50, 0) m_type = 2 if("no") @@ -190,7 +190,7 @@ message = "[src] emits a negative blip at [param]." else message = "[src] emits a negative blip." - playsound(src.loc, 'sound/machines/synth_no.ogg', 50, 0) + playsound(loc, 'sound/machines/synth_no.ogg', 50, 0) m_type = 2 if("wag", "wags") @@ -202,7 +202,7 @@ else if(species.bodyflags & TAIL_WAGGING) if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space)) message = "[src] starts wagging \his tail." - src.start_tail_wagging(1) + start_tail_wagging(1) else return else @@ -212,23 +212,23 @@ if("swag", "swags") if(species.bodyflags & TAIL_WAGGING || body_accessory) message = "[src] stops wagging \his tail." - src.stop_tail_wagging(1) + stop_tail_wagging(1) else return m_type = 1 if("airguitar") - if(!src.restrained()) + if(!restrained()) message = "[src] is strumming the air and headbanging like a safari chimp." m_type = 1 if("dance") - if(!src.restrained()) + if(!restrained()) message = "[src] dances around happily." m_type = 1 if("jump") - if(!src.restrained()) + if(!restrained()) message = "[src] jumps!" m_type = 1 @@ -241,7 +241,7 @@ m_type = 1 if("bow", "bows") - if(!src.buckled) + if(!buckled) var/M = null if(param) for(var/mob/A in view(null, null)) @@ -258,7 +258,7 @@ m_type = 1 if("salute", "salutes") - if(!src.buckled) + if(!buckled) var/M = null if(param) for(var/mob/A in view(null, null)) @@ -298,13 +298,13 @@ message = "[src] makes a peculiar noise." m_type = 2 if("clap", "claps") - if(!src.restrained()) + if(!restrained()) message = "[src] claps." m_type = 2 if(miming) m_type = 1 if("flap", "flaps") - if(!src.restrained()) + if(!restrained()) message = "[src] flaps \his wings." m_type = 2 if(miming) @@ -312,7 +312,7 @@ if("flip", "flips") m_type = 1 - if(!src.restrained()) + if(!restrained()) var/M = null if(param) for(var/mob/A in view(1, null)) @@ -350,7 +350,7 @@ SpinAnimation(5,1) if("aflap", "aflaps") - if(!src.restrained()) + if(!restrained()) message = "[src] flaps \his wings ANGRILY!" m_type = 2 if(miming) @@ -386,7 +386,7 @@ if("faint", "faints") message = "[src] faints." - if(src.sleeping) + if(sleeping) return //Can't faint while asleep AdjustSleeping(2) m_type = 1 @@ -588,11 +588,11 @@ message = "[src] takes a drag from a cigarette and blows \"[M]\" out in smoke." m_type = 1 else - message = "[src] says, \"[M], please. They had a family.\" [src.name] takes a drag from a cigarette and blows their name out in smoke." + message = "[src] says, \"[M], please. They had a family.\" [name] takes a drag from a cigarette and blows their name out in smoke." m_type = 2 if("point", "points") - if(!src.restrained()) + if(!restrained()) var/atom/M = null if(param) for(var/atom/A as mob|obj|turf in view()) @@ -607,7 +607,7 @@ m_type = 1 if("raise", "raises") - if(!src.restrained()) + if(!restrained()) message = "[src] raises a hand." m_type = 1 @@ -620,12 +620,12 @@ m_type = 1 if("signal", "signals") - if(!src.restrained()) + if(!restrained()) var/t1 = round(text2num(param)) if(isnum(t1)) - if(t1 <= 5 && (!src.r_hand || !src.l_hand)) + if(t1 <= 5 && (!r_hand || !l_hand)) message = "[src] raises [t1] finger\s." - else if(t1 <= 10 && (!src.r_hand && !src.l_hand)) + else if(t1 <= 10 && (!r_hand && !l_hand)) message = "[src] raises [t1] finger\s." m_type = 1 @@ -709,7 +709,7 @@ if("hug", "hugs") m_type = 1 - if(!src.restrained()) + if(!restrained()) var/M = null if(param) for(var/mob/A in view(1, null)) @@ -726,7 +726,7 @@ if("handshake") m_type = 1 - if(!src.restrained() && !src.r_hand) + if(!restrained() && !r_hand) var/mob/M = null if(param) for(var/mob/A in view(1, null)) @@ -744,7 +744,7 @@ if("dap", "daps") m_type = 1 - if(!src.restrained()) + if(!restrained()) var/M = null if(param) for(var/mob/A in view(1, null)) @@ -758,7 +758,7 @@ if("slap", "slaps") m_type = 1 - if(!src.restrained()) + if(!restrained()) var/M = null if(param) for(var/mob/A in view(1, null)) @@ -767,11 +767,11 @@ break if(M) message = "[src] slaps [M] across the face. Ouch!" - playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) + playsound(loc, 'sound/effects/snap.ogg', 50, 1) else message = "[src] slaps \himself!" - playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) - src.adjustFireLoss(4) + playsound(loc, 'sound/effects/snap.ogg', 50, 1) + adjustFireLoss(4) if("scream", "screams") if(miming) @@ -782,9 +782,9 @@ message = "[src] [species.scream_verb]!" m_type = 2 if(gender == FEMALE) - playsound(src.loc, "[species.female_scream_sound]", 80, 1, 0, pitch = get_age_pitch()) + playsound(loc, "[species.female_scream_sound]", 80, 1, 0, pitch = get_age_pitch()) else - playsound(src.loc, "[species.male_scream_sound]", 80, 1, 0, pitch = get_age_pitch()) //default to male screams if no gender is present. + playsound(loc, "[species.male_scream_sound]", 80, 1, 0, pitch = get_age_pitch()) //default to male screams if no gender is present. else message = "[src] makes a very loud noise." @@ -809,24 +809,24 @@ return message = "[src] snaps \his fingers." - playsound(src.loc, 'sound/effects/fingersnap.ogg', 50, 1, -3) + playsound(loc, 'sound/effects/fingersnap.ogg', 50, 1, -3) else message = "[src] snaps \his fingers right off!" - playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) + playsound(loc, 'sound/effects/snap.ogg', 50, 1) // Needed for M_TOXIC_FART if("fart", "farts") if(reagents.has_reagent("simethicone")) return -// playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun +// playsound(loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun if(locate(/obj/item/weapon/storage/bible) in get_turf(src)) to_chat(viewers(src), "[src] farts on the Bible!") to_chat(viewers(src), "A mysterious force smites [src]!") var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) s.start() - src.gib() + gib() else if(TOXIC_FARTS in mutations) message = "[src] unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart." else if(SUPER_FART in mutations) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 7f3c752659d..85a351606f6 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -131,7 +131,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/Move() if(charging) - PoolOrNew(/obj/effect/overlay/temp/decoy/fading, list(loc,src)) + new /obj/effect/overlay/temp/decoy/fading(loc, src) DestroySurroundings() . = ..() if(!stat && .) @@ -152,12 +152,12 @@ Difficulty: Hard var/turf/T = get_turf(target) if(!T || T == loc) return - PoolOrNew(/obj/effect/overlay/temp/dragon_swoop, T) + new /obj/effect/overlay/temp/dragon_swoop(T) charging = 1 DestroySurroundings() walk(src, 0) dir = get_dir(src, T) - var/obj/effect/overlay/temp/decoy/D = PoolOrNew(/obj/effect/overlay/temp/decoy, list(loc,src)) + var/obj/effect/overlay/temp/decoy/D = new /obj/effect/overlay/temp/decoy(loc, src) animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 5) sleep(5) throw_at(T, get_dist(src, T), 1, src, 0) @@ -242,9 +242,9 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodsmack(turf/T, handedness) if(handedness) - PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightsmack, T) + new /obj/effect/overlay/temp/bubblegum_hands/rightsmack(T) else - PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftsmack, T) + new /obj/effect/overlay/temp/bubblegum_hands/leftsmack(T) sleep(2.5) for(var/mob/living/L in T) if(!faction_check(L)) @@ -256,11 +256,11 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodgrab(turf/T, handedness) if(handedness) - PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightpaw, T) - PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightthumb, T) + new /obj/effect/overlay/temp/bubblegum_hands/rightpaw(T) + new /obj/effect/overlay/temp/bubblegum_hands/rightthumb(T) else - PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftpaw, T) - PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftthumb, T) + new /obj/effect/overlay/temp/bubblegum_hands/leftpaw(T) + new /obj/effect/overlay/temp/bubblegum_hands/leftthumb(T) sleep(6) for(var/mob/living/L in T) if(!faction_check(L)) @@ -311,7 +311,7 @@ Difficulty: Hard if(!pools.len) return FALSE - var/obj/effect/overlay/temp/decoy/DA = PoolOrNew(/obj/effect/overlay/temp/decoy, list(loc,src)) + var/obj/effect/overlay/temp/decoy/DA = new /obj/effect/overlay/temp/decoy(loc, src) DA.color = "#FF0000" var/oldtransform = DA.transform DA.transform = matrix()*2 @@ -353,7 +353,7 @@ Difficulty: Hard new /obj/effect/decal/cleanable/blood/bubblegum(J) for(var/i in 1 to range) J = get_step(previousturf, targetdir) - PoolOrNew(/obj/effect/overlay/temp/dir_setting/bloodsplatter, list(previousturf, get_dir(previousturf, J))) + new /obj/effect/overlay/temp/dir_setting/bloodsplatter(previousturf, get_dir(previousturf, J)) playsound(previousturf,'sound/effects/splat.ogg', 100, 1, -1) if(!J || !previousturf.CanAtmosPass(J)) break diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index b0a81e4444c..b40e64c6a31 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -115,7 +115,7 @@ Difficulty: Very Hard /mob/living/simple_animal/hostile/megafauna/colossus/bullet_act(obj/item/projectile/P) if(!stat) - var/obj/effect/overlay/temp/at_shield/AT = PoolOrNew(/obj/effect/overlay/temp/at_shield, src.loc, src) + var/obj/effect/overlay/temp/at_shield/AT = new /obj/effect/overlay/temp/at_shield(loc, src) var/random_x = rand(-32, 32) AT.pixel_x += random_x diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index 5ced32e8bfe..5afa7613c78 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -129,7 +129,7 @@ Difficulty: Medium /obj/effect/overlay/temp/target/proc/fall() var/turf/T = get_turf(src) playsound(T,'sound/magic/Fireball.ogg', 200, 1) - PoolOrNew(/obj/effect/overlay/temp/fireball,T) + new /obj/effect/overlay/temp/fireball(T) sleep(12) explosion(T, 0, 0, 1, 0, 0, 0, 1) @@ -161,7 +161,7 @@ Difficulty: Medium visible_message("Fire rains from the sky!") for(var/turf/turf in range(12,get_turf(src))) if(prob(10)) - PoolOrNew(/obj/effect/overlay/temp/target, turf) + new /obj/effect/overlay/temp/target(turf) /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_walls() playsound(get_turf(src),'sound/magic/Fireball.ogg', 200, 1) @@ -179,7 +179,7 @@ Difficulty: Medium if(!range || !previousturf.CanAtmosPass(J)) break range-- - PoolOrNew(/obj/effect/hotspot,J) + new /obj/effect/hotspot(J) J.hotspot_expose(700,50,1) for(var/mob/living/L in J.contents - hit_things) L.adjustFireLoss(20) @@ -223,7 +223,7 @@ Difficulty: Medium else tturf = get_turf(src) forceMove(tturf) - PoolOrNew(/obj/effect/overlay/temp/dragon_swoop, tturf) + new /obj/effect/overlay/temp/dragon_swoop(tturf) animate(src, pixel_x = initial(pixel_x), pixel_z = 0, time = 10) sleep(10) playsound(src.loc, 'sound/effects/meteorimpact.ogg', 200, 1) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index f46d3c74365..dfb9948a1e3 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -242,7 +242,7 @@ Difficulty: Hard pickedtarget = pick_n_take(targets) if(pickedtarget.stat == DEAD) pickedtarget = target - var/obj/effect/overlay/temp/hierophant/chaser/C = PoolOrNew(/obj/effect/overlay/temp/hierophant/chaser, list(loc, src, pickedtarget, chaser_speed, FALSE)) + var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, pickedtarget, chaser_speed, FALSE) C.moving = 3 C.moving_dir = pick_n_take(cardinal_copy) sleep(10) @@ -277,10 +277,10 @@ Difficulty: Hard spawn(0) diagonal_blasts(target) else if(chaser_cooldown < world.time) //if chasers are off cooldown, fire some! - var/obj/effect/overlay/temp/hierophant/chaser/C = PoolOrNew(/obj/effect/overlay/temp/hierophant/chaser, list(loc, src, target, chaser_speed, FALSE)) + var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, chaser_speed, FALSE) chaser_cooldown = world.time + initial(chaser_cooldown) if((prob(anger_modifier) || target.Adjacent(src)) && target != src) - var/obj/effect/overlay/temp/hierophant/chaser/OC = PoolOrNew(/obj/effect/overlay/temp/hierophant/chaser, list(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE)) + var/obj/effect/overlay/temp/hierophant/chaser/OC = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE) OC.moving = 4 OC.moving_dir = pick(cardinal - C.moving_dir) else //just release a burst of power @@ -291,11 +291,11 @@ Difficulty: Hard var/turf/T = get_turf(victim) if(!T) return - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/diagonal, list(T, src)) + new /obj/effect/overlay/temp/hierophant/telegraph/diagonal(T, src) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) - PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, src, FALSE)) + new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) for(var/d in diagonals) spawn(0) blast_wall(T, d) @@ -304,11 +304,11 @@ Difficulty: Hard var/turf/T = get_turf(victim) if(!T) return - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/cardinal, list(T, src)) + new /obj/effect/overlay/temp/hierophant/telegraph/cardinal(T, src) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) - PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, src, FALSE)) + new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) for(var/d in cardinal) spawn(0) blast_wall(T, d) @@ -317,11 +317,11 @@ Difficulty: Hard var/turf/T = get_turf(victim) if(!T) return - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, src)) + new /obj/effect/overlay/temp/hierophant/telegraph(T, src) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) - PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, src, FALSE)) + new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) for(var/d in alldirs) spawn(0) blast_wall(T, d) @@ -331,7 +331,7 @@ Difficulty: Hard var/turf/previousturf = T var/turf/J = get_step(previousturf, dir) for(var/i in 1 to range) - PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(J, src, FALSE)) + new /obj/effect/overlay/temp/hierophant/blast(J, src, FALSE) previousturf = J J = get_step(previousturf, dir) @@ -340,21 +340,21 @@ Difficulty: Hard return var/turf/T = get_turf(victim) var/turf/source = get_turf(src) - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, src)) - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(source, src)) + new /obj/effect/overlay/temp/hierophant/telegraph(T, src) + new /obj/effect/overlay/temp/hierophant/telegraph(source, src) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1) playsound(source,'sound/magic/blink.ogg', 200, 1) //playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1) blinking = TRUE sleep(2) //short delay before we start... - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(T, src)) - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(source, src)) + new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, src) + new /obj/effect/overlay/temp/hierophant/telegraph/teleport(source, src) for(var/t in RANGE_TURFS(1, T)) - var/obj/effect/overlay/temp/hierophant/blast/B = PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, src, FALSE)) + var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE) B.damage = 30 for(var/t in RANGE_TURFS(1, source)) - var/obj/effect/overlay/temp/hierophant/blast/B = PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, src, FALSE)) + var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE) B.damage = 30 animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out sleep(1) @@ -376,12 +376,12 @@ Difficulty: Hard var/turf/T = get_turf(victim) if(!T) return - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, src)) + new /obj/effect/overlay/temp/hierophant/telegraph(T, src) playsound(T,'sound/magic/blink.ogg', 200, 1) //playsound(T,'sound/effects/bin_close.ogg', 200, 1) sleep(2) for(var/t in RANGE_TURFS(1, T)) - PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, src, FALSE)) + new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/burst(turf/original) //release a wave of blasts playsound(original,'sound/magic/blink.ogg', 200, 1) @@ -395,7 +395,7 @@ Difficulty: Hard if(dist > last_dist) last_dist = dist sleep(1 + (burst_range - last_dist) * 0.5) //gets faster as it gets further out - PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, src, FALSE)) + new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE) /mob/living/simple_animal/hostile/megafauna/hierophant/AltClickOn(atom/A) //player control handler(don't give this to a player holy fuck) if(!istype(A) || get_dist(A, src) <= 2) @@ -471,7 +471,7 @@ Difficulty: Hard targetturf = get_turf(target) /obj/effect/overlay/temp/hierophant/chaser/proc/make_blast() - PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(loc, caster, friendly_fire_check)) + new /obj/effect/overlay/temp/hierophant/blast(loc, caster, friendly_fire_check) /obj/effect/overlay/temp/hierophant/telegraph icon = 'icons/effects/96x96.dmi' @@ -570,7 +570,7 @@ Difficulty: Hard H.timer = world.time + 51 if(do_after(user, 50, target = src)) playsound(src,'sound/magic/Blind.ogg', 200, 1, -4) - PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(get_turf(src), user)) + new /obj/effect/overlay/temp/hierophant/telegraph/teleport(get_turf(src), user) to_chat(user, "You touch the rune with the staff, dispelling it!") H.rune = null user.update_action_buttons_icon()