cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 04:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge examine refactor for vorestation

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-29 17:49:54 -04:00
parent 6ebd249748
commit 874baa1d2d
34 changed files with 179 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/advnifrepair.dm
+4 -3
View File
@@ -56,8 +56,9 @@
return 1
/obj/item/device/nifrepairer/examine(mob/user)
if(..(user, 1))
. = ..()
if(Adjacent(user))
if(supply.total_volume)
to_chat(user, "<span class='notice'>\The [src] contains [supply.total_volume] units of programmed nanites, ready for dispensing.</span>")
. += "<span class='notice'>\The [src] contains [supply.total_volume] units of programmed nanites, ready for dispensing.</span>"
else
to_chat(user, "<span class='notice'>\The [src] is empty and ready to accept nanopaste.</span>")
. += "<span class='notice'>\The [src] is empty and ready to accept nanopaste.</span>"
code/game/objects/items/devices/radio/radio.dm
-6
View File
@@ -581,16 +581,10 @@ var/global/list/default_medbay_channels = list(
/obj/item/device/radio/examine(mob/user)
. = ..()
<<<<<<< HEAD
if ((in_range(src, user) || loc == user))
if (b_stat)
user.show_message("<span class='notice'>\The [src] can be attached and modified!</span>")
=======
if((in_range(src, user) || loc == user))
if(b_stat)
. += "<span class='notice'>\The [src] can be attached and modified!</span>"
>>>>>>> 6c6644f... Rewrite examine() to pass a list around (#7038)
else
. += "<span class='notice'>\The [src] can not be modified or attached!</span>"