From 42cacda94b6c81406cdc7e803d2a7faa307edcff Mon Sep 17 00:00:00 2001 From: "morikou@gmail.com" Date: Thu, 27 Jan 2011 03:00:54 +0000 Subject: [PATCH] Oh god, no internet. What do? Update: - Changling chem regeneration rate and start chem reduced by half. - You can't emote while under the effects of the changeling's paralysis dart or zombie powder. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@917 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/mob/mob.dm | 2 +- .../gamemodes/changeling/changeling_powers.dm | 23 ++++++++++--------- code/game/master_controller.dm | 2 +- code/modules/mob/living/say.dm | 4 ++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/code/defines/mob/mob.dm b/code/defines/mob/mob.dm index 3f3ab135571..883820cc0ea 100644 --- a/code/defines/mob/mob.dm +++ b/code/defines/mob/mob.dm @@ -172,7 +172,7 @@ var/changeling_level = 0 var/list/absorbed_dna = list() var/changeling_fakedeath = 0 - var/chem_charges = 20.0 + var/chem_charges = 10.00 var/sting_range = 1 diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 4a70f411246..ff142459119 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -38,11 +38,12 @@ src.verbs -= /client/proc/changeling_lesser_form src.verbs -= /client/proc/changeling_lesser_transform src.verbs -= /client/proc/changeling_fakedeath - src.verbs += /client/proc/changeling_deaf_dart - src.verbs += /client/proc/changeling_blind_dart - src.verbs += /client/proc/changeling_paralysis_dart - src.verbs += /client/proc/changeling_silence_dart - src.verbs += /client/proc/changeling_boost_range + src.verbs -= /client/proc/changeling_deaf_dart + src.verbs -= /client/proc/changeling_blind_dart + src.verbs -= /client/proc/changeling_paralysis_dart + src.verbs -= /client/proc/changeling_silence_dart + src.verbs -= /client/proc/changeling_boost_range + usr.verbs -= /client/proc/changeling_transformation_dart /client/proc/changeling_absorb_dna() set category = "Changeling" @@ -395,7 +396,7 @@ usr.verbs -= /client/proc/changeling_boost_range - spawn(10) + spawn(5) usr.verbs += /client/proc/changeling_boost_range return @@ -423,7 +424,7 @@ usr.verbs -= /client/proc/changeling_silence_dart - spawn(10) + spawn(5) usr.verbs += /client/proc/changeling_silence_dart return @@ -466,7 +467,7 @@ usr.verbs -= /client/proc/changeling_blind_dart - spawn(10) + spawn(5) usr.verbs += /client/proc/changeling_blind_dart return @@ -495,7 +496,7 @@ usr.verbs -= /client/proc/changeling_deaf_dart - spawn(10) + spawn(5) usr.verbs += /client/proc/changeling_deaf_dart return @@ -524,7 +525,7 @@ usr.verbs -= /client/proc/changeling_paralysis_dart - spawn(10) + spawn(5) usr.verbs += /client/proc/changeling_paralysis_dart return @@ -565,7 +566,7 @@ usr.verbs -= /client/proc/changeling_transformation_dart - spawn(10) + spawn(5) usr.verbs += /client/proc/changeling_transformation_dart return \ No newline at end of file diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm index 0e219b1c301..39f49323ad4 100644 --- a/code/game/master_controller.dm +++ b/code/game/master_controller.dm @@ -78,7 +78,7 @@ datum/controller/game_controller M.Life() if (M.mind) if (M.mind.special_role == "Changeling") - M.chem_charges = max(min((M.chem_charges+0.5), 50), 0) + M.chem_charges = max(min((M.chem_charges+0.25), 50), 0) sleep(-1) for(var/datum/disease/D in active_diseases) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index c7e10cb73b0..4a9c4c7d79c 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -8,10 +8,10 @@ if (length(message) >= 1) if (copytext(message, 1, 2) != "*") - if (src.miming || src.silent) + if (src.miming) return - if (src.muted) + if (src.muted || src.silent) return if (src.stat == 2)