Merge remote-tracking branch 'refs/remotes/origin/master' into guns

code/datums/autolathe/arms.dm

@@ -132,9 +132,9 @@
 	path =/obj/item/ammo_magazine/m10mm
 	hidden = 1
 
-/datum/category_item/autolathe/arms/pistol_50
-	name = "pistol magazine (.50AE)"
-	path =/obj/item/ammo_magazine/m50
+/datum/category_item/autolathe/arms/pistol_44
+	name = "pistol magazine (.44)"
+	path =/obj/item/ammo_magazine/m44
 	hidden = 1
 
 /////// 5.56mm
@@ -225,9 +225,9 @@
 	category = "Arms and Ammunition"
 	hidden = 1
 
-/datum/category_item/autolathe/arms/pistol_50
-	name = "pistol magazine (.50AE)"
-	path =/obj/item/ammo_magazine/m50/empty
+/datum/category_item/autolathe/arms/pistol_44
+	name = "pistol magazine (.44)"
+	path =/obj/item/ammo_magazine/m44/empty
 	category = "Arms and Ammunition"
 	hidden = 1
 
@@ -340,7 +340,7 @@
 	hidden = 1
 
 /datum/category_item/autolathe/arms/pistol_clip_50
-	name = "ammo clip (.50AE)"
+	name = "ammo clip (.44)"
 	path =/obj/item/ammo_magazine/clip/c50
 	category = "Arms and Ammunition"
 	hidden = 1

code/datums/mind.dm

@@ -490,6 +490,8 @@
 			world.log << "## DEBUG: mind_initialize(): No ticker ready yet! Please inform Carn"
 	if(!mind.name)	mind.name = real_name
 	mind.current = src
+	if(player_is_antag(mind))
+		src.client.verbs += /client/proc/aooc
 
 //HUMAN
 /mob/living/carbon/human/mind_initialize()

code/datums/supplypacks/medical.dm

@@ -331,7 +331,7 @@
 
 /datum/supply_packs/med/defib
 	name = "Defibrilator crate"
-	contains = list(/obj/item/device/defib_kit = 4)
+	contains = list(/obj/item/device/defib_kit = 2)
 	cost = 30
 	containertype = /obj/structure/closet/crate/medical
 	containername = "Defibrilator crate"

code/datums/supplypacks/robotics.dm

@@ -159,7 +159,7 @@
 			/obj/item/device/kit/paint/gygax/recitence
 			)
 	name = "Random Gygax exosuit modkit"
-
+/*
 /datum/supply_packs/robotics/jumper_cables
 	name = "Jumper kit crate"
 	contains = list(
@@ -168,4 +168,5 @@
 	cost = 30
 	containertype = /obj/structure/closet/crate/secure/science
 	containername = "Jumper kit crate"
-	access = access_robotics
+	access = access_robotics
+*/