git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2634 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/gamemodes/blob/blob.dm

@@ -190,7 +190,9 @@
 
 //	command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.")
 //	world << sound('intercept.ogg')
-//  set_security_level(1)
+//  if(security_level < SEC_LEVEL_BLUE)
+//		set_security_level(SEC_LEVEL_BLUE)
+
 /datum/game_mode/blob/proc/check_quarantine()
 	var/numDead = 0
 	var/numAlive = 0

code/game/gamemodes/game_mode.dm

@@ -113,7 +113,8 @@
 
 	command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.")
 	world << sound('intercept.ogg')
-	set_security_level(1)
+	if(security_level < SEC_LEVEL_BLUE)
+		set_security_level(SEC_LEVEL_BLUE)
 
 
 /datum/game_mode/proc/get_players_for_role(var/role, override_jobbans=1)

code/game/jobs/access.dm

@@ -58,6 +58,7 @@
 	access_hop = 57
 	access_hos = 58
 	access_RC_announce = 59 //Request console announcements
+	access_keycard_auth = 60 //Used for events which require at least two people to confirm them
 
 	//BEGIN CENTCOM ACCESS
 	/*Should leave plenty of room if we need to add more access levels.
@@ -201,7 +202,7 @@
 			return list(access_medical, access_morgue, access_tox, access_tox_storage, access_chemistry, access_medlab, access_court,
 			            access_teleporter, access_heads, access_tech_storage, access_security, access_brig, access_atmospherics,
 			            access_maint_tunnels, access_bar, access_janitor, access_kitchen, access_robotics, access_armory, access_hydroponics,
-			            access_theatre, access_research, access_hos, access_RC_announce, access_forensics_lockers)
+			            access_theatre, access_research, access_hos, access_RC_announce, access_forensics_lockers, access_keycard_auth)
 		if("Head of Personnel")
 			return list(access_security, access_brig, access_court, access_forensics_lockers,
 			            access_tox, access_tox_storage, access_chemistry, access_medical, access_medlab, access_engine,
@@ -209,7 +210,7 @@
 			            access_all_personal_lockers, access_tech_storage, access_maint_tunnels, access_bar, access_janitor,
 			            access_crematorium, access_kitchen, access_robotics, access_cargo, access_cargo_bot, access_hydroponics, access_lawyer,
 			            access_theatre, access_research, access_mining, access_heads_vault, access_mining_station,
-			            access_hop, access_RC_announce)
+			            access_hop, access_RC_announce, access_keycard_auth)
 		if("Atmospheric Technician")
 			return list(access_atmospherics, access_maint_tunnels, access_emergency_storage)
 		if("Bartender")
@@ -236,17 +237,19 @@
 			return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
 			            access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
 			            access_heads, access_ai_upload, access_construction, access_robotics,
-			            access_mint, access_ce, access_RC_announce)
+			            access_mint, access_ce, access_RC_announce, access_keycard_auth)
 		if("Research Director")
 			return list(access_medlab, access_rd,
 			            access_maint_tunnels, access_heads, access_tox,
 			            access_tox_storage, access_chemistry, access_teleporter,
-			            access_research, access_robotics, access_xenobiology, access_RC_announce)
+			            access_research, access_robotics, access_xenobiology, access_RC_announce,
+			            access_keycard_auth)
 		if("Virologist")
 			return list(access_medical, access_morgue, access_virology)
 		if("Chief Medical Officer")
 			return list(access_medical, access_morgue, access_medlab, access_heads,
-			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce)
+			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
+			access_keycard_auth)
 		else
 			return list()
 
@@ -281,7 +284,8 @@
 	            access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_cargo_bot, access_construction,
 	            access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery,
 	            access_theatre, access_research, access_mining, access_mailsorting, access_mint_vault, access_mint,
-	            access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce)
+	            access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce,
+	            access_keycard_auth)
 
 /proc/get_all_centcom_access()
 	return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_creed, access_cent_captain)
@@ -302,7 +306,7 @@
 		if(4) //engineering and maintenance
 			return list(access_engine, access_engine_equip, access_maint_tunnels, access_external_airlocks, access_emergency_storage, access_tech_storage, access_atmospherics, access_construction, access_robotics, access_ce)
 		if(5) //command
-			return list(access_change_ids, access_ai_upload, access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers, access_mint_vault, access_heads_vault, access_hop, access_RC_announce)
+			return list(access_change_ids, access_ai_upload, access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers, access_mint_vault, access_heads_vault, access_hop, access_RC_announce, access_keycard_auth)
 		if(6) //station general
 			return list(access_chapel_office, access_kitchen,access_bar, access_janitor, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime)
 		if(7) //supply
@@ -448,6 +452,8 @@
 			return "CE Private"
 		if(access_RC_announce)
 			return "RC announcements"
+		if(access_keycard_auth)
+			return "Keycode auth. device"
 
 /proc/get_centcom_access_desc(A)
 	switch(A)

html/changelog.html

@@ -54,6 +54,16 @@ Stuff which is in development and not yet visible to players or just code relate
 (ie. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit tho. Thanks. -->
 
+<b><font color='blue'>3 December 2011</font><b>
+<ul>
+  <li><b>Errorage updated:</b>
+  <ul>
+	<li>Fixed the comms console locking up when you tried to change the alert level.</li>
+	<li>Added a keycard authentication device, which is used for high-security events. The idea behind it is the same as the two-key thing from submarine movies. You select the event you wish to trigger on one of the devices and then swipe your ID, if someone swipes their ID on one of the other devices within 2 seconds, the event is enacted. These devices are in each of the head's offices and all heads have the access level to confirm an event, it can also be added to cards at the HoP's ID computer. The only event that can currently be enacted is Red alert.</li>
+  </ul>
+  </li>
+</ul>
+
 <b><font color='blue'>3 December 2011</font><b>
 <ul>
   <li><b>Pete & Erro Christmas update:</b>

tgstation.dme

@@ -965,6 +965,7 @@
 #include "code\modules\research\rdmachines.dm"
 #include "code\modules\research\research.dm"
 #include "code\modules\research\server.dm"
+#include "code\modules\security levels\keycard authentication.dm"
 #include "code\modules\security levels\security levels.dm"
 #include "code\WorkInProgress\buildmode.dm"
 #include "code\WorkInProgress\explosion_particles.dm"