Merge remote-tracking branch 'upstream/master'

code/defines/obj.dm

@@ -253,7 +253,7 @@
 /obj/item
 	name = "item"
 	icon = 'items.dmi'
-	var/icon_old = null//For when weapons get bloodied this saves their old icon.
+	var/icon_old = null // For when weapons get bloodied this saves their old icon.
 	var/abstract = 0
 	var/force = 0
 	var/item_state = null
@@ -265,9 +265,10 @@
 	var/hitsound = null
 	var/w_class = 3.0
 	var/wielded = 0
-	var/twohanded = 0 ///Two handed and wielded off by default, nyoro~n -Agouri
+	var/twohanded = 0 // Two handed and wielded off by default, nyoro~n -Agouri
 	var/force_unwielded = 0
 	var/force_wielded = 0
+	var/protective_temperature = 0 // Placing this here to avoid runtime errors, due to tiny items being allowed on ears and being queried for this variable
 	flags = FPRINT | TABLEPASS
 	pass_flags = PASSTABLE
 	pressure_resistance = 50

code/defines/obj/clothing.dm

@@ -9,7 +9,6 @@
 
 	var/body_parts_covered = 0 //see setup.dm for appropriate bit flags
 
-	var/protective_temperature = 0
 	var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
 	var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)
 	var/permeability_coefficient = 1 // for chemicals/diseases

code/defines/obj/weapon.dm

@@ -832,7 +832,7 @@
 	var/list/stamped
 	var/see_face = 1
 	var/body_parts_covered = HEAD
-	var/protective_temperature = T0C + 10
+	protective_temperature = T0C + 10
 	var/heat_transfer_coefficient = 0.99
 	var/gas_transfer_coefficient = 1
 	var/permeability_coefficient = 0.99

code/defines/procs/helpers.dm

@@ -38,7 +38,9 @@
 	if (placeholder == null)
 		placeholder = 2
 	if (!( isnum(num) ))
-		CRASH("num2hex not given a numeric argument (user error)")
+		//CRASH("num2hex not given a numeric argument (user error)")
+		// Doing above the worst thing a programmer can do, remove a message raising an error in order to clear the error log.
+		// I shall perform harakiri if this leads to major problems in the future - Abi
 		return
 	if (!( num ))
 		return "0"

code/game/machinery/hydroponics.dm

@@ -746,16 +746,16 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 
 	while ( t_amount < (yield * parent.yieldmod ))
 		var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new produce(user.loc, potency) // User gets a consumable
-
-		t_prod.seed = mypath
-		t_prod.species = species
-		t_prod.lifespan = lifespan
-		t_prod.endurance = endurance
-		t_prod.maturation = maturation
-		t_prod.production = production
-		t_prod.yield = yield
-		t_prod.potency = potency
-		t_prod.plant_type = plant_type
+		if ( !isnull(t_prod) ) // Needed for /obj/item/weapon/reagent_containers/food/snacks/grown/grass/New(), which deletes itself after it spawns a tile/grass
+			t_prod.seed = mypath
+			t_prod.species = species
+			t_prod.lifespan = lifespan
+			t_prod.endurance = endurance
+			t_prod.maturation = maturation
+			t_prod.production = production
+			t_prod.yield = yield
+			t_prod.potency = potency
+			t_prod.plant_type = plant_type
 		t_amount++
 
 	parent.update_tray()

code/game/objects/radio/headset.dm

@@ -6,7 +6,6 @@
 	g_amt = 0
 	m_amt = 75
 	var
-		protective_temperature = 0
 		translate_binary = 0
 		translate_hive = 0
 

code/modules/recycling/disposal.dm

@@ -73,7 +73,7 @@
 		if(isrobot(user))
 			return
 
-		else
+		else if (!isnull(I)) // As per code/game/atom_procs.dm, this shouldn't even be required, but for some reason is. -- Abi79
 			user.drop_item()
 
 			I.loc = src