Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so.

This commit is contained in:
Tastyfish
2016-02-28 01:11:36 -05:00
parent 386db45948
commit aed9859b9a
11 changed files with 42 additions and 49 deletions
@@ -17,7 +17,7 @@
C.apply_effect(25 * weakness,IRRADIATE,0)
C.nutrition -= min(50 * weakness, C.nutrition)
C.Dizzy(6 * weakness)
C.weakened += 6 * weakness
C.AdjustWeakened(6 * weakness)
/datum/artifact_effect/hurt/DoEffectAura()
if(holder)
@@ -28,14 +28,14 @@
var/turf/T = get_turf(suspension_field)
if(field_type == "carbon")
for(var/mob/living/carbon/M in T)
M.weakened = max(M.weakened, 3)
M.Weaken(3)
cell.charge -= power_use
if(prob(5))
M << "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]"
if(field_type == "iron")
for(var/mob/living/silicon/M in T)
M.weakened = max(M.weakened, 3)
M.Weaken(3)
cell.charge -= power_use
if(prob(5))
M << "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]"
@@ -47,7 +47,7 @@
I.loc = suspension_field
for(var/mob/living/simple_animal/M in T)
M.weakened = max(M.weakened, 3)
M.Weaken(3)
cell.charge -= power_use
if(prob(5))
M << "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]"
@@ -247,7 +247,7 @@
if("carbon")
success = 1
for(var/mob/living/carbon/C in T)
C.weakened += 5
C.AdjustWeakened(5)
C.visible_message("\blue \icon[C] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
if("nitrogen")
success = 1
@@ -270,7 +270,7 @@
if("iron")
success = 1
for(var/mob/living/silicon/R in T)
R.weakened += 5
R.AdjustWeakened(5)
R.visible_message("\blue \icon[R] [R] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
//
//in case we have a bad field type
@@ -279,7 +279,7 @@
for(var/mob/living/simple_animal/C in T)
C.visible_message("\blue \icon[C] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
C.weakened += 5
C.AdjustWeakened(5)
suspension_field = new(T)
suspension_field.field_type = field_type
@@ -306,7 +306,7 @@
for(var/mob/M in T)
M << "<span class='info'>You no longer feel like floating.</span>"
M.weakened = min(M.weakened, 3)
M.SetWeakened(min(M.weakened, 3))
src.visible_message("\blue \icon[src] [src] deactivates with a gentle shudder.")
qdel(suspension_field)
@@ -385,7 +385,8 @@
var/mob/living/M = A
if(M in immune)
continue
M.stunned = 10
M.stunned += 10
M.canmove = 0
M.anchored = 1
if(istype(M, /mob/living/simple_animal/hostile))
var/mob/living/simple_animal/hostile/H = M
@@ -413,7 +414,7 @@
return
/obj/effect/timestop/proc/unfreeze_mob(mob/living/M)
M.stunned = 0
M.AdjustStunned(-10)
M.anchored = 0
if(istype(M, /mob/living/simple_animal/hostile))
var/mob/living/simple_animal/hostile/H = M