-Fixed changelings being unable to use their powers. (Sorry about that)

-Fixed runtimes with the camera tracking.

-Fixed an issue where alien larva couldn't heal oxygen loss damage.
-Fixed a runtime with cameranet chunks.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4761 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-09-26 23:36:15 +00:00
parent 01a93bb78e
commit 4ef1ae9634
4 changed files with 23 additions and 16 deletions
@@ -35,29 +35,29 @@
//Helper proc. Does all the checks and stuff for us to avoid copypasta
/mob/proc/changeling_power(var/required_chems=0, var/required_dna=0, var/max_genetic_damage=100, var/max_stat=0)
if(!src) return
if(!src.mind) return
if(!iscarbon(src)) return
if(!usr) return
if(!usr.mind) return
if(!iscarbon(usr)) return
var/datum/changeling/changeling = src.mind.changeling
var/datum/changeling/changeling = usr.mind.changeling
if(!changeling)
world.log << "[src] has the changeling_transform() verb but is not a changeling."
world.log << "[usr] has the changeling_transform() verb but is not a changeling."
return
if(usr.stat > max_stat)
src << "<span class='warning'>We are incapacitated.</span>"
usr << "<span class='warning'>We are incapacitated.</span>"
return
if(changeling.absorbed_dna.len < required_dna)
src << "<span class='warning'>We require at least [required_dna] samples of compatible DNA.</span>"
usr << "<span class='warning'>We require at least [required_dna] samples of compatible DNA.</span>"
return
if(changeling.chem_charges < required_chems)
src << "<span class='warning'>We require at least [required_chems] units of chemicals to do that!</span>"
usr << "<span class='warning'>We require at least [required_chems] units of chemicals to do that!</span>"
return
if(changeling.geneticdamage > max_genetic_damage)
src << "<span class='warning'>Our geneomes are still reassembling. We need time to recover first.</span>"
usr << "<span class='warning'>Our geneomes are still reassembling. We need time to recover first.</span>"
return
return changeling
+5 -2
View File
@@ -23,9 +23,12 @@
for(var/mob/living/M in mob_list)
// Easy checks first.
// Don't detect mobs on Centcom. Since the wizard den is on Centcomm, we only need this.
if(M.loc.z == 2)
var/turf/T = get_turf(M)
if(!T)
continue
if(M.loc.z > 6)
if(T.z == 2)
continue
if(T.z > 6)
continue
if(M == usr)
continue
@@ -216,11 +216,12 @@
//If there are alien weeds on the ground then heal if needed or give some toxins
if(locate(/obj/effect/alien/weeds) in loc)
if(health >= 25)
adjustToxLoss(5)
if(health >= maxHealth)
adjustToxLoss(plasma_rate)
else
adjustBruteLoss(-5)
adjustFireLoss(-5)
adjustBruteLoss(-heal_rate)
adjustFireLoss(-heal_rate)
adjustOxyLoss(-heal_rate)
return
@@ -88,6 +88,8 @@
obscured -= t.obscured
for(var/eye in seenby)
var/mob/aiEye/m = eye
if(!m || !m.ai)
continue
if(m.ai.client)
m.ai.client.images -= t.obscured
@@ -100,8 +102,9 @@
obscured += t.obscured
for(var/eye in seenby)
var/mob/aiEye/m = eye
if(!m)
if(!m || !m.ai)
seenby -= m
continue
if(m.ai.client)
m.ai.client.images += t.obscured