diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index b0f2357fdf..2e49590282 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -60,12 +60,14 @@ data = "0983E840344C39F4B059D5145FC5785DC6406A4FFF" read_only = 1 + /obj/machinery/computer/cloning/New() ..() spawn(5) - src.scanner = locate(/obj/machinery/dna_scannernew, get_step(src, WEST)) - src.pod1 = locate(/obj/machinery/clonepod, get_step(src, EAST)) - + updatemodules() + /*src.scanner = findscanner()//locate(/obj/machinery/dna_scannernew, get_step(src, WEST)) + src.pod1 = findcloner()//locate(/obj/machinery/clonepod, get_step(src, EAST)) + world << "SEARCHING FOR MACHEIN" src.temp = "" if (isnull(src.scanner)) src.temp += " SCNR-ERROR" @@ -75,10 +77,50 @@ src.pod1.connected = src if (src.temp == "") - src.temp = "System ready." + src.temp = "System ready."*/ return return +/obj/machinery/computer/cloning/proc/updatemodules() + //world << "UPDATING MODULES" + src.scanner = findscanner()//locate(/obj/machinery/dna_scannernew, get_step(src, WEST)) + src.pod1 = findcloner()//locate(/obj/machinery/clonepod, get_step(src, EAST)) + //world << "SEARCHING FOR MACHEIN" + //src.temp = "" + //if (isnull(src.scanner)) + // src.temp += " SCNR-ERROR" + if (!isnull(src.pod1)) + src.pod1.connected = src + // src.temp += " POD1-ERROR" + //else + + //if (src.temp == "") + // src.temp = "System ready." + +/obj/machinery/computer/cloning/proc/findscanner() + //..() + //world << "SEARCHING FOR SCANNER" + var/obj/machinery/dna_scannernew/scannerf = null + for(dir in list(NORTH,EAST,SOUTH,WEST)) + //world << "SEARCHING IN [dir]" + scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir)) + if (!isnull(scannerf)) + //world << "FOUND" + break + return scannerf + +/obj/machinery/computer/cloning/proc/findcloner() + //..() + //world << "SEARCHING FOR POD" + var/obj/machinery/clonepod/podf = null + for(dir in list(NORTH,EAST,SOUTH,WEST)) + //world << "SEARCHING IN [dir]" + podf = locate(/obj/machinery/clonepod, get_step(src, dir)) + if (!isnull(podf)) + //world << "FOUND" + break + return podf + /obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) @@ -105,13 +147,26 @@ if(stat & (BROKEN|NOPOWER)) return + updatemodules() + var/dat = "

Cloning System Control

" dat += "Refresh" - dat += "
[temp]
" + //dat += "
[temp]
" switch(src.menu) if(1) + dat += "

Modules

" + //dat += "Reload Modules" + if (isnull(src.scanner)) + dat += " Scanner-ERROR
" + else + dat += " Scanner-Found!
" + if (isnull(src.pod1)) + dat += " Pod-ERROR
" + else + dat += " Pod-Found!
" + dat += "

Scanner Functions

" if (isnull(src.scanner)) @@ -170,7 +225,7 @@ if(4) if (!src.active_record) src.menu = 2 - dat = "[src.temp]
" + //dat = "[src.temp]
" dat += "

Confirm Record Deletion

" dat += "Scan card to confirm.
" diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 6313effd10..fa2a8f59ee 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1772,7 +1772,7 @@ datum coco name = "Coco Powder" - id = "Coco Powder" + id = "coco" description = "A fatty, bitter paste made from coco beans." reagent_state = SOLID nutriment_factor = 5 * REAGENTS_METABOLISM diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index a49b639c21..b87870be07 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -70,7 +70,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) @@ -85,17 +85,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 f64a65fed0..3723a83269 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -193,6 +193,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 86018aab4e..96c6068fb6 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 abf25f3431..3bb1649408 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -579,6 +579,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.
" @@ -591,18 +593,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: " @@ -621,18 +623,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
" @@ -642,9 +644,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:
" @@ -660,8 +663,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) @@ -673,6 +674,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:
" @@ -681,14 +683,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])
" @@ -723,11 +727,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 || " @@ -784,26 +787,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]
" @@ -829,20 +831,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 || " @@ -864,9 +865,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 01d6d88e92..aa85da09d5 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)