Merge pull request #640 from CIB/master

ERT stuff
This commit is contained in:
Hawk-v3
2012-03-08 15:40:47 -08:00
2 changed files with 7 additions and 2 deletions
+4 -2
View File
@@ -58,7 +58,7 @@ proc/percentage_antagonists()
else return round(100 * antagonists / total)
proc/trigger_armed_response_team()
proc/trigger_armed_response_team(var/force = 0)
if(send_emergency_team)
return
@@ -67,6 +67,8 @@ proc/trigger_armed_response_team()
send_team_chance += percentage_antagonists() // the more antagonists, the higher the chance
send_team_chance = min(send_team_chance, 100)
if(force) send_team_chance = 100
// there's only a certain chance a team will be sent
if(!prob(send_team_chance)) return
@@ -79,7 +81,7 @@ proc/trigger_armed_response_team()
if(!nuke)
nuke = locate() in world
var/obj/item/weapon/paper/P = new
P.info = "Your orders, Commander, are to use all necessary tools given to return the station to a survivable condition. <br> To this end, you have been provided with the best tools we can give in the three areas of Medical Engineering and Security. The nuclear authorization code is: <b>[nuke.r_code]</b>. Be warned, if you detonate this without good reason, we will hold you to account for damages. Memorise this code, and then burn this message."
P.info = "Your orders, Commander, are to use all necessary tools given to return the station to a survivable condition. <br> To this end, you have been provided with the best tools we can give in the three areas of Medical Engineering and Security. The nuclear authorization code is: <b>[ nuke ? nuke.r_code : "AHH, THE NUKE IS GONE!"]</b>. Be warned, if you detonate this without good reason, we will hold you to account for damages. Memorise this code, and then burn this message."
P.name = "Emergency Nuclear Code, and ERT Orders"
for (var/obj/effect/landmark/A in world)
if (A.name == "nukecode")
+3
View File
@@ -1475,6 +1475,8 @@
else
infect_mob_random_greater(victim)
message_admins("[key_name_admin(usr)] has infected [victim] with a [lesser ? "minor" : "major"] virus2.", 1)
if("trigger_armed_response_team")
trigger_armed_response_team(1)
if("retardify")
if (src.rank in list("Badmin", "Game Admin", "Game Master"))
for(var/mob/living/carbon/human/H in world)
@@ -2039,6 +2041,7 @@
<A href='?src=\ref[src];secretsfun=radiation'>Irradiate the station</A><BR>
<A href='?src=\ref[src];secretsfun=prison_break'>Trigger a Prison Break</A><BR>
<A href='?src=\ref[src];secretsfun=virus'>Trigger a Virus Outbreak</A><BR>
<A href='?src=\ref[src];secretsfun=trigger_armed_response_team'>Trigger the Emergency Response Team</A><BR>
<A href='?src=\ref[src];secretsfun=immovable'>Spawn an Immovable Rod</A><BR>
<A href='?src=\ref[src];secretsfun=lightsout'>Toggle a "lights out" event</A><BR>
<A href='?src=\ref[src];secretsfun=ionstorm'>Spawn an Ion Storm</A><BR>