From 4bd80f021daf44268d4a93a1089e171c29cae733 Mon Sep 17 00:00:00 2001 From: Mike Long Date: Fri, 28 Oct 2016 20:52:03 -0400 Subject: [PATCH] Fixes #21240 --- code/game/objects/structures.dm | 25 ++++++++++++--------- code/game/objects/structures/false_walls.dm | 3 +++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 2cf309254a0..9377b9ce084 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -92,15 +92,20 @@ if(!(resistance_flags & INDESTRUCTIBLE)) if(resistance_flags & ON_FIRE) user << "It's on fire!" - var/healthpercent = (obj_integrity/max_integrity) * 100 if(broken) user << "It looks broken." - switch(healthpercent) - if(100 to INFINITY) - user << "It seems pristine and undamaged." - if(50 to 100) - user << "It looks slightly damaged." - if(25 to 50) - user << "It appears heavily damaged." - if(0 to 25) - user << "It's falling apart!" \ No newline at end of file + var/examine_status = examine_status() + if(examine_status) + user << examine_status + +/obj/structure/proc/examine_status() //An overridable proc, mostly for falsewalls. + var/healthpercent = (obj_integrity/max_integrity) * 100 + switch(healthpercent) + if(100 to INFINITY) + return "It seems pristine and undamaged." + if(50 to 100) + return "It looks slightly damaged." + if(25 to 50) + return "It appears heavily damaged." + if(0 to 25) + return "It's falling apart!" diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index d3df50a5c96..70585b96f26 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -139,6 +139,9 @@ /obj/structure/falsewall/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user) return 0 +/obj/structure/falsewall/examine_status() //So you can't detect falsewalls by examine. + return null + /* * False R-Walls */