Fixed issue 301.

Fixed a syringe gun runtime.
Added WJohnston's silver head ID, and his new asteroid floor sprites.

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

code/defines/obj/weapon.dm

@@ -486,6 +486,12 @@
 	var/assignment = null
 	var/dorm = 0		// determines if this ID has claimed a dorm already
 
+/obj/item/weapon/card/id/silver
+	name = "identification card"
+	desc = "A silver card which shows honour and dedication."
+	icon_state = "silver"
+	item_state = "silver_id"
+
 /obj/item/weapon/card/id/gold
 	name = "identification card"
 	desc = "A golden card which shows power and might."

code/game/jobs/job_controller.dm

@@ -254,7 +254,9 @@ var/global/datum/controller/occupations/job_master
 		switch(rank)
 			if("Cyborg")
 				return
-			if("Captain")
+			if(	"Head of Personnel" || "Head of Security" || "Chief Engineer" || "Research Director" || "Chief Medical Officer")
+				C = new /obj/item/weapon/card/id/silver(H)
+			else if("Captain")
 				C = new /obj/item/weapon/card/id/gold(H)
 			else
 				C = new /obj/item/weapon/card/id(H)

code/game/machinery/doors/airlock.dm

@@ -997,7 +997,7 @@ About the new airlock wires panel:
 			beingcrowbarred = 0
 		if( beingcrowbarred && (density && welded && !operating && src.p_open && (!src.arePowerSystemsOn() || stat & NOPOWER) && !src.locked) )
 			playsound(src.loc, 'Crowbar.ogg', 100, 1)
-			user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics into the airlock assembly.")
+			user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.")
 			if(do_after(user,40))
 				user << "\blue You removed the airlock electronics!"
 				switch(src.doortype)
@@ -1009,6 +1009,10 @@ About the new airlock wires panel:
 					if(5) new/obj/structure/door_assembly/door_assembly_mai( src.loc )
 					if(6) new/obj/structure/door_assembly/door_assembly_ext( src.loc )
 					if(7) new/obj/structure/door_assembly/door_assembly_g( src.loc )
+					if(14) new/obj/structure/door_assembly/door_assembly_com/glass( src.loc )
+					if(15) new/obj/structure/door_assembly/door_assembly_eng/glass( src.loc )	//issue 301 -mysthic
+					if(16) new/obj/structure/door_assembly/door_assembly_sec/glass( src.loc )
+					if(17) new/obj/structure/door_assembly/door_assembly_med/glass( src.loc )
 				var/obj/item/weapon/airlock_electronics/ae
 				if(!electronics)
 					ae = new/obj/item/weapon/airlock_electronics( src.loc )

code/modules/chemical/Chemistry-Tools.dm

@@ -533,6 +533,8 @@
 				var/turf/trg = get_turf(target)
 				var/obj/effect/syringe_gun_dummy/D = new/obj/effect/syringe_gun_dummy(get_turf(src))
 				var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
+				if((!S) || (!S.reagents))	//ho boy! wot runtimes!
+					return
 				S.reagents.trans_to(D, S.reagents.total_volume)
 				syringes -= S
 				del(S)

code/modules/mining/mine_turfs.dm

@@ -284,7 +284,7 @@
 	//	seedName = pick(list("1","2","3","4"))
 	//	seedAmt = rand(1,4)
 	if(prob(20))
-		icon_state = "asteroid[rand(0,8)]"
+		icon_state = "asteroid[rand(0,12)]"
 	spawn(2)
 		updateMineralOverlays()