Yay Updates

Needs fixing:
See how quickly the powernet drains at default load, I thought atmos
went to quickly so I upped the power cell by one level,
Shuttle Tags,
Graphical glitches involving some wires,
There is still some things missing with NanoUI but they are not game
breaking in any way I have seen so far.

Other than that we should be good to go.
This commit is contained in:
SoundScopes
2014-11-12 19:12:22 +00:00
parent c2e72bf51f
commit f25ee4ee9f
86 changed files with 25649 additions and 10773 deletions
+1 -1
View File
@@ -978,7 +978,7 @@ var/list/admin_verbs_mod = list(
return
var/datum/gas_mixture/environment = usr.loc.return_air()
environment.gas["phoron"] = 0
environment.gas["toxins"] = 0
environment.gas["nitrogen"] = 82.1472
environment.gas["oxygen"] = 21.8366
environment.gas["carbon_dioxide"] = 0
+19 -1
View File
@@ -1,11 +1,16 @@
/client/proc/atmosscan()
set category = "Mapping"
set name = "Check Plumbing"
set name = "Check Piping"
set background = 1
if(!src.holder)
src << "Only administrators may use this command."
return
feedback_add_details("admin_verb","CP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
if(alert("WARNING: This command should not be run on a live server. Do you want to continue?", "Check Piping", "No", "Yes") == "No")
return
usr << "Checking for disconnected pipes..."
//all plumbing - yes, some things might get stated twice, doesn't matter.
for (var/obj/machinery/atmospherics/plumbing in world)
if (plumbing.nodealert)
@@ -21,6 +26,19 @@
if (!pipe.node1 || !pipe.node2)
usr << "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])"
usr << "Checking for overlapping pipes..."
next_turf:
for(var/turf/T in world)
for(var/dir in cardinal)
var/check = 0
for(var/obj/machinery/atmospherics/pipe in T)
if(dir & pipe.initialize_directions)
check++
if(check > 1)
usr << "Overlapping pipe ([pipe.name]) located at [T.x],[T.y],[T.z] ([get_area(T)])"
continue next_turf
usr << "Done"
/client/proc/powerdebug()
set category = "Mapping"
set name = "Check Power"
+1 -1
View File
@@ -1142,7 +1142,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(Rad.anchored)
if(!Rad.P)
var/obj/item/weapon/tank/plasma/Plasma = new/obj/item/weapon/tank/plasma(Rad)
Plasma.air_contents.gas["phoron"] = 70
Plasma.air_contents.gas["toxins"] = 70
Rad.drainratio = 0
Rad.P = Plasma
Plasma.loc = Rad
+1 -1
View File
@@ -482,7 +482,7 @@ client/proc/one_click_antag()
break
new_vox.key = theghost.key
new_vox << "\blue You are a Vox Primalis, fresh out of the Shoal. Your ship has arrived at the Tau Ceti system hosting the NSV Exodus... or was it the Luna? NSS? Utopia? Nobody is really sure, but everyong is raring to start pillaging! Your current goal is: \red<B> [input]</B>"
new_vox << "\blue You are a Vox Primalis, fresh out of the Shoal. Your ship has arrived at the Tau Ceti system hosting the NSS Aurora... or was it the Luna? NSV? Utopia? Nobody is really sure, but everyong is raring to start pillaging! Your current goal is: \red<B> [input]</B>"
new_vox << "\red Don't forget to turn on your nitrogen internals!"
raiders--
+2
View File
@@ -168,6 +168,7 @@
voice_name = "Bluespace Cat"
real_name = "Bluespace Cat"
mind.name = "Bluespace Cat"
gender = "female"
regenerate_icons()
else
ghostize(0)
@@ -219,6 +220,7 @@
voice_name = "Bluespace Squid"
real_name = "Bluespace Squid"
mind.name = "Bluespace Squid"
gender = "female"
regenerate_icons()
else
ghostize(0)
+6 -4
View File
@@ -544,10 +544,12 @@
// this is the data which will be sent to the ui
var/data[0]
data["scan_progress"] = round(scanner_progress)
data["scanning"] = scanning
data["bloodsamp"] = (bloodsamp ? bloodsamp.name : "")
data["bloodsamp_desc"] = (bloodsamp ? (bloodsamp.desc ? bloodsamp.desc : "No information on record.") : "")
data = list(
"scan_progress" = round(scanner_progress),
"scanning" = scanning,
"bloodsamp" = (bloodsamp ? bloodsamp.name : ""),
"bloodsamp_desc" = (bloodsamp ? (bloodsamp.desc ? bloodsamp.desc : "No information on record.") : ""),
)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
if (!ui)
+1 -1
View File
@@ -280,7 +280,7 @@
if(!C.status)
continue
else
if(C.network != "CREED" && C.network != "thunder" && C.network != "RD" && C.network != "phoron" && C.network != "Prison") COMPILE ERROR! This will have to be updated as camera.network is no longer a string, but a list instead
if(C.network != "CREED" && C.network != "thunder" && C.network != "RD" && C.network != "toxins" && C.network != "Prison") COMPILE ERROR! This will have to be updated as camera.network is no longer a string, but a list instead
cameralist[C.network] = C.network
src.network = input(usr, "Which network would you like to view?") as null|anything in cameralist
+2 -2
View File
@@ -27,8 +27,8 @@
filenames = flist(path)
for(var/filename in filenames)
if(copytext(filename, length(filename)) != "/") // filenames which end in "/" are actually directories, which we want to ignore
asset_files.Add(file(path + filename)) // add this file to asset_files for sending to clients when they connect
if(fexists(path + filename))
asset_files.Add(fcopy_rsc(path + filename)) // add this file to asset_files for sending to clients when they connect
return
/**
File diff suppressed because one or more lines are too long