Merge pull request #614 from SoundScopes/master

UPdates

code/__HELPERS/icons.dm

@@ -699,34 +699,33 @@ proc // Creates a single icon from a given /atom or /image.  Only the first argu
 		while(TRUE)
 			if(curIndex<=process.len)
 				current = process[curIndex]
-				if(!current)	continue
-				currentLayer = current:layer
-				if(currentLayer<0) // Special case for FLY_LAYER
-					if(currentLayer <= -1000) return flat
-					if(pSet == 0) // Underlay
-						currentLayer = A.layer+currentLayer/1000
-					else // Overlay
-						currentLayer = A.layer+(1000+currentLayer)/1000
+				if(current)
+					currentLayer = current:layer
+					if(currentLayer<0) // Special case for FLY_LAYER
+						if(currentLayer <= -1000) return flat
+						if(pSet == 0) // Underlay
+							currentLayer = A.layer+currentLayer/1000
+						else // Overlay
+							currentLayer = A.layer+(1000+currentLayer)/1000
 
-				// Sort add into layers list
-				for(cmpIndex=1,cmpIndex<=layers.len,cmpIndex++)
-					compare = layers[cmpIndex]
-					if(currentLayer < layers[compare]) // Associated value is the calculated layer
-						layers.Insert(cmpIndex,current)
-						layers[current] = currentLayer
-						break
-				if(cmpIndex>layers.len) // Reached end of list without inserting
-					layers[current]=currentLayer // Place at end
+					// Sort add into layers list
+					for(cmpIndex=1,cmpIndex<=layers.len,cmpIndex++)
+						compare = layers[cmpIndex]
+						if(currentLayer < layers[compare]) // Associated value is the calculated layer
+							layers.Insert(cmpIndex,current)
+							layers[current] = currentLayer
+							break
+					if(cmpIndex>layers.len) // Reached end of list without inserting
+						layers[current]=currentLayer // Place at end
 
 				curIndex++
 
-			if(curIndex>process.len)
-				if(pSet == 0) // Switch to overlays
-					curIndex = 1
-					pSet = 1
-					process = A.overlays
-				else // All done
-					break
+			else if(pSet == 0) // Switch to overlays
+				curIndex = 1
+				pSet = 1
+				process = A.overlays
+			else // All done
+				break
 
 		var/icon/add // Icon of overlay being added
 

code/modules/admin/IsBanned.dm

@@ -164,7 +164,7 @@ world/IsBanned(key,address,computer_id)
 			if(!toban)
 				toban = 1
 
-		if(banFlag)
+		if(banFlag & (KEYBAN|IDBAN|IPBAN))
 			Adminbot.DB_ban_record(1, null, null, multireason, null, null, ckey(key), 1, address, computer_id)
 			notes_add_sql(key, newreason, null, address, computer_id)
 

code/modules/admin/verbs/debug.dm

@@ -566,7 +566,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		"nanotrasen officer",
 		"nanotrasen captain",
 		"shadowling"
-//		"iac_medic"
+		"iac_medic"
 		)
 	var/dresscode = input("Select dress for [M]", "Robust quick dress shop") as null|anything in dresspacks
 	if (isnull(dresscode))
@@ -1127,14 +1127,15 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.assignment = "Field Operator"
 			W.registered_name = M.real_name
 			M.equip_to_slot_or_del(W, slot_wear_id)
-/* REMOVED BECAUSE STUCK
+
 		if("iac_medic")
 
 			var/obj/item/clothing/under/rank/medical/iac = new(M)
-			iac.aband = new /obj/item/clothing/tie/armband/iac(iac)
+			iac.aband = new /obj/item/clothing/tie/armband/iac_armband(iac)
 			M.equip_to_slot_or_del(iac, slot_w_uniform)
 
-			M.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/iac(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/iac_vest(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/beret/iac(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(M), slot_l_ear)
@@ -1156,6 +1157,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/device/flash(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/emt(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(M), slot_s_store)
+			M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/iac(M.back), slot_in_backpack)
 
 			var/obj/item/weapon/card/id/silver/W = new(src)
 			W.name = "[M.real_name]'s ID Card"
@@ -1165,7 +1167,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.assignment = "IAC Worker"
 			W.registered_name = M.real_name
 			M.equip_to_slot_or_del(W, slot_wear_id)
-*/
+
 	M.regenerate_icons()
 
 	log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [dresscode].")

