Refactors the examine proc to return a list of strings (#12280)

This commit is contained in:
farie82
2019-09-25 22:05:01 -07:00
committed by variableundefined
parent 40a4cd1b75
commit 0e8ddb2afe
210 changed files with 808 additions and 830 deletions
+3 -3
View File
@@ -128,12 +128,12 @@
STOP_PROCESSING(SSobj, src)
/obj/item/assembly/examine(mob/user)
..()
. = ..()
if(in_range(src, user) || loc == user)
if(secured)
to_chat(user, "[src] is ready!")
. += "[src] is ready!"
else
to_chat(user, "[src] can be attached!")
. += "[src] can be attached!"
/obj/item/assembly/attack_self(mob/user)
if(!user)
+2 -2
View File
@@ -13,8 +13,8 @@
origin_tech = "materials=1;engineering=1"
/obj/item/onetankbomb/examine(mob/user)
..(user)
user.examinate(bombtank)
. = ..()
. += bombtank.examine(user)
/obj/item/onetankbomb/update_icon()
if(bombtank)
+3 -3
View File
@@ -70,12 +70,12 @@
/obj/item/assembly_holder/examine(mob/user)
..(user)
. = ..()
if(in_range(src, user) || loc == user)
if(secured)
to_chat(user, "[src] is ready!")
. += "[src] is ready!"
else
to_chat(user, "[src] can be attached!")
. += "[src] can be attached!"
/obj/item/assembly_holder/HasProximity(atom/movable/AM)
+2 -2
View File
@@ -29,8 +29,8 @@
return "The assembly is [secured ? "secure" : "not secure"]. The infrared trigger is [on ? "on" : "off"]."
/obj/item/assembly/infra/examine(mob/user)
..()
to_chat(user, describe())
. = ..()
. += describe()
/obj/item/assembly/infra/activate()
if(!..())
+2 -2
View File
@@ -9,9 +9,9 @@
bomb_name = "contact mine"
/obj/item/assembly/mousetrap/examine(mob/user)
..(user)
. = ..()
if(armed)
to_chat(user, "It looks like it's armed.")
. += "It looks like it's armed."
/obj/item/assembly/mousetrap/activate()
if(..())