Merge pull request #4815 from phil235/AudibleMsgFix

Simplifying audible messages
This commit is contained in:
Swag McYolosteinen
2014-09-27 15:01:56 +02:00
30 changed files with 107 additions and 116 deletions
+8 -4
View File
@@ -467,8 +467,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle
else if (href_list["doorder"])
if(world.time < reqtime)
for(var/mob/V in hearers(src))
V.show_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
say("[world.time - reqtime] seconds remaining until another requisition form may be printed.")
return
//Find the correct supply_pack datum
@@ -538,6 +537,10 @@ var/global/datum/controller/supply_shuttle/supply_shuttle
updateUsrDialog()
return
/obj/machinery/computer/ordercomp/say_quote(text)
return "flashes, \"[text]\""
/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob)
if(!allowed(user))
user << "<span class='warning'> Access Denied.</span>"
@@ -657,8 +660,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle
else if (href_list["doorder"])
if(world.time < reqtime)
for(var/mob/V in hearers(src))
V.show_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
say("[world.time - reqtime] seconds remaining until another requisition form may be printed.")
return
//Find the correct supply_pack datum
@@ -792,5 +794,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle
frequency.post_signal(src, status_signal)
/obj/machinery/computer/supplycomp/say_quote(text)
return "flashes, \"[text]\""