mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 13:37:58 +01:00
◦ Toggling midis will now disable the current midi(s) playing. How fucking cool is that?? ◦ Fixed a bug for metroids: the AI loop was not canceling when a player was inserted into the mob.
◦ 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
This commit is contained in:
committed by
Albert Iordache
parent
95c7f46825
commit
8f734c9bc6
@@ -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
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user