Respawn now vastly more configurable.

code/controllers/configuration.dm

@@ -51,6 +51,9 @@
 	var/allow_ai = 1					// allow ai job
 	var/hostedby = null
 	var/respawn = 1
+	var/respawn_delay=30
+	var/respawn_as_mommi = 0
+	var/respawn_as_mouse = 1
 	var/guest_jobban = 1
 	var/usewhitelist = 0
 	var/kick_inactive = 0				//force disconnect for inactive players
@@ -274,6 +277,12 @@
 				if ("norespawn")
 					config.respawn = 0
 
+				if ("respawn_as_mommi")
+					config.respawn_as_mommi = 1
+
+				if ("no_respawn_as_mouse")
+					config.respawn_as_mouse = 0
+
 				if ("servername")
 					config.server_name = value
 
@@ -475,6 +484,8 @@
 					config.bones_can_break = value
 				if("limbs_can_break")
 					config.limbs_can_break = value
+				if("respawn_delay")
+					config.respawn_delay = value
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 

code/global.dm

@@ -111,7 +111,7 @@ var/list/shuttles = list(  )
 var/list/reg_dna = list(  )
 //	list/traitobj = list(  )
 
-var/mouse_respawn_time = 5 //Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes.
+var/mouse_respawn_time = 1 //Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes.
 
 var/CELLRATE = 0.002  // multiplier for watts per tick <> cell storage (eg: .002 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
 var/CHARGELEVEL = 0.001 // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second)

code/modules/mob/dead/observer/observer.dm

@@ -262,6 +262,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Become mouse"
 	set category = "Ghost"
 
+	if(!config.respawn_as_mouse)
+		src << "<span class='warning'>Respawning as mouse is disabled..</span>"
+		return
+
 	var/timedifference = world.time - client.time_died_as_mouse
 	if(client.time_died_as_mouse && timedifference <= mouse_respawn_time * 600)
 		var/timedifference_text
@@ -296,11 +300,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	src << browse(dat, "window=manifest;size=370x420;can_close=1")
 
-/*
+
 /mob/dead/observer/verb/become_mommi()
 	set name = "Become MoMMI"
 	set category = "Ghost"
 
+	if(!config.respawn_as_mommi)
+		src << "<span class='warning'>Respawning as MoMMI is disabled..</span>"
+		return
+
 	var/timedifference = world.time - client.time_died_as_mouse
 	if(client.time_died_as_mouse && timedifference <= mouse_respawn_time * 600)
 		var/timedifference_text
@@ -324,7 +332,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(host)
 		host.ckey = src.ckey
 		//host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"
-*/
 
 //BEGIN TELEPORT HREF CODE
 /mob/dead/observer/Topic(href, href_list)

code/modules/mob/mob.dm

@@ -830,8 +830,8 @@ var/list/slot_equipment_priority = list( \
 			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!"
+		if (deathtime < config.respawn_delay*600)
+			usr << "You must wait [config.respawn_delay] minutes to respawn!"
 			return
 		else
 			usr << "You can respawn now, enjoy your new life!"

config-example/config.txt

@@ -209,6 +209,12 @@ USEALIENWHITELIST
 ## Comment this to unrestrict the number of alien players allowed in the round. The number represents the number of alien players for every human player.
 #ALIEN_PLAYER_RATIO 0.2
 
+## Comment this to disallow respawning as a MoMMI from MoMMI fabricators.
+RESPAWN_AS_MOMMI
+
+## Uncomment this to disallow spawning as a mouse.
+#NO_RESPAWN_AS_MOUSE
+
 ##Remove the # to let ghosts spin chairs
 #GHOST_INTERACTION
 
@@ -229,4 +235,4 @@ USEALIENWHITELIST
 
 ## Path to the python2 executable on the system.  Leave blank for default.
 ## Default is "python" on Windows, "/usr/bin/env python2" on UNIX.
-#PYTHON_PATH
+#PYTHON_PATH

config-example/game_options.txt

@@ -32,6 +32,8 @@ REVIVAL_CLONING 1
 ## amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite)
 REVIVAL_BRAIN_LIFE -1
 
+## Amount of time users must wait to respawn (as a human, assuming the server has respawn enabled)
+RESPAWN_DELAY 30
 
 
 ### MOB MOVEMENT ###