Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

code/game/objects/items/devices/paicard.dm

@@ -6,7 +6,7 @@
 	w_class = 2.0
 	slot_flags = SLOT_BELT
 	origin_tech = "programming=2"
-	var/request_cooldown = 60 // one minute
+	var/request_cooldown = 5 // five seconds
 	var/last_request
 	var/obj/item/device/radio/radio
 	var/looking_for_personality = 0

code/game/objects/items/devices/radio/headset.dm

@@ -57,13 +57,14 @@
 
 	return ..()
 
-/obj/item/device/radio/headset/receive_range(freq, level, aiOverride = 0)
-	if (aiOverride)
-		return ..(freq, level)
-	if(ishuman(src.loc))
-		var/mob/living/carbon/human/H = src.loc
+/obj/item/device/radio/headset/receive_range(freq, level)
+	if(ishuman(loc))
+		var/mob/living/carbon/human/H = loc
 		if(H.l_ear == src || H.r_ear == src)
 			return ..(freq, level)
+	else if(isanimal(loc))
+		// frankly, all the ones with inventory are small enough to not warrant snowflaking the slot check somehow
+		return ..(freq, level)
 	return -1
 
 /obj/item/device/radio/headset/alt