From ec6e3183430bf63096438cf30301abbf8e5ea32d Mon Sep 17 00:00:00 2001
From: phil235 <antoine_hernandez62@hotmail.fr>
Date: Sat, 23 May 2015 16:03:48 +0200
Subject: [PATCH] Fixes extinguisher (w/safety off) spraying water when placed
 on a table. Fixes runtime when putting beaker in autolathe. Fixes spray can
 empty message appearing when placing it on a table. Fixes experimentor manual
 not having a title. Fixes runtime with engine goggles updating nearby objects
 visibility. Fixes runtime when looking at picture from the AI camera.
 Updating the 'can_be_placed_into' list for items so their afterattack don't
 do anything when placing them in experimentor, autolathe, destructive
 analyzer. Fixes soap starting to clean the table when placed on it. Fixes
 drinking glasses having capitalized names.

---
 code/game/objects/items.dm                    |  5 ++-
 code/game/objects/items/toys.dm               |  2 +-
 .../game/objects/items/weapons/clown_items.dm |  2 +-
 .../objects/items/weapons/extinguisher.dm     |  2 +-
 code/game/objects/items/weapons/janisigns.dm  |  9 ----
 code/game/objects/items/weapons/manuals.dm    |  1 +
 .../clothing/glasses/engine_goggles.dm        |  2 +-
 .../detectivework/footprints_and_rag.dm       |  1 -
 .../drinks/drinks/drinkingglass.dm            | 42 +++++++++----------
 code/modules/paperwork/photography.dm         | 11 ++---
 .../reagents/reagent_containers/glass.dm      |  3 ++
 11 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 9ed07a3fb24..c2ab2cabdf9 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -71,7 +71,10 @@
 		/obj/structure/closet,
 		/obj/item/weapon/storage,
 		/obj/structure/safe,
-		/obj/machinery/disposal
+		/obj/machinery/disposal,
+		/obj/machinery/r_n_d/destructive_analyzer,
+		/obj/machinery/r_n_d/experimentor,
+		/obj/machinery/autolathe
 	)
 /obj/item/proc/check_allowed_items(atom/target, not_inside)
 	if((src in target) || ((!istype(target.loc, /turf)) && (!istype(target, /turf)) && (not_inside)) || is_type_in_list(target, can_be_placed_into))
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 54a982ced76..9cca4b143ee 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -399,7 +399,7 @@
 	update_window(usr)
 
 /obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity)
-	if(!proximity) return
+	if(!proximity || !check_allowed_items(target)) return
 	if(!uses)
 		user << "<span class='warning'>There is no more of [src.name] left!</span>"
 		if(!instant)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index f67f6013119..f2681b01489 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -41,7 +41,7 @@
 		M.slip(4, 2, src)
 
 /obj/item/weapon/soap/afterattack(atom/target, mob/user as mob, proximity)
-	if(!proximity)
+	if(!proximity || !check_allowed_items(target))
 		return
 	//I couldn't feasibly  fix the overlay bugs caused by cleaning items we are wearing.
 	//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 398d8668258..2dfa4b44c66 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -77,7 +77,7 @@
 
 /obj/item/weapon/extinguisher/afterattack(atom/target, mob/user , flag)
 	//TODO; Add support for reagents in water.
-	if(target.loc == user)//No more spraying yourself when putting your extinguisher away
+	if(target.loc == user || !check_allowed_items(target)) //No more spraying yourself when putting your extinguisher away
 		return
 	var/Refill = AttemptRefill(target, user)
 	if(Refill)
diff --git a/code/game/objects/items/weapons/janisigns.dm b/code/game/objects/items/weapons/janisigns.dm
index 3844bff42ad..48fd898b696 100644
--- a/code/game/objects/items/weapons/janisigns.dm
+++ b/code/game/objects/items/weapons/janisigns.dm
@@ -12,15 +12,6 @@
 	origin_tech = "programming=3"
 	var/list/signs = list()
 	var/max_signs = 10
