Merged respawn timer.

This commit is contained in:
Erthilo
2012-08-29 22:36:59 +01:00
parent 41e19a6e62
commit ddc7fc3031
2 changed files with 23 additions and 1 deletions
@@ -65,6 +65,7 @@ Works together with spawning an observer, noted above.
if(key)
var/mob/dead/observer/ghost = new(src) //Transfer safety to observer spawning proc.
ghost.can_reenter_corpse = can_reenter_corpse
ghost.timeofdeath = timeofdeath //BS12 EDIT
ghost.key = key
return ghost
+22 -1
View File
@@ -331,14 +331,35 @@ var/list/slot_equipment_priority = list( \
set category = "OOC"
if (!( abandon_allowed ))
usr << "\blue Respawn is disabled."
return
if ((stat != 2 || !( ticker )))
usr << "\blue <B>You must be dead to use this!</B>"
return
if (ticker.mode.name == "meteor" || ticker.mode.name == "epidemic") //BS12 EDIT
usr << "\blue Respawn is disabled."
return
else
var/deathtime = world.time - src.timeofdeath
var/deathtimeminutes = round(deathtime / 600)
var/pluralcheck = "minute"
if(deathtimeminutes == 0)
pluralcheck = ""
else if(deathtimeminutes == 1)
pluralcheck = " [deathtimeminutes] minute and"
else if(deathtimeminutes > 1)
pluralcheck = " [deathtimeminutes] minutes and"
var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1)
usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
if (deathtime < 18000)
usr << "You must wait 30 minutes to respawn!"
return
else
usr << "You can respawn now, enjoy your new life!"
log_game("[usr.name]/[usr.key] used abandon mob.")
usr << "\blue <B>Please roleplay correctly!</B>"
usr << "\blue <B>Make sure to play a different character, and please roleplay correctly!</B>"
if(!client)
log_game("[usr.key] AM failed due to disconnect.")