Fixes human think() emotes. (#9906)

This commit is contained in:
Matt Atlas
2020-09-07 20:33:53 +02:00
committed by GitHub
parent a590c39817
commit 1aefd0de23
19 changed files with 79 additions and 38 deletions
+1 -1
View File
@@ -107,7 +107,7 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th
return
if(!screw_loose && !odd_button && prob(2) && world.time > last_emote + 2 MINUTES)
custom_emote(2, "makes an excited beeping booping sound!")
custom_emote(AUDIBLE_MESSAGE, "makes an excited beeping booping sound!")
last_emote = world.time
if(screw_loose && prob(5)) // Make a mess
+8 -8
View File
@@ -140,7 +140,7 @@
arrest_type = 0
if(isnull(target))
custom_emote(2, "[emote_hear], \"Error, unit is unable to find target in view range!\"")
custom_emote(AUDIBLE_MESSAGE, "[emote_hear], \"Error, unit is unable to find target in view range!\"")
return 0
else
if(ishuman(target))
@@ -155,10 +155,10 @@
if(R && R.security)
R.security.criminal = "*Arrest*"
else
custom_emote(2, "[emote_hear], \"Warning, [target] does not have Security records! Enabling security records check mode!\"")
custom_emote(AUDIBLE_MESSAGE, "[emote_hear], \"Warning, [target] does not have Security records! Enabling security records check mode!\"")
check_records = TRUE
mode = SECBOT_HUNT
custom_emote(2, "[emote_hear], \"[arrest_type ? ("Detaining") : ("Arresting")] [target]\"")
custom_emote(AUDIBLE_MESSAGE, "[emote_hear], \"[arrest_type ? ("Detaining") : ("Arresting")] [target]\"")
/mob/living/bot/secbot/ed209/proc/stay_command(var/mob/speaker,var/text)
walk_to(src, src, 0, move_to_delay)
@@ -166,7 +166,7 @@
auto_patrol = 0
target = null
check_records = FALSE
custom_emote(2, "[emote_hear], \"Roger that, going into idle mode. Auto patrol disabled.\"")
custom_emote(AUDIBLE_MESSAGE, "[emote_hear], \"Roger that, going into idle mode. Auto patrol disabled.\"")
return 1
/mob/living/bot/secbot/ed209/proc/stop_command(var/mob/speaker,var/text)
@@ -174,7 +174,7 @@
return
walk_to(src, src, 0, move_to_delay)
check_records = FALSE
custom_emote(2, "[emote_hear], \"Roger that, unit going offline.\"")
custom_emote(AUDIBLE_MESSAGE, "[emote_hear], \"Roger that, unit going offline.\"")
turn_off()
return 1
@@ -183,7 +183,7 @@
mode = SECBOT_IDLE
auto_patrol = 1
target = null
custom_emote(2, "[emote_hear], \"Roger that, starting patrol now.\"")
custom_emote(AUDIBLE_MESSAGE, "[emote_hear], \"Roger that, starting patrol now.\"")
return 1
/mob/living/bot/secbot/ed209/proc/follow_command(var/mob/speaker,var/text)
@@ -191,7 +191,7 @@
if(findtext(text,"me"))
mode = SECBOT_FOLLOW
target = speaker
custom_emote(2, "[emote_hear], \"Roger that, following you\"")
custom_emote(AUDIBLE_MESSAGE, "[emote_hear], \"Roger that, following you\"")
return 1
target = get_target_by_name(text)
@@ -202,7 +202,7 @@
return 0
mode = SECBOT_FOLLOW
custom_emote(2, "[emote_hear], \"Roger that, following [target]\"")
custom_emote(AUDIBLE_MESSAGE, "[emote_hear], \"Roger that, following [target]\"")
return 1
+1 -1
View File
@@ -115,7 +115,7 @@
addTiles(1)
if(prob(5))
custom_emote(2, "makes an excited booping beeping sound!")
custom_emote(AUDIBLE_MESSAGE, "makes an excited booping beeping sound!")
/mob/living/bot/floorbot/think()
..()
+1 -1
View File
@@ -68,7 +68,7 @@
if(last_newpatient_speak + 300 < world.time)
var/message = pick("Hey, [H.name]! Hold on, I'm coming.", "Wait [H.name]! I want to help!", "[H.name], you appear to be injured!")
say(message)
custom_emote(1, "points at [H.name].")
custom_emote(VISIBLE_MESSAGE, "points at [H.name].")
last_newpatient_speak = world.time
break
+1 -1
View File
@@ -354,7 +354,7 @@
if(threat >= 4)
target = M
say("Level [threat] infraction alert!")
custom_emote(1, "points at [M.name]!")
custom_emote(VISIBLE_MESSAGE, "points at [M.name]!")
mode = SECBOT_HUNT
break
return