Conflict fix.

code/modules/admin/verbs/vox_raiders.dm

@@ -60,9 +60,10 @@ var/global/vox_tick = 1
 	var/obj/item/weapon/card/id/syndicate/W = new(src)
 	W.name = "[real_name]'s Legitimate Human ID Card"
 	W.icon_state = "id"
-	W.access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage, access_syndicate)
+	W.access = list(access_syndicate)
 	W.assignment = "Trader"
 	W.registered_name = real_name
+	W.registered_user = src
 	equip_to_slot_or_del(W, slot_wear_id)
 
 	var/obj/item/weapon/implant/cortical/I = new(src)
@@ -75,6 +76,7 @@ var/global/vox_tick = 1
 	if(ticker.mode && ( istype( ticker.mode,/datum/game_mode/heist ) ) )
 		var/datum/game_mode/heist/M = ticker.mode
 		M.cortical_stacks += I
+		M.raiders[mind] = I
 
 	vox_tick++
 	if (vox_tick > 4) vox_tick = 1

code/modules/clothing/shoes/magboots.dm

@@ -2,6 +2,7 @@
 	desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
 	name = "magboots"
 	icon_state = "magboots0"
+	species_restricted = null
 	var/magpulse = 0
 //	flags = NOSLIP //disabled by default
 

code/modules/mob/new_player/sprite_accessories.dm

@@ -521,7 +521,6 @@
 		name = "Short Vox Quills"
 		icon_state = "vox_shortquills"
 		species_allowed = list("Vox")
-		do_colouration = 0
 
 /datum/sprite_accessory/facial_hair
 

code/modules/projectiles/guns/energy/special.dm

@@ -63,6 +63,15 @@ obj/item/weapon/gun/energy/staff
 
 	update_icon()
 		return
+
+
+	click_empty(mob/user = null)
+		if (user)
+			user.visible_message("*fizzle*", "\red <b>*fizzle*</b>")
+		else
+			src.visible_message("*fizzle*")
+		playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 1)
+
 /obj/item/weapon/gun/energy/staff/animate
 	name = "staff of animation"
 	desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."

code/modules/projectiles/projectile.dm

@@ -112,27 +112,25 @@
 					M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
 					msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[firer.x];Y=[firer.y];Z=[firer.z]'>JMP</a>)") //BS12 EDIT ALG
 
-		spawn(0)
-
-			if(A)
-				if (!forcedodge)
-					forcedodge = A.bullet_act(src, def_zone) // searches for return value
-				if(forcedodge == -1) // the bullet passes through a dense object!
-					bumped = 0 // reset bumped variable!
-					if(istype(A, /turf))
-						loc = A
-					else
-						loc = A.loc
-					permutated.Add(A)
-					return 0
-				if(istype(A,/turf))
-					for(var/obj/O in A)
-						O.bullet_act(src)
-					for(var/mob/M in A)
-						M.bullet_act(src, def_zone)
-				density = 0
-				invisibility = 101
-				del(src)
+		if(A)
+			if (!forcedodge)
+				forcedodge = A.bullet_act(src, def_zone) // searches for return value
+			if(forcedodge == -1) // the bullet passes through a dense object!
+				bumped = 0 // reset bumped variable!
+				if(istype(A, /turf))
+					loc = A
+				else
+					loc = A.loc
+				permutated.Add(A)
+				return 0
+			if(istype(A,/turf))
+				for(var/obj/O in A)
+					O.bullet_act(src)
+				for(var/mob/M in A)
+					M.bullet_act(src, def_zone)
+			density = 0
+			invisibility = 101
+			del(src)
 		return 1
 
 

code/modules/projectiles/projectile/animate.dm

@@ -7,7 +7,7 @@
 	flag = "energy"
 
 /obj/item/projectile/animate/Bump(var/atom/change)
-	. = ..()
-	if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects))
+	if((istype(change, /obj/item) || istype(change, /obj/structure)) && !is_type_in_list(change, protected_objects))
 		var/obj/O = change
 		new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer)
+	..()

code/modules/reagents/dartgun.dm

@@ -29,7 +29,7 @@
 	var/obj/item/weapon/dart_cartridge/cartridge = null //Container of darts.
 	var/max_beakers = 3
 	var/dart_reagent_amount = 15
-	var/container_type = /obj/item/weapon/reagent_containers/glass/beaker/vial
+	var/container_type = /obj/item/weapon/reagent_containers/glass/beaker
 	var/list/starting_chems = null
 
 /obj/item/weapon/gun/dartgun/update_icon()
@@ -51,7 +51,7 @@
 	..()
 	if(starting_chems)
 		for(var/chem in starting_chems)
-			var/obj/item/weapon/reagent_containers/glass/beaker/vial/B = new(src)
+			var/obj/B = new container_type(src)
 			B.reagents.add_reagent(chem, 50)
 			beakers += B
 	cartridge = new /obj/item/weapon/dart_cartridge(src)
@@ -97,7 +97,7 @@
 			user << "\blue [I] doesn't seem to fit into [src]."
 			return
 		if(beakers.len >= max_beakers)
-			user << "\blue [src] already has [max_beakers] vials in it - another one isn't going to fit!"
+			user << "\blue [src] already has [max_beakers] beakers in it - another one isn't going to fit!"
 			return
 		var/obj/item/weapon/reagent_containers/glass/beaker/B = I
 		user.drop_item()

code/modules/virus2/effect.dm

@@ -141,6 +141,7 @@
 				H << "<span class='notice'>You can't feel your [E.display_name] anymore...</span>"
 				for (var/datum/organ/external/C in E.children)
 					C.status |= ORGAN_DEAD
+			H.update_body(1)
 		mob.adjustToxLoss(15*multiplier)
 
 	deactivate(var/mob/living/carbon/mob,var/multiplier)
@@ -150,6 +151,7 @@
 				E.status &= ~ORGAN_DEAD
 				for (var/datum/organ/external/C in E.children)
 					C.status &= ~ORGAN_DEAD
+			H.update_body(1)
 
 /datum/disease2/effect/immortal
 	name = "Longevity Syndrome"