Merge pull request #539 from SkyMarshal/master

Fixed lasers, balanced nuke, removed stupid code, removed Karma, improved admin panel.

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

@@ -12,8 +12,9 @@
 		else//Safety, in case a turf cannot be found.
 			loc = pick(latejoin)
 		if(!istype(body,/mob))	return//This needs to be recoded sometime so it has loc as its first arg
-		real_name = body.real_name
-		name = body.real_name
+		real_name = body.name
+		original_name = body.original_name
+		name = body.original_name
 		if(!safety)
 			corpse = body
 			verbs += /mob/dead/observer/proc/reenter_corpse
@@ -157,58 +158,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		L+=T
 	usr.loc = pick(L)
 
-var/list/karma_spenders = list()
-
-/mob/dead/observer/verb/spend_karma(var/mob/M in world) // Karma system -- TLE
-	set name = "Spend Karma"
-	set category = "Ghost"
-	set desc = "Let the gods know whether someone's been naughty or nice. <One use only>"
-	if(!istype(M, /mob))
-		usr << "\red That's not a mob. You shouldn't have even been able to specify that. Please inform your server administrator post haste."
-		return
-
-	if(!M.client)
-		usr << "\red That mob has no client connected at the moment."
-		return
-	if(client.karma_spent)
-		usr << "\red You've already spent your karma for the round."
-		return
-	for(var/a in karma_spenders)
-		if(a == key)
-			usr << "\red You've already spent your karma for the round."
-			return
-	if(M.key == key)
-		usr << "\red You can't spend karma on yourself!"
-		return
-	var/choice = input("Give [M.name] good karma or bad karma?", "Karma") in list("Good", "Bad", "Cancel")
-	client.karma_spent = 1
-	if(!choice || choice == "Cancel")
-		return
-	client.karma_spent = 0
-	if(choice == "Good")
-		M.client.karma += 1
-	if(choice == "Bad")
-		M.client.karma -= 1
-	usr << "[choice] karma spent on [M.name]."
-	client.karma_spent = 1
-	karma_spenders.Add(key)
-	if(M.client.karma <= -2 || M.client.karma >= 2)
-		var/special_role = "None"
-		var/assigned_role = "None"
-		var/karma_diary = file("data/logs/karma_[time2text(world.realtime, "YYYY/MM-Month/DD-Day")].log")
-		if(M.mind)
-			if(M.mind.special_role)
-				special_role = M.mind.special_role
-			if(M.mind.assigned_role)
-				assigned_role = M.mind.assigned_role
-		karma_diary << "[M.name] ([M.key]) [assigned_role]/[special_role]: [M.client.karma] - [time2text(world.timeofday, "hh:mm:ss")]"
-	var/isnegative = 1
-	if(choice == "Good")
-		isnegative = 0
-	else
-		isnegative = 1
-	sql_report_karma(src, M, isnegative)
-
 /mob/dead/observer/verb/toggle_alien_candidate()
 	set name = "Toggle Be Alien Candidate"
 	set category = "Ghost"

code/modules/mob/new_player/new_player.dm

@@ -208,6 +208,7 @@
 					preferences.randomize_name()
 				observer.name = preferences.real_name
 				observer.real_name = observer.name
+				observer.original_name = observer.name //Original name is only used in ghost chat! It is not to be edited by anything!
 
 				del(src)
 				return 1

code/modules/mob/new_player/preferences.dm

@@ -828,6 +828,7 @@ datum/preferences
 		if(be_random_name)
 			randomize_name()
 		character.real_name = real_name
+		character.original_name = real_name //Original name is only used in ghost chat! It is not to be edited by anything!
 
 		character.flavor_text = flavor_text
 

code/modules/mob/say.dm

@@ -23,14 +23,10 @@
 	var/name = src.real_name
 	var/alt_name = ""
 
-	if (istype(src, /mob/living/carbon/human) && src.name != src.real_name)
-		var/mob/living/carbon/human/H = src
-		alt_name = " (as [H.get_authentification_name()])"
-	else if (istype(src, /mob/dead/observer))
-		name = "Ghost"
-		alt_name = " ([src.real_name])"
-	else if (!istype(src, /mob/living/carbon/human))
-		name = src.name
+	if(original_name) //Original name is only used in ghost chat! It is not to be edited by anything!
+		name = src.original_name
+		if( original_name != real_name )
+			alt_name = " (died as [src.real_name])"
 
 	message = src.say_quote(message)