-	can_be_placed_into = list(
-		/obj/machinery/r_n_d/destructive_analyzer,
-		/obj/structure/table,
-		/obj/structure/rack,
-		/obj/structure/closet,
-		/obj/item/weapon/storage,
-		/obj/structure/safe,
-		/obj/machinery/disposal
-	)
 
 /obj/item/weapon/holosign_creator/afterattack(atom/target, mob/user, flag)
 	if(flag)
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 5136e6073d2..7e69597ba3d 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -287,6 +287,7 @@
 	name = "Mentoring your Experiments"
 	icon_state = "rdbook"
 	author = "Dr. H.P. Kritz"
+	title = "Mentoring your Experiments"
 	dat = {"<html>
 		<head>
 		<style>
diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm
index 69a41a17689..5062d3aeda4 100644
--- a/code/modules/clothing/glasses/engine_goggles.dm
+++ b/code/modules/clothing/glasses/engine_goggles.dm
@@ -67,7 +67,7 @@
 		if(!t_ray_on() || !(O in range(1, loc)))
 			invis_objects -= O
 			var/turf/T = O.loc
-			if(T.intact)
+			if(T && T.intact)
 				O.invisibility = 101
 
 /obj/item/clothing/glasses/meson/engine/proc/t_ray_on()
diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index 945e133b85f..022c1130ce7 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -17,7 +17,6 @@
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(5)
 	volume = 5
-	can_be_placed_into = null
 
 /obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity)
 	if(!proximity)
diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
index 4d307f9d636..911362474c1 100644
--- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
@@ -1,7 +1,7 @@
 
 
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass
-	name = "glass"
+	name = "drinking glass"
 	desc = "Your standard drinking glass."
 	icon_state = "glass_empty"
 	amount_per_transfer_from_this = 10
@@ -233,35 +233,35 @@
 				desc = "Ultimate refreshment."
 			if("tonic")
 				icon_state = "glass_clear"
-				name = "Glass of Tonic Water"
+				name = "glass of Tonic Water"
 				desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
 			if("sodawater")
 				icon_state = "glass_clear"
-				name = "Glass of Soda Water"
+				name = "glass of Soda Water"
 				desc = "Soda water. Why not make a scotch and soda?"
 			if("water")
 				icon_state = "glass_clear"
-				name = "Glass of Water"
+				name = "glass of Water"
 				desc = "The father of all refreshments."
 			if("spacemountainwind")
 				icon_state = "Space_mountain_wind_glass"
-				name = "Glass of Space Mountain Wind"
+				name = "glass of Space Mountain Wind"
 				desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
 			if("thirteenloko")
 				icon_state = "thirteen_loko_glass"
-				name = "Glass of Thirteen Loko"
+				name = "glass of Thirteen Loko"
 				desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
 			if("dr_gibb")
 				icon_state = "dr_gibb_glass"
-				name = "Glass of Dr. Gibb"
+				name = "glass of Dr. Gibb"
 				desc = "Dr. Gibb. Not as dangerous as the name might imply."
 			if("space_up")
 				icon_state = "space-up_glass"
-				name = "Glass of Space-up"
+				name = "glass of Space-up"
 				desc = "Space-up. It helps you keep your cool."
 			if("lemon_lime")
 				icon_state = "glass_yellow"
-				name = "Glass of Lemon-Lime"
+				name = "glass of Lemon-Lime"
 				desc = "You're pretty certain a real fruit has never actually touched this."
 			if("moonshine")
 				icon_state = "glass_clear"
@@ -269,23 +269,23 @@
 				desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
 			if("soymilk")
 				icon_state = "glass_white"
-				name = "Glass of soy milk"
+				name = "glass of soy milk"
 				desc = "White and nutritious soy goodness!"
 			if("berryjuice")
 				icon_state = "berryjuice"
-				name = "Glass of berry juice"
+				name = "glass of berry juice"
 				desc = "Berry juice. Or maybe it's jam. Who cares?"
 			if("poisonberryjuice")
 				icon_state = "poisonberryjuice"
