cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-09 06:04:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Robot examination and actions now use dynamic pronouns (#31967)

Browse Source 
* silicon pronoun respect

* refinement
This commit is contained in:
CRUNCH
2026-06-11 02:58:48 +01:00
committed by GitHub
parent f0f7ccf5ba
commit 2ec8cbe539
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_emote.dm
+1 -1
View File
@@ -76,7 +76,7 @@
bypass_unintentional_cooldown = TRUE // again, this absolutely MUST play when a user dies, if it can.
message = "seizes up and falls limp, their eyes dead and lifeless..."
message_alien = "lets out a waning guttural screech, green blood bubbling from its maw..."
message_robot = "shudders violently for a moment before falling still, its eyes slowly darkening."
message_robot = "shudders violently for a moment before falling still, their eyes slowly darkening."
message_AI = "screeches, its screen flickering as its systems slowly halt."
message_larva = "lets out a sickly hiss of air and falls limply to the floor..."
message_monkey = "lets out a faint chimper as it collapses and stops moving..."
code/modules/mob/living/silicon/robot/robot_examine.dm
+16 -16
View File
@@ -3,48 +3,48 @@
var/msg = "<span class='notice'>"
if(module)
msg += "It has loaded a [module.name].\n"
msg += "[p_they(TRUE)] [p_have()] loaded a [module.name].\n"
var/obj/act_module = get_active_hand()
if(act_module)
msg += "It is holding [bicon(act_module)] \a [act_module].\n"
msg += "[p_they(TRUE)] [p_are()] holding [bicon(act_module)] \a [act_module].\n"
msg += "<span class='warning'>"
if(getBruteLoss())
if(getBruteLoss() < maxHealth*0.5)
msg += "It looks slightly dented.\n"
msg += "[p_they(TRUE)] look[p_s()] slightly dented.\n"
else
msg += "<B>It looks severely dented!</B>\n"
msg += "<b>[p_they(TRUE)] look[p_s()] severely dented!</b>\n"
if(getFireLoss())
if(getFireLoss() < maxHealth*0.5)
msg += "It looks slightly charred.\n"
msg += "[p_they(TRUE)] look[p_s()] slightly charred.\n"
else
msg += "<B>It looks severely burnt and heat-warped!</B>\n"
msg += "<b>[p_they(TRUE)] look[p_s()] severely burnt and heat-warped!</b>\n"
if(health < -maxHealth*0.5)
msg += "It looks barely operational.\n"
msg += "[p_they(TRUE)] look[p_s()] barely operational.\n"
if(fire_stacks < 0)
msg += "It's covered in water.\n"
msg += "[p_theyre(TRUE)] covered in water.\n"
else if(fire_stacks > 0)
msg += "It's coated in something flammable.\n"
msg += "[p_theyre(TRUE)] coated in something flammable.\n"
msg += "</span>"
if(opened)
msg += "[SPAN_WARNING("Its cover is open and the power cell is [cell ? "installed" : "missing"].")]\n"
msg += "[SPAN_WARNING("[p_their(TRUE)] cover is open and [p_their()] power cell is [cell ? "installed" : "missing"].")]\n"
else
msg += "Its cover is closed[locked ? "" : ", and looks unlocked"].\n"
msg += "[p_their(TRUE)] cover is closed[locked ? "" : ", and looks unlocked"].\n"
if(cell && cell.charge <= 0)
msg += "[SPAN_WARNING("Its battery indicator is blinking red!")]\n"
msg += "[SPAN_WARNING("[p_their(TRUE)] battery indicator is blinking red!")]\n"
switch(stat)
if(CONSCIOUS)
if(!client)
msg += "It appears to be in stand-by mode.\n" //afk
msg += "[p_they(TRUE)] appear[p_s()] to be in stand-by mode.\n" //afk
if(UNCONSCIOUS)
msg += "[SPAN_WARNING("It doesn't seem to be responding.")]\n"
msg += "[SPAN_WARNING("[p_they(TRUE)] [p_do()]n't seem to be responding.")]\n"
if(DEAD)
if(!suiciding)
msg += "[SPAN_DEADSAY("It looks like its internal subsystems are beyond repair and require replacing.")]\n"
msg += "[SPAN_DEADSAY("It looks like [p_their()] internal subsystems are beyond repair and require replacing.")]\n"
else
msg += "[SPAN_WARNING("It looks like its system is corrupted beyond repair. There is no hope of recovery.")]\n"
msg += "[SPAN_WARNING("It looks like [p_their()] system is corrupted beyond repair. There is no hope of recovery.")]\n"
msg += "</span>"
if(print_flavor_text())
code/modules/mob/living/silicon/silicon_mob.dm
+2 -2
View File
@@ -392,7 +392,7 @@
set desc = "Sets a description which will be shown when someone examines you."
set category = "IC"
pose = tgui_input_text(usr, "This is [src]. It...", "Pose", pose)
pose = tgui_input_text(usr, "This is [src]. [p_they()]...", "Pose", pose)
/mob/living/silicon/verb/set_flavor()
set name = "Set Flavour Text"
@@ -654,7 +654,7 @@
/mob/living/silicon/examine(mob/user)
. = ..()
if(silicon_hat)
. += "<span class='notice'>They are wearing a [bicon(silicon_hat)] [silicon_hat.name].<span>"
. += "<span class='notice'>[p_they(TRUE)] [p_are()] wearing a [bicon(silicon_hat)] [silicon_hat.name].<span>"
. += "<span class='notice'>Use an empty hand on [src] on grab mode to remove [silicon_hat].<span>"
/mob/living/silicon/plushify(plushie_override, curse_time)