Fixes conflicts in icons/obj/gun.dmi.

code/game/objects/items/robot/robot_upgrades.dm

@@ -39,6 +39,7 @@
 	R.speech_synthesizer_langs = list()
 	R.notify_ai(2)
 	R.updateicon()
+	R.add_language("Robot Talk", 1)
 
 	return 1
 

code/game/objects/items/weapons/AI_modules.dm

@@ -106,18 +106,18 @@ AI MODULES
 
 /obj/item/weapon/aiModule/zeroth/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	if(target.laws.zeroth)
-		if(removeownlaw && (laws[1] == target.laws.zeroth))
+		if(removeownlaw && (src.type == target.laws.zeroth_type))
 			target.clear_zeroth_law()
-			return 2
+			return 1
 		else
 			target << "[sender.real_name] attempted to modify your zeroth law."
 			target << "It would be in your best interest to play along with [sender.real_name] that:"
 			for(var/failedlaw in laws)
 				target << "[failedlaw]"
-			return 1
+			return 2
 
 	for(var/templaw in laws)
-		target.set_zeroth_law(templaw)
+		target.set_zeroth_law(templaw, null, src.type)
 
 /obj/item/weapon/aiModule/ion/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	for(var/templaw in laws)
@@ -175,10 +175,11 @@ AI MODULES
 	..()
 
 /obj/item/weapon/aiModule/zeroth/oneHuman/transmitInstructions(var/mob/living/silicon/target, var/mob/sender)
-	if(..() == 1)
-		return "[targetName], but the AI's existing zeroth law cannot be overriden."
-	if(..() == 2)
+	var/result = ..()
+	if(result == 1)
 		return "The AI's zeroth law has been overridden."
+	if(result == 2)
+		return "[targetName], but the AI's existing zeroth law cannot be overriden."
 	return targetName
 
 
@@ -204,9 +205,9 @@ AI MODULES
 /obj/item/weapon/aiModule/zeroth/quarantine/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	var/result = ..()
 	if(result == 1)
-		return "The AI's existing zeroth law cannot be overriden."
-	if(result == 2)
 		return "The AI's zeroth law has been overridden."
+	if(result == 2)
+		return "The AI's existing zeroth law cannot be overriden."		
 	return laws[1]
 
 /******************** OxygenIsToxicToHumans ********************/

code/game/objects/items/weapons/kitchen.dm

@@ -155,6 +155,7 @@
 	name = "combat knife"
 	force = 15.0
 	throwforce = 10.0
+	w_class = 2
 	origin_tech = "materials=2;combat=2"
 	desc = "A razor sharp knife, built from advanced alloys, designed for quick, melee killing. Also not half bad as a kitchen knife."
 	slot_flags = SLOT_BELT

code/game/objects/items/weapons/storage/belt.dm

@@ -101,6 +101,18 @@
 		"/obj/item/device/sensor_device"
 	)
 
+/obj/item/weapon/storage/belt/medical/response_team
+
+/obj/item/weapon/storage/belt/medical/response_team/New()
+	new /obj/item/weapon/reagent_containers/pill/salbutamol(src)
+	new /obj/item/weapon/reagent_containers/pill/salbutamol(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/charcoal(src)
+	new /obj/item/weapon/reagent_containers/pill/salicylic(src)
+	new /obj/item/weapon/reagent_containers/pill/salicylic(src)
+	new /obj/item/weapon/reagent_containers/pill/salicylic(src)
+
+
 /obj/item/weapon/storage/belt/botany
 	name = "botanist belt"
 	desc = "Can hold various botanical supplies."

code/game/objects/items/weapons/storage/firstaid.dm

@@ -150,6 +150,28 @@
 	new /obj/item/clothing/glasses/hud/health/night(src)
 	return
 
+/obj/item/weapon/storage/firstaid/surgery
+	name = "field surgery kit"
+	icon_state = "duffel-med"
+	desc = "A kit for surgery in the field."
+	max_w_class = 4
+	storage_slots = 10
+	can_hold = list("/obj/item/roller","/obj/item/weapon/bonesetter","/obj/item/weapon/bonegel", "/obj/item/weapon/scalpel", "/obj/item/weapon/hemostat",
+		"/obj/item/weapon/cautery", "/obj/item/weapon/retractor", "/obj/item/weapon/FixOVein", "/obj/item/weapon/surgicaldrill", "/obj/item/weapon/circular_saw")
+
+/obj/item/weapon/storage/firstaid/surgery/New()
+	..()
+	new /obj/item/roller(src)
+	new /obj/item/weapon/bonesetter(src)
+	new /obj/item/weapon/bonegel(src)
+	new /obj/item/weapon/scalpel(src)
+	new /obj/item/weapon/hemostat(src)
+	new /obj/item/weapon/cautery(src)
+	new /obj/item/weapon/retractor(src)
+	new /obj/item/weapon/FixOVein(src)
+	new /obj/item/weapon/surgicaldrill(src)
+	new /obj/item/weapon/circular_saw(src)
+
 /*
  * Pill Bottles
  */