various compile fixes

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-01-23 00:43:54 +10:00
parent bb5a349fcf
commit fb2b2a1d52
9 changed files with 64 additions and 129 deletions
+2 -88
View File
@@ -366,93 +366,6 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
if((COLD_RESISTANCE in mutations) || (prob(1)))
heal_organ_damage(0,1)
if(mHallucination in mutations)
hallucination = 100
halloss = 0
if(mSmallsize in mutations)
if(!(pass_flags & PASSTABLE))
pass_flags |= PASSTABLE
else
if(pass_flags & PASSTABLE)
pass_flags &= ~PASSTABLE
// Make nanoregen heal youu, -3 all damage types
if((NANOREGEN in augmentations) || (mRegen in mutations))
var/healed = 0
var/hptoreg = 0
if(NANOREGEN in augmentations)
hptoreg += 3
if(mRegen in mutations)
hptoreg += 2
if(stat==UNCONSCIOUS) hptoreg/=2
if(stat==DEAD) hptoreg=0
for(var/i=0, i<hptoreg, i++)
var/list/damages = new/list()
if(getToxLoss())
damages+="tox"
if(getOxyLoss())
damages+="oxy"
if(getCloneLoss())
damages+="clone"
if(getBruteLoss())
damages+="brute"
if(getFireLoss())
damages+="burn"
if(halloss != 0)
damages+="hal"
if(damages.len)
switch(pick(damages))
if("tox")
adjustToxLoss(-1)
healed = 1
if("oxy")
adjustOxyLoss(-1)
healed = 1
if("clone")
adjustCloneLoss(-1)
healed = 1
if("brute")
heal_organ_damage(1,0)
healed = 1
if("burn")
heal_organ_damage(0,1)
healed = 1
if("hal")
if(halloss > 0)
halloss -= 1
if(halloss < 0)
halloss = 0
healed = 1
else
break
if(healed)
if(prob(5))
src << "\blue You feel your wounds mending..."
if(!(/mob/living/carbon/human/proc/morph in src.verbs))
if(mMorph in mutations)
src.verbs += /mob/living/carbon/human/proc/morph
else
if(!(mMorph in mutations))
src.verbs -= /mob/living/carbon/human/proc/morph
if(!(/mob/living/carbon/human/proc/remoteobserve in src.verbs))
if(mRemote in mutations)
src.verbs += /mob/living/carbon/human/proc/remoteobserve
else
if(!(mRemote in mutations))
src.verbs -= /mob/living/carbon/human/proc/remoteobserve
if(!(/mob/living/carbon/human/proc/remotesay in src.verbs))
if(mRemotetalk in mutations)
src.verbs += /mob/living/carbon/human/proc/remotesay
else
if(!(mRemotetalk in mutations))
src.verbs -= /mob/living/carbon/human/proc/remotesay
if ((HULK in mutations) && health <= 25)
mutations.Remove(HULK)
update_mutations() //update our mutation overlays
@@ -605,8 +518,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
proc/handle_breath(datum/gas_mixture/breath)
if((status_flags & GODMODE) || REBREATHER in augmentations)
if(status_flags & GODMODE)
return
if(!breath || (breath.total_moles() == 0) || suiciding)
if(reagents.has_reagent("inaprovaline"))
return
+5 -14
View File
@@ -18,12 +18,12 @@
if (copytext(message, 1, 2) != "*")
return
if(dna)
/*if(dna.mutantrace == "lizard")
/*if(dna)
if(dna.mutantrace == "lizard")
if(copytext(message, 1, 2) != "*")
message = replacetext(message, "s", stutter("ss"))*/
message = replacetext(message, "s", stutter("ss"))
/*if(dna.mutantrace == "slime" && prob(5))
if(dna.mutantrace == "slime" && prob(5))
if(copytext(message, 1, 2) != "*")
if(copytext(message, 1, 2) == ";")
message = ";"
@@ -33,17 +33,8 @@
var/imax = rand(5,20)
for(var/i = 0,i<imax,i++)
message += "E"*/
if(copytext(message, 1, 2) != "*")
if(copytext(message, 1, 2) == ";")
message = ";"
else
message = ""
message += "SKR"
var/imax = rand(5,20)
for(var/i = 0,i<imax,i++)
message += "E"
if(stat != DEAD)
if(stat != DEAD)jump
for(var/datum/disease/pierrot_throat/D in viruses)
var/list/temp_message = text2list(message, " ") //List each word in the message
var/list/pick_list = list()
+2 -1
View File
@@ -28,7 +28,8 @@
robot_talk(message)
else if ((copytext(message, 1, 3) == ":h") || (copytext(message, 1, 3) == ":H") || \
(copytext(message, 1, 3) == "#h") || (copytext(message, 1, 3) == "#H") || \
(copytext(message, 1, 3) == ".h") || (copytext(message, 1, 3) == ".H")) if(isAI(src)&&client)//For patching directly into AI holopads.
(copytext(message, 1, 3) == ".h") || (copytext(message, 1, 3) == ".H"))
if(isAI(src)&&client)//For patching directly into AI holopads.
var/mob/living/silicon/ai/U = src
message = copytext(message, 3)
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))