Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

Conflicts:
	code/controllers/configuration.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/factions.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/verbs/ooc.dm
	code/game/verbs/who.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/login.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/paperwork/paper.dm
	config/config.txt
	html/changelog.html
	icons/mob/human.dmi
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

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

@@ -1,7 +1,2 @@
 /mob/dead/observer/Login()
-	..()
-	if(client.holder && client.holder.state != 2)
-		client.holder.state = 2
-		var/rank = client.holder.rank
-		client.clear_admin_verbs()
-		client.update_admins(rank)
+	..()

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

@@ -10,8 +10,8 @@
 	log_say("Ghost/[src.key] : [message]")
 
 	if (src.client)
-		if(src.client.muted_deadchat)
-			src << "\red You cannot talk in deadchat (muted by admins)."
+		if(src.client.muted & MUTE_DEADCHAT)
+			src << "\red You cannot talk in deadchat (muted)."
 			return
 
 		if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT))

code/modules/mob/living/carbon/carbon.dm

@@ -267,6 +267,8 @@
 					for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in vent_found.network.normal_members)
 						if(temp_vent.loc == loc)
 							continue
+						if(temp_vent.welded)
+							continue
 						var/turf/T = get_turf(temp_vent)
 
 						if(!T || T.z != loc.z)

code/modules/mob/living/carbon/human/emote.dm

@@ -66,8 +66,8 @@
 			if(silent)
 				return
 			if (src.client)
-				if (client.muted_ic)
-					src << "\red You cannot send IC messages (muted by admins)."
+				if (client.muted & MUTE_IC)
+					src << "\red You cannot send IC messages (muted)."
 					return
 				if (src.client.handle_spam_prevention(message,MUTE_IC))
 					return

code/modules/mob/living/carbon/human/human_defines.dm

@@ -19,6 +19,8 @@
 
 	var/s_tone = 0	//Skin tone
 
+	var/lip_style = null	//no lipstick by default- arguably misleading, as it could be used for general makeup
+
 	var/age = 30		//Player's age (pure fluff)
 	var/b_type = "A+"	//Player's bloodtype (Not currently used, just character fluff)
 

code/modules/mob/living/carbon/human/update_icons.dm

@@ -302,9 +302,10 @@ proc/get_damage_icon_part(damage_state, body_part)
 	stand_icon.Blend(eyes_s, ICON_OVERLAY)
 	lying_icon.Blend(eyes_l, ICON_OVERLAY)
 
-	//Mouth
-	stand_icon.Blend(new/icon('icons/mob/human_face.dmi', "mouth_[g]_s"), ICON_OVERLAY)
-	lying_icon.Blend(new/icon('icons/mob/human_face.dmi', "mouth_[g]_l"), ICON_OVERLAY)
+	//Mouth	(lipstick!)
+	if(lip_style)
+		stand_icon.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_s"), ICON_OVERLAY)
+		lying_icon.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_l"), ICON_OVERLAY)
 
 	//Underwear
 	if(underwear < 6 && underwear > 0)
@@ -758,8 +759,9 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 // Used mostly for creating head items
 /mob/living/carbon/human/proc/generate_head_icon()
-	var/g = "m"
-	if (gender == FEMALE)	g = "f"
+//gender no longer matters for the mouth, although there should probably be seperate base head icons.
+//	var/g = "m"
+//	if (gender == FEMALE)	g = "f"
 
 	//base icons
 	var/icon/face_lying		= new /icon('icons/mob/human_face.dmi',"bald_l")
@@ -780,14 +782,12 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 	//Eyes
 	// Note: These used to be in update_face(), and the fact they're here will make it difficult to create a disembodied head
-	var/icon/eyes_s = new/icon('icons/mob/human_face.dmi', "eyes_s")
 	var/icon/eyes_l = new/icon('icons/mob/human_face.dmi', "eyes_l")
-	eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
 	eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
 	face_lying.Blend(eyes_l, ICON_OVERLAY)
 
-	//Mouth
-	face_lying.Blend(new/icon('icons/mob/human_face.dmi', "mouth_[g]_l"), ICON_OVERLAY)
+	if(lip_style)
+		face_lying.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_l"), ICON_OVERLAY)
 
 	var/image/face_lying_image = new /image(icon = face_lying)
 	return face_lying_image

code/modules/mob/living/carbon/human/whisper.dm

@@ -8,8 +8,8 @@
 	log_whisper("[src.name]/[src.key] : [message]")
 
 	if (src.client)
-		if (src.client.muted_ic)
-			src << "\red You cannot whisper (muted by admins)."
+		if (src.client.muted & MUTE_IC)
+			src << "\red You cannot whisper (muted)."
 			return
 
 		if (src.client.handle_spam_prevention(message,MUTE_IC))

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -762,7 +762,10 @@ mob/living/carbon/metroid/var/temperature_resistance = T0C+75
 					if(!border_obstacle.CanPass(D, D.loc, 1, 0))
 						ok = 0
 
-	del(D)
+	//del(D)
+	//Garbage Collect Dummy
+	D.loc = null
+	D = null
 	if (!( ok ))
 
 		return 0

code/modules/mob/living/login.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /mob/living/Login()
 	..()
 	//Mind updates
@@ -62,4 +63,63 @@
 		if ("changeling")
 			if (podman.mind in ticker.mode:changelings)
 				podman.make_changeling()
