diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index b02e6a4f7a29..6869ce1332d3 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -497,6 +497,7 @@ K9 SCANNER var/mob/living/carbon/human/tracked_k9 /obj/item/device/k9_scanner/Destroy() + . = ..() tracked_k9 = null /obj/item/device/k9_scanner/attack(mob/attacked_mob as mob, mob/user as mob) diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm index 8806e33be889..01f35e3e7d19 100644 --- a/code/game/objects/items/pamphlets.dm +++ b/code/game/objects/items/pamphlets.dm @@ -107,12 +107,12 @@ bypass_pamphlet_limit = TRUE /obj/item/pamphlet/skill/k9_handler/can_use(mob/living/carbon/human/user) - if(issynthk9(user)) + if(isk9synth(user)) to_chat(user, SPAN_WARNING("You don't need to use this! Give it to another marine to make them your handler.")) return FALSE - if(user.job != JOB_SQUAD_MEDIC) - to_chat(user, SPAN_WARNING("Only squad corpsmen can use this.")) + if(user.job != JOB_SQUAD_MEDIC && user.job != JOB_POLICE) + to_chat(user, SPAN_WARNING("This is not meant for you.")) return var/obj/item/card/id/ID = user.wear_id diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index b76bb68ce78a..20615ad097c6 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -748,10 +748,10 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, return var/fire_sprite_sheet var/fire_sprite_prefix - if (istype(species, /datum/species/monkey)) //Point towards burning sprites for monkeys + if (ismonkey(src)) //Point towards burning sprites for monkeys fire_sprite_sheet = 'icons/mob/humans/onmob/OnFire.dmi' fire_sprite_prefix = "monkey" - else if (istype(species, /datum/species/synthetic/synth_k9)) //Point towards burning sprites for k9_synths + else if (isk9synth(src)) //Point towards burning sprites for k9_synths fire_sprite_sheet = 'icons/mob/humans/onmob/OnFire.dmi' fire_sprite_prefix = "k9" else //Default to human shaped fire sprites