mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
Refactors the examine proc to return a list of strings (#12280)
This commit is contained in:
committed by
variableundefined
parent
40a4cd1b75
commit
0e8ddb2afe
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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(!..())
|
||||
|
||||
@@ -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(..())
|
||||
|
||||
Reference in New Issue
Block a user