Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1

Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt

code/modules/mining/equipment_locker.dm

@@ -192,7 +192,7 @@
 	updateUsrDialog()
 	return
 
-/obj/machinery/mineral/ore_redemption/ex_act(severity, specialty)
+/obj/machinery/mineral/ore_redemption/ex_act(severity, target)
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(5, 1, src)
 	s.start()
@@ -357,7 +357,7 @@
 			new /obj/item/device/t_scanner/adv_mining_scanner(src.loc)
 	qdel(voucher)
 
-/obj/machinery/mineral/equipment_vendor/ex_act(severity, specialty)
+/obj/machinery/mineral/equipment_vendor/ex_act(severity, target)
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(5, 1, src)
 	s.start()

code/modules/mining/laborcamp/laborstacker.dm

@@ -59,15 +59,14 @@
 
 
 /obj/machinery/mineral/labor_claim_console/attackby(obj/item/I as obj, mob/user as mob)
-	if(istype(I, /obj/item/weapon/card/emag))
-		emagged = 1
-		user << "<span class='warning'>PZZTTPFFFT</span>"
-		return
-	else if(istype(I, /obj/item/weapon/card/id))
+	if(istype(I, /obj/item/weapon/card/id))
 		return attack_hand(user)
 	..()
 
-
+/obj/machinery/mineral/labor_claim_console/emag_act(mob/user as mob)
+	if(!emagged)
+		emagged = 1
+		user << "<span class='warning'>PZZTTPFFFT</span>"
 
 
 

code/modules/mining/mine_turfs.dm

@@ -18,7 +18,7 @@
 	var/scan_state = null //Holder for the image we display when we're pinged by a mining scanner
 	var/hidden = 1
 
-/turf/simulated/mineral/ex_act(severity, specialty)
+/turf/simulated/mineral/ex_act(severity, target)
 	..()
 	switch(severity)
 		if(3.0)
@@ -496,8 +496,8 @@
 /turf/simulated/floor/plating/asteroid/burn_tile()
 	return
 
-/turf/simulated/floor/plating/asteroid/ex_act(severity, specialty)
-	contents_explosion(src, severity, specialty)
+/turf/simulated/floor/plating/asteroid/ex_act(severity, target)
+	contents_explosion(severity, target)
 	switch(severity)
 		if(3.0)
 			return
@@ -509,7 +509,7 @@
 	return
 
 /turf/simulated/floor/plating/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob)
-
+	//note that this proc does not call ..()
 	if(!W || !user)
 		return 0
 
@@ -572,10 +572,6 @@
 				O.attackby(W,user)
 				return
 
-	else
-		..(W,user)
-	return
-
 /turf/simulated/floor/plating/asteroid/proc/gets_dug()
 	if(dug)
 		return

code/modules/mining/satchel_ore_boxdm.dm

@@ -83,6 +83,6 @@
 	src.updateUsrDialog()
 	return
 
-obj/structure/ore_box/ex_act(severity, specialty)
+obj/structure/ore_box/ex_act(severity, target)
 	if(prob(100 / severity) && severity < 3)
 		qdel(src) //nothing but ores can get inside unless its a bug and ores just return nothing on ex_act, not point in calling it on them