-				name = "Glass of berry juice"
+				name = "glass of berry juice"
 				desc = "Berry juice. Or maybe it's poison. Who cares?"
 			if("carrotjuice")
 				icon_state = "carrotjuice"
-				name = "Glass of  carrot juice"
+				name = "glass of  carrot juice"
 				desc = "It's just like a carrot but without crunching."
 			if("banana")
 				icon_state = "banana"
-				name = "Glass of banana juice"
+				name = "glass of banana juice"
 				desc = "The raw essence of a banana. HONK."
 			if("bahama_mama")
 				icon_state = "bahama_mama"
@@ -409,7 +409,7 @@
 				desc = "Only for the experienced. You think you see sand floating in the glass."
 			if("ice")
 				icon_state = "iceglass"
-				name = "Glass of ice"
+				name = "glass of ice"
 				desc = "Generally, you're supposed to put something else in there too..."
 			if("icecoffee")
 				icon_state = "icedcoffeeglass"
@@ -421,19 +421,19 @@
 				desc = "All natural, antioxidant-rich flavour sensation."
 			if("coffee")
 				icon_state = "glass_brown"
-				name = "Glass of coffee"
+				name = "glass of coffee"
 				desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
 			if("tea")
 				icon_state = "teaglass"
-				name = "Glass of tea"
+				name = "glass of tea"
 				desc = "Drinking it from here would not seem right."
 			if("bilk")
 				icon_state = "glass_brown"
-				name = "Glass of bilk"
+				name = "glass of bilk"
 				desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
 			if("welding_fuel")
 				icon_state = "dr_gibb_glass"
-				name = "Glass of welder fuel"
+				name = "glass of welder fuel"
 				desc = "Unless you're an industrial tool, this is probably not safe for consumption."
 			if("b52")
 				icon_state = "b52glass"
@@ -476,11 +476,11 @@
 				var/image/I = image(icon, "glassoverlay")
 				I.color = mix_color_from_reagents(reagents.reagent_list)
 				overlays += I
-				name = "Glass of ..what?"
+				name = "glass of ..what?"
 				desc = "You can't really tell what this is."
 	else
 		icon_state = "glass_empty"
-		name = "Drinking glass"
+		name = "drinking glass"
 		desc = "Your standard drinking glass."
 		return
 
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index bfb76afccc0..202f6d1efad 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -348,12 +348,13 @@ obj/item/device/camera/siliconcam/proc/selectpicture(var/obj/item/device/camera/
 obj/item/device/camera/siliconcam/proc/viewpichelper(var/obj/item/device/camera/siliconcam/targetloc)
 	var/obj/item/weapon/photo/P = new/obj/item/weapon/photo()
 	var/datum/picture/selection = selectpicture(targetloc)
-	P.photocreate(selection.fields["icon"], selection.fields["img"], selection.fields["desc"])
-	P.pixel_x = selection.fields["pixel_x"]
-	P.pixel_y = selection.fields["pixel_y"]
+	if(selection)
+		P.photocreate(selection.fields["icon"], selection.fields["img"], selection.fields["desc"])
+		P.pixel_x = selection.fields["pixel_x"]
+		P.pixel_y = selection.fields["pixel_y"]
 
-	P.show(usr)
-	usr << P.desc
+		P.show(usr)
+		usr << P.desc
 	qdel(P)    //so 10 thousand picture items are not left in memory should an AI take them and then view them all
 
 obj/item/device/camera/siliconcam/proc/viewpictures(user)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 8cf1fb79d65..9f478f5e14b 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -11,6 +11,9 @@
 		/obj/machinery/chem_heater/,
 		/obj/machinery/reagentgrinder,
 		/obj/machinery/biogenerator,
+		/obj/machinery/r_n_d/destructive_analyzer,
+		/obj/machinery/r_n_d/experimentor,
+		/obj/machinery/autolathe,
 		/obj/structure/table,
 		/obj/structure/rack,
 		/obj/structure/closet,