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/game/objects/items/weapons/cosmetics.dm

@@ -0,0 +1,87 @@
+/obj/item/weapon/lipstick
+	name = "red lipstick"
+	desc = "A generic brand of lipstick."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "lipstick"
+	flags = FPRINT | TABLEPASS
+	w_class = 1.0
+	var/colour = "red"
+	var/open = 0
+
+
+/obj/item/weapon/lipstick/purple
+	name = "purple lipstick"
+	colour = "purple"
+
+/obj/item/weapon/lipstick/jade
+	name = "jade lipstick"
+	colour = "jade"
+
+/obj/item/weapon/lipstick/black
+	name = "black lipstick"
+	colour = "black"
+
+
+/obj/item/weapon/lipstick/random
+	name = "lipstick"
+
+/obj/item/weapon/lipstick/random/New()
+	colour = pick("red","purple","jade","black")
+	name = "[colour] lipstick"
+
+
+/obj/item/weapon/lipstick/attack_self(mob/user as mob)
+	user << "<span class='notice'>You twist \the [src] [open ? "closed" : "open"].</span>"
+	open = !open
+	if(open)
+		icon_state = "[initial(icon_state)]_[colour]"
+	else
+		icon_state = initial(icon_state)
+
+/obj/item/weapon/lipstick/attack(mob/M as mob, mob/user as mob)
+	if(!open)	return
+
+	if(!istype(M, /mob))	return
+
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.lip_style)	//if they already have lipstick on
+			user << "<span class='notice'>You need to wipe off the old lipstick first!</span>"
+			return
+		if(H == user)
+			user.visible_message("<span class='notice'>[user] does their lips with \the [src].</span>", \
+								 "<span class='notice'>You take a moment to apply \the [src]. Perfect!</span>")
+			H.lip_style = colour
+			H.update_body()
+		else
+			user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
+								 "<span class='notice'>You begin to apply \the [src].</span>")
+			if(do_after(user, 20) && do_after(H, 20, 5, 0))	//user needs to keep their active hand, H does not.
+				user.visible_message("<span class='notice'>[user] does [H]'s lips with \the [src].</span>", \
+									 "<span class='notice'>You apply \the [src].</span>")
+				H.lip_style = colour
+				H.update_body()
+	else
+		user << "<span class='notice'>Where are the lips on that?</span>"
+
+//you can wipe off lipstick with paper!
+/obj/item/weapon/paper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(user.zone_sel.selecting == "mouth")
+		if(!istype(M, /mob))	return
+
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+			if(H == user)
+				user << "<span class='notice'>You wipe off the lipstick with [src].</span>"
+				H.lip_style = null
+				H.update_body()
+			else
+				user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \
+								 	 "<span class='notice'>You begin to wipe off [H]'s lipstick.</span>")
+				if(do_after(user, 10) && do_after(H, 10, 5, 0))	//user needs to keep their active hand, H does not.
+					user.visible_message("<span class='notice'>[user] wipes [H]'s lipstick off with \the [src].</span>", \
+										 "<span class='notice'>You wipe off [H]'s lipstick.</span>")
+					H.lip_style = null
+					H.update_body()
+	else
+		..()

code/game/objects/items/weapons/mop.dm

@@ -3,8 +3,6 @@
 	name = "mop"
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "mop"
-	var/mopping = 0
-	var/mopcount = 0
 	force = 3.0
 	throwforce = 10.0
 	throw_speed = 5
@@ -12,6 +10,8 @@
 	w_class = 3.0
 	flags = FPRINT | TABLEPASS
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
+	var/mopping = 0
+	var/mopcount = 0
 
 
 /obj/item/weapon/mop/New()
@@ -21,7 +21,7 @@
 
 
 obj/item/weapon/mop/proc/clean(turf/simulated/A as turf)
-	src.reagents.reaction(A,1,10)
+	reagents.reaction(A,1,10)
 	A.clean_blood()
 	for(var/obj/effect/O in A)
 		if( istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay) )
@@ -35,35 +35,20 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A as turf)
 
 
 /obj/item/weapon/mop/afterattack(atom/A, mob/user as mob)
-	if (src.reagents.total_volume < 1 || mopcount >= 5)
-		user << "\blue Your mop is dry!"
+	if(reagents.total_volume < 1 || mopcount >= 5)
+		user << "<span class='notice'>Your mop is dry!</span>"
 		return
 
-	if (istype(A, /turf/simulated))
-		for(var/mob/O in viewers(user, null))
-			O.show_message("\red <B>[user] begins to clean \the [A]</B>", 1)
-		sleep(40)
-		if(A)
-			clean(A)
-		user << "\blue You have finished mopping!"
-		mopcount++
-	else if (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
-		for(var/mob/O in viewers(user, null))
-			O.show_message("\red <B>[user] begins to clean \the [get_turf(A)]</B>", 1)
-		sleep(40)
-		if(A)
-			clean(get_turf(A))
-		user << "\blue You have finished mopping!"
-		mopcount++
+	if(istype(A, /turf/simulated) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
+		user.visible_message("<span class='warning'>[user] begins to clean \the [get_turf(A)].</span>")
+		if(do_after(user, 40))
+			if(A)
+				clean(get_turf(A))
+			user << "<span class='notice'>You have finished mopping!</span>"
+			mopcount++
 
 	if(mopcount >= 5) //Okay this stuff is an ugly hack and i feel bad about it.
 		spawn(5)
-			src.reagents.clear_reagents()
+			reagents.clear_reagents()
 			mopcount = 0
-	return
-
-
-
-
-
-
+	return