Fixes a missing " in a file

Adds a borg reset upgrade that can revive a dead borg, valued at roughly half the cost of a new borg body.
The world restart when everyone dies will no longer fire if someone else is revived during the 30 seconds.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3420 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
VivianFoxfoot@gmail.com
2012-04-09 16:21:47 +00:00
parent e99bde9c55
commit 97ee64f5e9
7 changed files with 36 additions and 9 deletions
@@ -493,7 +493,7 @@
var/obj/item/borg/upgrade/U = W
if(!opened)
usr << "You must access the borgs internals!"
else if(!src.module)
else if(!src.module && U.require_module)
usr << "The borg must choose a module before he can be upgraded!"
else if(U.locked)
usr << "The upgrade is locked and cannot be used yet!"
@@ -6,11 +6,10 @@
if(..()) return 1
return 0
/* No longer needed, but I'll leave it here incase we plan to re-use it.
//No longer needed, but I'll leave it here incase we plan to re-use it.
/mob/living/silicon/robot/movement_delay()
var/tally = 0 //Incase I need to add stuff other than "speed" later
tally = speed
return tally
*/
@@ -9,6 +9,7 @@
var/construction_time = 120
var/construction_cost = list("metal"=10000)
var/locked = 0
var/require_module = 0
/obj/item/borg/upgrade/proc/action()
return
@@ -17,6 +18,7 @@
/obj/item/borg/upgrade/reset/
name = "Borg module reset board"
desc = "Used to reset a borg's module. Destroys any other upgrades applied to the borg."
require_module = 1
/obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R)
R.uneq_all()
@@ -37,6 +39,7 @@
name = "Borg Flash-Supression"
desc = "A highly advanced, complicated system for supressing incoming flashes directed at the borg's optical processing system."
construction_cost = list("metal"=10000,"gold"=2000,"silver"=3000,"glass"=2000, "diamond"=5000)
require_module = 1
/obj/item/borg/upgrade/flashproof/New() // Why the fuck does the fabricator make a new instance of all the items?
@@ -45,3 +48,18 @@
/obj/item/borg/upgrade/flashproof/action(var/mob/living/silicon/robot/R)
if(R.module)
R.module += src
/obj/item/borg/upgrade/restart/
name = "Borg emergancy restart module"
desc = "Used to force a restart of a disabled-but-repaired borg, bringing it back online."
construction_cost = list("metal"=60000 , "glass"=5000)
/obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R)
if(!R.key)
for(var/mob/dead/observer/ghost in world)
if(ghost.corpse == R && ghost.client)
ghost.client.mob = ghost.corpse
R.stat = 0
+12 -3
View File
@@ -114,12 +114,21 @@
if(!cancel)
world << "<B>Everyone is dead! Resetting in 30 seconds!</B>"
feedback_set_details("end_error","no live players")
if(blackbox)
blackbox.save_all_data_to_sql()
spawn(300)
for(var/mob/M in world)
if(M.client && (M.stat != DEAD))
world << "Aborting world restart!"
return
feedback_set_details("end_error","no live players")
if(blackbox)
blackbox.save_all_data_to_sql()
sleep(50)
log_game("Rebooting because of no live players")
world.Reboot()
return
+1 -1
View File
@@ -130,7 +130,7 @@ datum/preferences/proc/savefile_load(mob/user)
F["job_engsec_med"] >> src.job_engsec_med
F["job_engsec_low"] >> src.job_engsec_low
F[OOC_Notes"] >> src.metadata
F["OOC_Notes"] >> src.metadata
if(isnull(metadata))
metadata = ""