From be97382c265d62d5daa268018fe0c1faac28dd54 Mon Sep 17 00:00:00 2001
From: Citinited <kendo123@hotmail.co.uk>
Date: Sat, 8 Jul 2017 09:32:17 +0100
Subject: [PATCH] Tigercat & Fox tweaks

---
 code/game/machinery/doors/airlock.dm                    | 7 ++++---
 code/game/objects/effects/mines.dm                      | 4 ++--
 code/modules/mob/living/simple_animal/friendly/corgi.dm | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 0313a054b57..80a4a36ee44 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -646,9 +646,10 @@ About the new airlock wires panel:
 			if(user)
 				src.attack_ai(user)
 
-/obj/machinery/door/airlock/CanPass(obj/item/mover)
-	if(isElectrified() && density)
-		if(mover.flags & CONDUCT)
+/obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target, height=0)
+	if(isElectrified() && density && istype(mover, /obj/item))
+		var/obj/item/I = mover
+		if(I.flags & CONDUCT)
 			var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
 			s.set_up(5, 1, src)
 			s.start()
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 7cee28286df..26582219a9e 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -57,11 +57,11 @@
 	var/radiation_amount
 
 /obj/effect/mine/dnascramble/mineEffect(mob/living/victim)
+	victim.apply_effect(radiation_amount, IRRADIATE, 0)
 	if(ishuman(victim))
 		var/mob/living/carbon/human/V = victim
-		if(V.species.flags & (RADIMMUNE | NO_DNA))
+		if(V.species.flags & NO_DNA)
 			return
-	victim.apply_effect(radiation_amount, IRRADIATE, 0)
 	randmutb(victim)
 	domutcheck(victim ,null)
 
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 8d2c5242970..8338a225010 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -61,7 +61,7 @@
 		dat += "<tr><td>&nbsp;</td></tr>"
 		dat += "<tr><td><B>Collar:</B></td><td><A href='?src=[UID()];item=[slot_collar]'>[(collar && !(collar.flags&ABSTRACT)) ? collar : "<font color=grey>Empty</font>"]</A></td></tr>"
 	if(facehugger)
-		dat += "<tr><td><B>Facehugger:</B></td><td><A href='?src=[UID()];["remove_hugger"]=remove_hugger'>[facehugger]</A></td></tr>"
+		dat += "<tr><td><B>Facehugger:</B></td><td><A href='?src=[UID()];remove_hugger=1'>[facehugger]</A></td></tr>"
 	dat += {"</table>
 	<A href='?src=[user.UID()];mach_close=mob\ref[src]'>Close</A>
 	"}
@@ -104,7 +104,7 @@
 
 /mob/living/simple_animal/pet/corgi/Topic(href, href_list)
 	if(usr.stat) return
-	if(!Adjacent(usr) || !(ishuman(usr) || isrobot(usr) ||  isalienadult(usr)))
+	if((!ishuman(usr) && !isrobot(usr)) || !Adjacent(usr))
 		return
 	//Removing from inventory
 	if(href_list["remove_inv"])