diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index d7e6d55aed6..fde015a9c2e 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -760,7 +760,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type) /obj/item/proc/showoff(mob/user) for (var/mob/M in view(user)) - M.show_message(span_filter_notice("[user] holds up [src]. Take a closer look."),1) + M.show_message(span_filter_notice("[user] holds up [src]. Take a closer look."),1) /mob/living/carbon/verb/showoff() set name = "Show Held Item" diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm index aa0c245b62e..f5bce6ef594 100644 --- a/code/modules/economy/retail_scanner.dm +++ b/code/modules/economy/retail_scanner.dm @@ -82,6 +82,9 @@ dat += locked ? "
" : "Reset Log
" dat += "
" dat += "Device ID: [machine_id]" + + dat = "Retail Scanner[dat]" + user << browse(dat, "window=retail;size=350x500") onclose(user, "retail") @@ -182,7 +185,7 @@ /obj/item/retail_scanner/showoff(mob/user) for (var/mob/M in view(user)) - M.show_message("[user] holds up [src]. Swipe card or item.",1) + M.show_message("[user] holds up [src]. Swipe card or item.",1) /obj/item/retail_scanner/proc/confirm(var/obj/item/I) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index bb9db800610..5eb9ed78c1f 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -561,64 +561,64 @@ return //PRETTIER TOOL LIST. -/mob/living/silicon/robot/drone/installed_modules() +// /mob/living/silicon/robot/drone/installed_modules() - if(weapon_lock) - to_chat(src, span_danger("Weapon lock active, unable to use modules! Count:[weaponlock_time]")) - return +// if(weapon_lock) +// to_chat(src, span_danger("Weapon lock active, unable to use modules! Count:[weaponlock_time]")) +// return - if(!module) - module = new /obj/item/robot_module/drone(src) +// if(!module) +// module = new /obj/item/robot_module/drone(src) - var/dat = "Drone modules\n" - dat += {" - Activated Modules -
- Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
- Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
- Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
-
- Installed Modules

"} +// var/dat = "Drone modules\n" +// dat += {" +// Activated Modules +//
+// Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
+// Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
+// Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
+//
+// Installed Modules

"} - var/tools = span_bold("Tools and devices") + "
" - var/resources = "
" + span_bold("Resources") + "
" +// var/tools = span_bold("Tools and devices") + "
" +// var/resources = "
" + span_bold("Resources") + "
" - for (var/O in module.modules) +// for (var/O in module.modules) - var/module_string = "" +// var/module_string = "" - if (!O) - module_string += span_bold("Resource depleted") + "
" - else if(activated(O)) - module_string += text("[O]: Activated
") - else - module_string += text("[O]: Activate
") +// if (!O) +// module_string += span_bold("Resource depleted") + "
" +// else if(activated(O)) +// module_string += text("[O]: Activated
") +// else +// module_string += text("[O]: Activate
") - if((istype(O,/obj/item) || istype(O,/obj/item)) && !(istype(O,/obj/item/stack/cable_coil))) - tools += module_string - else - resources += module_string +// if((istype(O,/obj/item) || istype(O,/obj/item)) && !(istype(O,/obj/item/stack/cable_coil))) +// tools += module_string +// else +// resources += module_string - if (emagged) - for (var/O in module.emag) +// if (emagged) +// for (var/O in module.emag) - var/module_string = "" +// var/module_string = "" - if (!O) - module_string += span_bold("Resource depleted") + "
" - else if(activated(O)) - module_string += text("[O]: Activated
") - else - module_string += text("[O]: Activate
") +// if (!O) +// module_string += span_bold("Resource depleted") + "
" +// else if(activated(O)) +// module_string += text("[O]: Activated
") +// else +// module_string += text("[O]: Activate
") - if((istype(O,/obj/item) || istype(O,/obj/item)) && !(istype(O,/obj/item/stack/cable_coil))) - tools += module_string - else - resources += module_string +// if((istype(O,/obj/item) || istype(O,/obj/item)) && !(istype(O,/obj/item/stack/cable_coil))) +// tools += module_string +// else +// resources += module_string - dat += tools +// dat += tools - dat += resources +// dat += resources - src << browse(dat, "window=robotmod") +// src << browse(dat, "window=robotmod") diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 9ee2d05f505..0f06a5c878a 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -350,7 +350,7 @@ to_chat(src, "\The [A.alarm_name()].") if(alarm_raised) - to_chat(src, span_filter_notice("\[Show Alerts\]")) + to_chat(src, span_filter_notice("\[Show Alerts\]")) for(var/datum/alarm_handler/AH in queued_alarms) var/list/alarms = queued_alarms[AH] @@ -362,7 +362,7 @@ /mob/living/silicon/ai/raised_alarm(var/datum/alarm/A) var/cameratext = "" for(var/obj/machinery/camera/C in A.cameras()) - cameratext += "[(cameratext == "")? "" : "|"][C.c_tag]" + cameratext += "[(cameratext == "")? "" : "|"][C.c_tag]" to_chat(src, span_filter_warning("[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])"))