From 5b691f8727a433bf64d4f73ff8b3a2e8858bab59 Mon Sep 17 00:00:00 2001 From: rockdtben Date: Fri, 30 Dec 2011 17:47:35 +0000 Subject: [PATCH] brainloss is now only referenced via procs. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2874 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/virus2/base.dm | 4 ++-- code/datums/diseases/brainrot.dm | 10 +++++----- code/game/jobs/job/civilian_chaplain.dm | 2 +- code/modules/admin/admin.dm | 2 +- code/modules/chemical/Chemistry-Reagents.dm | 2 +- code/modules/mob/living/carbon/human/examine.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 2 +- code/modules/mob/living/say.dm | 4 ++-- code/modules/mob/say.dm | 2 +- code/modules/power/apc.dm | 4 ++-- code/unused/disease2/base.dm | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/code/WorkInProgress/virus2/base.dm b/code/WorkInProgress/virus2/base.dm index 505cf3694b..a797a1f277 100644 --- a/code/WorkInProgress/virus2/base.dm +++ b/code/WorkInProgress/virus2/base.dm @@ -419,7 +419,7 @@ name = "Lazy mind syndrome" stage = 3 activate(var/mob/living/carbon/mob,var/multiplier) - mob.brainloss = 50 + mob.setBrainLoss(50) /datum/disease2/effect/greater/suicide name = "Suicidal syndrome" @@ -438,7 +438,7 @@ name = "Lazy mind syndrome" stage = 3 activate(var/mob/living/carbon/mob,var/multiplier) - mob.brainloss = 20 + mob.setBrainLoss(20) /datum/disease2/effect/lesser/drowsy name = "Bedroom Syndrome" diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index d068e42f77..ea43be7f75 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -23,15 +23,15 @@ if(prob(2)) affected_mob << "\red Your don't feel like yourself." if(prob(5)) - affected_mob.brainloss +=1 + affected_mob.adjustBrainLoss(1) affected_mob.updatehealth() if(3) if(prob(2)) affected_mob.emote("stare") if(prob(2)) affected_mob.emote("drool") - if(prob(10) && affected_mob.brainloss<=98)//shouldn't retard you to death now - affected_mob.brainloss += 2 + if(prob(10) && affected_mob.getBrainLoss()<=98)//shouldn't retard you to death now + affected_mob.adjustBrainLoss(2) affected_mob.updatehealth() if(prob(2)) affected_mob << "\red Your try to remember something important...but can't." @@ -50,8 +50,8 @@ affected_mob.updatehealth() if(prob(2)) affected_mob << "\red Your head hurts." */ - if(prob(15) && affected_mob.brainloss<=98) //shouldn't retard you to death now - affected_mob.brainloss +=3 + if(prob(15) && affected_mob.getBrainLoss()<=98) //shouldn't retard you to death now + affected_mob.adjustBrainLoss(3) affected_mob.updatehealth() if(prob(2)) affected_mob << "\red Strange buzzing fills your head, removing all thoughts." diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 7528f6646d..cf0dc454c5 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -49,7 +49,7 @@ B.name = "Guys Gone Wild" if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks") B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition") - H.brainloss = 100 // starts off retarded as fuck + H.setBrainLoss(100) // starts off retarded as fuck if("science") B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") else diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index cf2a65e82a..63cf0e63a6 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1472,7 +1472,7 @@ for(var/mob/living/carbon/human/H in world) if(H.client) H << "\red You suddenly feel stupid." - H.brainloss = 60 + H.setBrainLoss(60) message_admins("[key_name_admin(usr)] made everybody retarded") else alert("You cannot perform this action. You must be of a higher administrative rank!") diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 6c032fd147..0bbdf1cbac 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1266,7 +1266,7 @@ datum holder.remove_reagent("carpotoxin", 5) if(holder.has_reagent("zombiepowder")) holder.remove_reagent("zombiepowder", 5) - M.brainloss = 0 + M.setBrainLoss(0) M.disabilities = 0 M.sdisabilities = 0 M.eye_blurry = 0 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 273ca94c81..960ca43346 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -143,7 +143,7 @@ if (src.stat == 1) usr << "\red [src.name] doesn't seem to be responding to anything around [t_him], [t_his] eyes closed as though asleep." - else if (src.brainloss >= 60) + else if (src.getBrainLoss() >= 60) usr << "\red [src.name] has a stupid expression on [t_his] face." if (!src.client) usr << "\red [src.name] doesn't seem as though they want to talk." diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 6ea255d562..e2f4908337 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -153,7 +153,7 @@ if (disabilities & 16) if (prob(10)) stuttering = max(10, stuttering) - if (brainloss >= 60 && stat != 2) + if (getBrainLoss() >= 60 && stat != 2) if (prob(7)) switch(pick(1,2,3)) if(1) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 5537441df5..44a01e77b3 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -60,7 +60,7 @@ var/message_range = null var/message_mode = null - if (brainloss >= 60 && prob(50)) + if (getBrainLoss() >= 60 && prob(50)) if (ishuman(src)) message_mode = "headset" // Special message handling @@ -123,7 +123,7 @@ return // :downs: - if (brainloss >= 60) + if (getBrainLoss() >= 60) message = dd_replacetext(message, " am ", " ") message = dd_replacetext(message, " is ", " ") message = dd_replacetext(message, " are ", " ") diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 1ff51f8677..9e5684d908 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -59,7 +59,7 @@ var/ending = copytext(text, length(text)) if (src.stuttering) return "stammers, \"[text]\""; - if (src.brainloss >= 60) + if (src.getBrainLoss() >= 60) return "gibbers, \"[text]\""; if (ending == "?") return "asks, \"[text]\""; diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index c682561e67..ab3608bba3 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -749,11 +749,11 @@ return 0 var/mob/living/carbon/human/H = user if (istype(H)) - if(H.brainloss >= 60) + if(H.getBrainLoss() >= 60) for(var/mob/M in viewers(src, null)) M << "\red [H] stares cluelessly at [src] and drools." return 0 - else if(prob(H.brainloss)) + else if(prob(H.getBrainLoss())) user << "\red You momentarily forget how to use [src]." return 0 return 1 diff --git a/code/unused/disease2/base.dm b/code/unused/disease2/base.dm index f2acae2a30..73f09d627c 100644 --- a/code/unused/disease2/base.dm +++ b/code/unused/disease2/base.dm @@ -279,7 +279,7 @@ name = "Lazy mind syndrome" stage = 3 activate(var/mob/living/carbon/mob,var/multiplier) - mob.brainloss = 50 + mob.setBrainLoss(50) /datum/disease2/effect/suicide name = "Suicidal syndrome"