cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 16:44:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4836 from Jordie0608/consistencyisthespiceoflifeliketurpentineisforenhancingcolours

Browse Source 
Fixes #4722 Inconsistent formatting in RD machine warnings
This commit is contained in:
Cheridan
2014-09-19 09:36:39 -05:00
parent 1d9cdb07e3 b7d903fbda
commit 21dcbb0887
3 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/circuitprinter.dm
+1 -1
View File
@@ -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 << "<span class='warning'>The [name] must be linked to an R&D console first!</span>"
return 1
if (O.is_open_container())
return
code/modules/research/destructive_analyzer.dm
+6 -16
View File
@@ -53,38 +53,28 @@ Note: Must be placed within 3 tiles of the R&D Console
if (disabled)
return
if (!linked_console)
user << "<span class='warning'>The protolathe must be linked to an R&D console first!</span>"
user << "<span class='warning'>The [src.name] must be linked to an R&D console first!</span>"
return
if (busy)
user << "<span class='warning'> The protolathe is busy right now.</span>"
user << "<span class='warning'>The [src.name] is busy right now.</span>"
return
if (istype(O, /obj/item) && !loaded_item)
if(!O.origin_tech)
user << "<span class='warning'> This doesn't seem to have a tech origin!</span>"
user << "<span class='warning'>This doesn't seem to have a tech origin!</span>"
return
var/list/temp_tech = ConvertReqString2List(O.origin_tech)
if (temp_tech.len == 0)
user << "<span class='warning'> You cannot deconstruct this item!</span>"
user << "<span class='warning'>You cannot deconstruct this item!</span>"
return
if(!user.drop_item())
user << "<span class='notice'>\The [O] is stuck to your hand, you cannot put it in the analyzer!</span>"
user << "<span class='warning'>\The [O] is stuck to your hand, you cannot put it in the [src.name]!</span>"
return
busy = 1
loaded_item = O
O.loc = src
user << "<span class='notice'>You add the [O.name] to the machine!</span>"
user << "<span class='notice'>You add the [O.name] to the [src.name]!</span>"
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"*/
code/modules/research/protolathe.dm
+5 -5
View File
@@ -131,22 +131,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 << "<span class='warning'> The [src.name] must be linked to an R&D console first!</span>"
return 1
if (busy)
user << "<span class='warning'>The protolathe is busy. Please wait for completion of previous operation.</span>"
user << "<span class='warning'>The [src.name] is busy. Please wait for completion of previous operation.</span>"
return 1
if (O.is_open_container())
return
if (!istype(O, /obj/item/stack/sheet) || istype(O, /obj/item/stack/sheet/mineral/wood))
user << "<span class='warning'>You cannot insert this item into the protolathe!</span>"
user << "<span class='warning'>You cannot insert this item into the [src.name]!</span>"
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 << "<span class='warning'>The protolathe's material bin is full. Please remove material before adding more.</span>"
user << "<span class='warning'>The [src.name]'s material bin is full. Please remove material before adding more.</span>"
return 1
var/obj/item/stack/sheet/stack = O
@@ -189,4 +189,4 @@ Note: Must be placed west/left of and R&D console to function.
sleep(10)
src.overlays -= "protolathe_[stack.name]"
return
return