cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where dogs would respond to commands if dead (#58629)

Browse Source
This commit is contained in:
Moose1002
2021-04-24 14:07:34 -07:00
committed by GitHub
parent 2df60d2443
commit 0369dd0918
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/ai/dog/dog_controller.dm
+10 -1
View File
@@ -192,7 +192,9 @@
if(carried_item)
examine_text += "<span class='notice'>[pawn.p_they(TRUE)] [pawn.p_are()] carrying [carried_item.get_examine_string(user)] in [pawn.p_their()] mouth.</span>"
if(blackboard[BB_DOG_FRIENDS][user])
examine_text += "<span class='notice'>[pawn.p_they(TRUE)] seem[pawn.p_s()] happy to see you!</span>"
var/mob/living/living_pawn = pawn
if(!IS_DEAD_OR_INCAP(living_pawn))
examine_text += "<span class='notice'>[pawn.p_they(TRUE)] seem[pawn.p_s()] happy to see you!</span>"
/// If we died, drop anything we were carrying
/datum/ai_controller/dog/proc/on_death(mob/living/ol_yeller)
@@ -250,6 +252,10 @@
if(!COOLDOWN_FINISHED(src, command_cooldown))
return
var/mob/living/living_pawn = pawn
if(IS_DEAD_OR_INCAP(living_pawn))
return
var/spoken_text = speech_args[SPEECH_MESSAGE] // probably should check for full words
var/command
if(findtext(spoken_text, "heel") || findtext(spoken_text, "sit") || findtext(spoken_text, "stay"))
@@ -301,6 +307,9 @@
return
if(!can_see(pawn, pointing_friend, length=AI_DOG_VISION_RANGE) || !can_see(pawn, pointed_movable, length=AI_DOG_VISION_RANGE))
return
var/mob/living/living_pawn = pawn
if(IS_DEAD_OR_INCAP(living_pawn))
return
COOLDOWN_START(src, command_cooldown, AI_DOG_COMMAND_COOLDOWN)