diff --git a/baystation12.dme b/baystation12.dme index 85a262c6f0..fe37d105fc 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -198,6 +198,7 @@ #include "code\game\communications.dm" #include "code\game\dna.dm" #include "code\game\hud.dm" +#include "code\game\response_team.dm" #include "code\game\shuttle_engines.dm" #include "code\game\skincmd.dm" #include "code\game\smoothwall.dm" diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 762dae9784..faf3946385 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -256,7 +256,7 @@ var/specops_shuttle_timeleft = 0 user << "\red Access Denied." return - if (sent_strike_team == 0 && send_emergency_team == 0) + if (sent_strike_team == 0 && sent_emergency_team == 0) usr << "\red The strike team has not yet deployed." return diff --git a/code/game/response_team.dm b/code/game/response_team.dm index df21a5a2a5..3d658818e6 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -1,13 +1,13 @@ //STRIKE TEAMS var/list/response_team_members = list() -var/send_emergency_team = 0 +var/global/sent_emergency_team = 0 client/verb/JoinResponseTeam() set category = "IC" if(istype(usr,/mob/dead/observer) || istype(usr,/mob/new_player)) - if(!send_emergency_team) + if(!sent_emergency_team) usr << "No emergency response team is currently being sent." return if(jobban_isbanned(usr, "Syndicate") || jobban_isbanned(usr, "Emergency Response Team") || jobban_isbanned(usr, "Security Officer")) @@ -64,7 +64,7 @@ proc/percentage_antagonists() proc/trigger_armed_response_team(var/force = 0) - if(send_emergency_team) + if(sent_emergency_team) return var/send_team_chance = 20 // base chance that a team will be sent @@ -79,7 +79,7 @@ proc/trigger_armed_response_team(var/force = 0) command_alert("According to our sensors, [station_name()] has entered code red. We will prepare and dispatch an emergency response team to deal with the situation.", "Command Report") - send_emergency_team = 1 + sent_emergency_team = 1 var/area/security/nuke_storage/nukeloc = locate()//To find the nuke in the vault var/obj/machinery/nuclearbomb/nuke = locate() in nukeloc diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index 32037ccabb..ca5d8e5cb8 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -2,6 +2,7 @@ var/const/commandos_possible = 6 //if more Commandos are needed in the future var/global/sent_strike_team = 0 + /client/proc/strike_team() if(!ticker) usr << "The game hasn't started yet!"