Skip to content

Commit

Permalink
species vars and prep for resolving merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
blackdragonTOW committed Jun 19, 2024
1 parent c1ab5b6 commit 78282dd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions code/game/objects/items/devices/scanners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/pamphlets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 78282dd

Please sign in to comment.