From 7ec232dea6e9533399cbaed3c716febae5b7718c Mon Sep 17 00:00:00 2001 From: "mport2004@gmail.com" Date: Tue, 27 Sep 2011 09:48:09 +0000 Subject: [PATCH] Quick edit to the blob spawn in notes. Mime wall recharge time is now equal to the time for the wall to vanish. In short you can only have one wall up at a time. The walls also finally have a bullet_act proc so hiding on top of walls is much less effective. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2278 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/wizard/spells.dm | 13 +++++++++++++ code/game/jobs/jobprocs.dm | 2 +- code/modules/mob/living/blob/blob.dm | 1 + code/modules/projectiles/projectile.dm | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/wizard/spells.dm b/code/game/gamemodes/wizard/spells.dm index 4a624bb2ab..4e5b8eaa99 100644 --- a/code/game/gamemodes/wizard/spells.dm +++ b/code/game/gamemodes/wizard/spells.dm @@ -136,6 +136,19 @@ density = 1 unacidable = 1 + + bullet_act(var/obj/item/projectile/Proj, var/def_zone) + var/turf/T = get_turf(src.loc) + if(T) + for(var/obj/O in T) + if(O != src) + O.bullet_act(Proj,def_zone) + for(var/mob/M in T) + M.bullet_act(Proj, def_zone) + ..() + + + /client/proc/forcewall() set category = "Spells" diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 507c515dec..3b7cf85b16 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -714,7 +714,7 @@ usr << "You still haven't atoned for your speaking transgression. Wait." return usr.verbs -= /client/proc/mimewall - spawn(100) + spawn(300) usr.verbs += /client/proc/mimewall for (var/mob/V in viewers(usr)) if(V!=usr) diff --git a/code/modules/mob/living/blob/blob.dm b/code/modules/mob/living/blob/blob.dm index eb1d2ecf81..49538e019f 100644 --- a/code/modules/mob/living/blob/blob.dm +++ b/code/modules/mob/living/blob/blob.dm @@ -256,5 +256,6 @@ B << "You have the power to create a new blob node that will help expand the blob." B << "To create this node you will have to be on a normal blob tile and far enough away from any other node." B << "Check your Blob verbs and hit Create Node to build a node." + B << "NOTE: Create new blob will only work 50% of the time." spawn(10) del(G_found) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 066722480e..bea88099e3 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -61,7 +61,7 @@ M.attack_log += text("\[[]\] []/[] shot []/[] with a []", time_stamp(), firer, firer.ckey, M, M.ckey, src) firer.attack_log += text("\[[]\] []/[] shot []/[] with a []", time_stamp(), firer, firer.ckey, M, M.ckey, src) else - M.attack_log += text("\[[]\] UNKOWN SUBJECT (No longer exists) shot []/[] with a []", time_stamp(), M, M.ckey, src) + M.attack_log += text("\[[]\] UNKNOWN SUBJECT (No longer exists) shot []/[] with a []", time_stamp(), M, M.ckey, src) spawn(0) if(A)