From c5043cdb78625fff363418e8e452d36f5b2e2246 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Sat, 19 Nov 2011 18:53:27 +0000 Subject: [PATCH] =?UTF-8?q?=E2=97=A6=20Toggling=20midis=20will=20now=20dis?= =?UTF-8?q?able=20the=20current=20midi(s)=20playing.=20How=20fucking=20coo?= =?UTF-8?q?l=20is=20that=3F=3F=20=E2=97=A6=20Fixed=20a=20bug=20for=20metro?= =?UTF-8?q?ids:=20the=20AI=20loop=20was=20not=20canceling=20when=20a=20pla?= =?UTF-8?q?yer=20was=20inserted=20into=20the=20mob.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ◦ A few icon additions for future updates, namely the terminals and plasmatoids. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2531 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/verbs/sound.dm | 6 +++++- .../modules/mob/living/carbon/metroid/life.dm | 4 ++-- html/changelog.html | 9 +++++++++ icons/mob/mob.dmi | Bin 126109 -> 126369 bytes icons/obj/stationobjs.dmi | Bin 89974 -> 90570 bytes icons/obj/terminals.dmi | Bin 9441 -> 12446 bytes 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/code/game/verbs/sound.dm b/code/game/verbs/sound.dm index 06b27939075..cced7b67b23 100644 --- a/code/game/verbs/sound.dm +++ b/code/game/verbs/sound.dm @@ -1,6 +1,7 @@ /mob/verb/togglemidis() set category = "Special Verbs" set name = "Toggle Midis" + set desc = "This will prevent further admin midis from playing, as well as cut off the current one." if(istype(usr,/mob)) var/mob/M = usr @@ -8,5 +9,8 @@ if(M.client) M.client.midis = !M.client.midis - M << "You will now [M.client.midis? "start":"stop"] receiving any sounds uploaded by admins." + if(!M.client.midis) + M << sound(null, 0, 0, 777) // breaks the client's sound output on channel 777 + + M << "You will now [M.client.midis? "start":"stop"] receiving any sounds uploaded by admins[M.client.midis? "":", and any current midis playing have been disabled"]." return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index 48edc4c9045..df3db674bbd 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -215,7 +215,7 @@ AIprocess() // the master AI process - if(AIproc || stat == 2) return + if(AIproc || stat == 2 || client) return var/hungry = 0 var/starving = 0 @@ -233,7 +233,7 @@ if(Victim) // can't eat AND have this little process at the same time break - if(!Target) + if(!Target || client) break diff --git a/html/changelog.html b/html/changelog.html index a7d656e3d00..a89b100a9fa 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -54,6 +54,15 @@ Stuff which is in development and not yet visible to players or just code relate (ie. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit tho. Thanks. --> +19 November 2011 +
    +
  • Doohl updated: +
      +
    • Toggling admin midis will now DISABLE THE CURRENT MIDI OH MY GOSH!
      • +
    +
    • +
+ 16 November 2011