From ef95f0094f4ba96428c77a89f0044d445ae8789d Mon Sep 17 00:00:00 2001 From: Jordie Date: Mon, 15 Sep 2014 18:19:58 +1000 Subject: [PATCH 1/5] Added span + [name] --- code/modules/research/protolathe.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 4e2273b02b1..d9a729db59f 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -127,22 +127,22 @@ Note: Must be placed west/left of and R&D console to function. if (disabled) return if (!linked_console) - user << "\The protolathe must be linked to an R&D console first!" + user << " The [src.name] must be linked to an R&D console first!" return 1 if (busy) - user << "The protolathe is busy. Please wait for completion of previous operation." + user << "The [src.name] is busy. Please wait for completion of previous operation." return 1 if (O.is_open_container()) return if (!istype(O, /obj/item/stack/sheet) || istype(O, /obj/item/stack/sheet/mineral/wood)) - user << "You cannot insert this item into the protolathe!" + user << "You cannot insert this item into the [src.name]!" return 1 if (stat) return 1 if(istype(O,/obj/item/stack/sheet)) var/obj/item/stack/sheet/S = O if (TotalMaterials() + S.perunit > max_material_storage) - user << "The protolathe's material bin is full. Please remove material before adding more." + user << "The [src.name]'s material bin is full. Please remove material before adding more." return 1 var/obj/item/stack/sheet/stack = O @@ -185,4 +185,4 @@ Note: Must be placed west/left of and R&D console to function. sleep(10) src.overlays -= "protolathe_[stack.name]" - return \ No newline at end of file + return From cd2cdde82e4a838a3a0f15cec95c37145a00abe1 Mon Sep 17 00:00:00 2001 From: Jordie Date: Mon, 15 Sep 2014 18:21:52 +1000 Subject: [PATCH 2/5] Spans unlinked message --- code/modules/research/circuitprinter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 6c960e0d5c8..427fffa7d8f 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -92,7 +92,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). if (disabled) return if (!linked_console) - user << "\The [name] must be linked to an R&D console first!" + user << "The [name] must be linked to an R&D console first!" return 1 if (O.is_open_container()) return From dd3934656314d2a62a191f1d13d0f7092ab3f98c Mon Sep 17 00:00:00 2001 From: Jordie Date: Mon, 15 Sep 2014 18:24:34 +1000 Subject: [PATCH 3/5] [name]ifies messages and removes debug item --- code/modules/research/destructive_analyzer.dm | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 9034c3430a4..f9d31980d80 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -53,38 +53,28 @@ Note: Must be placed within 3 tiles of the R&D Console if (disabled) return if (!linked_console) - user << "The protolathe must be linked to an R&D console first!" + user << "The [src.name] must be linked to an R&D console first!" return if (busy) - user << " The protolathe is busy right now." + user << "The [src.name] is busy right now." return if (istype(O, /obj/item) && !loaded_item) if(!O.origin_tech) - user << " This doesn't seem to have a tech origin!" + user << "This doesn't seem to have a tech origin!" return var/list/temp_tech = ConvertReqString2List(O.origin_tech) if (temp_tech.len == 0) - user << " You cannot deconstruct this item!" + user << "You cannot deconstruct this item!" return if(!user.drop_item()) - user << "\The [O] is stuck to your hand, you cannot put it in the analyzer!" + user << "The [O] is stuck to your hand, you cannot put it in the [src.name]!" return busy = 1 loaded_item = O O.loc = src - user << "You add the [O.name] to the machine!" + user << "You add the [O.name] to the [src.name]!" flick("d_analyzer_la", src) spawn(10) icon_state = "d_analyzer_l" busy = 0 return - -//For testing purposes only. -/*/obj/item/weapon/deconstruction_test - name = "Test Item" - desc = "WTF?" - icon = 'icons/obj/weapons.dmi' - icon_state = "d20" - g_amt = 5000 - m_amt = 5000 - origin_tech = "materials=5;plasmatech=5;syndicate=5;programming=9"*/ From 2bb0f348f487605e096ba0cc03ea33cd2a3bb88f Mon Sep 17 00:00:00 2001 From: Jordie Date: Mon, 15 Sep 2014 18:25:16 +1000 Subject: [PATCH 4/5] notice > warning --- code/modules/research/destructive_analyzer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index f9d31980d80..27ddd0a777d 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -67,7 +67,7 @@ Note: Must be placed within 3 tiles of the R&D Console user << "You cannot deconstruct this item!" return if(!user.drop_item()) - user << "The [O] is stuck to your hand, you cannot put it in the [src.name]!" + user << "The [O] is stuck to your hand, you cannot put it in the [src.name]!" return busy = 1 loaded_item = O From b7d903fbda8dd0ff41e6b606f5e16a6f380685fe Mon Sep 17 00:00:00 2001 From: Jordie Date: Thu, 18 Sep 2014 13:34:16 +1000 Subject: [PATCH 5/5] Adds \ back to DA nodrop message --- code/modules/research/destructive_analyzer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 27ddd0a777d..3d2f4ffc7ec 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -67,7 +67,7 @@ Note: Must be placed within 3 tiles of the R&D Console user << "You cannot deconstruct this item!" return if(!user.drop_item()) - user << "The [O] is stuck to your hand, you cannot put it in the [src.name]!" + user << "\The [O] is stuck to your hand, you cannot put it in the [src.name]!" return busy = 1 loaded_item = O