Changed the prison break event to affect the main brig!

Added a sprite for welded vents. (Original courtesy of Cheridan)
Added an overlay for connected canisters. (Thanks to ruarai)
Updated one of the AI statuses to be animated.
Fixed the original style hotkeys.

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

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -51,6 +51,9 @@
 			air_contents.volume = 1000
 
 	update_icon()
+		if(welded)
+			icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]weld"
+			return
 		if(on && !(stat & (NOPOWER|BROKEN)))
 			if(pump_direction)
 				icon_state = "[level == 1 && istype(loc, /turf/simulated) ? "h" : "" ]out"
@@ -236,6 +239,9 @@
 		return
 
 	hide(var/i) //to make the little pipe section invisible, the icon changes.
+		if(welded)
+			icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]weld"
+			return
 		if(on&&node)
 			if(pump_direction)
 				icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]out"
@@ -256,9 +262,11 @@
 					if(!welded)
 						user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.")
 						welded = 1
+						update_icon()
 					else
 						user.visible_message("[user] unwelds the vent.", "You unweld the vent.", "You hear welding.")
 						welded = 0
+						update_icon()
 				W:welding = 1
 			else
 				user << "\blue You need more welding fuel to complete this task."

code/game/gamemodes/events.dm

@@ -313,21 +313,28 @@
 	for(var/mob/living/carbon/monkey/M in world)
 		M.radiation += rand(5,25)
 
+//Changing this to affect the main station. Blame Urist. --Pete
 /proc/prison_break() // -- Callagan
 	for (var/obj/machinery/power/apc/temp_apc in world)
-		if(istype(get_area(temp_apc), /area/prison))
+		if(istype(get_area(temp_apc), /area/security/brig))
 			temp_apc.overload_lighting()
-	for (var/obj/machinery/computer/prison_shuttle/temp_shuttle in world)
+//	for (var/obj/machinery/computer/prison_shuttle/temp_shuttle in world)
-		temp_shuttle.prison_break()
+//		temp_shuttle.prison_break()
 	for (var/obj/structure/secure_closet/security/temp_closet in world)
-		if(istype(get_area(temp_closet), /area/prison))
+		if(istype(get_area(temp_closet), /area/security/brig))
 			temp_closet.locked = 0
 			temp_closet.icon_state = temp_closet.icon_closed
 	for (var/obj/machinery/door/airlock/security/temp_airlock in world)
-		if(istype(get_area(temp_airlock), /area/prison))
+		if(istype(get_area(temp_airlock), /area/security/brig))
 			temp_airlock.prison_open()
+	for (var/obj/machinery/door/airlock/glass_security/temp_glassairlock in world)
+		if(istype(get_area(temp_glassairlock), /area/security/brig))
+			temp_glassairlock.prison_open()
+	for (var/obj/machinery/door_timer/temp_timer in world)
+		if(istype(get_area(temp_timer), /area/security/brig))
+			temp_timer.releasetime = 1
 	sleep(150)
-	command_alert("Prison station VI is not accepting commands. Recommend station AI involvement.", "VI Alert")
+	command_alert("Gr3y.T1d3 virus detected in [station_name()] imprisonment subroutines. Recommend station AI involvement.", "Security Alert")
 
 /proc/carp_migration() // -- Darem
 	for(var/obj/effect/landmark/C in world)

code/game/machinery/atmoalter/canister.dm

@@ -58,7 +58,10 @@
 	else
 		icon_state = "[color]"
 		if(holding)
-			overlays += image('atmos.dmi', "can-oT")
+			overlays += image('atmos.dmi', "can-open")
+
+		if(connected_port)
+			overlays += image('atmos.dmi', "can-connector")
 
 		var/tank_pressure = air_contents.return_pressure()
 

code/game/machinery/atmoalter/portable_atmospherics.dm

@@ -89,12 +89,14 @@
 		if(connected_port)
 			disconnect()
 			user << "\blue You disconnect [name] from the port."
+			update_icon()
 			return
 		else
 			var/obj/machinery/atmospherics/portables_connector/possible_port = locate(/obj/machinery/atmospherics/portables_connector/) in loc
 			if(possible_port)
 				if(connect(possible_port))
 					user << "\blue You connect [name] to the port."
+					update_icon()
 					return
 				else
 					user << "\blue [name] failed to connect to the port."

html/changelog.html

@@ -64,9 +64,9 @@ should be listed in the changelog upon commit tho. Thanks. -->
 			<li>Numpad with Num Lock enabled = movement in wanted direction.</li>
 			<li>Numpad with Num Lock disabled = as it was before. movement north-south-east-west and throw, drop, swap hands, use item on itself.</li>
 			<li>Page up (also numpad 9 with num lock disabled) = swap hands</li>
-			<li>Page down (also numpad 3 with num lock disabled) = drop</li>
+			<li>Page down (also numpad 3 with num lock disabled) = use item in hand on itself</li>
-			<li>home (also numpad 7 with num lock disabled) = throw</li>
+			<li>home (also numpad 7 with num lock disabled) = drop</li>
-			<li>end (also numpad 1 with num lock disabled) = use item in hand on itself</li>
+			<li>end (also numpad 1 with num lock disabled) = throw</li>
 			<li>CTRL + A = throw</li>
 			<li>CTRL + S = swap hands</li>
 			<li>CTRL + D = drop</li>

interface/skin.dmf

@@ -9,16 +9,16 @@ macro "macro"
 		is-disabled = false
 	elem 
 		name = "SOUTHEAST"
-		command = "drop-item"
-		is-disabled = false
-	elem 
-		name = "SOUTHWEST"
 		command = "attack-self"
 		is-disabled = false
 	elem 
-		name = "NORTHWEST"
+		name = "SOUTHWEST"
 		command = "toggle-throw-mode"
 		is-disabled = false
+	elem 
+		name = "NORTHWEST"
+		command = "drop-item"
+		is-disabled = false
 	elem 
 		name = "CTRL+WEST"
 		command = "westface"