From d908f7f4688891f44d33469c059b663943c74c7b Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Fri, 16 Dec 2011 23:47:49 +0000 Subject: [PATCH] TG Updates: Bugfixes: Fix for Issue 161. Fix for Issue 239. Circuit imprinter runtime involving Atmosphereic Alert circuits. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ▫ Capitalized some letters in the security level messages. Because that really annoyed me! ▫ Merged Donkieyo's patches with the master branch. (Forum post: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=7051) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2706 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mining/mine_items.dm | 8 +-- code/modules/mob/new_player/new_player.dm | 1 + code/modules/research/designs.dm | 4 +- code/modules/research/rdconsole.dm | 60 +++++++++---------- .../security levels/security levels.dm | 6 +- 5 files changed, 39 insertions(+), 40 deletions(-) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 39c9aa41e72..79157b40fa7 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -63,7 +63,7 @@ proc/move_mining_shuttle() /obj/machinery/computer/mining_shuttle/attack_hand(user as mob) src.add_fingerprint(usr) var/dat - dat = text("Mining shuttle: Call") + dat = text("
Mining shuttle:
Send
") user << browse("[dat]", "window=miningshuttle;size=200x100") /obj/machinery/computer/mining_shuttle/Topic(href, href_list) @@ -78,17 +78,17 @@ proc/move_mining_shuttle() return if (!mining_shuttle_moving) - usr << "\blue shuttle called and will arrive shortly" + usr << "\blue Shuttle recieved message and will be sent shortly." move_mining_shuttle() else - usr << "\blue shuttle is already moving" + usr << "\blue Shuttle is already moving." /obj/machinery/computer/mining_shuttle/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/card/emag)) src.req_access = list() hacked = 1 - usr << "The computer's controls are now all access" + usr << "You fried the consoles ID checking system. It's now available to everyone!" /******************************Lantern*******************************/ diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 1c1eee6d2a2..6498340632e 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -194,6 +194,7 @@ var/mob/dead/observer/observer = new() spawning = 1 + src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo close_spawn_windows() var/obj/O = locate("landmark*Observer-Start") diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index dd36cedae5b..233e8113388 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -185,13 +185,13 @@ datum build_path = "/obj/item/weapon/circuitboard/secure_data" atmosalerts - name = "Circuit Design (Atmosphere Alerts Console)" + name = "Circuit Design (Atmosphere Alert)" desc = "Allows for the construction of circuit boards used to build an atmosphere alert console.." id = "atmosalerts" req_tech = list("programming" = 2) build_type = IMPRINTER materials = list("$glass" = 2000, "acid" = 20) - build_path = "/obj/item/weapon/circuitboard/atmosphere/alerts" + build_path = "/obj/item/weapon/circuitboard/atmos_alert" air_management name = "Circuit Design (Atmospheric Monitor)" diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index cbc5b709dbc..fa6178bdee2 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -578,6 +578,8 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Main Menu" if(1.2) //Technology Disk Menu + + dat += "Main Menu
" dat += "Disk Contents: (Technology Data Disk)

" if(t_disk.stored == null) dat += "The disk has no data stored on it.
" @@ -590,18 +592,18 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Operations: " dat += "Upload to Database || " dat += "Clear Disk || " - dat += "Eject Disk
" - dat += "
Main Menu" + dat += "Eject Disk" if(1.3) //Technology Disk submenu + dat += "
Main Menu || " + dat += "Return to Disk Operations
" dat += "Load Technology to Disk:

" for(var/datum/tech/T in files.known_tech) dat += "[T.name] " dat += "(Copy to Disk)
" - dat += "

Main Menu || " - dat += "Return to Disk Operations" if(1.4) //Design Disk menu. + dat += "Main Menu
" if(d_disk.blueprint == null) dat += "The disk has no data stored on it.
" dat += "Operations: " @@ -620,18 +622,18 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "
Operations: " dat += "Upload to Database || " dat += "Clear Disk || " - dat += "Eject Disk
" - dat += "Main Menu" + dat += "Eject Disk" if(1.5) //Technology disk submenu + dat += "Main Menu || " + dat += "Return to Disk Operations
" dat += "Load Design to Disk:

" for(var/datum/design/D in files.known_designs) dat += "[D.name] " dat += "(Copy to Disk)
" - dat += "
Main Menu || " - dat += "Return to Disk Operations" if(1.6) //R&D console settings + dat += "Main Menu
" dat += "R&D Console Setting:

" if(sync) dat += "Sync Database with Network
" @@ -641,9 +643,10 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Device Linkage Menu
" dat += "Lock Console
" dat += "Reset R&D Database.
" - dat += "
Main Menu" if(1.7) //R&D device linkage + dat += "Main Menu || " + dat += "Settings Menu
" dat += "R&D Console Device Linkage Menu:

