From 4224b2401f43fd464b2090bba078e456fc0a5c61 Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 8 Mar 2012 15:25:48 -0800 Subject: [PATCH] ERT spawn button now in secrets. --- code/game/response_team.dm | 6 ++++-- code/modules/admin/admin.dm | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index b6dfc498cc2..5cbcee8c722 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -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.
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: [nuke.r_code]. 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.
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: [ nuke ? nuke.r_code : "AHH, THE NUKE IS GONE!"]. 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") diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index b1b7300fb0a..825bafc03c3 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -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 @@ Irradiate the station
Trigger a Prison Break
Trigger a Virus Outbreak
+Trigger the Emergency Response Team
Spawn an Immovable Rod
Toggle a "lights out" event
Spawn an Ion Storm