-Added maintenance cameras. These are cameras which are located in maintenance, not only that but they have a 66% chance of not spawning. Leading to random blind spots in maintenance.

-Fixed large grenades, removed the reliability prob().

-Added maintenance cameras on the map.

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

code/game/machinery/camera/camera.dm

@@ -38,6 +38,11 @@
 	WireColorToFlag = randomCameraWires()
 	assembly = new(src)
 	assembly.state = 4
+	/* // Use this to look for cameras that have the same c_tag.
+	for(var/obj/machinery/camera/C in cameranet.cameras)
+		if(C != src && C.c_tag == src.c_tag && C.network == src.network)
+			world.log << "[src.c_tag] [src.x] [src.y] [src.z] conflicts with [C.c_tag] [C.x] [C.y] [C.z]"
+	*/
 	..()
 
 

code/game/machinery/camera/presets.dm

@@ -18,6 +18,13 @@
 	upgradeXRay()
 	upgradeMotion()
 
+/obj/machinery/camera/maintenance/New()
+	// Maintenance camera that has a 66% chance of not spawning.
+	if(prob(66))
+		del(src)
+		return
+	..()
+
 // CHECKS
 
 /obj/machinery/camera/proc/isEmpProof()

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -9,7 +9,7 @@
 	var/path = 0
 	var/obj/item/weapon/circuitboard/circuit = null
 	var/list/beakers = new/list()
-	var/list/allowed_containers = list("/obj/item/weapon/reagent_containers/glass/beaker", "/obj/item/weapon/reagent_containers/glass/dispenser", "/obj/item/weapon/reagent_containers/glass/bottle")
+	var/list/allowed_containers = list(/obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle)
 	var/affected_area = 3
 
 	New()
@@ -41,7 +41,7 @@
 				stage = 2
 			else
 				user << "\red You need to add at least one beaker before locking the assembly."
-		else if((istype(W,/obj/item/weapon/reagent_containers/glass/beaker) || istype(W,/obj/item/weapon/reagent_containers/glass/bottle)) && stage == 1 && path != 2)
+		else if(is_type_in_list(W, allowed_containers) && stage == 1 && path != 2)
 			path = 1
 			if(beakers.len == 2)
 				user << "\red The grenade can not hold more containers."
@@ -56,46 +56,46 @@
 					user << "\red \the [W] is empty."
 
 	prime()
-		if(prob(reliability))
+		//if(prob(reliability))
-			var/has_reagents = 0
+		var/has_reagents = 0
-			for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
+		for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
-				if(G.reagents.total_volume) has_reagents = 1
+			if(G.reagents.total_volume) has_reagents = 1
 
-			if(!has_reagents)
+		if(!has_reagents)
-				playsound(src.loc, 'sound/items/Screwdriver2.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/Screwdriver2.ogg', 50, 1)
-				state = 0
+			state = 0
-				return
+			return
 
-			playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1)
+		playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1)
 
-			for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
+		for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
-				G.reagents.trans_to(src, G.reagents.total_volume)
+			G.reagents.trans_to(src, G.reagents.total_volume)
 
-			if(src.reagents.total_volume) //The possible reactions didnt use up all reagents.
+		if(src.reagents.total_volume) //The possible reactions didnt use up all reagents.
-				var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
+			var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
-				steam.set_up(10, 0, get_turf(src))
+			steam.set_up(10, 0, get_turf(src))
-				steam.attach(src)
+			steam.attach(src)
-				steam.start()
+			steam.start()
 
-				for(var/atom/A in view(affected_area, src.loc))
+			for(var/atom/A in view(affected_area, src.loc))
-					if( A == src ) continue
+				if( A == src ) continue
-					src.reagents.reaction(A, 1, 10)
+				src.reagents.reaction(A, 1, 10)
 
 
-			invisibility = INVISIBILITY_MAXIMUM //Why am i doing this?
+		invisibility = INVISIBILITY_MAXIMUM //Why am i doing this?
-			spawn(50)		   //To make sure all reagents can work
+		spawn(50)		   //To make sure all reagents can work
-				del(src)	   //correctly before deleting the grenade.
+			del(src)	   //correctly before deleting the grenade.
-		else
+		/*else
 			icon_state = initial(icon_state) + "_locked"
 			crit_fail = 1
 			for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
-				G.loc = get_turf(src.loc)
+				G.loc = get_turf(src.loc)*/
 
 /obj/item/weapon/grenade/chem_grenade/large
 	name = "Large Chem Grenade"
 	desc = "An oversized grenade that affects a larger area."
 	icon_state = "large_grenade"
-	allowed_containers = list("/obj/item/weapon/reagent_containers/glass")
+	allowed_containers = list(/obj/item/weapon/reagent_containers/glass)
 	origin_tech = "combat=3;materials=3"
 	affected_area = 4
 

html/changelog.html

@@ -49,6 +49,14 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+<div class="commit sansserif">
+	<h2 class="date">7 September 2012</h2>
+	<h3 class="author">Giacom updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="experiment">Added maintenance cameras. These are cameras which are located in maintenance, not only that but they have a 66% chance of not spawning. Leading to random blind spots in maintenance. This is an experimental feature and is subject to change, please post feedback if you have anything to say about it.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">6 September 2012</h2>
 	<h3 class="author">Cheridan updated:</h3>
@@ -61,7 +69,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<h2 class="date">6 September 2012</h2>
 	<h3 class="author">Giacom updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="tweak">Removed cameras from bots. They weren't working well with freelook and I felt that since they weren't used at all, they wouldn't be missed.</li>
+		<li class="tweak">Removed cameras from bots (NOT BORGS). They weren't working well with freelook and I felt that since they weren't used at all, they wouldn't be missed.</li>
 	</ul>
 </div>