+=======
+/mob/living/Login()
+	..()
+	//Mind updates
+	mind_initialize()	//updates the mind (or creates and initializes one if one doesn't exist)
+	mind.active = 1		//indicates that the mind is currently synced with a client
+
+	//Round specific stuff like hud updates
+	if(ticker && ticker.mode)
+		switch(ticker.mode.name)
+			if("sandbox")
+				CanBuild()
+			if("revolution")
+				if((mind in ticker.mode.revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
+					ticker.mode.update_rev_icons_added(src.mind)
+			if("cult")
+				if(mind in ticker.mode:cult)
+					ticker.mode.update_cult_icons_added(src.mind)
+			if("nuclear emergency")
+				if(mind in ticker.mode:syndicates)
+					ticker.mode.update_all_synd_icons()
+	return .
+
+//This stuff needs to be merged from cloning.dm but I'm not in the mood to be shouted at for breaking all the things :< ~Carn
+	/* clones
+	switch(ticker.mode.name)
+		if("revolution")
+			if(src.occupant.mind in ticker.mode:revolutionaries)
+				ticker.mode:update_all_rev_icons() //So the icon actually appears
+			if(src.occupant.mind in ticker.mode:head_revolutionaries)
+				ticker.mode:update_all_rev_icons()
+		if("nuclear emergency")
+			if (src.occupant.mind in ticker.mode:syndicates)
+				ticker.mode:update_all_synd_icons()
+		if("cult")
+			if (src.occupant.mind in ticker.mode:cult)
+				ticker.mode:add_cultist(src.occupant.mind)
+				ticker.mode:update_all_cult_icons() //So the icon actually appears
+	*/
+
+	/*	Plantpeople
+	switch(ticker.mode.name)
+		if ("revolution")
+			if (podman.mind in ticker.mode:revolutionaries)
+				ticker.mode:add_revolutionary(podman.mind)
+				ticker.mode:update_all_rev_icons() //So the icon actually appears
+			if (podman.mind in ticker.mode:head_revolutionaries)
+				ticker.mode:update_all_rev_icons()
+		if ("nuclear emergency")
+			if (podman.mind in ticker.mode:syndicates)
+				ticker.mode:update_all_synd_icons()
+		if ("cult")
+			if (podman.mind in ticker.mode:cult)
+				ticker.mode:add_cultist(podman.mind)
+				ticker.mode:update_all_cult_icons() //So the icon actually appears
+		if ("changeling")
+			if (podman.mind in ticker.mode:changelings)
+				podman.make_changeling()
+>>>>>>> remotes/git-svn
 	*/

code/modules/mob/living/say.dm

@@ -86,8 +86,8 @@ var/list/department_radio_keys = list(
 		return say_dead(message)
 
 	if (src.client)
-		if(client.muted_ic)
-			src << "\red You cannot speak in IC (muted by admins)."
+		if(client.muted & MUTE_IC)
+			src << "\red You cannot speak in IC (muted)."
 			return
 		if (src.client.handle_spam_prevention(message,MUTE_IC))
 			return

code/modules/mob/living/silicon/robot/emote.dm

@@ -69,8 +69,8 @@
 
 		if ("me")
 			if (src.client)
-				if(client.muted_ic)
-					src << "You cannot send IC messages (muted by admins)."
+				if(client.muted & MUTE_IC)
+					src << "You cannot send IC messages (muted)."
 					return
 				if (src.client.handle_spam_prevention(message,MUTE_IC))
 					return

code/modules/mob/living/silicon/say.dm

@@ -3,8 +3,8 @@
 		return
 
 	if (src.client)
-		if(client.muted_ic)
-			src << "You cannot send IC messages (muted by admins)."
+		if(client.muted & MUTE_IC)
+			src << "You cannot send IC messages (muted)."
 			return
 		if (src.client.handle_spam_prevention(message,MUTE_IC))
 			return

code/modules/mob/login.dm

@@ -1,5 +1,10 @@
 //handles setting lastKnownIP and computer_id for use by the ban systems as well as checking for multikeying
 /mob/proc/update_Login_details()
+	//trigger admin holder updates. This is hear as all Login() calls this proc.
+	if(client.holder)
+		client.update_admins(client.holder.rank)
+
+	//Multikey checks and logging
 	lastKnownIP	= client.address
 	computer_id	= client.computer_id
 	log_access("Login: [key_name(src)] from [lastKnownIP ? lastKnownIP : "localhost"]-[computer_id] || BYOND v[client.byond_version]")

code/modules/mob/new_player/preferences.dm

@@ -1120,9 +1120,10 @@ datum/preferences
 
 	proc/setup_client(var/client/C)
 		if(C)
-			C.sound_adminhelp = src.sound_adminhelp
+			if(C.holder)
+				C.holder.sound_adminhelp = src.sound_adminhelp
+				C.holder.ooccolor = src.ooccolor
 			C.midis = src.midis
-			C.ooccolor = src.ooccolor
 			C.be_alien = be_special & BE_ALIEN
 			C.be_pai = be_special & BE_PAI
 			if(isnull(src.ghost_ears)) src.ghost_ears = 1 //There were problems where the default was null before someone saved their profile.

code/modules/mob/new_player/preferences_setup.dm

@@ -540,7 +540,6 @@ datum/preferences
 		preview_icon_side = new(preview_icon, dir = WEST)
 
 		del(preview_icon)
-		del(mouth_s)
 		del(eyes_s)
 		del(clothes_s)