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

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

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

@@ -62,7 +62,7 @@
 
 /obj/item/weapon/dnainjector/proc/inject(mob/living/M as mob, mob/user as mob)
 	if(istype(M,/mob/living))
-		M.apply_effect(rand(10,25),IRRADIATE,0)
+		M.apply_effect(rand(10,25),IRRADIATE,0,1)
 
 	if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
 		// UI in syringe.
@@ -97,6 +97,7 @@
 		var/mob/living/carbon/human/H = M
 		if(H.species.flags & NO_DNA_RAD)
 			return
+			
 	if (!usr.IsAdvancedToolUser())
 		return
 

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

@@ -55,8 +55,8 @@
 	..()
 
 /obj/item/weapon/shard/Crossed(AM as mob|obj)
-	if(ismob(AM))
-		var/mob/M = AM
+	if(isliving(AM))
+		var/mob/living/M = AM
 		M << "\red <B>You step on \the [src]!</B>"
 		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
 		if(ishuman(M))

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

@@ -31,6 +31,7 @@
 				else
 					src.icon_state = src.icon_closed
 					user << "\red You unlock the [src.name]!"
+					origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
 					return
 			else
 				user << "\red Access Denied"
@@ -58,6 +59,7 @@
 		desc = "It appears to be broken."
 		icon_state = src.icon_broken
 		user << "<span class='notice'>You unlock \the [src].</span>"
+		origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
 		return
 
 /obj/item/weapon/storage/lockbox/loyalty
@@ -89,7 +91,7 @@
 	item_state = "syringe_kit"
 	w_class = 3
 	max_w_class = 2
-	max_combined_w_class = 20 
+	max_combined_w_class = 20
 	storage_slots = 12
 	req_access = list(access_captain)
 	icon_locked = "medalbox+l"