Merge pull request #1918 from Markolie/fixes2

Fixes

code/game/machinery/Freezer.dm

@@ -41,7 +41,7 @@
 		H += M.rating
 	for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts)
 		T += M.rating
-	min_temperature = T0C - (170 + (T*15))
+	min_temperature = max(0,T0C - (170 + (T*15)))
 	current_heat_capacity = 1000 * ((H - 1) ** 2)
 
 /obj/machinery/atmospherics/unary/cold_sink/freezer/attackby(obj/item/I, mob/user, params)

code/game/response_team.dm

@@ -33,7 +33,6 @@ var/send_emergency_team
 	if(alert("Do you want to dispatch an Emergency Response Team?",,"Yes","No") != "Yes")
 		return
 
-
 	if(get_security_level() != "red") // Allow admins to reconsider if the alert level isn't Red
 		switch(alert("The station is not in red alert. Do you still want to dispatch a response team?",,"Yes","No"))
 			if("No")
@@ -137,10 +136,13 @@ var/send_emergency_team
 	var/obj/item/weapon/paper/P = new
 	P.info = "Your orders, Commander, are to use all means necessary to return the station to a survivable condition.<br>To this end, you have been provided with the best tools we can give for Security, Medical, Engineering and Janitorial duties. The nuclear authorization code is: <b>[ nuke ? nuke.r_code : "UNKNOWN"]</b>. Be warned, if you detonate this without good reason, we will hold you to account for damages. Memorise this code, and then destroy this message."
 	P.name = "ERT Orders and Emergency Nuclear Code"
+	var/obj/item/weapon/stamp/centcom/stamp = new
+	P.stamp(stamp)
+	qdel(stamp)
 	for (var/obj/effect/landmark/A in world)
 		if (A.name == "nukecode")
 			P.loc = A.loc
-			del(A)
+			qdel(A)
 			continue
 */
 
@@ -186,7 +188,7 @@ var/send_emergency_team
 
 	M.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]"
 	M.name = M.real_name
-	M.age = rand(23,45)
+	M.age = rand(23,35)
 
 	//Creates mind stuff.
 	M.mind = new
@@ -320,6 +322,12 @@ var/send_emergency_team
 
 		if("Commander")
 			command_slots = 0
+			
+			// Override name and age for the commander
+			M.real_name = "[pick("Lieutenant", "Captain", "Major")] [pick(last_names)]"			
+			M.name = M.real_name
+			M.age = rand(35,45)
+	
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/commander(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/responseteam(M), slot_in_backpack)

code/modules/admin/verbs/striketeam.dm

@@ -7,9 +7,6 @@ var/global/sent_strike_team = 0
 	if(!ticker)
 		usr << "<font color='red'>The game hasn't started yet!</font>"
 		return
-	if(world.time < 6000)
-		usr << "<font color='red'>There are [(6000-world.time)/10] seconds remaining before it may be called.</font>"
-		return
 	if(sent_strike_team == 1)
 		usr << "<font color='red'>CentCom is already sending a team.</font>"
 		return

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -12,9 +12,6 @@ var/global/sent_syndicate_strike_team = 0
 	if(!ticker)
 		alert("The game hasn't started yet!")
 		return
-//	if(world.time < 6000)
-//		alert("Not so fast, buddy. Wait a few minutes until the game gets going. There are [(6000-world.time)/10] seconds remaining.")
-//		return
 	if(sent_syndicate_strike_team == 1)
 		alert("The Syndicate are already sending a team, Mr. Dumbass.")
 		return

code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm

@@ -130,7 +130,7 @@
 
 	if (deathtime < 6000 && joinedasobserver == 0)	
 		usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
-		usr << "You must wait 10 minutes to respawn as a drone!"
+		usr << "<span class='warning'>You must wait 10 minutes to respawn as a drone!</span>"
 		return
 
 	for(var/obj/machinery/drone_fabricator/DF in world)

code/modules/mob/mob.dm

@@ -610,72 +610,43 @@ var/list/slot_equipment_priority = list( \
 /mob/proc/is_dead()
 	return stat == DEAD
 
-
-/*
-/mob/verb/help()
-	set name = "Help"
-	src << browse('html/help.html', "window=help")
-	return
-*/
-
-
 /mob
-
 	var/newPlayerType = /mob/new_player
 
-/*
 /mob/verb/abandon_mob()
 	set name = "Respawn"
 	set category = "OOC"
 
-	if (!( abandon_allowed ))
-		usr << "\blue Respawn is disabled."
+	if (!abandon_allowed)
+		usr << "<span class='warning'>Respawning is disabled.</span>"
 		return
-	if ((stat != 2 || !( ticker )))
-		usr << "\blue <B>You must be dead to use this!</B>"
+		
+	if (stat != DEAD || !ticker)
+		usr << "<span class='boldnotice'>You must be dead to use this!</span>"
 		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.")
+	log_game("[key_name(usr)] has respawned.")
 
 	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.")
+		log_game("[key_name(usr)] respawn failed due to disconnect.")
 		return
 	client.screen.Cut()
+	
 	if(!client)
-		log_game("[usr.key] AM failed due to disconnect.")
+		log_game("[key_name(usr)] respawn failed due to disconnect.")
 		return
 
-	var/mob/newPlayer = new newPlayerType()
+	var/mob/new_player/M = new /mob/new_player()
 	if(!client)
-		log_game("[usr.key] AM failed due to disconnect.")
-		del(newPlayer)
+		log_game("[key_name(usr)] respawn failed due to disconnect.")
+		qdel(M)
 		return
 
-	newPlayer.key = key
+	M.key = key
 	return
-*/
+
 /mob/verb/observe()
 	set name = "Observe"
 	set category = "OOC"