Bot code improvements - Medibots (#63471)

_maps/map_files/generic/CentCom.dmm

@@ -824,11 +824,10 @@
 /turf/open/floor/stone,
 /area/centcom/holding)
 "dr" = (
-/mob/living/simple_animal/bot/medbot{
+/mob/living/simple_animal/bot/medbot/stationary{
 	desc = "A little medical robot. You can make out the word \"sincerity\" on its chassis.";
 	name = "Hijikata";
-	radio_key = null;
-	stationary_mode = 1
+	radio_key = null
 	},
 /turf/open/floor/wood/large,
 /area/centcom/holding)
@@ -1595,11 +1594,10 @@
 /turf/open/floor/iron,
 /area/tdome/arena)
 "gV" = (
-/mob/living/simple_animal/bot/medbot{
+/mob/living/simple_animal/bot/medbot/stationary{
 	desc = "When engaged in combat, the vanquishing of thine enemy can be the warrior's only concern.";
 	name = "Momo";
-	radio_key = null;
-	stationary_mode = 1
+	radio_key = null
 	},
 /turf/open/floor/sepia,
 /area/centcom/holding)
@@ -14934,11 +14932,10 @@
 /turf/open/floor/iron/dark,
 /area/centcom/admin)
 "Sa" = (
-/mob/living/simple_animal/bot/medbot{
+/mob/living/simple_animal/bot/medbot/stationary{
 	desc = "When engaged in combat, the vanquishing of thine enemy can be the warrior's only concern.";
 	name = "Hattori";
-	radio_key = null;
-	stationary_mode = 1
+	radio_key = null
 	},
 /turf/open/floor/sepia,
 /area/centcom/holding)
@@ -44151,7 +44148,7 @@ es
 bu
 fO
 Pf
-hb
+Sa
 cH
 fO
 Oe
@@ -44408,7 +44405,7 @@ AG
 AG
 Up
 hb
-Sa
+hb
 ge
 fO
 UC

code/__DEFINES/robots.dm

@@ -170,3 +170,11 @@
 #define SECBOT_CHECK_RECORDS (1<<3)
 ///Whether we will stun & cuff or endlessly stun
 #define SECBOT_HANDCUFF_TARGET (1<<4)
+
+//MedBOT defines
+///Whether to declare if someone (we are healing) is in critical condition
+#define MEDBOT_DECLARE_CRIT (1<<0)
+///If the bot will stand still, only healing those next to it.
+#define MEDBOT_STATIONARY_MODE (1<<1)
+///Whether the bot will randomly speak from time to time. This will not actually prevent all speech.
+#define MEDBOT_SPEAK_MODE (1<<2)

code/modules/mob/living/simple_animal/bot/bot.dm

@@ -182,8 +182,8 @@
 	balloon_alert(src, "turned off")
 	update_appearance()
 
-/mob/living/simple_animal/bot/proc/get_bot_flag(checked_flag)
-	if(bot_mode_flags & checked_flag)
+/mob/living/simple_animal/bot/proc/get_bot_flag(checked_mode, checked_flag)
+	if(checked_mode & checked_flag)
 		return TRUE
 	return FALSE
 
@@ -946,7 +946,7 @@ Pass a positive integer as an argument to override a bot's default speed.
 	return
 
 /mob/living/simple_animal/bot/update_icon_state()
-	icon_state = "[initial(icon_state)][get_bot_flag(BOT_MODE_ON)]"
+	icon_state = "[initial(icon_state)][get_bot_flag(bot_mode_flags, BOT_MODE_ON)]"
 	return ..()
 
 /mob/living/simple_animal/bot/proc/topic_denied(mob/user) //Access check proc for bot topics! Remember to place in a bot's individual Topic if desired.

code/modules/mob/living/simple_animal/bot/cleanbot.dm

@@ -138,7 +138,7 @@
 		if(BOT_CLEANING)
 			icon_state = "[base_icon]-c"
 		else
-			icon_state = "[base_icon][get_bot_flag(BOT_MODE_ON)]"
+			icon_state = "[base_icon][get_bot_flag(bot_mode_flags, BOT_MODE_ON)]"
 
 /mob/living/simple_animal/bot/cleanbot/bot_reset()
 	..()

code/modules/mob/living/simple_animal/bot/ed209bot.dm

@@ -28,7 +28,7 @@
 
 /mob/living/simple_animal/bot/secbot/ed209/emag_act(mob/user)
 	..()
-	icon_state = "ed209[get_bot_flag(BOT_MODE_ON)]"
+	icon_state = "ed209[get_bot_flag(bot_mode_flags, BOT_MODE_ON)]"
 	set_weapon()
 
 /mob/living/simple_animal/bot/secbot/ed209/handle_automated_action()

code/modules/mob/living/simple_animal/bot/floorbot.dm

@@ -384,7 +384,7 @@
 
 /mob/living/simple_animal/bot/floorbot/update_icon_state()
 	. = ..()
-	icon_state = "[toolbox_color]floorbot[get_bot_flag(BOT_MODE_ON)]"
+	icon_state = "[toolbox_color]floorbot[get_bot_flag(bot_mode_flags, BOT_MODE_ON)]"
 
 /mob/living/simple_animal/bot/floorbot/explode()
 	bot_mode_flags &= ~BOT_MODE_ON

code/modules/mob/living/simple_animal/bot/medbot.dm

@@ -9,6 +9,10 @@
 #define MEDBOT_PANIC_ENDING 90
 #define MEDBOT_PANIC_END 100
 
+#define MEDBOT_NEW_PATIENTSPEAK_DELAY (30 SECONDS)
+#define MEDBOT_PATIENTSPEAK_DELAY (20 SECONDS)
+#define MEDBOT_FREAKOUT_DELAY (15 SECONDS)
+
 /mob/living/simple_animal/bot/medbot
 	name = "\improper Medibot"
 	desc = "A little medical robot. He looks somewhat underwhelmed."
@@ -40,23 +44,17 @@
 	var/mob/living/carbon/oldpatient
 	var/oldloc
 	var/last_found = 0
-	/// Don't spam the "HEY I'M COMING" messages
-	var/last_newpatient_speak = 0
 	/// How much healing do we do at a time?
 	var/heal_amount = 2.5
 	/// Start healing when they have this much damage in a category
 	var/heal_threshold = 10
 	/// What damage type does this bot support. Because the default is brute, if the medkit is brute-oriented there is a slight bonus to healing. set to "all" for it to heal any of the 4 base damage types
 	var/damagetype_healer = BRUTE
-	/// If active, the bot will transmit a critical patient alert to MedHUD users.
-	var/declare_crit = TRUE
-	/// Prevents spam of critical patient alerts.
-	var/declare_cooldown = FALSE
-	/// If enabled, the Medibot will not move automatically.
-	var/stationary_mode = FALSE
 
-	/// silences the medbot if TRUE
-	var/shut_up = FALSE
+	///Flags Medbots use to decide how they should be acting.
+	var/medical_mode_flags = MEDBOT_DECLARE_CRIT | MEDBOT_SPEAK_MODE
+//	Selections:  MEDBOT_DECLARE_CRIT | MEDBOT_STATIONARY_MODE | MEDBOT_SPEAK_MODE
+
 	/// techweb linked to the medbot
 	var/datum/techweb/linked_techweb
 	///Is the medbot currently tending wounds
@@ -65,12 +63,20 @@
 	var/tipped_status = MEDBOT_PANIC_NONE
 	///The name we got when we were tipped
 	var/tipper_name
-	///Cooldown to track last time we were tipped/righted and said a voice line, to avoid spam
+
+	///Last announced healing a person in critical condition
+	COOLDOWN_DECLARE(last_patient_message)
+	///Last announced trying to catch up to a new patient
+	COOLDOWN_DECLARE(last_newpatient_speak)
+	///Last time we were tipped/righted and said a voice line
 	COOLDOWN_DECLARE(last_tipping_action_voice)
 
 /mob/living/simple_animal/bot/medbot/autopatrol
 	bot_mode_flags = BOT_MODE_ON | BOT_MODE_AUTOPATROL | BOT_MODE_REMOTE_ENABLED | BOT_MODE_PAI_CONTROLLABLE
 
+/mob/living/simple_animal/bot/medbot/stationary
+	medical_mode_flags = MEDBOT_DECLARE_CRIT | MEDBOT_STATIONARY_MODE | MEDBOT_SPEAK_MODE
+
 /mob/living/simple_animal/bot/medbot/mysterious
 	name = "\improper Mysterious Medibot"
 	desc = "International Medibot of mystery."
@@ -83,10 +89,27 @@
 	desc = "Looks like it hasn't been modified since the late 2080s."
 	skin = "bezerk"
 	damagetype_healer = "all"
+	medical_mode_flags = MEDBOT_SPEAK_MODE
 	heal_threshold = 0
-	declare_crit = 0
 	heal_amount = 5
 
+/mob/living/simple_animal/bot/medbot/examine(mob/user)
+	. = ..()
+	if(tipped_status == MEDBOT_PANIC_NONE)
+		return
+
+	switch(tipped_status)
+		if(MEDBOT_PANIC_NONE to MEDBOT_PANIC_LOW)
+			. += "It appears to be tipped over, and is quietly waiting for someone to set it right."
+		if(MEDBOT_PANIC_LOW to MEDBOT_PANIC_MED)
+			. += "It is tipped over and requesting help."
+		if(MEDBOT_PANIC_MED to MEDBOT_PANIC_HIGH)
+			. += "They are tipped over and appear visibly distressed." // now we humanize the medbot as a they, not an it
+		if(MEDBOT_PANIC_HIGH to MEDBOT_PANIC_FUCK)
+			. += span_warning("They are tipped over and visibly panicking!")
+		if(MEDBOT_PANIC_FUCK to INFINITY)
+			. += span_warning("<b>They are freaking out from being tipped over!</b>")
+
 /mob/living/simple_animal/bot/medbot/update_icon_state()
 	. = ..()
 	if(!(bot_mode_flags & BOT_MODE_ON))
@@ -96,9 +119,9 @@
 		icon_state = "[base_icon_state]a"
 		return
 	if(mode == BOT_HEALING)
-		icon_state = "[base_icon_state]s[stationary_mode]"
+		icon_state = "[base_icon_state]s[get_bot_flag(medical_mode_flags, MEDBOT_STATIONARY_MODE)]"
 		return
-	icon_state = "[base_icon_state][stationary_mode ? 2 : 1]" //Bot has yellow light to indicate stationary mode.
+	icon_state = "[base_icon_state][get_bot_flag(medical_mode_flags, MEDBOT_STATIONARY_MODE) ? 2 : 1]" //Bot has yellow light to indicate stationary mode.
 
 /mob/living/simple_animal/bot/medbot/update_overlays()
 	. = ..()
@@ -116,8 +139,6 @@
 	skin = new_skin
 	update_appearance()
 	linked_techweb = SSresearch.science_tech
-	if(damagetype_healer == "all")
-		return
 
 	AddComponent(/datum/component/tippable, \
 		tip_time = 3 SECONDS, \
@@ -133,7 +154,6 @@
 	oldpatient = null
 	oldloc = null
 	last_found = world.time
-	declare_cooldown = 0
 	update_appearance()
 
 /mob/living/simple_animal/bot/medbot/proc/soft_reset() //Allows the medibot to still actively perform its medical duties without being completely halted as a hard reset does.
@@ -151,9 +171,9 @@
 	var/list/data = ..()
 	if(!(bot_cover_flags & BOT_COVER_LOCKED) || issilicon(user) || isAdminGhostAI(user))
 		data["custom_controls"]["heal_threshold"] = heal_threshold
-		data["custom_controls"]["speaker"] = !shut_up
-		data["custom_controls"]["crit_alerts"] = declare_crit
-		data["custom_controls"]["stationary_mode"] = stationary_mode
+		data["custom_controls"]["speaker"] = medical_mode_flags & MEDBOT_SPEAK_MODE
+		data["custom_controls"]["crit_alerts"] = medical_mode_flags & MEDBOT_DECLARE_CRIT
+		data["custom_controls"]["stationary_mode"] = medical_mode_flags & MEDBOT_STATIONARY_MODE
 		data["custom_controls"]["sync_tech"] = TRUE
 	return data
 
@@ -171,13 +191,12 @@
 			if(heal_threshold > 75)
 				heal_threshold = 75
 		if("speaker")
-			shut_up = !shut_up
+			medical_mode_flags ^= MEDBOT_SPEAK_MODE
 		if("crit_alerts")
-			declare_crit = !declare_crit
+			medical_mode_flags ^= MEDBOT_DECLARE_CRIT
 		if("stationary_mode")
-			stationary_mode = !stationary_mode
+			medical_mode_flags ^= MEDBOT_STATIONARY_MODE
 			path = list()
-			update_appearance()
 		if("sync_tech")
 			var/oldheal_amount = heal_amount
 			var/tech_boosters
@@ -191,6 +210,8 @@
 				if(oldheal_amount < heal_amount)
 					speak("New knowledge found! Surgical efficacy improved to [round(heal_amount/initial(heal_amount)*100)]%!")
 
+	update_appearance()
+
 /mob/living/simple_animal/bot/medbot/attackby(obj/item/W as obj, mob/user as mob, params)
 	var/current_health = health
 	..()
@@ -201,7 +222,7 @@
 	..()
 	if(!(bot_cover_flags & BOT_COVER_EMAGGED))
 		return
-	declare_crit = FALSE
+	medical_mode_flags &= ~MEDBOT_DECLARE_CRIT
 	if(user)
 		to_chat(user, span_notice("You short out [src]'s reagent synthesis circuits."))
 	audible_message(span_danger("[src] buzzes oddly!"))
@@ -219,15 +240,13 @@
 
 	if(assess_patient(H))
 		last_found = world.time
-		if((last_newpatient_speak + 300) < world.time) //Don't spam these messages!
+		if(COOLDOWN_FINISHED(src, last_newpatient_speak))
+			COOLDOWN_START(src, last_newpatient_speak, MEDBOT_NEW_PATIENTSPEAK_DELAY)
 			var/list/messagevoice = list("Hey, [H.name]! Hold on, I'm coming." = 'sound/voice/medbot/coming.ogg',"Wait [H.name]! I want to help!" = 'sound/voice/medbot/help.ogg',"[H.name], you appear to be injured!" = 'sound/voice/medbot/injured.ogg')
 			var/message = pick(messagevoice)
 			speak(message)
 			playsound(src, messagevoice[message], 50, FALSE)
-			last_newpatient_speak = world.time
 		return H
-	else
-		return
 
 /*
  * Proc used in a callback for before this medibot is tipped by the tippable component.
@@ -238,7 +257,7 @@
 	if(!COOLDOWN_FINISHED(src, last_tipping_action_voice))
 		return
 
-	COOLDOWN_START(src, last_tipping_action_voice, 15 SECONDS) // message for tipping happens when we start interacting, message for righting comes after finishing
+	COOLDOWN_START(src, last_tipping_action_voice, MEDBOT_FREAKOUT_DELAY) // message for tipping happens when we start interacting, message for righting comes after finishing
 	var/static/list/messagevoice = list(
 		"Hey, wait..." = 'sound/voice/medbot/hey_wait.ogg',
 		"Please don't..." = 'sound/voice/medbot/please_dont.ogg',
@@ -277,7 +296,7 @@
 	tipper_name = null
 
 	if(COOLDOWN_FINISHED(src, last_tipping_action_voice))
-		COOLDOWN_START(src, last_tipping_action_voice, 15 SECONDS)
+		COOLDOWN_START(src, last_tipping_action_voice, MEDBOT_FREAKOUT_DELAY)
 		var/message = pick(messagevoice)
 		speak(message)
 		playsound(src, messagevoice[message], 70)
@@ -313,25 +332,9 @@
 	else if(prob(tipped_status * 0.2))
 		playsound(src, 'sound/machines/warning-buzzer.ogg', 30, extrarange=-2)
 
-/mob/living/simple_animal/bot/medbot/examine(mob/user)
-	. = ..()
-	if(tipped_status == MEDBOT_PANIC_NONE)
-		return
-
-	switch(tipped_status)
-		if(MEDBOT_PANIC_NONE to MEDBOT_PANIC_LOW)
-			. += "It appears to be tipped over, and is quietly waiting for someone to set it right."
-		if(MEDBOT_PANIC_LOW to MEDBOT_PANIC_MED)
-			. += "It is tipped over and requesting help."
-		if(MEDBOT_PANIC_MED to MEDBOT_PANIC_HIGH)
-			. += "They are tipped over and appear visibly distressed." // now we humanize the medbot as a they, not an it
-		if(MEDBOT_PANIC_HIGH to MEDBOT_PANIC_FUCK)
-			. += span_warning("They are tipped over and visibly panicking!")
-		if(MEDBOT_PANIC_FUCK to INFINITY)
-			. += span_warning("<b>They are freaking out from being tipped over!</b>")
-
 /mob/living/simple_animal/bot/medbot/handle_automated_action()
-	if(!..())
+	. = ..()
+	if(!.)
 		return
 
 	if(mode == BOT_TIPPED)
@@ -352,7 +355,7 @@
 		soft_reset()
 
 	if(QDELETED(patient))
-		if(!shut_up && prob(1))
+		if(medical_mode_flags & MEDBOT_SPEAK_MODE && prob(1))
 			if(bot_cover_flags & BOT_COVER_EMAGGED && prob(30))
 				var/list/i_need_scissors = list('sound/voice/medbot/fuck_you.ogg', 'sound/voice/medbot/turn_off.ogg', 'sound/voice/medbot/im_different.ogg', 'sound/voice/medbot/close.ogg', 'sound/voice/medbot/shindemashou.ogg')
 				playsound(src, pick(i_need_scissors), 70)
@@ -361,7 +364,7 @@
 				var/message = pick(messagevoice)
 				speak(message)
 				playsound(src, messagevoice[message], 50)
-		var/scan_range = (stationary_mode ? 1 : DEFAULT_SCAN_RANGE) //If in stationary mode, scan range is limited to adjacent patients.
+		var/scan_range = (medical_mode_flags & MEDBOT_STATIONARY_MODE ? 1 : DEFAULT_SCAN_RANGE) //If in stationary mode, scan range is limited to adjacent patients.
 		patient = scan(/mob/living/carbon/human, oldpatient, scan_range)
 		oldpatient = patient
 
@@ -379,7 +382,7 @@
 		mode = BOT_IDLE
 		last_found = world.time
 
-	else if(stationary_mode && patient) //Since we cannot move in this mode, ignore the patient and wait for another.
+	else if(medical_mode_flags & MEDBOT_STATIONARY_MODE && patient) //Since we cannot move in this mode, ignore the patient and wait for another.
 		soft_reset()
 		return
 
@@ -400,20 +403,19 @@
 	if(path.len > 8 && patient)
 		frustration++
 
-	if(bot_mode_flags & BOT_MODE_AUTOPATROL && !stationary_mode && !patient)
+	if(bot_mode_flags & BOT_MODE_AUTOPATROL && !(medical_mode_flags & MEDBOT_STATIONARY_MODE) && !patient)
 		if(mode == BOT_IDLE || mode == BOT_START_PATROL)
 			start_patrol()
 
 		if(mode == BOT_PATROL)
 			bot_patrol()
 
-	return
-
 /mob/living/simple_animal/bot/medbot/proc/assess_patient(mob/living/carbon/C)
 	. = FALSE
 	//Time to see if they need medical help!
-	if(stationary_mode && !Adjacent(C)) //YOU come to ME, BRO
+	if(medical_mode_flags & MEDBOT_STATIONARY_MODE && !Adjacent(C)) //YOU come to ME, BRO
 		return FALSE
+
 	if(C.stat == DEAD || (HAS_TRAIT(C, TRAIT_FAKEDEATH)))
 		return FALSE //welp too late for them!
 
@@ -426,7 +428,7 @@
 	if(bot_cover_flags & BOT_COVER_EMAGGED) //Everyone needs our medicine. (Our medicine is toxins)
 		return TRUE
 
-	if(HAS_TRAIT(C,TRAIT_MEDIBOTCOMINGTHROUGH) && !HAS_TRAIT_FROM(C,TRAIT_MEDIBOTCOMINGTHROUGH,tag)) //the early medbot gets the worm (or in this case the patient)
+	if(HAS_TRAIT(C, TRAIT_MEDIBOTCOMINGTHROUGH) && !HAS_TRAIT_FROM(C, TRAIT_MEDIBOTCOMINGTHROUGH, tag)) //the early medbot gets the worm (or in this case the patient)
 		return FALSE
 
 	if(ishuman(C))
@@ -437,7 +439,7 @@
 			if (CS.clothing_flags & CH.clothing_flags & THICKMATERIAL)
 				return FALSE // Skip over them if they have no exposed flesh.
 
-	if(declare_crit && C.health <= 0) //Critical condition! Call for help!
+	if(medical_mode_flags & MEDBOT_DECLARE_CRIT && C.health <= 0) //Critical condition! Call for help!
 		declare(C)
 
 	//They're injured enough for it!
@@ -469,8 +471,8 @@
 		update_appearance()
 		medicate_patient(C)
 		update_appearance()
-	else
-		..()
+		return
+	..()
 
 /mob/living/simple_animal/bot/medbot/examinate(atom/A as mob|obj|turf in view())
 	..()
@@ -579,11 +581,15 @@
 	..()
 
 /mob/living/simple_animal/bot/medbot/proc/declare(crit_patient)
-	if(declare_cooldown > world.time)
+	if(!COOLDOWN_FINISHED(src, last_patient_message))
 		return
+	COOLDOWN_START(src, last_patient_message, MEDBOT_PATIENTSPEAK_DELAY)
 	var/area/location = get_area(src)
 	speak("Medical emergency! [crit_patient || "A patient"] is in critical condition at [location]!", radio_channel)
-	declare_cooldown = world.time + 200
+
+#undef MEDBOT_NEW_PATIENTSPEAK_DELAY
+#undef MEDBOT_PATIENTSPEAK_DELAY
+#undef MEDBOT_FREAKOUT_DELAY
 
 #undef MEDBOT_PANIC_NONE
 #undef MEDBOT_PANIC_LOW