code/modules/clothing/head/helmet.dm

@@ -76,3 +76,12 @@
 	armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.7
+
+/obj/item/clothing/head/helmet/iac
+	name = "IAC helmet"
+	desc = "A helmet worn by medical workers of the Interstellar Aid Corps."
+	icon = 'icons/obj/clothing/iac_uniform.dmi'
+	item_state = "iac_helmet"
+	icon_state = "iac_helmet"
+	armor = list(melee = 50, bullet = 30, laser = 30,energy = 15, bomb = 10, bio = 20, rad = 0)
+	flags_inv = HIDEEARS|HIDEEYES

code/modules/clothing/head/jobs.dm

@@ -83,3 +83,9 @@
 /obj/item/clothing/head/surgery/green
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green."
 	icon_state = "surgcap_green"
+
+/obj/item/clothing/head/beret/iac
+	name = "IAC beret"
+	desc = "A beret worn by medical workers of the Interstellar Aid Corps."
+	icon = 'icons/obj/clothing/iac_uniform.dmi'
+	icon_state = "iac_beret"

code/modules/clothing/suits/miscellaneous.dm

@@ -396,4 +396,12 @@
 		else
 			usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are."
 			return
-	usr.update_inv_wear_suit()*/	//so our overlays update
+	usr.update_inv_wear_suit()*/	//so our overlays update
+
+/obj/item/clothing/suit/storage/iac_vest
+	name = "IAC responce vest"
+	desc = "An high durability vest worn by medical workers of the Interstellar Aid Corps"
+	icon_state = "iac_bib"
+	item_state = "iac_bib"
+	icon = 'icons/obj/clothing/iac_uniform.dmi'
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 30, rad = 20)

code/modules/clothing/under/jobs/medsci.dm

@@ -146,8 +146,11 @@
 /obj/item/clothing/under/rank/medical/iac
 	name = "iac scrubs"
 	desc = "A change of sterile medical scrubs worn by IAC workers. Has minor protection against biohazards."
-	icon_state = "scrubsblue"
-	item_state = "scrubsblue"
+	icon_state = "iac_s"
+	icon = 'icons/obj/clothing/iac_uniform.dmi'
+	item_state = "iac"
+	item_color = "iac"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 
 
 /*

code/modules/events/prison_break.dm

@@ -24,7 +24,7 @@
 
 /datum/event/prison_break/start()
 	for(var/area/A in world)
-		if(istype(A, /area/security/prison) || istype(A, /area/security/brig) || istype(A, /area/security/lobby) || istype(A, /area/security/main))
+		if(istype(A, /area/security/prison) || istype(A, /area/security/brig) || istype(A, /area/security/lobby))
 			prisonAreas += A
 
 	if(prisonAreas && prisonAreas.len > 0)
@@ -35,6 +35,7 @@
 /datum/event/prison_break/tick()
 	if(activeFor == releaseWhen)
 		if(prisonAreas && prisonAreas.len > 0)
+			msg_scopes_list(prisonAreas, "Area's")
 			for(var/area/A in prisonAreas)
 				for(var/obj/machinery/power/apc/temp_apc in A)
 					temp_apc.overload_lighting()

html/changelog.html

@@ -56,6 +56,21 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
 
+<div class='commit sansserif'>
+	<h2 class='date'>13 June 2015</h2>
+	<h3 class='author'>SoundScopes updated:</h3>
+	<ul class='changes bgimages16'>
+		<li class='rscadd'>Communal Brig</li>
+		<li class='rscadd'>Magnetic prisioner jumpsuits</li>
+		<li class='tweak'>Security Map Change</li>
+		<li class='bugfix'>Infinite camera loop</li>
+		<li class='bugfix'>Implanting brains into mobs</li>
+		<li class='bugfix'>Atmospheric meters in the monitoring computers now show pressure</li>
+		<li class='bugfix'>Research dorms sleeping quarters buttons work</li>
+	</ul>
+</div>
+
+
 <div class='commit sansserif'>
 	<h2 class='date'>03 June 2015</h2>
 	<h3 class='author'>Skull132 updated:</h3>