Updated the map with fixed incinerator doors that use the new heat_proof var.

Added a few film canisters to art storage and the dorms.
Fixed a misplaced wall in R&D.

Added a new carpet icon_state, so the dorms don't have to look stupid.

Added a new option for key auth devices, it removes the maint access requirement from all doors.

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

code/game/turfs/simulated/floor.dm

@@ -113,7 +113,7 @@ turf/simulated/floor/proc/update_icon()
 				icon_state = "grass[pick("1","2","3","4")]"
 	else if(is_carpet_floor())
 		if(!broken && !burnt)
-			if(icon_state != "carpetsymbol")
+			if(icon_state == "carpet")
 				var/connectdir = 0
 				for(var/direction in cardinal)
 					if(istype(get_step(src,direction),/turf/simulated/floor))

code/modules/security levels/keycard authentication.dm

@@ -21,11 +21,11 @@
 	power_channel = ENVIRON
 
 /obj/machinery/keycard_auth/attack_ai(mob/user as mob)
-	user << "The station AI is not to interact with these devices"
+	user << "The station AI is not to interact with these devices."
 	return
 
 /obj/machinery/keycard_auth/attack_paw(mob/user as mob)
-	user << "You are too primitive to use this device"
+	user << "You are too primitive to use this device."
 	return
 
 /obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -55,23 +55,24 @@
 	if(user.stat || stat & (NOPOWER|BROKEN))
 		user << "This device is not powered."
 		return
-	if (busy)
-		user << "This device is busy"
+	if(busy)
+		user << "This device is busy."
 		return
 
 	user.set_machine(src)
 
 	var/dat = "<h1>Keycard Authentication Device</h1>"
 
-	dat += "This device is used to trigger some high security events. It requires the simultaneous swipe of two high-level ID cards"
+	dat += "This device is used to trigger some high security events. It requires the simultaneous swipe of two high-level ID cards."
 	dat += "<br><hr><br>"
 
-	if ( screen == 1 )
+	if(screen == 1)
 		dat += "Select an event to trigger:<ul>"
 		dat += "<li><A href='?src=\ref[src];triggerevent=Red alert'>Red alert</A></li>"
+		dat += "<li><A href='?src=\ref[src];triggerevent=Emergency Maintenance Access'>Emergency Maintenance Access</A></li>"
 		dat += "</ul>"
 		user << browse(dat, "window=keycard_auth;size=500x250")
-	if ( screen == 2 )
+	if(screen == 2)
 		dat += "Please swipe your card to authorize the following event: <b>[event]</b>"
 		dat += "<p><A href='?src=\ref[src];reset=1'>Back</A>"
 		user << browse(dat, "window=keycard_auth;size=500x250")
@@ -80,20 +81,20 @@
 
 /obj/machinery/keycard_auth/Topic(href, href_list)
 	..()
-	if (busy)
-		usr << "This device is busy"
+	if(busy)
+		usr << "This device is busy."
 		return
-	if (usr.stat || stat & (BROKEN|NOPOWER))
-		usr << "This device is without power"
+	if(usr.stat || stat & (BROKEN|NOPOWER))
+		usr << "This device is without power."
 		return
-	if (href_list["triggerevent"])
+	if(href_list["triggerevent"])
 		event = href_list["triggerevent"]
 		screen = 2
-	if (href_list["reset"])
+	if(href_list["reset"])
 		reset()
 
-	src.updateUsrDialog()
-	src.add_fingerprint(usr)
+	updateUsrDialog()
+	add_fingerprint(usr)
 	return
 
 /obj/machinery/keycard_auth/proc/reset()
@@ -141,4 +142,15 @@
 	switch(event)
 		if("Red alert")
 			set_security_level(SEC_LEVEL_RED)
-			feedback_inc("alert_keycard_auth_red",1)
+			feedback_inc("alert_keycard_auth_red",1)
+		if("Emergency Maintenance Access")
+			make_maint_all_access()
+			feedback_inc("alert_keycard_auth_maint",1)
+
+/proc/make_maint_all_access()
+	for(var/obj/machinery/door/airlock/A in world)
+		if(A.z == 1)
+			A.req_access.Remove(access_maint_tunnels)
+
+	world << "<font size=4 color='red'>Attention!</font>"
+	world << "<font color='red'>The maintenance access requirement has been revoked on all airlocks. All crew members are now permitted access to emergency maintenance areas.</font>"

html/changelog.html

@@ -53,6 +53,10 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<h3 class="author">Giacom updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="rscadd">You can now create your own solar arrays! Order the solar pack crate and you'll receive 21 solar assemblies, 1 electronic which you can put into an assembly to make it a solar tracker and finally the solar computer circuit board. You will get more detailed instructions in the crate, on a piece of paper.</li>
+	<h3 class="author">Petethegoat updated:</h3>
+	</ul>
+	<ul class="changes bgimages16">
+		<li class="rscadd">Added a new option to the key authorisation devices. It removes the maintenance access requirement from all doors. It's irreversible, so only use it in an emergency!</li>
 	</ul>
 	
 <div class="commit sansserif">