Merge branch 'master' into development

code/modules/antag_contest/contest_objective.dm

@@ -59,12 +59,16 @@
 
 	var/params[] = list(":ckey" = owner.current.client.ckey, ":char_id" = owner.current.client.prefs.current_character, ":char_faction" = INDEP, ":obj_type" = type_name, ":obj_side" = side, ":obj_outcome" = completed)
 
-	var/list/faction_data = contest_faction_data(get_query.item[1])
-	params[":char_faction"] = faction_data[1]
+	if (get_query.NextRow())
+		var/list/faction_data = contest_faction_data(get_query.item[1])
+		params[":char_faction"] = faction_data[1]
 
 	var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO ss13_contest_reports (id, player_ckey, character_id, character_faction, objective_type, objective_side, objective_outcome, objective_datetime) VALUES (NULL, :ckey, :char_id, :char_faction, :obj_type, :obj_side, :obj_outcome, NOW())")
 	log_query.Execute(params)
 
+	if (log_query.ErrorMsg())
+		log_debug("CONTEST: Error uploading results. Datadump: [list2params(params)]")
+
 /*
  * Pro-synth objectives
  */
@@ -161,6 +165,9 @@
 
 	return ..()
 
+/datum/objective/competition/pro_synth/protect
+	type_name = "pro_synth/protect"
+
 /datum/objective/competition/pro_synth/protect/find_target()
 	..(1)
 	if (target && target.current)
@@ -245,6 +252,9 @@
 
 	return ..()
 
+/datum/objective/competition/anti_synth/demote
+	type_name = "anti_synth/demote"
+
 /datum/objective/competition/anti_synth/demote/find_target()
 	..(1)
 	if (target && target.current)

code/modules/mob/living/simple_animal/friendly/spiderbot.dm

@@ -24,8 +24,8 @@
 
 	wander = 0
 
-	health = 10
-	maxHealth = 10
+	health = 25
+	maxHealth = 25
 	hunger_enabled = 0
 
 	attacktext = "shocked"
@@ -212,10 +212,12 @@
 	if(camera)
 		camera.status = 0
 
-	held_item.loc = src.loc
-	held_item = null
+	if (held_item)
+		held_item.loc = src.loc
+		held_item = null
 
-	gibs(loc, viruses, null, null, /obj/effect/gibspawner/robot) //TODO: use gib() or refactor spiderbots into synthetics.
+	eject_brain()
+	gibs(loc, viruses, null, /obj/effect/gibspawner/robot) //TODO: use gib() or refactor spiderbots into synthetics.
 	qdel(src)
 	return
 

code/modules/mob/mob_helpers.dm

@@ -4,6 +4,41 @@
 		return 1
 	return 0
 
+/proc/ishuman_species(A)
+	if(istype(A, /mob/living/carbon/human) && (A:get_species() == "Human"))
+		return 1
+	return 0
+
+/proc/isunathi(A)
+	if(istype(A, /mob/living/carbon/human) && (A:get_species() == "Unathi"))
+		return 1
+	return 0
+
+/proc/istajara(A)
+	if(istype(A, /mob/living/carbon/human) && (A:get_species() == "Tajara"))
+		return 1
+	return 0
+
+/proc/isskrell(A)
+	if(istype(A, /mob/living/carbon/human) && (A:get_species() == "Skrell"))
+		return 1
+	return 0
+
+/proc/isvaurca(A)
+	if(istype(A, /mob/living/carbon/human) && (A:get_species() == "Vaurca"))
+		return 1
+	return 0
+
+/proc/isipc(A)
+	if(istype(A, /mob/living/carbon/human) && (A:get_species() == "Machine"))
+		return 1
+	return 0
+
+/proc/isvox(A)
+	if(istype(A, /mob/living/carbon/human) && (A:get_species() == "Vox"))
+		return 1
+	return 0
+
 /proc/isalien(A)
 	if(istype(A, /mob/living/carbon/alien))
 		return 1

code/modules/reagents/Chemistry-Recipes.dm

@@ -476,7 +476,6 @@
 /datum/chemical_reaction/explosion_potassium/on_reaction(var/datum/reagents/holder, var/created_volume)
 	var/datum/effect/effect/system/reagents_explosion/e = new()
 	e.set_up(round (created_volume/10, 1), holder.my_atom, 0, 0)
-	e.holder_damage(holder.my_atom)
 	if(isliving(holder.my_atom))
 		e.amount *= 0.5
 		var/mob/living/L = holder.my_atom
@@ -542,7 +541,6 @@
 /datum/chemical_reaction/nitroglycerin/on_reaction(var/datum/reagents/holder, var/created_volume)
 	var/datum/effect/effect/system/reagents_explosion/e = new()
 	e.set_up(round (created_volume/2, 1), holder.my_atom, 0, 0)
-	e.holder_damage(holder.my_atom)
 	if(isliving(holder.my_atom))
 		e.amount *= 0.5
 		var/mob/living/L = holder.my_atom
@@ -1978,7 +1976,7 @@
 	result = "white_coffee"
 	required_reagents = list("milk" = 1, "blackcoffee" = 2)
 	result_amount = 2
-	
+
 //aurora's drinks
 
 /datum/chemical_reaction/daiquiri
@@ -2064,7 +2062,7 @@
 	result = "deweycocktail"
 	required_reagents = list("cremeyvette" = 1, "gin" = 1, "grenadine" = 1)
 	result_amount = 3
-	
+
 /datum/chemical_reaction/rustynail
 	name = "Rusty Nail"
 	id = "rustynail"