From a2ff8ada2dd56fe98cb632f529c5333210e4f24f Mon Sep 17 00:00:00 2001 From: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Mon, 5 Feb 2024 07:37:16 +1000 Subject: [PATCH] Fixes railings mentioning tables on inspect. (#23554) * teehee * cinnamonsnowball review * contra review * Update railings.dm * Update code/game/objects/structures.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --- code/game/objects/structures.dm | 5 ++++- code/game/objects/structures/railings.dm | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 046072df06d..b719335d278 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -154,6 +154,9 @@ return FALSE return TRUE +/obj/structure/proc/get_climb_text() + return "You can Click-Drag yourself to [src] to climb on top of it after a short delay." + /obj/structure/examine(mob/user) . = ..() if(!(resistance_flags & INDESTRUCTIBLE)) @@ -165,7 +168,7 @@ if(examine_status) . += examine_status if(climbable) - . += "You can Click-Drag someone to [src] to put them on the table after a short delay." + . += get_climb_text() /obj/structure/proc/examine_status(mob/user) //An overridable proc, mostly for falsewalls. var/healthpercent = (obj_integrity/max_integrity) * 100 diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 3ff5c263535..266460cc6a9 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -12,6 +12,9 @@ var/currently_climbed = FALSE var/mover_dir = null +/obj/structure/railing/get_climb_text() + return "You can Click-Drag yourself to [src] to climb over it after a short delay." + /obj/structure/railing/corner //aesthetic corner sharp edges hurt oof ouch icon_state = "railing_corner" density = FALSE