Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

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/disks.dm

@@ -1,15 +1,3 @@
 /obj/item/weapon/disk
 	name = "disk"
 	icon = 'icons/obj/items.dmi'
-
-/obj/item/weapon/disk/nuclear
-	name = "nuclear authentication disk"
-	desc = "Better keep this safe."
-	icon_state = "nucleardisk"
-	item_state = "card-id"
-	w_class = 1.0
-
-/*
-/obj/item/weapon/disk/nuclear/pickup(mob/living/user as mob)
-	if(issyndicate(user))
-		set_security_level(3)*/     //Nuke Ops rework makes stealth approach significantly harder; this makes it damn near impossible; besides, it's horrendously meta.

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
  */

code/game/objects/structures/morgue.dm

@@ -318,9 +318,6 @@
 			return
 
 	else
-		if(!isemptylist(search_contents_for(/obj/item/weapon/disk/nuclear)))
-			usr << "You get the feeling that you shouldn't cremate one of the items in the cremator."
-			return
 		if(!isemptylist(search_contents_for(/obj/item/flag/nation)))
 			usr << "You get the feeling that you shouldn't cremate one of the items in the cremator."
 			return