mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-24 17:11:40 +00:00
remove returns & bad spacing from DoEffectPulse
This commit is contained in:
@@ -63,9 +63,7 @@
|
||||
to_chat(H, "<font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
|
||||
else
|
||||
to_chat(H, "<font color='red'>[pick(messages)]</font>")
|
||||
|
||||
if(prob(50))
|
||||
H.dizziness += rand(3,5)
|
||||
else if(prob(25))
|
||||
H.dizziness += rand(5,15)
|
||||
return 1
|
||||
|
||||
@@ -43,4 +43,3 @@
|
||||
var/turf/T = get_turf(holder)
|
||||
for(var/mob/living/L in range(src.effectrange,T))
|
||||
apply_berserk(L)
|
||||
return TRUE
|
||||
@@ -68,10 +68,8 @@
|
||||
to_chat(H, "<font color='red' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
|
||||
else
|
||||
to_chat(H, "<font color='red'>[pick(messages)]</font>")
|
||||
|
||||
if(prob(50))
|
||||
H.dizziness += rand(3,5)
|
||||
else if(prob(25))
|
||||
H.dizziness += rand(5,15)
|
||||
H.nutrition = H.nutrition / 4
|
||||
return 1
|
||||
|
||||
@@ -56,4 +56,3 @@
|
||||
if(world.time - last_message > 200)
|
||||
to_chat(M, "<font color='blue'>SYSTEM ALERT: Energy boost detected!</font>")
|
||||
last_message = world.time
|
||||
return 1
|
||||
|
||||
@@ -46,4 +46,3 @@
|
||||
if(world.time - last_message > 200)
|
||||
to_chat(M, "<font color='red'>SYSTEM ALERT: Energy drain detected!</font>")
|
||||
last_message = world.time
|
||||
return 1
|
||||
|
||||
@@ -51,15 +51,12 @@
|
||||
for(var/mob/living/L in oview(effectrange, get_turf(holder)))
|
||||
if(!L.stat)
|
||||
nearby_mobs |= L
|
||||
|
||||
for(var/obj/machinery/light/light in range(effectrange, get_turf(holder)))
|
||||
light.flicker()
|
||||
|
||||
for(var/mob/living/L in nearby_mobs)
|
||||
if(L.isSynthetic())
|
||||
to_chat(L, "<span class='danger'>ERROR: Electrical fault detected!</span>")
|
||||
L.stuttering += 3
|
||||
|
||||
if(ishuman(L))
|
||||
var/mob/living/carbon/human/H = L
|
||||
var/obj/item/organ/external/affected = H.get_organ(check_zone(BP_TORSO))
|
||||
|
||||
@@ -13,4 +13,3 @@
|
||||
if(holder)
|
||||
var/turf/T = get_turf(holder)
|
||||
empulse(T, effectrange/4, effectrange/3, effectrange/2, effectrange)
|
||||
return 1
|
||||
|
||||
@@ -43,4 +43,3 @@
|
||||
var/turf/T = get_turf(holder)
|
||||
for(var/mob/living/L in range(src.effectrange,T))
|
||||
apply_modifier(L)
|
||||
return TRUE
|
||||
@@ -59,11 +59,8 @@
|
||||
age_plantlife(Tray)
|
||||
if(prob(10))
|
||||
var/mob/living/simple_mob/animal/sif/glitterfly/G = new(get_turf(Tray))
|
||||
|
||||
my_glitterflies |= G
|
||||
|
||||
G.ai_holder.returns_home = TRUE
|
||||
|
||||
for(var/obj/effect/plant/P in view(effectrange,get_turf(holder)))
|
||||
age_plantlife(P)
|
||||
|
||||
|
||||
@@ -61,9 +61,7 @@
|
||||
to_chat(H, "<font color='blue' size='[num2text(rand(1,5))]'><b>[pick(drastic_messages)]</b></font>")
|
||||
else
|
||||
to_chat(H, "<font color='blue'>[pick(messages)]</font>")
|
||||
|
||||
if(prob(50))
|
||||
H.dizziness += rand(3,5)
|
||||
else if(prob(25))
|
||||
H.dizziness += rand(5,15)
|
||||
return 1
|
||||
|
||||
@@ -45,7 +45,6 @@
|
||||
|
||||
/datum/artifact_effect/uncommon/heal/DoEffectPulse()
|
||||
var/atom/holder = get_master_holder()
|
||||
//todo: check over this properly
|
||||
if(holder)
|
||||
var/turf/T = get_turf(holder)
|
||||
for (var/mob/living/carbon/C in range(src.effectrange,T))
|
||||
|
||||
@@ -39,11 +39,8 @@
|
||||
for(var/mob/living/L in oview(get_turf(holder), effectrange))
|
||||
if(L.stat || !L.mind)
|
||||
continue
|
||||
|
||||
if(target && get_dist(get_turf(holder), L) > get_dist(get_turf(holder), target))
|
||||
continue
|
||||
|
||||
target = L
|
||||
|
||||
if(target)
|
||||
throw_at_mob(target, chargelevelmax)
|
||||
|
||||
@@ -23,4 +23,3 @@
|
||||
var/atom/holder = get_master_holder()
|
||||
if(holder)
|
||||
SSradiation.radiate(holder, ((radiation_amount * 25) * (sqrt(src.effectrange)))) //Need to get feedback on this
|
||||
return 1
|
||||
|
||||
@@ -99,7 +99,6 @@
|
||||
var/atom/holder = get_master_holder()
|
||||
for(var/mob/living/L in oview(effectrange, get_turf(holder)))
|
||||
stored_life += 2 * steal_life(L)
|
||||
|
||||
var/turf/T = get_turf(holder)
|
||||
for(var/mob/living/L in T)
|
||||
if(L.stat == DEAD)
|
||||
|
||||
@@ -39,4 +39,3 @@
|
||||
M.adjustBruteLoss(-10)
|
||||
M.adjustFireLoss(-10)
|
||||
M.updatehealth()
|
||||
return 1
|
||||
|
||||
@@ -39,4 +39,3 @@
|
||||
M.adjustBruteLoss(10)
|
||||
M.adjustFireLoss(10)
|
||||
M.updatehealth()
|
||||
return 1
|
||||
|
||||
@@ -44,4 +44,3 @@
|
||||
H.eye_blurry = min(H.eye_blurry + rand(5,15) * weakness, 50 * weakness)
|
||||
for (var/mob/living/silicon/robot/R in range(src.effectrange,holder))
|
||||
to_chat(R, "<font color='red'>SYSTEM ALERT: CPU cycles slowing down.</font>")
|
||||
return 1
|
||||
|
||||
@@ -47,11 +47,9 @@
|
||||
to_chat(M, "<font color='red'>You are displaced by a strange force!</font>")
|
||||
if(M.buckled)
|
||||
M.buckled.unbuckle_mob()
|
||||
|
||||
var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread()
|
||||
sparks.set_up(3, 0, get_turf(M))
|
||||
sparks.start()
|
||||
|
||||
M.Move(pick(trange(50, T)))
|
||||
sparks = new /datum/effect_system/spark_spread()
|
||||
sparks.set_up(3, 0, M.loc)
|
||||
|
||||
Reference in New Issue
Block a user