diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm index a154f363cfd..748ff65aeb4 100644 --- a/code/modules/mob/living/basic/bots/_bots.dm +++ b/code/modules/mob/living/basic/bots/_bots.dm @@ -261,7 +261,7 @@ GLOBAL_LIST_INIT(command_strings, list( var/new_name = sanitize_name( reject_bad_text(tgui_input_text( user = user, - message = "This machine is designated [real_name]. Would you like to update its registration?", + message = "This machine is designated [real_name]. Would you like to update [p_their()] registration?", title = "Name change", default = real_name, max_length = MAX_NAME_LEN, @@ -333,16 +333,16 @@ GLOBAL_LIST_INIT(command_strings, list( else . += "[src] is in pristine condition." - . += span_notice("Its maintenance panel is [bot_access_flags & BOT_COVER_MAINTS_OPEN ? "open" : "closed"].") - . += span_info("You can use a screwdriver to [bot_access_flags & BOT_COVER_MAINTS_OPEN ? "close" : "open"] it.") + . += span_notice("[p_Their()] maintenance panel is [bot_access_flags & BOT_COVER_MAINTS_OPEN ? "open" : "closed"].") + . += span_info("You can use a screwdriver to [bot_access_flags & BOT_COVER_MAINTS_OPEN ? "close" : "open"] [p_them()].") if(bot_access_flags & BOT_COVER_MAINTS_OPEN) - . += span_notice("Its control panel is [bot_access_flags & BOT_COVER_LOCKED ? "locked" : "unlocked"].") + . += span_notice("[p_Their()] control panel is [bot_access_flags & BOT_COVER_LOCKED ? "locked" : "unlocked"].") if(!(bot_access_flags & BOT_COVER_EMAGGED) && (issilicon(user) || user.Adjacent(src))) - . += span_info("Alt-click [issilicon(user) ? "" : "or use your ID on "]it to [bot_access_flags & BOT_COVER_LOCKED ? "un" : ""]lock its control panel.") + . += span_info("Alt-click [issilicon(user) ? "" : "or use your ID on "][p_them()] to [bot_access_flags & BOT_COVER_LOCKED ? "un" : ""]lock [p_their()] control panel.") if(isnull(paicard)) return - . += span_notice("It has a pAI device installed.") + . += span_notice("[p_They()] [p_have()] a pAI device installed.") if(!(bot_access_flags & BOT_COVER_MAINTS_OPEN)) . += span_info("You can use a hemostat to remove it.") diff --git a/code/modules/mob/living/basic/bots/hygienebot/hygienebot.dm b/code/modules/mob/living/basic/bots/hygienebot/hygienebot.dm index 461f22d3fa5..80e1ce7b63b 100644 --- a/code/modules/mob/living/basic/bots/hygienebot/hygienebot.dm +++ b/code/modules/mob/living/basic/bots/hygienebot/hygienebot.dm @@ -8,6 +8,7 @@ base_icon_state = "hygienebot" pass_flags = parent_type::pass_flags | PASSTABLE layer = MOB_UPPER_LAYER + gender = MALE density = FALSE anchored = FALSE health = 100 diff --git a/code/modules/mob/living/basic/bots/medbot/medbot.dm b/code/modules/mob/living/basic/bots/medbot/medbot.dm index 508ae260fb1..92afa3006dd 100644 --- a/code/modules/mob/living/basic/bots/medbot/medbot.dm +++ b/code/modules/mob/living/basic/bots/medbot/medbot.dm @@ -360,7 +360,7 @@ patient.visible_message(span_notice("[src] tends the wounds of [patient]!"), "[span_infoplain(span_green("[src] tends your wounds!"))]") if(done_healing) - visible_message(span_infoplain("[src] places its tools back into itself.")) + visible_message(span_infoplain("[src] places [p_their()] tools back into [p_themselves()].")) to_chat(src, "[patient] is now healthy!") update_bot_mode(new_mode = BOT_IDLE) return diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 6d4adbb688b..c89029d2cca 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -335,15 +335,15 @@ . += "[src]'s parts look very loose!" else . += "[src] is in pristine condition." - . += span_notice("Its maintenance panel is [bot_cover_flags & BOT_COVER_MAINTS_OPEN ? "open" : "closed"].") + . += span_notice("[p_Their()] maintenance panel is [bot_cover_flags & BOT_COVER_MAINTS_OPEN ? "open" : "closed"].") . += span_info("You can use a screwdriver to [bot_cover_flags & BOT_COVER_MAINTS_OPEN ? "close" : "open"] it.") if(bot_cover_flags & BOT_COVER_MAINTS_OPEN) - . += span_notice("Its control panel is [bot_cover_flags & BOT_COVER_LOCKED ? "locked" : "unlocked"].") + . += span_notice("[p_Their()] control panel is [bot_cover_flags & BOT_COVER_LOCKED ? "locked" : "unlocked"].") var/is_sillycone = HAS_SILICON_ACCESS(user) if(!(bot_cover_flags & BOT_COVER_EMAGGED) && (is_sillycone || user.Adjacent(src))) - . += span_info("Alt-click [is_sillycone ? "" : "or use your ID on "]it to [bot_cover_flags & BOT_COVER_LOCKED ? "un" : ""]lock its control panel.") + . += span_info("Alt-click [is_sillycone ? "" : "or use your ID on "]it to [bot_cover_flags & BOT_COVER_LOCKED ? "un" : ""]lock [p_their()] control panel.") if(paicard) - . += span_notice("It has a pAI device installed.") + . += span_notice("[p_They()] has a pAI device installed.") if(!(bot_cover_flags & BOT_COVER_MAINTS_OPEN)) . += span_info("You can use a hemostat to remove it.") diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index e6d6aedfc4d..ca875f65146 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -101,12 +101,12 @@ . = ..() if(bot_cover_flags & BOT_COVER_MAINTS_OPEN) if(cell) - . += span_notice("It has \a [cell] installed.") + . += span_notice("[p_They()] [p_have()] \a [cell] installed.") . += span_info("You can use a crowbar to remove it.") else - . += span_notice("It has an empty compartment where a power cell can be installed.") + . += span_notice("[p_They()] [p_have()] an empty compartment where a power cell can be installed.") if(load) //observer check is so we don't show the name of the ghost that's sitting on it to prevent metagaming who's ded. - . += span_notice("\A [isobserver(load) ? "ghostly figure" : load] is on its load platform.") + . += span_notice("\A [isobserver(load) ? "ghostly figure" : load] is on [p_their()] load platform.") /mob/living/simple_animal/bot/mulebot/Destroy() diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index efde9fee120..0f53bf5dd8a 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -5,6 +5,7 @@ icon_state = "secbot" light_color = "#f56275" light_power = 0.8 + gender = MALE density = FALSE anchored = FALSE health = 25