" dat += "Re-sync with Nearby Devices
" dat += "Linked Devices:
" @@ -659,8 +662,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "* Circuit Imprinter (Disconnect)
" else dat += "* (No Circuit Imprinter Linked)
" - dat += "
Settings Menu || " - dat += "Main Menu" ////////////////////DESTRUCTIVE ANALYZER SCREENS//////////////////////////// if(2.0) @@ -672,6 +673,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Main Menu" if(2.2) + dat += "Main Menu
" dat += "Deconstruction Menu
" dat += "Name: [linked_destroy.loaded_item.name]
" dat += "Origin Tech:
" @@ -680,14 +682,16 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "* [CallTechName(T)] [temp_tech[T]]
" dat += "
Deconstruct Item || " dat += "Eject Item || " - dat += "Main Menu" /////////////////////PROTOLATHE SCREENS///////////////////////// if(3.0) + dat += "Main Menu
" dat += "NO PROTOLATHE LINKED TO CONSOLE

" - dat += "Main Menu" if(3.1) + dat += "Main Menu || " + dat += "Material Storage || " + dat += "Chemical Storage
" dat += "Protolathe Menu:

" dat += "Material Amount: [linked_lathe.TotalMaterials()] cm3 (MAX: [linked_lathe.max_material_storage])
" dat += "Chemical Volume: [linked_lathe.reagents.total_volume] (MAX: [linked_lathe.reagents.maximum_volume])
" @@ -722,11 +726,10 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "* [temp_dat]
" else dat += "* [temp_dat]
" - dat += "
Material Storage || " - dat += "Chemical Storage || " - dat += "Main Menu" if(3.2) //Protolathe Material Storage Sub-menu + dat += "Main Menu || " + dat += "Protolathe Menu
" dat += "Material Storage
" //Metal dat += "* [linked_lathe.m_amount] cm3 of Metal || " @@ -783,26 +786,25 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(linked_lathe.clown_amount >= 3750) dat += "(1 Sheet) " if(linked_lathe.clown_amount >= 18750) dat += "(5 Sheets) " if(linked_lathe.clown_amount >= 3750) dat += "(Max Sheets)" - dat += "
" - - dat += "
Protolathe Menu | " - dat += "Main Menu" if(3.3) //Protolathe Chemical Storage Submenu + dat += "Main Menu || " + dat += "Protolathe Menu
" dat += "Chemical Storage
" for(var/datum/reagent/R in linked_lathe.reagents.reagent_list) dat += "Name: [R.name] | Units: [R.volume] " dat += "(Purge)
" dat += "Disposal All Chemicals in Storage
" - dat += "
Protolathe Menu | " - dat += "Main Menu" ///////////////////CIRCUIT IMPRINTER SCREENS//////////////////// if(4.0) + dat += "Main Menu
" dat += "NO CIRCUIT IMPRINTER LINKED TO CONSOLE

" - dat += "Main Menu" if(4.1) + dat += "Main Menu || " + dat += "Material Storage || " + dat += "Chemical Storage
" dat += "Circuit Imprinter Menu:

" dat += "Material Amount: [linked_imprinter.TotalMaterials()] cm3
" dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
" @@ -828,20 +830,19 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "* [temp_dat]
" else dat += "* [temp_dat]
" - dat += "
Material Storage || " - dat += "Chemical Storage || " - dat += "Main Menu" if(4.2) + dat += "Main Menu || " + dat += "Imprinter Menu
" dat += "Chemical Storage
" for(var/datum/reagent/R in linked_imprinter.reagents.reagent_list) dat += "Name: [R.name] | Units: [R.volume] " dat += "(Purge)
" dat += "Disposal All Chemicals in Storage
" - dat += "
Imprinter Menu | " - dat += "Main Menu" if(4.3) + dat += "Main Menu || " + dat += "Circuit Imprinter Menu
" dat += "Material Storage
" //Glass dat += "* [linked_imprinter.g_amount] cm3 of Glass || " @@ -863,9 +864,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(linked_imprinter.diamond_amount > 3750) dat += "(1 Sheet) " if(linked_imprinter.diamond_amount > 18750) dat += "(5 Sheets) " if(linked_imprinter.diamond_amount > 3750) dat += "(Max Sheets)" - dat += "
" - dat += "
Circuit Imprinter Menu | " - dat += "Main Menu" user << browse("Research and Development Console
[dat]", "window=rdconsole;size=575x400") onclose(user, "rdconsole") \ No newline at end of file diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index a659b2b370a..acf08c14921 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -21,7 +21,7 @@ if(level >= SEC_LEVEL_GREEN && level <= SEC_LEVEL_DELTA && level != security_level) switch(level) if(SEC_LEVEL_GREEN) - world << "Attention! security level lowered to green" + world << "Attention! Security level lowered to green" world << "[config.alert_desc_green]" security_level = SEC_LEVEL_GREEN for(var/obj/machinery/firealarm/FA in world) @@ -30,10 +30,10 @@ FA.overlays += image('monitors.dmi', "overlay_green") if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) - world << "Attention! security level elevated to blue" + world << "Attention! Security level elevated to blue" world << "[config.alert_desc_blue_upto]" else - world << "Attention! security level lowered to blue" + world << "Attention! Security level lowered to blue" world << "[config.alert_desc_blue_downto]" security_level = SEC_LEVEL_BLUE for(var/obj/machinery/firealarm/FA in world)