Fixed cyborg rev heads counting as living and still being able to flash people.

Normal revs that get borged will be unrev'd.
Added a cooldown to the captains message system.
Cleaned up the Coms computer slightly.
Fixed a few runtimes.
More blob work.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2207 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-09-16 05:52:10 +00:00
parent b16a48067e
commit c471fde2f9
22 changed files with 2110 additions and 2162 deletions
+2 -14
View File
@@ -1257,20 +1257,8 @@
spawn(rand(300,600))
del(P)
if("goblob")
command_alert("Confirmed anomaly type SPC-MGM-152 aboard [station_name()]. All personnel must destroy the anomaly.", "Anomaly Alert")
world << sound('outbreak5.ogg')
var/turf/T = pick(blobstart)
var/obj/blob/bl = new /obj/blob( T.loc, 30 )
spawn(0)
bl.Life()
bl.Life()
bl.Life()
bl.Life()
bl.Life()
blobevent = 1
dotheblobbaby()
spawn(3000)
blobevent = 0
mini_blob_event()
message_admins("[key_name_admin(usr)] has spawned blob", 1)
if("aliens")
if(aliens_allowed)
alien_infestation()
+6 -2
View File
@@ -40,8 +40,7 @@ var/mining_shuttle_moving = 0
var/mining_shuttle_location = 0 // 0 = station 13, 1 = mining station
proc/move_mining_shuttle()
if (mining_shuttle_moving)
return
if(mining_shuttle_moving) return
mining_shuttle_moving = 1
spawn(mining_shuttle_tickstomove*10)
var/area/fromArea
@@ -80,6 +79,11 @@ proc/move_mining_shuttle()
usr.machine = src
src.add_fingerprint(usr)
if(href_list["move"])
if(ticker.mode.name == "blob")
if(ticker.mode:declared)
usr << "Under directive 7-10, [station_name()] is quarantined until further notice."
return
if (!mining_shuttle_moving)
usr << "\blue shuttle called and will arrive shortly"
move_mining_shuttle()
+5 -1
View File
@@ -60,13 +60,17 @@
spawn(0)
ainame(src)
if(src.mind)
ticker.mode.remove_revolutionary(src.mind)
return
/mob/living/silicon/ai/verb/pick_icon()
set category = "AI Commands"
set name = "Change AI Core Display"
if(stat || aiRestorePowerRoutine)
return
//if(icon_state == initial(icon_state))
var/icontype = input("Please, select a display!", "AI", null/*, null*/) in list("Clown", "HAL9000", "Monochrome", "Blue", "HAL9000 Mark2", "Inverted", "Firewall", "Green")
if(icontype == "Clown")
@@ -35,6 +35,8 @@
var/obj/item/weapon/cell/C = new(src)
C.charge = 1500
cell = C
if(src.mind)
ticker.mode.remove_revolutionary(src.mind)
..()
//If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
+3 -1
View File
@@ -2245,8 +2245,10 @@ note dizziness decrements automatically in the mob's Life() proc.
if("nuclear emergency")
if (!derp) boom.icon_state = "loss_nuke"
else boom.icon_state = "loss_nuke2"
if("AI malfunction")
if("malfunction")
boom.icon_state = "loss_malf"
if("blob")
return//Nothin here yet and the general one does not fit.
else
boom.icon_state = "loss_general"
#elif